Merge pull request Sefiraat#188 from balugaq/master

balugaq · web-flow · commit e426b1057743 · 2024-11-23T16:47:07.000+08:00
Resolves Sefiraat#182 & Sefiraat#186
diff --git a/LICENSE b/LICENSE
@@ -1,12 +1,4 @@
-Unless otherwise specified, all code in this repository is licensed under the GPL-3.0 license.
-
-Licenses:
-- LICENSES/GPL-3.0 - GNU General Public License v3.0
-- LICENSES/MIT - The MIT License
-
-See LICENSES/GPL-3.0 for original license text.
-The following is a copy of LICENSES/GPL-3.0:
-
+All code in this repository is licensed under the GPL-3.0 license.
 Valid-License-Identifier: GPL-3.0
 License-Text:
 
diff --git a/LICENSES/GPL-3.0 b/LICENSES/GPL-3.0
diff --git a/LICENSES/MIT b/LICENSES/MIT
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ytdd9527.networksexpansion</groupId>
     <artifactId>NetworksExpansion</artifactId>
-    <version>2.1-Alpha-10</version>
+    <version>2.1-Alpha-11</version>
 
     <distributionManagement>
         <repository>
diff --git a/src/main/java/com/balugaq/netex/utils/LineOperationUtil.java b/src/main/java/com/balugaq/netex/utils/LineOperationUtil.java
@@ -1,6 +1,7 @@
 package com.balugaq.netex.utils;
 
 import com.balugaq.netex.api.enums.TransportMode;
+import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunBlockData;
 import com.xzavier0722.mc.plugin.slimefun4.storage.util.StorageCacheUtils;
 import io.github.sefiraat.networks.network.NetworkRoot;
 import io.github.sefiraat.networks.network.stackcaches.ItemRequest;
@@ -57,6 +58,39 @@ public static void doOperation(Location startLocation, BlockFace direction, int
         }
     }
 
+    public static void doEnergyOperation(Location startLocation, BlockFace direction, int limit, Consumer<BlockMenu> consumer) {
+        doEnergyOperation(startLocation, direction, limit, true, true, consumer);
+    }
+
+    public static void doEnergyOperation(Location startLocation, BlockFace direction, int limit, boolean allowNoMenu, Consumer<BlockMenu> consumer) {
+        doEnergyOperation(startLocation, direction, limit, allowNoMenu, true, consumer);
+    }
+
+    public static void doEnergyOperation(Location startLocation, BlockFace direction, int limit, boolean allowNoMenu, boolean optimizeExperience, Consumer<BlockMenu> consumer) {
+        Location location = startLocation.clone();
+        int finalLimit = limit;
+        if (optimizeExperience) {
+            finalLimit += 1;
+        }
+        for (int i = 0; i < finalLimit; i++) {
+            switch (direction) {
+                case NORTH -> location.setZ(location.getZ() - 1);
+                case SOUTH -> location.setZ(location.getZ() + 1);
+                case EAST -> location.setX(location.getX() + 1);
+                case WEST -> location.setX(location.getX() - 1);
+                case UP -> location.setY(location.getY() + 1);
+                case DOWN -> location.setY(location.getY() - 1);
+            }
+            final BlockMenu blockMenu = StorageCacheUtils.getMenu(location);
+            if (blockMenu == null) {
+                if (!allowNoMenu) {
+                    return;
+                }
+            }
+            consumer.accept(blockMenu);
+        }
+    }
+
     public static void grabItem(
             @Nonnull NetworkRoot root,
             @Nonnull BlockMenu blockMenu,
@@ -412,7 +446,7 @@ public static void pushItem(
     }
 
     public static void outPower(@Nonnull Location location, @Nonnull NetworkRoot root, int rate) {
-        var blockData = StorageCacheUtils.getBlock(location);
+        final SlimefunBlockData blockData = StorageCacheUtils.getBlock(location);
         if (blockData == null) {
             return;
         }
@@ -427,14 +461,10 @@ public static void outPower(@Nonnull Location location, @Nonnull NetworkRoot roo
             return;
         }
 
-        final String charge = blockData.getData("energy-charge");
-        int chargeInt = 0;
-        if (charge != null) {
-            chargeInt = Integer.parseInt(charge);
-        }
+        int existingCharge = component.getCharge(location);
 
         final int capacity = component.getCapacity();
-        final int space = capacity - chargeInt;
+        final int space = capacity - existingCharge;
 
         if (space <= 0) {
             return;
diff --git a/src/main/java/com/ytdd9527/networksexpansion/core/items/machines/AbstractAdvancedAutoCrafter.java b/src/main/java/com/ytdd9527/networksexpansion/core/items/machines/AbstractAdvancedAutoCrafter.java
@@ -291,6 +291,14 @@ public void init() {
                 drawBackground(Icon.OUTPUT_BACKGROUND_STACK, OUTPUT_BACKGROUND);
             }
 
+            @Override
+            public void newInstance(@Nonnull BlockMenu menu, @Nonnull Block b) {
+                addMenuClickHandler(BLUEPRINT_SLOT, (player, slot, clickedItem, clickAction) -> {
+                    releaseCache(menu);
+                    return true;
+                });
+            }
+
             @Override
             public boolean canOpen(@Nonnull Block block, @Nonnull Player player) {
                 return player.hasPermission("slimefun.inventory.bypass") || (this.getSlimefunItem().canUse(player, false)
diff --git a/src/main/java/com/ytdd9527/networksexpansion/core/items/machines/AbstractAutoCrafter.java b/src/main/java/com/ytdd9527/networksexpansion/core/items/machines/AbstractAutoCrafter.java
@@ -268,6 +268,14 @@ public void init() {
                 drawBackground(Icon.OUTPUT_BACKGROUND_STACK, OUTPUT_BACKGROUND);
             }
 
+            @Override
+            public void newInstance(@Nonnull BlockMenu menu, @Nonnull Block b) {
+                addMenuClickHandler(BLUEPRINT_SLOT, (player, slot, clickedItem, clickAction) -> {
+                    releaseCache(menu);
+                    return true;
+                });
+            }
+
             @Override
             public boolean canOpen(@Nonnull Block block, @Nonnull Player player) {
                 return player.hasPermission("slimefun.inventory.bypass") || (this.getSlimefunItem().canUse(player, false)
diff --git a/src/main/java/com/ytdd9527/networksexpansion/implementation/machines/cargo/power/power_outlet/line/LinePowerOutlet.java b/src/main/java/com/ytdd9527/networksexpansion/implementation/machines/cargo/power/power_outlet/line/LinePowerOutlet.java
@@ -62,7 +62,7 @@ private void outPower(@Nonnull BlockMenu blockMenu) {
 
         final NetworkRoot root = definition.getNode().getRoot();
         final BlockFace blockFace = getCurrentDirection(blockMenu);
-        LineOperationUtil.doOperation(blockMenu.getLocation(), blockFace, this.maxDistance, false, (targetMenu) -> {
+        LineOperationUtil.doEnergyOperation(blockMenu.getLocation(), blockFace, this.maxDistance, true, false, (targetMenu) -> {
             LineOperationUtil.outPower(targetMenu.getLocation(), root, this.rate);
         });
     }
diff --git a/src/main/java/com/ytdd9527/networksexpansion/implementation/tools/ItemMover.java b/src/main/java/com/ytdd9527/networksexpansion/implementation/tools/ItemMover.java
@@ -49,7 +49,7 @@
 @SuppressWarnings("unused")
 public class ItemMover extends SpecialSlimefunItem implements DistinctiveItem {
     @Nonnull
-    public static final Interaction[] CHECK_INTERACTIONS = new Interaction[] {
+    public static final Interaction[] CHECK_INTERACTIONS = new Interaction[]{
             Interaction.PLACE_BLOCK, Interaction.BREAK_BLOCK, Interaction.INTERACT_BLOCK
     };
     @Nonnull
@@ -452,11 +452,6 @@ private static List<String> cloneDefaultLore() {
         return new ArrayList<>(DEFAULT_LORE);
     }
 
-    @Override
-    public boolean canStack(@Nonnull ItemMeta itemMeta, @Nonnull ItemMeta itemMeta1) {
-        return itemMeta.getPersistentDataContainer().equals(itemMeta1.getPersistentDataContainer());
-    }
-
     public static boolean hasPermission(Player player, Location location) {
         for (Interaction interaction : CHECK_INTERACTIONS) {
             if (!Slimefun.getProtectionManager().hasPermission(player, location, interaction)) {
@@ -471,4 +466,9 @@ public static boolean hasPermission(Player player, Location location) {
 
         return true;
     }
+
+    @Override
+    public boolean canStack(@Nonnull ItemMeta itemMeta, @Nonnull ItemMeta itemMeta1) {
+        return itemMeta.getPersistentDataContainer().equals(itemMeta1.getPersistentDataContainer());
+    }
 }
diff --git a/src/main/java/com/ytdd9527/networksexpansion/utils/ParticleUtil.java b/src/main/java/com/ytdd9527/networksexpansion/utils/ParticleUtil.java
@@ -11,6 +11,7 @@
 
 /**
  * @author Final_ROOT
+ * @author balugaq
  * @since 2.0
  */
 public class ParticleUtil {
@@ -137,4 +138,47 @@ public static void drawCubeByLocations(@Nonnull Plugin plugin, @Nonnull Particle
         }
         ParticleUtil.drawCubeByLocations(plugin, particle, interval, locations);
     }
+
+    public static void drawRegionOutline(@Nonnull Plugin plugin, @Nonnull Particle particle, long interval, @Nonnull Location corner1, @Nonnull Location corner2) {
+        World world = corner1.getWorld();
+        if (world == null || corner1.getWorld() != corner2.getWorld()) {
+            return;
+        }
+
+        double minX = Math.min(corner1.getX(), corner2.getX());
+        double minY = Math.min(corner1.getY(), corner2.getY());
+        double minZ = Math.min(corner1.getZ(), corner2.getZ());
+        double maxX = Math.max(corner1.getX(), corner2.getX());
+        double maxY = Math.max(corner1.getY(), corner2.getY());
+        double maxZ = Math.max(corner1.getZ(), corner2.getZ());
+
+        Location[] corners = new Location[]{
+                new Location(world, minX, minY, minZ),
+                new Location(world, minX, minY, maxZ + 1),
+                new Location(world, maxX + 1, minY, maxZ + 1),
+                new Location(world, maxX + 1, minY, minZ),
+                new Location(world, minX, maxY + 1, minZ),
+                new Location(world, minX, maxY + 1, maxZ + 1),
+                new Location(world, maxX + 1, maxY + 1, maxZ + 1),
+                new Location(world, maxX + 1, maxY + 1, minZ)
+        };
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[0], corners[1]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[0], corners[3]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[0], corners[4]);
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[1], corners[2]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[1], corners[5]);
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[2], corners[3]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[2], corners[6]);
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[3], corners[7]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[4], corners[5]);
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[4], corners[7]);
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[5], corners[6]);
+
+        drawLineByDistance(plugin, particle, interval, 0.25, corners[6], corners[7]);
+    }
 }
diff --git a/src/main/java/com/ytdd9527/networksexpansion/utils/ReflectionUtil.java b/src/main/java/com/ytdd9527/networksexpansion/utils/ReflectionUtil.java
@@ -6,6 +6,10 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+
+/**
+ * @author Final_ROOT
+ */
 @UtilityClass
 public class ReflectionUtil {
 
diff --git a/src/main/java/com/ytdd9527/networksexpansion/utils/databases/DataStorage.java b/src/main/java/com/ytdd9527/networksexpansion/utils/databases/DataStorage.java
@@ -116,6 +116,7 @@ public static void saveAmountChange() {
             }
         }
         Networks.getInstance().getLogger().info(Networks.getLocalizationService().getString("messages.data-saving.saved-drawer"));
+        Networks.getInstance().debug("Task amount: " + Networks.getQueryQueue().getTaskAmount());
     }
 
     public static boolean isContainerLoaded(int id) {
diff --git a/src/main/java/io/github/sefiraat/networks/NetworkStorage.java b/src/main/java/io/github/sefiraat/networks/NetworkStorage.java
@@ -8,7 +8,6 @@
 import org.bukkit.Location;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/io/github/sefiraat/networks/commands/NetworksMain.java b/src/main/java/io/github/sefiraat/networks/commands/NetworksMain.java
diff --git a/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java b/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java
diff --git a/src/main/resources/lang/zh-CN.yml b/src/main/resources/lang/zh-CN.yml

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private void outPower(@Nonnull BlockMenu blockMenu) {`
`62`	`62`
`63`	`63`	`final NetworkRoot root = definition.getNode().getRoot();`
`64`	`64`	`final BlockFace blockFace = getCurrentDirection(blockMenu);`
`65`		`- LineOperationUtil.doOperation(blockMenu.getLocation(), blockFace, this.maxDistance, false, (targetMenu) -> {`
	`65`	`+ LineOperationUtil.doEnergyOperation(blockMenu.getLocation(), blockFace, this.maxDistance, true, false, (targetMenu) -> {`
`66`	`66`	`LineOperationUtil.outPower(targetMenu.getLocation(), root, this.rate);`
`67`	`67`	`});`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ public static void saveAmountChange() {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`Networks.getInstance().getLogger().info(Networks.getLocalizationService().getString("messages.data-saving.saved-drawer"));`
	`119`	`+ Networks.getInstance().debug("Task amount: " + Networks.getQueryQueue().getTaskAmount());`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`public static boolean isContainerLoaded(int id) {`