From efb3e2ce70b8556006c57f271123521a94a84cb2 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 11 Dec 2019 15:30:15 +0100 Subject: [PATCH] Full 1.15 support --- SpigotCore_15/pom.xml | 53 +++++++++++++++++++ .../de/steamwar/inventory/SWInventory_15.java | 13 +++++ .../src/de/steamwar/inventory/SWItem_15.java | 15 ++++++ .../src/de/steamwar/sql/Schematic_15.java | 23 ++++++++ SpigotCore_Main/pom.xml | 8 ++- .../de/steamwar/inventory/SWInventory.java | 3 ++ .../src/de/steamwar/inventory/SWItem.java | 4 ++ .../src/de/steamwar/sql/Schematic.java | 8 +++ pom.xml | 1 + 9 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 SpigotCore_15/pom.xml create mode 100644 SpigotCore_15/src/de/steamwar/inventory/SWInventory_15.java create mode 100644 SpigotCore_15/src/de/steamwar/inventory/SWItem_15.java create mode 100644 SpigotCore_15/src/de/steamwar/sql/Schematic_15.java diff --git a/SpigotCore_15/pom.xml b/SpigotCore_15/pom.xml new file mode 100644 index 0000000..610c11b --- /dev/null +++ b/SpigotCore_15/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + steamwar + SpigotCore + 2.0 + + + SpigotCore_15 + 2.0 + + + src + + + src + + **/*.java + **/*.kt + + + + + + + + steamwar + Spigot + 1.15 + provided + + + steamwar + FAWE + 1.14 + provided + + + steamwar + SpigotCore_API + 2.0 + + + steamwar + SpigotCore_14 + 2.0 + + + \ No newline at end of file diff --git a/SpigotCore_15/src/de/steamwar/inventory/SWInventory_15.java b/SpigotCore_15/src/de/steamwar/inventory/SWInventory_15.java new file mode 100644 index 0000000..1b3271b --- /dev/null +++ b/SpigotCore_15/src/de/steamwar/inventory/SWInventory_15.java @@ -0,0 +1,13 @@ +package de.steamwar.inventory; + +import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; + +class SWInventory_15 { + private SWInventory_15() {} + + static Inventory get(Player player, int size, String title){ + return new CraftInventoryCustom(player, size, title); + } +} diff --git a/SpigotCore_15/src/de/steamwar/inventory/SWItem_15.java b/SpigotCore_15/src/de/steamwar/inventory/SWItem_15.java new file mode 100644 index 0000000..46a5760 --- /dev/null +++ b/SpigotCore_15/src/de/steamwar/inventory/SWItem_15.java @@ -0,0 +1,15 @@ +package de.steamwar.inventory; + +import org.bukkit.Material; + +class SWItem_15 { + private SWItem_15(){} + + static Material getMaterial(String material) { + return SWItem_14.getMaterial(material); + } + + static Material getDye(int colorCode){ + return SWItem_14.getDye(colorCode); + } +} diff --git a/SpigotCore_15/src/de/steamwar/sql/Schematic_15.java b/SpigotCore_15/src/de/steamwar/sql/Schematic_15.java new file mode 100644 index 0000000..5dd23e2 --- /dev/null +++ b/SpigotCore_15/src/de/steamwar/sql/Schematic_15.java @@ -0,0 +1,23 @@ +package de.steamwar.sql; + +import com.sk89q.worldedit.extent.clipboard.Clipboard; +import org.bukkit.entity.Player; + +import java.io.IOException; +import java.io.InputStream; + +class Schematic_15 { + private Schematic_15(){} + + static byte[] getPlayerClipboard(Player player, boolean schemFormat) throws IOException, NoClipboardException { + return Schematic_14.getPlayerClipboard(player, schemFormat); + } + + static void setPlayerClipboard(Player player, InputStream is, boolean schemFormat) throws IOException, NoClipboardException { + Schematic_14.setPlayerClipboard(player, is, schemFormat); + } + + static Clipboard getClipboard(InputStream is, boolean schemFormat) throws IOException, NoClipboardException { + return Schematic_14.getClipboard(is, schemFormat); + } +} diff --git a/SpigotCore_Main/pom.xml b/SpigotCore_Main/pom.xml index 4e37b49..e927f09 100644 --- a/SpigotCore_Main/pom.xml +++ b/SpigotCore_Main/pom.xml @@ -47,7 +47,7 @@ steamwar Spigot - 1.12 + 1.15 provided @@ -80,5 +80,11 @@ 2.0 compile + + steamwar + SpigotCore_15 + 2.0 + compile + \ No newline at end of file diff --git a/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java b/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java index 143262b..671a755 100644 --- a/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java +++ b/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java @@ -31,6 +31,9 @@ public class SWInventory implements Listener { case 14: inventory = SWInventory_14.get(p, size, t); break; + case 15: + inventory = SWInventory_15.get(p, size, t); + break; default: inventory = SWInventory_12.get(p, size, t); } diff --git a/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java b/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java index 8b8df63..dd7b441 100644 --- a/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java +++ b/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java @@ -40,6 +40,8 @@ public class SWItem { switch(Core.getVersion()){ case 14: return SWItem_14.getMaterial(material); + case 15: + return SWItem_15.getMaterial(material); default: return SWItem_12.getMaterial(material); } @@ -52,6 +54,8 @@ public class SWItem { switch(Core.getVersion()){ case 14: return SWItem_14.getDye(colorCode); + case 15: + return SWItem_15.getDye(colorCode); default: return SWItem_12.getDye(); } diff --git a/SpigotCore_Main/src/de/steamwar/sql/Schematic.java b/SpigotCore_Main/src/de/steamwar/sql/Schematic.java index cccb5a3..92565fc 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/Schematic.java +++ b/SpigotCore_Main/src/de/steamwar/sql/Schematic.java @@ -184,6 +184,8 @@ public class Schematic { return Schematic_8.getClipboard(is); case 14: return Schematic_14.getClipboard(is, schemFormat); + case 15: + return Schematic_15.getClipboard(is, schemFormat); default: return Schematic_12.getClipboard(is); } @@ -207,6 +209,9 @@ public class Schematic { case 14: Schematic_14.setPlayerClipboard(player, is, schemFormat); break; + case 15: + Schematic_15.setPlayerClipboard(player, is, schemFormat); + break; default: Schematic_12.setPlayerClipboard(player, is); } @@ -235,6 +240,9 @@ public class Schematic { case 14: data = Schematic_14.getPlayerClipboard(player, newFormat); break; + case 15: + data = Schematic_15.getPlayerClipboard(player, newFormat); + break; default: newFormat = false; data = Schematic_12.getPlayerClipboard(player); diff --git a/pom.xml b/pom.xml index f403dc5..1a1eeb5 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ SpigotCore_8 SpigotCore_12 SpigotCore_14 + SpigotCore_15 SpigotCore_Main \ No newline at end of file