From feb21afa92a346314ef0b1af6497624e15377d68 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 21 Dec 2019 21:02:11 +0100 Subject: [PATCH 1/2] Adding first 1.15 support --- {BauSystem_14 => BauSystem_15}/pom.xml | 4 ++-- .../steamwar/bausystem/commands/CommandInfo_15.java | 6 +++--- .../de/steamwar/bausystem/world/AutoLoader_15.java | 4 ++-- .../src/de/steamwar/bausystem/world/Region_15.java | 4 ++-- .../de/steamwar/bausystem/world/TNTTracer_15.java | 4 ++-- .../de/steamwar/bausystem/commands/CommandInfo.java | 4 ++-- .../src/de/steamwar/bausystem/world/Region.java | 4 ++-- .../src/de/steamwar/bausystem/world/TNTTracer.java | 12 ++++++------ pom.xml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename {BauSystem_14 => BauSystem_15}/pom.xml (94%) rename BauSystem_14/src/de/steamwar/bausystem/commands/CommandInfo_14.java => BauSystem_15/src/de/steamwar/bausystem/commands/CommandInfo_15.java (54%) rename BauSystem_14/src/de/steamwar/bausystem/world/AutoLoader_14.java => BauSystem_15/src/de/steamwar/bausystem/world/AutoLoader_15.java (93%) rename BauSystem_14/src/de/steamwar/bausystem/world/Region_14.java => BauSystem_15/src/de/steamwar/bausystem/world/Region_15.java (91%) rename BauSystem_14/src/de/steamwar/bausystem/world/TNTTracer_14.java => BauSystem_15/src/de/steamwar/bausystem/world/TNTTracer_15.java (95%) diff --git a/BauSystem_14/pom.xml b/BauSystem_15/pom.xml similarity index 94% rename from BauSystem_14/pom.xml rename to BauSystem_15/pom.xml index 8d99b7d..4e122ef 100644 --- a/BauSystem_14/pom.xml +++ b/BauSystem_15/pom.xml @@ -10,7 +10,7 @@ 1.0 - BauSystem_14 + BauSystem_15 1.0 @@ -30,7 +30,7 @@ steamwar Spigot - 1.14 + 1.15 provided diff --git a/BauSystem_14/src/de/steamwar/bausystem/commands/CommandInfo_14.java b/BauSystem_15/src/de/steamwar/bausystem/commands/CommandInfo_15.java similarity index 54% rename from BauSystem_14/src/de/steamwar/bausystem/commands/CommandInfo_14.java rename to BauSystem_15/src/de/steamwar/bausystem/commands/CommandInfo_15.java index db914ad..0fd1b90 100644 --- a/BauSystem_14/src/de/steamwar/bausystem/commands/CommandInfo_14.java +++ b/BauSystem_15/src/de/steamwar/bausystem/commands/CommandInfo_15.java @@ -1,9 +1,9 @@ package de.steamwar.bausystem.commands; -import net.minecraft.server.v1_14_R1.MinecraftServer; +import net.minecraft.server.v1_15_R1.MinecraftServer; -public class CommandInfo_14 { - private CommandInfo_14(){} +public class CommandInfo_15 { + private CommandInfo_15(){} static double[] getTps(){ return MinecraftServer.getServer().recentTps; diff --git a/BauSystem_14/src/de/steamwar/bausystem/world/AutoLoader_14.java b/BauSystem_15/src/de/steamwar/bausystem/world/AutoLoader_15.java similarity index 93% rename from BauSystem_14/src/de/steamwar/bausystem/world/AutoLoader_14.java rename to BauSystem_15/src/de/steamwar/bausystem/world/AutoLoader_15.java index a4c990c..cd19878 100644 --- a/BauSystem_14/src/de/steamwar/bausystem/world/AutoLoader_14.java +++ b/BauSystem_15/src/de/steamwar/bausystem/world/AutoLoader_15.java @@ -4,8 +4,8 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.event.player.PlayerInteractEvent; -class AutoLoader_14 { - private AutoLoader_14(){} +class AutoLoader_15 { + private AutoLoader_15(){} static boolean tntPlaceActionPerform(Location location){ Material m = location.getBlock().getType(); diff --git a/BauSystem_14/src/de/steamwar/bausystem/world/Region_14.java b/BauSystem_15/src/de/steamwar/bausystem/world/Region_15.java similarity index 91% rename from BauSystem_14/src/de/steamwar/bausystem/world/Region_14.java rename to BauSystem_15/src/de/steamwar/bausystem/world/Region_15.java index aa9ff59..e15f89d 100644 --- a/BauSystem_14/src/de/steamwar/bausystem/world/Region_14.java +++ b/BauSystem_15/src/de/steamwar/bausystem/world/Region_15.java @@ -7,8 +7,8 @@ import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.transform.AffineTransform; import org.bukkit.Bukkit; -public class Region_14 { - private Region_14(){} +public class Region_15 { + private Region_15(){} static void paste(Schematic schem, Vector v, AffineTransform aT){ schem.paste(new BukkitWorld(Bukkit.getWorlds().get(0)), BlockVector3.at(v.getX(), v.getY(), v.getZ()), false, true, aT).flushQueue(); diff --git a/BauSystem_14/src/de/steamwar/bausystem/world/TNTTracer_14.java b/BauSystem_15/src/de/steamwar/bausystem/world/TNTTracer_15.java similarity index 95% rename from BauSystem_14/src/de/steamwar/bausystem/world/TNTTracer_14.java rename to BauSystem_15/src/de/steamwar/bausystem/world/TNTTracer_15.java index 586e125..945bba3 100644 --- a/BauSystem_14/src/de/steamwar/bausystem/world/TNTTracer_14.java +++ b/BauSystem_15/src/de/steamwar/bausystem/world/TNTTracer_15.java @@ -9,8 +9,8 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; -class TNTTracer_14 { - private TNTTracer_14(){} +class TNTTracer_15 { + private TNTTracer_15(){} static void remove(Map> locations, TNTPrimed tnt){ Material material = tnt.getLocation().getBlock().getType(); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java index d3e70e7..db20493 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java @@ -33,8 +33,8 @@ public class CommandInfo implements CommandExecutor { double[] tps; switch(Core.getVersion()){ - case 14: - tps = CommandInfo_14.getTps(); + case 15: + tps = CommandInfo_15.getTps(); break; default: tps = CommandInfo_12.getTps(); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/Region.java b/BauSystem_Main/src/de/steamwar/bausystem/world/Region.java index 7ff96d6..71f66d0 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/Region.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/Region.java @@ -67,8 +67,8 @@ public class Region { static void paste(Schematic schem, Vector v, AffineTransform aT){ switch(Core.getVersion()){ - case 14: - Region_14.paste(schem, v, aT); + case 15: + Region_15.paste(schem, v, aT); default: Region_12.paste(schem, v, aT); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTTracer.java b/BauSystem_Main/src/de/steamwar/bausystem/world/TNTTracer.java index 980790f..6b5c831 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTTracer.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/TNTTracer.java @@ -27,8 +27,8 @@ public class TNTTracer { static void remove(TNTPrimed tnt){ switch (Core.getVersion()){ - case 14: - TNTTracer_14.remove(locations, tnt); + case 15: + TNTTracer_15.remove(locations, tnt); break; default: TNTTracer_12.remove(locations, tnt); @@ -52,8 +52,8 @@ public class TNTTracer { status = Status.SHOW; switch (Core.getVersion()){ - case 14: - return TNTTracer_14.show(locations, printedLocs); + case 15: + return TNTTracer_15.show(locations, printedLocs); default: return TNTTracer_12.show(locations, printedLocs); } @@ -74,8 +74,8 @@ public class TNTTracer { private static boolean airOrBrick(Block block){ switch(Core.getVersion()){ - case 14: - return TNTTracer_14.airOrBrick(block); + case 15: + return TNTTracer_15.airOrBrick(block); default: return TNTTracer_12.airOrBrick(block); } diff --git a/pom.xml b/pom.xml index 96bc0c3..1ed6e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ BauSystem_12 - BauSystem_14 + BauSystem_15 BauSystem_Main BauSystem_API From f49fe41d37735d29f83c52443af6356a0c2189da Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 21 Dec 2019 21:07:58 +0100 Subject: [PATCH 2/2] Adding api-version --- BauSystem_Main/src/plugin.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BauSystem_Main/src/plugin.yml b/BauSystem_Main/src/plugin.yml index ea9b9f6..0f92685 100644 --- a/BauSystem_Main/src/plugin.yml +++ b/BauSystem_Main/src/plugin.yml @@ -1,9 +1,11 @@ name: BauSystem author: Lixfel -version: 1.0 +version: "1.0" depend: [WorldEdit, SpigotCore] load: POSTWORLD main: de.steamwar.bausystem.BauSystem +api-version: "1.13" + commands: tnt: fire: