Update HeatCollectorTileEntity.java

Cadiboo · Cadiboo · commit d68957429158 · 2019-11-12T14:45:09.000+11:00
diff --git a/src/main/java/io/github/cadiboo/examplemod/tileentity/HeatCollectorTileEntity.java b/src/main/java/io/github/cadiboo/examplemod/tileentity/HeatCollectorTileEntity.java
@@ -70,7 +70,7 @@ protected void onContentsChanged(final int slot) {
 	private final LazyOptional<ItemStackHandler> inventoryCapabilityExternal = LazyOptional.of(() -> this.inventory);
 	private final LazyOptional<EnergyStorage> energyCapabilityExternal = LazyOptional.of(() -> this.energy);
 
-	private int lastSyncedEnergy = -1;
+	private int lastEnergy = -1;
 
 	public HeatCollectorTileEntity() {
 		super(ModTileEntityTypes.HEAT_COLLECTOR);
@@ -111,7 +111,7 @@ else if (blockState.getBlock() == Blocks.CAMPFIRE)
 			if (fluidState.isTagged(FluidTags.LAVA))
 				fireEnergy += 50;
 
-			if(fireEnergy > 0)
+			if (fireEnergy > 0)
 				energy.receiveEnergy(fireEnergy, false);
 
 		}
@@ -143,7 +143,7 @@ else if (blockState.getBlock() == Blocks.CAMPFIRE)
 		}
 
 		// If the energy has changed.
-		if (lastSyncedEnergy != energy.getEnergyStored()) {
+		if (lastEnergy != energy.getEnergyStored()) {
 
 			// "markDirty" tells vanilla that the chunk containing the tile entity has
 			// changed and means the game will save the chunk to disk later.
@@ -157,7 +157,7 @@ else if (blockState.getBlock() == Blocks.CAMPFIRE)
 			world.notifyBlockUpdate(pos, blockState, blockState, 2);
 
 			// Update the last synced energy to the current energy
-			lastSyncedEnergy = energy.getEnergyStored();
+			lastEnergy = energy.getEnergyStored();
 		}
 
 	}
@@ -186,7 +186,7 @@ public void onLoad() {
 		// We set this in onLoad instead of the constructor so that TileEntities
 		// constructed from NBT (saved tile entities) have this set to the proper value
 		if (world != null && !world.isRemote)
-			lastSyncedEnergy = energy.getEnergyStored();
+			lastEnergy = energy.getEnergyStored();
 	}
 
 	/**
@@ -234,6 +234,18 @@ public CompoundNBT getUpdateTag() {
 		return this.write(new CompoundNBT());
 	}
 
+	/**
+	 * Invalidates our tile entity
+	 */
+	@Override
+	public void remove() {
+		super.remove();
+		// We need to invalidate our capability references so that any cached references (by other mods) don't
+		// continue to reference our capabilities and try to use them and/or prevent them from being garbage collected
+		inventoryCapabilityExternal.invalidate();
+		energyCapabilityExternal.invalidate();
+	}
+
 	@Nonnull
 	@Override
 	public ITextComponent getDisplayName() {
