Merge branch 'master' into RedstoneTester

BauSystem_12/src/de/steamwar/bausystem/commands/TPSLimit_12.java

@@ -24,7 +24,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
-import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 
 import java.util.ArrayList;
@@ -36,7 +36,7 @@ class TPSLimit_12 {
 
     static void createTickCache(World world) {
         packets.clear();
-        world.getEntitiesByClasses(TNTPrimed.class, FallingBlock.class).forEach(entity -> {
+        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
             packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), 0, 0, 0));
             packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
 

BauSystem_12/src/de/steamwar/bausystem/tracer/TraceEntity_12.java

@@ -49,7 +49,7 @@ class TraceEntity_12 extends EntityFallingBlock implements AbstractTraceEntity {
         } else if (references++ > 0)
             return;
 
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(this, 0, 0);
+        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(this, 70, Block.getCombinedId(getBlock()));
         PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
         playerConnection.sendPacket(packetPlayOutSpawnEntity);
 

BauSystem_15/src/de/steamwar/bausystem/commands/TPSLimit_15.java

@@ -24,7 +24,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ class TPSLimit_15 {
 
     static void createTickCache(World world) {
         packets.clear();
-        world.getEntitiesByClasses(TNTPrimed.class, FallingBlock.class).forEach(entity -> {
+        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
             packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
             packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
 

BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonator.java

@@ -33,7 +33,7 @@ public class CommandDetonator implements CommandExecutor {
 
     private void help(Player player) {
         player.sendMessage("§8/§edetonator wand §8- §7Legt den Fernzünder ins Inventar");
-        player.sendMessage("§8/§edetonator detonate §8- §7Benutzt den Fernzünder");
+        player.sendMessage("§8/§edetonator detonate §8- §7Benutzt den nächst besten Fernzünder");
         player.sendMessage("§8/§edetonator reset §8- §7Löscht alle markierten Positionen");
         player.sendMessage("§8/§edetonator remove §8- §7Entfernt den Fernzünder");
     }

BauSystem_Main/src/de/steamwar/bausystem/world/Detonator.java

@@ -50,7 +50,11 @@ public class Detonator implements Listener {
 
         im.setDisplayName("§eFernzünder");
 
-        VersionedRunnable.call(new VersionedRunnable(() -> im.getPersistentDataContainer().set(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE, (byte) 1), 15));
+        VersionedRunnable.call(
+                new VersionedRunnable(() -> {
+                    im.getPersistentDataContainer().set(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE, (byte) 1);
+                    im.getPersistentDataContainer().set(new NamespacedKey(BauSystem.getPlugin(), "deto-locs"), PersistentDataType.INTEGER, 0);
+                }, 15));
 
         List<String> lorelist = Arrays.asList("§eLinks Klick §8- §7Setzte einen Punkt zum Aktivieren",
                 "§eLinks Klick + Shift §8- §7Füge einen Punkt hinzu", "§eRechts Klick §8- §7Löse alle Punkte aus");
@@ -66,7 +70,7 @@ public class Detonator implements Listener {
             ItemMeta meta = item.getItemMeta();
             PersistentDataContainer container = meta.getPersistentDataContainer();
             List<int[]> locs = new ArrayList<>();
-            for (int i = 0; i < 128; i++) {
+            for (int i = 0; i < getDetoLocs(container); i++) {
                 NamespacedKey key = new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + i);
                 if (container.has(key, PersistentDataType.INTEGER_ARRAY))
                     locs.add(container.get(key, PersistentDataType.INTEGER_ARRAY));
@@ -94,7 +98,7 @@ public class Detonator implements Listener {
             }, 12), new VersionedCallable<>(() -> removeLocation(item, location), 15));
         } else {
             DetonatorListener.print(player, detoloader.addBack ? "§e" + detoloader.getBlock() + " hinzugefügt" :
-                    detoloader.getBlock(), Math.min(Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() + 1, 128));
+                    detoloader.getBlock(), Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() + 1);
             if (detoloader.getActivation() == 0)
                 return VersionedCallable.call(new VersionedCallable<>(() -> {
                     PLAYER_LOCS.computeIfAbsent(player, player1 -> new HashSet<>()).add(new Detoloader.DetonatorActivation(location));
@@ -110,11 +114,40 @@ public class Detonator implements Listener {
 
     public static void execute(Player player) {
         VersionedRunnable.call(new VersionedRunnable(() -> execute(player, PLAYER_LOCS.get(player)), 12), new VersionedRunnable(() -> {
-            Detonator detonator = getDetonator(player, player.getInventory().getItemInMainHand());
+            try {
-            execute(player, detonator.getLocs());
+                ItemStack item = getNextBestDetonator(player);
+                if (item == null)
+                    return;
+                Detonator detonator = getDetonator(player, item);
+                execute(player, detonator.getLocs());
+            } catch (SecurityException e) {
+                player.sendMessage(BauSystem.PREFIX + "§c" + e.getMessage());
+            }
         }, 15));
     }
 
+    private static ItemStack getNextBestDetonator(Player player) {
+        if (player.getInventory().getItemInMainHand().getItemMeta() != null && player.getInventory().getItemInMainHand().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
+            return player.getInventory().getItemInMainHand();
+        }
+
+        if(player.getInventory().getItemInOffHand().getItemMeta() != null && player.getInventory().getItemInOffHand().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
+            return player.getInventory().getItemInOffHand();
+        }
+
+        for (ItemStack item : player.getInventory().getContents()) {
+            if (item == null)
+                continue;
+
+            if (item.getItemMeta() != null &&
+                    item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
+                return item;
+            }
+        }
+        player.sendMessage(BauSystem.PREFIX + "§cDu hast keinen Detonator im Inventar");
+        return null;
+    }
+
     private static void execute(Player player, Set<Detoloader.DetonatorActivation> locs) {
         for (Detoloader.DetonatorActivation activation : locs) {
 
@@ -141,22 +174,46 @@ public class Detonator implements Listener {
 
     private static int getFreeSlot(ItemStack item) {
         ItemMeta meta = item.getItemMeta();
+        if (meta == null) {
+            throw new SecurityException("Das Item ist kein Detonator");
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
-        for (int i = 0; i < 128; i++) {
+        if (!container.has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
-            if (!container.has(new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + i), PersistentDataType.INTEGER_ARRAY))
+            throw new SecurityException("Das Item ist kein Detonator");
+        }
+        for (int i = 0; i < getDetoLocs(container) + 1; i++) {
+            if (!container.has(new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + i), PersistentDataType.INTEGER_ARRAY)) {
                 return i;
+            }
         }
         return -1;
     }
 
+    private static int getDetoLocs(PersistentDataContainer container) {
+        if (!container.has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
+            throw new SecurityException("Das Item ist kein Detonator");
+        }
+        return container.get(new NamespacedKey(BauSystem.getPlugin(), "deto-locs"), PersistentDataType.INTEGER);
+    }
+
+    private static void increaseLocsSize(PersistentDataContainer container, int to) {
+        if (!container.has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
+            throw new SecurityException("Das Item ist kein Detonator");
+        }
+        if (container.get(new NamespacedKey(BauSystem.getPlugin(), "deto-locs"), PersistentDataType.INTEGER) < to) {
+            container.set(new NamespacedKey(BauSystem.getPlugin(), "deto-locs"), PersistentDataType.INTEGER, to);
+        }
+    }
+
     public static ItemStack pushLocToDetonator(ItemStack item, Detoloader.DetonatorActivation detoloader) {
         int slot = getFreeSlot(item);
         if (slot == -1)
-            throw new SecurityException("Der Detonator ist auf 128 Positionen Limitiert");
+            throw new SecurityException("Ein Fehler ist aufgetreten");
         ItemMeta meta = item.getItemMeta();
         Location block = detoloader.location;
         meta.getPersistentDataContainer().set(new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + slot), PersistentDataType.INTEGER_ARRAY, new int[]
                 {block.getBlockX(), block.getBlockY(), block.getBlockZ(), detoloader.activation});
+        increaseLocsSize(meta.getPersistentDataContainer(), slot + 1);
         item.setItemMeta(meta);
         return item;
     }
@@ -164,7 +221,8 @@ public class Detonator implements Listener {
     public static ItemStack clearDetonator(ItemStack item) {
         ItemMeta meta = item.getItemMeta();
         PersistentDataContainer container = meta.getPersistentDataContainer();
-        for (int i = 0; i < 128; i++) {
+        container.set(new NamespacedKey(BauSystem.getPlugin(), "deto-locs"), PersistentDataType.INTEGER, 0);
+        for (int i = 0; i < getDetoLocs(container); i++) {
             NamespacedKey key = new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + i);
             container.remove(key);
         }
@@ -179,7 +237,7 @@ public class Detonator implements Listener {
     private static int getSlotOfLocation(ItemStack item, Location location) {
         ItemMeta meta = item.getItemMeta();
         PersistentDataContainer container = meta.getPersistentDataContainer();
-        for (int i = 0; i < 128; i++) {
+        for (int i = 0; i < getDetoLocs(container); i++) {
             NamespacedKey key = new NamespacedKey(BauSystem.getPlugin(), DETO_PREFIX + i);
             if (container.has(key, PersistentDataType.INTEGER_ARRAY)) {
                 int[] locs = container.get(key, PersistentDataType.INTEGER_ARRAY);

BauSystem_Main/src/de/steamwar/bausystem/world/DetonatorListener.java

@@ -27,40 +27,35 @@ public class DetonatorListener implements Listener {
             }
             ItemStack item = event.getItem();
             event.setCancelled(true);
-            try {
+            switch (event.getAction()) {
-                switch (event.getAction()) {
+                case LEFT_CLICK_BLOCK:
-                    case LEFT_CLICK_BLOCK:
+                    Detoloader detoloader = VersionedCallable.call(
-                        Detoloader detoloader = VersionedCallable.call(
+                            new VersionedCallable<>(() -> AutoLoader_12.onPlayerInteractLoader(event), 12),
-                                new VersionedCallable<>(() -> AutoLoader_12.onPlayerInteractLoader(event), 12),
+                            new VersionedCallable<>(() -> AutoLoader_15.onPlayerInteractLoader(event), 15));
-                                new VersionedCallable<>(() -> AutoLoader_15.onPlayerInteractLoader(event), 15));
 
-                        if (detoloader == null) {
+                    if (detoloader == null) {
-                            return;
+                        return;
-                        } else if (detoloader.activation == -1) {
+                    } else if (detoloader.activation == -1) {
-                            print(player, detoloader.getBlock(), detoloader.addBack ? Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() : 0);
+                        print(player, detoloader.getBlock(), detoloader.addBack ? Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() : 0);
-                            return;
+                        return;
-                        }
+                    }
 
-                        if (event.getPlayer().isSneaking()) {
+                    if (event.getPlayer().isSneaking()) {
-                            player.getInventory().setItemInMainHand(Detonator.toggleLocation(item, player, detoloader, event.getClickedBlock().getLocation()));
+                        player.getInventory().setItemInMainHand(Detonator.toggleLocation(item, player, detoloader, event.getClickedBlock().getLocation()));
+                    } else {
+                        if (detoloader.getActivation() == 0) {
+                            player.getInventory().setItemInMainHand(Detonator.setLocation(player, item, new Detoloader.DetonatorActivation(event.getClickedBlock().getLocation())));
                         } else {
-                            if (detoloader.getActivation() == 0) {
+                            player.getInventory().setItemInMainHand(Detonator.setLocation(player, item, new Detoloader.DetonatorActivation(detoloader.activation, event.getClickedBlock().getLocation())));
-                                player.getInventory().setItemInMainHand(Detonator.setLocation(player, item, new Detoloader.DetonatorActivation(event.getClickedBlock().getLocation())));
-                            } else {
-                                player.getInventory().setItemInMainHand(Detonator.setLocation(player, item, new Detoloader.DetonatorActivation(detoloader.activation, event.getClickedBlock().getLocation())));
-                            }
-                            print(player, detoloader.addBack ? "§e" + detoloader.getBlock() + " gesetzt" :
-                                    detoloader.getBlock(), detoloader.addBack ? Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() : 0);
                         }
-                        break;
+                        print(player, detoloader.addBack ? "§e" + detoloader.getBlock() + " gesetzt" :
-                    case RIGHT_CLICK_AIR:
+                                detoloader.getBlock(), detoloader.addBack ? Detonator.getDetonator(player, player.getInventory().getItemInMainHand()).getLocs().size() : 0);
-                    case RIGHT_CLICK_BLOCK:
+                    }
-                        Detonator.execute(player);
+                    break;
-                        break;
+                case RIGHT_CLICK_AIR:
-                }
+                case RIGHT_CLICK_BLOCK:
-            } catch (RuntimeException e) {
+                    Detonator.execute(player);
-                player.sendMessage(BauSystem.PREFIX + "§c" + e.getMessage());
+                    break;
-                player.getInventory().setItemInMainHand(item);
             }
         }
     }