From a4a08aa9cd167ccb64df49ec2e131de05d78cde4 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 26 Nov 2025 11:09:29 +0100 Subject: [PATCH] oughe, --- changelog | 11 ++++++++++- gradle.properties | 2 +- .../java/com/hbm/blocks/network/CranePartitioner.java | 4 ++-- src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../hbm/tileentity/network/TileEntityDroneDock.java | 9 ++++++++- .../tileentity/network/TileEntityRequestNetwork.java | 1 + 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index 71476a113..f2a83e6b9 100644 --- a/changelog +++ b/changelog @@ -1,2 +1,11 @@ +## Changed +* Removed a ton of unused projectile entities +* Removed the old ZOMG beams, negative energy type explosions now use DFC-like effects instead +* Removed the old multitool (it sucked) + ## Fixed -* Fixed ore acidizer recipe config just straight up not working with ore dictionary keys \ No newline at end of file +* Fixed ore acidizer recipe config just straight up not working with ore dictionary keys +* Fixed logistic network nodes disabled via redstone not re-enabling when redstone is cut +* Added provisional emergency brake to drone pathfinding, pathfinding will simply fail if it goes on for too long +* Fixed ore acidizer partitioner freezing the game +* Fixed ore acidizer partitioner trash slots not being accessible via automation \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e9b25f39b..4c3fe0d0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5523 +mod_build_number=5526 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/blocks/network/CranePartitioner.java b/src/main/java/com/hbm/blocks/network/CranePartitioner.java index 45f62074d..2b13d5363 100644 --- a/src/main/java/com/hbm/blocks/network/CranePartitioner.java +++ b/src/main/java/com/hbm/blocks/network/CranePartitioner.java @@ -201,8 +201,8 @@ public class CranePartitioner extends BlockContainer implements IConveyorBelt, I public int[] getAccessibleSlotsFromSide(int side) { if(access == null) { - access = new int[SLOT_COUNT]; // writing this by hand is for chumps - for(int i = 0; i < SLOT_COUNT; i++) access[i] = i; + access = new int[SLOT_COUNT * 2]; // writing this by hand is for chumps + for(int i = 0; i < SLOT_COUNT * 2; i++) access[i] = i; } return access; diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 741b57b26..93c6325d8 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5523)"; + public static final String VERSION = "1.0.27 BETA (5526)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityDroneDock.java b/src/main/java/com/hbm/tileentity/network/TileEntityDroneDock.java index 32382fc6e..161ac7150 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityDroneDock.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityDroneDock.java @@ -134,7 +134,9 @@ public class TileEntityDroneDock extends TileEntityRequestNetworkContainer imple paths.add(init); // breadth-first search - for(int i = 0; i < pathingDepth; i++) { + outer: for(int i = 0; i < pathingDepth; i++) { + + int iterationBrake = 1000; List> newPaths = new ArrayList(); @@ -155,6 +157,11 @@ public class TileEntityDroneDock extends TileEntityRequestNetworkContainer imple newPath.add(connectedSafe); newPaths.add(newPath); } + + // emergency halt after 1000 iterations, forces pathing depth to proceed + // theoretical maximum is therefore 10k iterations + iterationBrake--; + if(iterationBrake <= 0) continue outer; } } diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java b/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java index 3ba252aaa..4dfca1430 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java @@ -42,6 +42,7 @@ public abstract class TileEntityRequestNetwork extends TileEntityLoadedBase { PathNode newNode = createNode(pos); if(this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) newNode.active = false; + else newNode.active = true; // push new node push(worldObj, newNode);