From e6417bd57873a696914fcaa870e7fbabaf5646de Mon Sep 17 00:00:00 2001 From: jojo Date: Fri, 12 Feb 2021 11:01:58 +0100 Subject: [PATCH] Fix pr stuff --- .../CommandSimulatorTabCompleter.java | 4 +-- .../bausystem/world/TNTSimulator.java | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulatorTabCompleter.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulatorTabCompleter.java index dea9982..65841e7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulatorTabCompleter.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulatorTabCompleter.java @@ -33,10 +33,10 @@ public class CommandSimulatorTabCompleter implements TabCompleter { @Override public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { if(!(sender instanceof Player)) return new ArrayList<>(); - return detonaterTabComplete((Player) sender, args); + return simulatorTabComplete((Player) sender, args); } - private List detonaterTabComplete(Player player, String[] args) { + private List simulatorTabComplete(Player player, String[] args) { List tabComplete = new ArrayList<>(); tabComplete.add("wand"); tabComplete.add("start"); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java b/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java index f294bbd..d537811 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java @@ -117,7 +117,7 @@ public class TNTSimulator { })); // Change Count of spawned TNT - swInventory.setItem(10, new SWItem(SWItem.getDye(10), "§a+1", clickType -> { + swInventory.setItem(10, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { tntSpawn.setCount(tntSpawn.getCount() + 1); if (tntSpawn.getCount() > 400) { tntSpawn.setCount(400); @@ -132,7 +132,7 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(28, new SWItem(SWItem.getDye(1), "§c-1", clickType -> { + swInventory.setItem(28, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { tntSpawn.setCount(tntSpawn.getCount() - 1); if (tntSpawn.getCount() < 1) { tntSpawn.setCount(1); @@ -141,7 +141,7 @@ public class TNTSimulator { })); // Change TickOffset - swInventory.setItem(11, new SWItem(SWItem.getDye(10), "§a+1", clickType -> { + swInventory.setItem(11, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { tntSpawn.setTickOffset(tntSpawn.getTickOffset() + 1); if (tntSpawn.getTickOffset() > 8000) { tntSpawn.setTickOffset(8000); @@ -156,7 +156,7 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(29, new SWItem(SWItem.getDye(1), "§c-1", clickType -> { + swInventory.setItem(29, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { tntSpawn.setTickOffset(tntSpawn.getTickOffset() - 1); if (tntSpawn.getTickOffset() < 0) { tntSpawn.setTickOffset(0); @@ -165,7 +165,7 @@ public class TNTSimulator { })); // Change FuseTicks - swInventory.setItem(12, new SWItem(SWItem.getDye(10), "§a+1", clickType -> { + swInventory.setItem(12, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { tntSpawn.setFuseTicks(tntSpawn.getFuseTicks() + 1); if (tntSpawn.getFuseTicks() > 80) { tntSpawn.setFuseTicks(80); @@ -180,7 +180,7 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(30, new SWItem(SWItem.getDye(1), "§c-1", clickType -> { + swInventory.setItem(30, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { tntSpawn.setFuseTicks(tntSpawn.getFuseTicks() - 1); if (tntSpawn.getFuseTicks() < 1) { tntSpawn.setFuseTicks(1); @@ -195,21 +195,21 @@ public class TNTSimulator { })); // Velocity Settings - swInventory.setItem(13, new SWItem(tntSpawn.isxVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7Start §eVelocity X §8- §7" + active(tntSpawn.isxVelocity()), clickType -> { + swInventory.setItem(13, new SWItem(tntSpawn.isxVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7TNT §eSprung X §8- §7" + active(tntSpawn.isxVelocity()), clickType -> { tntSpawn.setxVelocity(!tntSpawn.isxVelocity()); editTNT(player, tntSpawn); })); - swInventory.setItem(22, new SWItem(tntSpawn.isyVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7Start §eVelocity Y §8- §7" + active(tntSpawn.isyVelocity()), clickType -> { + swInventory.setItem(22, new SWItem(tntSpawn.isyVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7TNT §eSprung Y §8- §7" + active(tntSpawn.isyVelocity()), clickType -> { tntSpawn.setyVelocity(!tntSpawn.isyVelocity()); editTNT(player, tntSpawn); })); - swInventory.setItem(31, new SWItem(tntSpawn.iszVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7Start §eVelocity Z §8- §7" + active(tntSpawn.iszVelocity()), clickType -> { + swInventory.setItem(31, new SWItem(tntSpawn.iszVelocity() ? Material.LIME_CONCRETE : Material.RED_CONCRETE, "§7TNT §eSprung Z §8- §7" + active(tntSpawn.iszVelocity()), clickType -> { tntSpawn.setzVelocity(!tntSpawn.iszVelocity()); editTNT(player, tntSpawn); })); // X Position - swInventory.setItem(14, new SWItem(SWItem.getDye(10), "§a+0,0625", clickType -> { + swInventory.setItem(14, new SWItem(SWItem.getDye(10), "§7+0,0625", clickType -> { tntSpawn.getPosition().add(X_VECTOR); editTNT(player, tntSpawn); })); @@ -219,13 +219,13 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(32, new SWItem(SWItem.getDye(1), "§c-0,0625", clickType -> { + swInventory.setItem(32, new SWItem(SWItem.getDye(1), "§7-0,0625", clickType -> { tntSpawn.getPosition().add(NX_VECTOR); editTNT(player, tntSpawn); })); // Y Position - swInventory.setItem(15, new SWItem(SWItem.getDye(10), "§a+0,0625", clickType -> { + swInventory.setItem(15, new SWItem(SWItem.getDye(10), "§7+0,0625", clickType -> { tntSpawn.getPosition().add(Y_VECTOR); editTNT(player, tntSpawn); })); @@ -235,13 +235,13 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(33, new SWItem(SWItem.getDye(1), "§c-0,0625", clickType -> { + swInventory.setItem(33, new SWItem(SWItem.getDye(1), "§7-0,0625", clickType -> { tntSpawn.getPosition().add(NY_VECTOR); editTNT(player, tntSpawn); })); // Z Position - swInventory.setItem(16, new SWItem(SWItem.getDye(10), "§a+0,0625", clickType -> { + swInventory.setItem(16, new SWItem(SWItem.getDye(10), "§7+0,0625", clickType -> { tntSpawn.getPosition().add(Z_VECTOR); editTNT(player, tntSpawn); })); @@ -251,7 +251,7 @@ public class TNTSimulator { editTNT(player, tntSpawn); }, () -> editTNT(player, tntSpawn)); })); - swInventory.setItem(34, new SWItem(SWItem.getDye(1), "§c-0,0625", clickType -> { + swInventory.setItem(34, new SWItem(SWItem.getDye(1), "§7-0,0625", clickType -> { tntSpawn.getPosition().add(NZ_VECTOR); editTNT(player, tntSpawn); }));