Fixed orphaned tanks not properly updating

- Fixed TankBlockEntity not being removed when a tank is dismantled using the wrench.

build.gradle

@@ -17,9 +17,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 //apply plugin: 'maven-publish'
 
-String ForgeVersion = '1.14.4-28.1.61'
+String ForgeVersion = '1.14.4-28.1.87'
 
-version = "1.14.4-1.8.0.0"
+version = "1.14.4-1.8.0.1"
 group= "net.zarathul.simplefluidtanks" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "simplefluidtanks"
 

src/main/java/net/zarathul/simplefluidtanks/blocks/TankBlock.java

@@ -176,16 +176,16 @@ public void onReplaced(BlockState state, World world, BlockPos pos, BlockState n
 				if (ignoreBlockBreakCoords.contains(pos))
 				{
 					ignoreBlockBreakCoords.remove(pos);
-
-					return;
 				}
-
-				// get the valve the tank is connected to and disband the multiblock
-				ValveBlockEntity valveEntity = Utils.getValve(world, pos);
-
-				if (valveEntity != null)
+				else
 				{
-					valveEntity.disbandMultiblock(pos);
+					// get the valve the tank is connected to and disband the multiblock
+					ValveBlockEntity valveEntity = Utils.getValve(world, pos);
+
+					if (valveEntity != null)
+					{
+						valveEntity.disbandMultiblock(pos);
+					}
 				}
 			}
 		}
@@ -208,7 +208,7 @@ protected void handleToolWrenchClick(World world, BlockPos pos, PlayerEntity pla
 				valveEntity = tankEntity.getValve();
 				// ignore the BlockBreak event for this TankBlock, this way
 				// there will be no reset of the whole tank
-				ignoreBlockBreakCoords.add(pos);
+				ignoreBlockBreakCoords.add(pos.toImmutable());
 			}
 
 			world.destroyBlock(pos, true);

src/main/java/net/zarathul/simplefluidtanks/configuration/Config.java

@@ -54,18 +54,22 @@ public final class Config
 
 		tankBlockHardness = CommonConfigBuilder.translation("config.tankblock_hardness")
 				.comment("The amount of hits the block can take before it breaks (-1 = indestructible).")
+				.worldRestart()
 				.defineInRange("tankBlockHardness", defaultTankBlockHardness, -1.0d, Float.MAX_VALUE);
 
 		tankBlockResistance = CommonConfigBuilder.translation("config.tankblock_resistance")
 				.comment("The blocks resistance to explosions.")
+				.worldRestart()
 				.defineInRange("tankBlockResistance", defaultTankBlockResistance, 1.0d, Float.MAX_VALUE);
 
 		valveBlockHardness = CommonConfigBuilder.translation("config.valveblock_hardness")
 				.comment("The amount of hits the block can take before it breaks (-1 = indestructible).")
+				.worldRestart()
 				.defineInRange("valveBlockHardness", defaultValveBlockHardness, -1.0d, Float.MAX_VALUE);
 
 		valveBlockResistance = CommonConfigBuilder.translation("config.valveblock_resistance")
 				.comment("The blocks resistance to explosions.")
+				.worldRestart()
 				.defineInRange("valveBlockResistance", defaultValveBlockResistance, 1.0d, Float.MAX_VALUE);
 
 		CommonConfigBuilder.pop();

src/main/java/net/zarathul/simplefluidtanks/tileentities/ValveBlockEntity.java

@@ -416,7 +416,7 @@ public void formMultiblock()
 	{
 		// store the current fluid for reinsertion
 		FluidStack fluid = internalTank.getFluid();
-		int oldFluidAmount = fluid.getAmount();
+		//int oldFluidAmount = fluid.getAmount();
 
 		// find new tanks and update the valves textures
 
@@ -495,6 +495,7 @@ private void updateOrphanedTanks()
 
 			if (tankEntity != null)
 			{
+				tankEntity.updateBlockState();
 				Utils.syncBlockAndRerender(world, tankEntity.getPos());
 				tankEntity.markDirty();
 			}
@@ -1120,7 +1121,7 @@ private boolean isUnlinkedTank(BlockPos block)
 
 		BlockState state = world.getBlockState(block);
 
-		if (state.getBlock() instanceof TankBlock)
+		if (state.getBlock() == SimpleFluidTanks.tankBlock)
 		{
 			TankBlockEntity tankEntity = Utils.getTileEntityAt(world, TankBlockEntity.class, block);
 
@@ -1129,10 +1130,10 @@ private boolean isUnlinkedTank(BlockPos block)
 				return !tankEntity.isPartOfTank();
 			}
 		}
-		else if (block.equals(pos) && tankPriorities.isEmpty())
+		else
 		{
 			// this valve is also considered a unlinked tank as long as it has no associated tanks
-			return true;
+			return (block.equals(pos) && tankPriorities.isEmpty());
 		}
 
 		return false;