Fix AxisMovementLimiter

Signed-off-by: yoyosource <yoyosource@nidido.de>

BauSystem_19/src/de/steamwar/bausystem/features/simulator/preview/AxisMovementLimiter.java

@@ -81,7 +81,7 @@ public class AxisMovementLimiter {
                 }
                 break;
         }
-        System.out.println(axis + " " + minX + " -> " + maxX + "   " + minY + " -> " + maxY + "   " + minZ + " -> " + maxZ);
+        // System.out.println(axis + " " + minX + " -> " + maxX + "   " + minY + " -> " + maxY + "   " + minZ + " -> " + maxZ);
     }
 
     private List<Pos> possibleCollisions() {
@@ -160,14 +160,16 @@ public class AxisMovementLimiter {
         if (collision == null) {
             return movement;
         } else {
-            System.out.println(axis + " " + movement + " " + collision);
             switch (axis) {
                 case X:
-                    return x - collision;
+                    // System.out.println(axis + " " + movement + " " + x + " " + collision);
+                    return collision - x;
                 case Y:
-                    return y - collision;
+                    // System.out.println(axis + " " + movement + " " + y + " " + collision);
+                    return collision - y;
                 case Z:
-                    return z - collision;
+                    // System.out.println(axis + " " + movement + " " + z + " " + collision);
+                    return collision - z;
                 default:
                     throw new IllegalStateException("Unexpected value: " + axis);
             }

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java

@@ -67,7 +67,7 @@ public class SimulatorCursor {
             return;
         }
 
-        if (SimulatorStorage.getSimulator(player.getInventory().getItemInOffHand()) != null && result.getHitPosition().distanceSquared(player.getLocation().toVector()) < 25) {
+        if (SimulatorStorage.getSimulator(player.getInventory().getItemInOffHand()) != null && result.getHitPosition().distanceSquared(player.getLocation().toVector()) < 16) {
             return;
         }
 

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java

@@ -44,6 +44,9 @@ import java.util.function.Function;
 @Linked
 public class TNTSimulatorListener implements Listener {
 
+    private Map<Player, PreviewRecord> previewRecordMap = new HashMap<>();
+    private Map<Player, TNTSimulator> currentSimulator = new HashMap<>();
+
     private boolean permissionCheck(Player player) {
         if (!Permission.hasPermission(player, Permission.WORLD)) {
             BauSystem.MESSAGE.send("SIMULATOR_NO_PERMS", player);
@@ -52,88 +55,82 @@ public class TNTSimulatorListener implements Listener {
         return true;
     }
 
+    private Pair<TNTSimulator, Boolean> getSimulator(Player player) {
+        if (ItemUtils.isItem(player.getInventory().getItemInOffHand(), "simulator")) {
+            return new Pair<>(SimulatorStorage.getSimulator(player.getInventory().getItemInOffHand()), true);
+        }
+        if (ItemUtils.isItem(player.getInventory().getItemInMainHand(), "simulator")) {
+            return new Pair<>(SimulatorStorage.getSimulator(player.getInventory().getItemInMainHand()), false);
+        }
+        return new Pair<>(null, false);
+    }
+
     static RayTraceUtils.RRayTraceResult trace(Player player, Location to, TNTSimulator simulator) {
         return RayTraceUtils.traceREntity(player, to, simulator.getEntities());
     }
 
+    private void hideShow(Player player, TNTSimulator simulator) {
+        TNTSimulator tntSimulator = currentSimulator.remove(player);
+        if (tntSimulator == simulator) return;
+        if (tntSimulator != null) tntSimulator.hide(player);
+        if (simulator != null) {
+            simulator.show(player);
+            SimulatorCursor.show(player, simulator, trace(player, player.getLocation(), simulator));
+        }
+    }
+
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent e) {
-        if (ItemUtils.isItem(e.getPlayer().getInventory().getItemInMainHand(), "simulator")) {
+        Pair<TNTSimulator, Boolean> simulatorPair = getSimulator(e.getPlayer());
-            simulatorShowHide(e.getPlayer(), i -> null, PlayerInventory::getItemInMainHand, e.getTo());
+        hideShow(e.getPlayer(), simulatorPair.getKey());
-        } else {
-            SimulatorCursor.hide(e.getPlayer());
-        }
     }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent e) {
-        simulatorShowHide(e.getPlayer(), i -> i.getItem(e.getPreviousSlot()), i -> i.getItem(e.getNewSlot()), e.getPlayer().getLocation());
+        Pair<TNTSimulator, Boolean> simulatorPair = getSimulator(e.getPlayer());
+        hideShow(e.getPlayer(), simulatorPair.getKey());
     }
 
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent e) {
-        simulatorShowHide(e.getPlayer(), i -> e.getItemDrop().getItemStack(), i -> null, e.getPlayer().getLocation());
+        Pair<TNTSimulator, Boolean> simulatorPair = getSimulator(e.getPlayer());
-    }
+        hideShow(e.getPlayer(), simulatorPair.getKey());
-
-    private TNTSimulator simulatorShowHide(Player player, Function<PlayerInventory, ItemStack> oldItemFunction, Function<PlayerInventory, ItemStack> newItemFunction, Location location) {
-        TNTSimulator oldSimulator = SimulatorStorage.getSimulator(oldItemFunction.apply(player.getInventory()));
-        SimulatorCursor.hide(player, oldSimulator);
-        
-        TNTSimulator simulator = SimulatorStorage.getSimulator(newItemFunction.apply(player.getInventory()));
-        if (simulator == null) return null;
-
-        SimulatorCursor.show(player, simulator, trace(player, location, simulator));
-        return simulator;
     }
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
-        if (ItemUtils.isItem(e.getPlayer().getInventory().getItemInMainHand(), "simulator")) {
+        Pair<TNTSimulator, Boolean> simulatorPair = getSimulator(e.getPlayer());
-            simulatorShowHide(e.getPlayer(), i -> null, PlayerInventory::getItemInMainHand, e.getPlayer().getLocation());
+        hideShow(e.getPlayer(), simulatorPair.getKey());
-        }
     }
 
     @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
+    public void onPlayerQuit(PlayerQuitEvent e) {
-        SimulatorCursor.hide(event.getPlayer(), null);
+        hideShow(e.getPlayer(), null);
-        SimulatorStorage.getSimulatorNames().forEach(s -> {
-            SimulatorStorage.getSimulator(s)._hide(event.getPlayer());
-        });
-        PreviewRecord previewRecord = previewRecordMap.remove(event.getPlayer());
-        if (previewRecord != null) {
-            previewRecord.close(event.getPlayer());
-        }
     }
 
-    private Map<Player, PreviewRecord> previewRecordMap = new HashMap<>();
-
     @EventHandler
-    public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
+    public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent e) {
-        PreviewRecord current = previewRecordMap.remove(event.getPlayer());
+        Pair<TNTSimulator, Boolean> simulatorPair = getSimulator(e.getPlayer());
-        if (current != null) {
+        hideShow(e.getPlayer(), simulatorPair.getKey());
-            current.close(event.getPlayer());
-        }
 
-        if (!ItemUtils.isItem(event.getOffHandItem(), "simulator")) {
+        if (!simulatorPair.getValue()) return;
-            return;
-        }
-        if (ItemUtils.isItem(event.getMainHandItem(), "simulator")) {
-            return;
-        }
-        if (!permissionCheck(event.getPlayer())) {
-            return;
-        }
         
-        TNTSimulator simulator = SimulatorStorage.getSimulator(event.getOffHandItem());
+        TNTSimulator simulator = SimulatorStorage.getSimulator(e.getOffHandItem());
-        if (simulator == null) return;
+        if (preview(e.getPlayer(), simulator)) {
-        Pair<Integer, Map<Integer, List<List<Pair<TNTData, Integer>>>>> toCalculate = simulator.locations(event.getPlayer());
+            e.setCancelled(true);
+        }
+    }
+
+    private boolean preview(Player player, TNTSimulator simulator) {
+        if (simulator == null) return false;
+        Pair<Integer, Map<Integer, List<List<Pair<TNTData, Integer>>>>> toCalculate = simulator.locations(player);
         PreviewRecord previewRecord = Simulator.impl.run(toCalculate);
         if (previewRecord == null) {
-            event.setCancelled(true);
+            return true;
-            return;
         }
-        previewRecord.add(event.getPlayer());
+        previewRecord.add(player);
-        previewRecordMap.put(event.getPlayer(), previewRecord);
+        previewRecordMap.put(player, previewRecord);
+        return false;
     }
 
     @EventHandler