Add support for WAILA (specifically with WTHIT).

4 files changed, 36 insertions, 9 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/EmcStorageBlock.java b/src/main/java/lv/enes/mc/eris_alchemy/block/EmcStorageBlock.java
new file mode 100644
index 0000000..8c0b93e
--- /dev/null
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/EmcStorageBlock.java
@@ -0,0 +1,18 @@
+package lv.enes.mc.eris_alchemy.block;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+
+// TODO: Somehow make this be an automatic thing depending on the EmcStorageEntity or something
+public interface EmcStorageBlock {
+        double getStoredEmc(CompoundTag blockEntityData);
+
+        default double getStoredEmc(ItemStack stack) {
+                var bed = BlockItem.getBlockEntityData(stack);
+                if (bed == null) {
+                        return 0;
+                }
+                return getStoredEmc(bed);
+        }
+}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/EnergyCondenserBlock.java b/src/main/java/lv/enes/mc/eris_alchemy/block/EnergyCondenserBlock.java
index af58fc6..19eb681 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/EnergyCondenserBlock.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/EnergyCondenserBlock.java
@@ -3,7 +3,6 @@ package lv.enes.mc.eris_alchemy.block;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import lv.enes.mc.eris_alchemy.Emc;
-import lv.enes.mc.eris_alchemy.EmcStorage;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry;
 import lv.enes.mc.eris_alchemy.block.entity.EnergyCondenserEntity;
 import net.minecraft.core.BlockPos;
@@ -17,7 +16,7 @@ import net.minecraft.world.level.block.state.BlockState;
 
 import java.util.List;
 
-public class EnergyCondenserBlock extends ChestLikeBlock<EnergyCondenserEntity> implements EmcStorage {
+public class EnergyCondenserBlock extends ChestLikeBlock<EnergyCondenserEntity> implements EmcStorageBlock {
         public static final Component CONTAINER_TITLE
                         = Component.translatable("container.eris_alchemy.energy_condenser");
 
@@ -44,7 +43,7 @@ public class EnergyCondenserBlock extends ChestLikeBlock<EnergyCondenserEntity>
         }
 
         @Override
-        public double getStoredEmc(ItemStack stack, CompoundTag blockEntityData) {
+        public double getStoredEmc(CompoundTag blockEntityData) {
                 return blockEntityData.getDouble("stored_emc");
         }
 
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EmcStorageEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EmcStorageEntity.java
new file mode 100644
index 0000000..465e743
--- /dev/null
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EmcStorageEntity.java
@@ -0,0 +1,6 @@
+package lv.enes.mc.eris_alchemy.block.entity;
+
+public interface EmcStorageEntity {
+        double getMaxEmc();
+        double getStoredEmc();
+}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
index 33a6250..105e9e3 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
@@ -25,7 +25,7 @@ import org.quiltmc.loader.api.minecraft.ClientOnly;
 
 import java.util.stream.IntStream;
 
-public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedScreenHandlerFactory {
+public class EnergyCondenserEntity extends ChestLikeEntity implements EmcStorageEntity, ExtendedScreenHandlerFactory {
         private final static int WIDTH = 13;
         private final static int HEIGHT = 7;
 
@@ -49,6 +49,11 @@ public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedSc
                 return items;
         }
 
+        @Override
+        public double getMaxEmc() {
+                return Emc.get(items.get(0)).orElse(Double.POSITIVE_INFINITY);
+        }
+
         @ClientOnly
         @Nonnull
         public Material getMaterial() {
@@ -61,6 +66,7 @@ public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedSc
                 return Blocks.ENERGY_CONDENSER;
         }
 
+        @Override
         public double getStoredEmc() {
                 return storedEmc.getValue();
         }
@@ -89,11 +95,9 @@ public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedSc
         @Override
         public void tick(Level world, BlockPos pos, BlockState state) {
                 super.tick(world, pos, state);
-                Emc.get(items.get(0)).ifPresent(cost -> {
-                        tryConsumeEmc(cost);
-                        tryCloneTemplate(cost);
-                });
-
+                var cost = getMaxEmc();
+                tryConsumeEmc(cost);
+                tryCloneTemplate(cost);
                 this.storedEmc.syncIfChanged(ContainerOpenersCounterUtil.getOpeners(openersCounter));
         }