Comparator and Redstone interactivity

src/main/java/net/dries007/tfc/ForgeEventHandler.java

@@ -83,6 +83,7 @@
 
 import com.mojang.datafixers.util.Pair;
 import com.mojang.logging.LogUtils;
+
 import net.dries007.tfc.client.ClientHelpers;
 import net.dries007.tfc.common.TFCEffects;
 import net.dries007.tfc.common.TFCTags;
@@ -147,6 +148,7 @@
 import net.dries007.tfc.world.chunkdata.ChunkDataCapability;
 import net.dries007.tfc.world.chunkdata.ChunkGeneratorExtension;
 import net.dries007.tfc.world.settings.RockLayerSettings;
+
 import org.slf4j.Logger;
 
 public final class ForgeEventHandler

src/main/java/net/dries007/tfc/common/blockentities/BarrelBlockEntity.java

@@ -406,6 +406,12 @@ public BarrelRecipe getRecipe()
         return recipe;
     }
 
+    @Override
+    public int getAnalogValue()
+    {
+        return recipe != null ? 1 : 0;
+    }
+
     public long getSealedTick()
     {
         return sealedTick;

src/main/java/net/dries007/tfc/common/blockentities/BlastFurnaceBlockEntity.java

@@ -16,6 +16,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Inventory;
@@ -656,7 +657,7 @@ private void updateCachedRecipe()
         }
     }
 
-    static class BlastFurnaceInventory extends ItemStackHandler implements BlastFurnaceRecipe.Inventory, DelegateFluidHandler
+    static class BlastFurnaceInventory extends ItemStackHandler implements BlastFurnaceRecipe.Inventory, DelegateFluidHandler, IAnalogInventory
     {
         private final BlastFurnaceBlockEntity blastFurnace;
 
@@ -684,5 +685,12 @@ public IFluidHandler getFluidHandler()
         {
             return blastFurnace.outputFluidTank;
         }
+
+        @Override
+        public int getAnalogOutput()
+        {
+            boolean hasItems = !(blastFurnace.catalystStacks.isEmpty() && blastFurnace.inputStacks.isEmpty());
+            return (hasItems ? 1 : 0) + Mth.floor((blastFurnace.catalystStacks.size() + blastFurnace.inputStacks.size()) / 2f / blastFurnace.lastKnownCapacity * 14);
+        }
     }
 }

src/main/java/net/dries007/tfc/common/blockentities/BloomeryBlockEntity.java

@@ -14,7 +14,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.util.Mth;
 import net.minecraft.world.Containers;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -442,7 +442,7 @@ public List<ItemStack> getCatalystStacks()
         return catalystStacks;
     }
 
-    static class Inventory extends InventoryItemHandler implements BloomeryInventory
+    static class Inventory extends InventoryItemHandler implements BloomeryInventory, IAnalogInventory
     {
         private final BloomeryBlockEntity bloomery;
 
@@ -484,5 +484,11 @@ public ItemStack getCatalyst()
         {
             return bloomery.catalystStacks.isEmpty() ? ItemStack.EMPTY : bloomery.catalystStacks.get(0);
         }
+
+        @Override
+        public int getAnalogOutput()
+        {
+            return bloomery.cachedRecipe != null ? 1 + Mth.floor(14f * bloomery.getRemainingTicks() / bloomery.cachedRecipe.getDuration()) : 0;
+        }
     }
 }

src/main/java/net/dries007/tfc/common/blockentities/CrucibleBlockEntity.java

@@ -10,6 +10,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -316,7 +317,7 @@ private void updateCaches()
         }
     }
 
-    static class CrucibleInventory implements DelegateItemHandler, SimpleFluidHandler, INBTSerializable<CompoundTag>, IHeatBlock
+    static class CrucibleInventory implements DelegateItemHandler, SimpleFluidHandler, INBTSerializable<CompoundTag>, IHeatBlock, IAnalogInventory
     {
         private final CrucibleBlockEntity crucible;
 
@@ -431,5 +432,11 @@ public void setTemperatureIfWarmer(float temperature)
                 crucible.markForSync();
             }
         }
+
+        @Override
+        public int getAnalogOutput()
+        {
+            return Mth.floor(alloy.getAmount() / (float) alloy.getMaxUnits() * 14.0F) + (alloy.getAmount() > 0 ? 1 : 0);
+        }
     }
 }

src/main/java/net/dries007/tfc/common/blockentities/IAnalogInventory.java

@@ -0,0 +1,18 @@
+/*
+ * Licensed under the EUPL, Version 1.2.
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ */
+
+package net.dries007.tfc.common.blockentities;
+
+/**
+ * Helper for containers that interface with comparators
+ */
+public interface IAnalogInventory
+{
+    /**
+     * @return the redstone analog value
+     */
+    int getAnalogOutput();
+}

src/main/java/net/dries007/tfc/common/blockentities/InventoryBlockEntity.java

@@ -153,6 +153,15 @@ public boolean canInteractWith(Player player)
         }
     }
 
+    public int getAnalogValue()
+    {
+        if (inventory instanceof IAnalogInventory analog)
+        {
+            return analog.getAnalogOutput();
+        }
+        return 0;
+    }
+
     /**
      * A factory interface for the inventory field, allows self references in the constructor
      */

src/main/java/net/dries007/tfc/common/blockentities/LargeVesselBlockEntity.java

@@ -68,7 +68,7 @@ public void onSeal()
         }
     }
 
-    public static class VesselInventory extends InventoryItemHandler implements INBTSerializable<CompoundTag>
+    public static class VesselInventory extends InventoryItemHandler implements INBTSerializable<CompoundTag>, IAnalogInventory
     {
         private final LargeVesselBlockEntity vessel;
 
@@ -102,5 +102,11 @@ private boolean canModify()
         {
             return !vessel.getBlockState().getValue(LargeVesselBlock.SEALED);
         }
+
+        @Override
+        public int getAnalogOutput()
+        {
+            return Helpers.getAnalogSignalFrom(vessel.inventory);
+        }
     }
 }

src/main/java/net/dries007/tfc/common/blockentities/NestBoxBlockEntity.java

@@ -9,7 +9,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Inventory;
@@ -109,4 +108,10 @@ public AbstractContainerMenu createMenu(int windowID, Inventory inv, Player play
     {
         return NestBoxContainer.create(this, inv, windowID);
     }
+
+    @Override
+    public int getAnalogValue()
+    {
+        return Helpers.getAnalogSignalFrom(this.inventory);
+    }
 }

src/main/java/net/dries007/tfc/common/blockentities/PowderkegBlockEntity.java

@@ -146,7 +146,7 @@ public void setLit(boolean lit, @Nullable Entity igniter)
         markForSync();
     }
 
-    public static class PowderkegInventory implements DelegateItemHandler, INBTSerializable<CompoundTag>, EmptyInventory
+    public static class PowderkegInventory implements DelegateItemHandler, INBTSerializable<CompoundTag>, EmptyInventory, IAnalogInventory
     {
         private final PowderkegBlockEntity powderkeg;
         private final InventoryItemHandler inventory;
@@ -195,6 +195,12 @@ private boolean canModify()
         {
             return !powderkeg.getBlockState().getValue(PowderkegBlock.SEALED);
         }
+
+        @Override
+        public int getAnalogOutput()
+        {
+            return Helpers.getAnalogSignalFrom(inventory);
+        }
     }
 
 }

src/main/java/net/dries007/tfc/common/blockentities/QuernBlockEntity.java

@@ -13,6 +13,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -205,4 +206,11 @@ private void finishGrinding()
             }
         }
     }
+
+    @Override
+    public int getAnalogValue()
+    {
+        ItemStack handstone = inventory.getStackInSlot(SLOT_HANDSTONE);
+        return handstone.isEmpty() ? 0 : 1 + Mth.floor(14f * handstone.getDamageValue() / handstone.getMaxDamage());
+    }
 }

src/main/java/net/dries007/tfc/common/blockentities/ToolRackBlockEntity.java

@@ -8,7 +8,6 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -90,4 +89,19 @@ private void insertItem(int slot, ItemStack stack)
         level.playSound(null, worldPosition, TFCSounds.TOOL_RACK_PLACE.get(), SoundSource.BLOCKS, 1, 1 + ((level.random.nextFloat() - level.random.nextFloat()) / 16));
     }
 
+    // Sorry for this.
+    // This returns a unique analog value for every permutation of items within slots
+    @Override
+    public int getAnalogValue()
+    {
+        int value = 0;
+        for (int slot = 0; slot < inventory.getSlots(); slot++)
+        {
+            if (!inventory.getStackInSlot(slot).isEmpty())
+            {
+                value |= 1 << slot;
+            }
+        }
+        return value;
+    }
 }

src/main/java/net/dries007/tfc/common/blocks/DeadTorchBlock.java

@@ -7,12 +7,15 @@
 package net.dries007.tfc.common.blocks;
 
 import java.util.Random;
-
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.TorchBlock;
-import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.TorchBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
+
+import net.dries007.tfc.common.blockentities.TickCounterBlockEntity;
 
 public class DeadTorchBlock extends TorchBlock
 {

src/main/java/net/dries007/tfc/common/blocks/DeadWallTorchBlock.java

@@ -7,12 +7,15 @@
 package net.dries007.tfc.common.blocks;
 
 import java.util.Random;
-
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.WallTorchBlock;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
+
+import net.dries007.tfc.common.blockentities.TickCounterBlockEntity;
 
 public class DeadWallTorchBlock extends WallTorchBlock
 {

src/main/java/net/dries007/tfc/common/blocks/LargeVesselBlock.java

@@ -7,13 +7,11 @@
 package net.dries007.tfc.common.blocks;
 
 import java.util.List;
-
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -32,13 +30,14 @@
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.network.NetworkHooks;
+import org.jetbrains.annotations.Nullable;
 
 import net.dries007.tfc.client.TFCSounds;
+import net.dries007.tfc.common.blockentities.InventoryBlockEntity;
 import net.dries007.tfc.common.blockentities.LargeVesselBlockEntity;
+import net.dries007.tfc.common.blockentities.TFCBlockEntities;
 import net.dries007.tfc.common.blocks.devices.SealableDeviceBlock;
 import net.dries007.tfc.util.Helpers;
-import org.jetbrains.annotations.Nullable;
 
 public class LargeVesselBlock extends SealableDeviceBlock
 {
@@ -134,4 +133,16 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
         }
         return InteractionResult.SUCCESS;
     }
+
+    @Override
+    public int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos)
+    {
+        return level.getBlockEntity(pos, TFCBlockEntities.LARGE_VESSEL.get()).map(InventoryBlockEntity::getAnalogValue).orElse(super.getAnalogOutputSignal(state, level, pos));
+    }
+
+    @Override
+    public boolean hasAnalogOutputSignal(BlockState state)
+    {
+        return true;
+    }
 }

src/main/java/net/dries007/tfc/common/blocks/TFCCandleBlock.java

@@ -7,16 +7,18 @@
 package net.dries007.tfc.common.blocks;
 
 import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CandleBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
+import org.jetbrains.annotations.Nullable;
 
 import net.dries007.tfc.common.blockentities.TickCounterBlockEntity;
 import net.dries007.tfc.common.items.TFCItems;
@@ -69,5 +71,4 @@ public void randomTick(BlockState state, ServerLevel level, BlockPos pos, Random
     {
         onRandomTick(state, level, pos);
     }
-
 }

src/main/java/net/dries007/tfc/common/blocks/TFCCandleCakeBlock.java

@@ -13,6 +13,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
@@ -31,8 +32,9 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 
-import net.dries007.tfc.common.items.CandleBlockItem;
+import net.dries007.tfc.common.blockentities.TickCounterBlockEntity;
 import net.dries007.tfc.common.items.TFCItems;
 import net.dries007.tfc.util.Helpers;
 
@@ -149,5 +151,4 @@ public ExtendedProperties getExtendedProperties()
     {
         return properties;
     }
-
 }