Fix issues with ID's outside of expected ranges, Fix #423

ChiselsAndBits · Aug 25, 2018 · d4ca03f · d4ca03f
1 parent 68d35ae
commit d4ca03f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/BlockBitInfo.java b/src/main/java/mod/chiselsandbits/chiseledblock/BlockBitInfo.java
@@ -30,6 +30,7 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 
 public class BlockBitInfo
 {
@@ -86,6 +87,19 @@ public static int getColorFor(
 		return out;
 	}
 
+	public static void recalculateFluidBlocks()
+	{
+		fluidBlocks.clear();
+
+		for ( final Fluid o : FluidRegistry.getRegisteredFluids().values() )
+		{
+			if ( o.canBePlacedInWorld() )
+			{
+				BlockBitInfo.addFluidBlock( o.getBlock(), o );
+			}
+		}
+	}
+
 	public static void addFluidBlock(
 			final Block blk,
 			final Fluid fluid )

diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlob.java b/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlob.java
@@ -842,7 +842,7 @@ public int getSideFlags(
 	public static boolean isFluid(
 			final int ref )
 	{
-		return fluidFilterState.get( ref & 0xfff );
+		return fluidFilterState.get( ref & 0xffff );
 	}
 
 	public boolean filterFluids(
@@ -858,7 +858,7 @@ public boolean filterFluids(
 				continue;
 			}
 
-			if ( fluidFilterState.get( ref & 0xfff ) != wantsFluids )
+			if ( fluidFilterState.get( ref & 0xffff ) != wantsFluids )
 			{
 				values[x] = 0;
 			}

diff --git a/src/main/java/mod/chiselsandbits/core/ChiselsAndBits.java b/src/main/java/mod/chiselsandbits/core/ChiselsAndBits.java
@@ -26,8 +26,6 @@
 import mod.chiselsandbits.registry.ModItems;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -177,14 +175,6 @@ public void postinit(
 
 		integration.postinit();
 
-		for ( final Fluid o : FluidRegistry.getRegisteredFluids().values() )
-		{
-			if ( o.canBePlacedInWorld() )
-			{
-				BlockBitInfo.addFluidBlock( o.getBlock(), o );
-			}
-		}
-
 		NetworkRouter.instance = new NetworkRouter();
 		NetworkRegistry.INSTANCE.registerGuiHandler( this, new ModGuiRouter() );
 	}
@@ -196,6 +186,7 @@ public void idsMapped(
 			final FMLModIdMappingEvent event )
 	{
 		idsHaveBeenMapped = true;
+		BlockBitInfo.recalculateFluidBlocks();
 		clearCache();
 	}