Fix tank comparator output.

TheCBProject · Sep 22, 2024 · b0fc03c · b0fc03c
1 parent b9f1015
commit b0fc03c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/codechicken/enderstorage/block/BlockEnderChest.java b/src/main/java/codechicken/enderstorage/block/BlockEnderChest.java
@@ -77,11 +77,6 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos,
         return shape;
     }
 
-    @Override
-    public boolean hasAnalogOutputSignal(BlockState state) {
-        return true;
-    }
-
     @Nullable
     @Override
     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {

diff --git a/src/main/java/codechicken/enderstorage/block/BlockEnderStorage.java b/src/main/java/codechicken/enderstorage/block/BlockEnderStorage.java
@@ -170,7 +170,12 @@ public boolean canConnectRedstone(BlockState state, BlockGetter world, BlockPos
     @Override
     public int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
         BlockEntity tile = world.getBlockEntity(pos);
-        return tile instanceof TileFrequencyOwner ? ((TileFrequencyOwner) tile).comparatorInput() : 0;
+        return tile instanceof TileFrequencyOwner ? ((TileFrequencyOwner) tile).comparatorOutput() : 0;
+    }
+
+    @Override
+    public boolean hasAnalogOutputSignal(BlockState state) {
+        return true;
     }
 
     @Override

diff --git a/src/main/java/codechicken/enderstorage/tile/TileEnderChest.java b/src/main/java/codechicken/enderstorage/tile/TileEnderChest.java
@@ -138,7 +138,7 @@ public boolean rotate() {
     }
 
     @Override
-    public int comparatorInput() {
+    public int comparatorOutput() {
         return ItemHandlerHelper.calcRedstoneFromInventory(getItemHandler());
     }
 

diff --git a/src/main/java/codechicken/enderstorage/tile/TileEnderTank.java b/src/main/java/codechicken/enderstorage/tile/TileEnderTank.java
@@ -177,7 +177,7 @@ public boolean rotate() {
     }
 
     @Override
-    public int comparatorInput() {
+    public int comparatorOutput() {
         IFluidTank tank = getStorage();
         FluidStack fluid = tank.getFluid();
         return fluid.getAmount() * 14 / tank.getCapacity() + (fluid.getAmount() > 0 ? 1 : 0);

diff --git a/src/main/java/codechicken/enderstorage/tile/TileFrequencyOwner.java b/src/main/java/codechicken/enderstorage/tile/TileFrequencyOwner.java
@@ -9,8 +9,6 @@
 import codechicken.lib.vec.Cuboid6;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.Connection;
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
@@ -123,7 +121,7 @@ public boolean redstoneInteraction() {
         return false;
     }
 
-    public int comparatorInput() {
+    public int comparatorOutput() {
         return 0;
     }