Fix bin lock state and resistive heater energy usage not being persisted when broken

Author: pupnewfster

README.md

@@ -28,8 +28,8 @@ of things that we haven't finished porting yet.
 
 ## Known Bugs/Things that aren't done being ported yet ##
 - Options in the Module Tweaker that have side effects don't currently have those side effects displayed
-- Resistive Heaters do not keep their set Energy Usage when breaking and placing again
-- Bins forget if they are locked and what they are locked too if broken and placed
+- Fixed (Upcoming 10.6.2): Resistive Heaters do not keep their set Energy Usage when breaking and placing again
+- Fixed (Upcoming 10.6.2): Bins forget if they are locked and what they are locked too if broken and placed
 - When breaking and placing blocks that have fluid item input slots, they do not persist whether the item was actively being drained or whether it was being filled
 - The QIO Dashboard does not persist items stored in crafting windows when broken
 - The Portable QIO Dashboard's Crafting windows do not work at all. DO NOT TRY TO USE THEM

src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -22,6 +22,13 @@ public record LockData(ItemStack lock) {
         lock = lock.copy();
     }
 
+    public static LockData create(ItemStack lock) {
+        if (lock.isEmpty()) {
+            return EMPTY;
+        }
+        return new LockData(lock.copyWithCount(1));
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/datagen/generated/mekanism/data/mekanism/loot_table/blocks/advanced_bin.json

@@ -1,55 +1,69 @@
 package mekanism.common.attachments.containers.energy;
 
-import java.util.Objects;
+import mekanism.api.AutomationType;
 import mekanism.api.SerializationConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.math.FloatingLong;
 import mekanism.api.math.FloatingLongSupplier;
 import mekanism.common.attachments.containers.ContainerType;
-import mekanism.common.block.attribute.AttributeEnergy;
 import mekanism.common.capabilities.energy.BasicEnergyContainer;
 import mekanism.common.capabilities.energy.ResistiveHeaterEnergyContainer;
-import mekanism.common.registries.MekanismBlockTypes;
+import mekanism.common.registries.MekanismDataComponents;
+import mekanism.common.tile.machine.TileEntityResistiveHeater;
 import mekanism.common.util.NBTUtils;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
-@NothingNullByDefault//TODO - 1.21: Figure out how to implement this properly??
+@NothingNullByDefault
 public class ComponentBackedResistiveEnergyContainer extends ComponentBackedEnergyContainer {
 
+    private static final FloatingLongSupplier SUPPLIES_ZERO = () -> FloatingLong.ZERO;
+
     public static ComponentBackedResistiveEnergyContainer create(ContainerType<?, ?, ?> ignored, ItemStack attachedTo, int containerIndex) {
-        AttributeEnergy attributeEnergy = Objects.requireNonNull(MekanismBlockTypes.RESISTIVE_HEATER.get(AttributeEnergy.class));
-        return new ComponentBackedResistiveEnergyContainer(attachedTo, containerIndex, () -> attributeEnergy.getStorage().multiply(0.005),
-              attributeEnergy::getStorage, attributeEnergy.getUsage());
+        return new ComponentBackedResistiveEnergyContainer(attachedTo, containerIndex);
     }
 
-    private FloatingLong currentMaxEnergy;
-    private FloatingLong energyPerTick;
-
-    private ComponentBackedResistiveEnergyContainer(ItemStack attachedTo, int containerIndex, FloatingLongSupplier rate, FloatingLongSupplier capacity,
-          FloatingLong baseEnergyPerTick) {
-        super(attachedTo, containerIndex, BasicEnergyContainer.manualOnly, BasicEnergyContainer.alwaysTrue, rate, capacity);
-        this.currentMaxEnergy = super.getMaxEnergy();
-        this.energyPerTick = baseEnergyPerTick.copyAsConst();
+    private ComponentBackedResistiveEnergyContainer(ItemStack attachedTo, int containerIndex) {
+        super(attachedTo, containerIndex, BasicEnergyContainer.manualOnly, BasicEnergyContainer.alwaysTrue, SUPPLIES_ZERO, SUPPLIES_ZERO);
     }
 
     @Override
     public FloatingLong getMaxEnergy() {
-        return currentMaxEnergy;
+        return getEnergyPerTick().multiply(ResistiveHeaterEnergyContainer.USAGE_MULTIPLIER);
+    }
+
+    private FloatingLong getRate() {
+        return getMaxEnergy().multiply(0.005);
+    }
+
+    @Override
+    protected FloatingLong getInsertRate(@Nullable AutomationType automationType) {
+        //Allow unknown or manual interaction to bypass rate limit for the item
+        return automationType == null || automationType == AutomationType.MANUAL ? FloatingLong.MAX_VALUE : getRate();
+    }
+
+    @Override
+    protected FloatingLong getExtractRate(@Nullable AutomationType automationType) {
+        //Allow unknown or manual interaction to bypass rate limit for the item
+        return automationType == null || automationType == AutomationType.MANUAL ? FloatingLong.MAX_VALUE : getRate();
+    }
+
+    private FloatingLong getEnergyPerTick() {
+        return attachedTo.getOrDefault(MekanismDataComponents.ENERGY_USAGE, TileEntityResistiveHeater.BASE_USAGE);
     }
 
     private void updateEnergyUsage(FloatingLong energyUsage) {
-        energyPerTick = energyUsage;
-        this.currentMaxEnergy = energyUsage.multiply(ResistiveHeaterEnergyContainer.USAGE_MULTIPLIER).copyAsConst();
+        attachedTo.set(MekanismDataComponents.ENERGY_USAGE, energyUsage);
         //Clamp the energy
         setEnergy(getEnergy());
     }
 
     @Override
     public CompoundTag serializeNBT(HolderLookup.Provider provider) {
         CompoundTag nbt = super.serializeNBT(provider);
-        nbt.putString(SerializationConstants.ENERGY_USAGE, energyPerTick.toString());
+        nbt.putString(SerializationConstants.ENERGY_USAGE, getEnergyPerTick().toString());
         return nbt;
     }