fix: logistics inserters ignore their enabled/disabled state

klikli-dev · Aug 18, 2024 · 895426e · 895426e
1 parent 698f371
commit 895426e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/...content/apparatus/logisticsfluidconnector/extractor/LogisticsFluidExtractorBehaviour.java b/...content/apparatus/logisticsfluidconnector/extractor/LogisticsFluidExtractorBehaviour.java
@@ -47,10 +47,12 @@ protected boolean isValidInsertTarget(LeafNodeBehaviour<IFluidHandler, @Nullable
                 this.blockEntity.getBlockState().getValue(BlockStateProperties.FACING);
     }
 
+    @Override
     public boolean enabled() {
         return this.enabled;
     }
 
+    @Override
     public void enabled(boolean enabled) {
         this.enabled = enabled;
     }
@@ -117,7 +119,7 @@ public void tickServer() {
         this.distributor.tick(); //moved from super.tickServer() here because otherwise the distributor keeps moving targets despite not moving items
 
         var insertTarget = this.distributor.target();
-        if (insertTarget == null)
+        if (insertTarget == null || !insertTarget.inserter().enabled()) //TODO: this should be improved, disabled targets should be skipped by the distributor
             return;
 
         var extractTarget = this.extractTargets.getFirst(); //we only support one target

diff --git a/...y/content/apparatus/logisticsfluidconnector/inserter/LogisticsFluidInserterBehaviour.java b/...y/content/apparatus/logisticsfluidconnector/inserter/LogisticsFluidInserterBehaviour.java
@@ -25,10 +25,12 @@ public LogisticsFluidInserterBehaviour(BlockEntity blockEntity) {
         super(blockEntity, Capabilities.FluidHandler.BLOCK);
     }
 
+    @Override
     public boolean enabled() {
         return this.enabled;
     }
 
+    @Override
     public void enabled(boolean enabled) {
         this.enabled = enabled;
         this.onEnabledChanged();

diff --git a/...y/content/apparatus/logisticsitemconnector/extractor/LogisticsItemExtractorBehaviour.java b/...y/content/apparatus/logisticsitemconnector/extractor/LogisticsItemExtractorBehaviour.java
@@ -46,10 +46,12 @@ protected boolean isValidInsertTarget(LeafNodeBehaviour<IItemHandler, @Nullable
                 this.blockEntity.getBlockState().getValue(BlockStateProperties.FACING);
     }
 
+    @Override
     public boolean enabled() {
         return this.enabled;
     }
 
+    @Override
     public void enabled(boolean enabled) {
         this.enabled = enabled;
     }
@@ -114,7 +116,7 @@ public void tickServer() {
         this.distributor.tick(); //moved from super.tickServer() here because otherwise the distributor keeps moving targets despite not moving items
 
         var insertTarget = this.distributor.target();
-        if (insertTarget == null)
+        if (insertTarget == null || !insertTarget.inserter().enabled()) //TODO: this should be improved, disabled targets should be skipped by the distributor
             return;
 
         var extractTarget = this.extractTargets.getFirst(); //we only support one target

diff --git a/...rgy/content/apparatus/logisticsitemconnector/inserter/LogisticsItemInserterBehaviour.java b/...rgy/content/apparatus/logisticsitemconnector/inserter/LogisticsItemInserterBehaviour.java
@@ -25,10 +25,12 @@ public LogisticsItemInserterBehaviour(BlockEntity blockEntity) {
         super(blockEntity, Capabilities.ItemHandler.BLOCK);
     }
 
+    @Override
     public boolean enabled() {
         return this.enabled;
     }
 
+    @Override
     public void enabled(boolean enabled) {
         this.enabled = enabled;
         this.onEnabledChanged();

diff --git a/src/main/java/com/klikli_dev/theurgy/content/behaviour/logistics/LeafNodeBehaviour.java b/src/main/java/com/klikli_dev/theurgy/content/behaviour/logistics/LeafNodeBehaviour.java
@@ -65,6 +65,10 @@ public void filter(Filter filter){
         this.filter = filter;
     }
 
+    public abstract boolean enabled();
+
+    public abstract void enabled(boolean enabled);
+
     /**
      * Gets the capability type of this node.
      */