Added an additional constructor to every implementation of IFluidBloc…

…k. It is now possible to create a fluid block with a Fluid, Material and MapColor, so that the Material's MapColor isn't used for the blocks MapColor. (MinecraftForge#5293)
hypehuman · Jan 4, 2019 · 21f7c31 · 21f7c31
1 parent 4e11c95
commit 21f7c31
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
@@ -31,6 +31,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.BlockStairs;
+import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyInteger;
@@ -162,9 +163,9 @@ public UnlistedPropertyBool(String name)
      */
     protected final Fluid definedFluid;
 
-    public BlockFluidBase(Fluid fluid, Material material)
+    public BlockFluidBase(Fluid fluid, Material material, MapColor mapColor)
     {
-        super(material);
+        super(material, mapColor);
         this.setTickRandomly(true);
         this.disableStats();
 
@@ -181,6 +182,11 @@ public BlockFluidBase(Fluid fluid, Material material)
         this.setDefaultState(blockState.getBaseState().withProperty(LEVEL, getMaxRenderHeightMeta()));
     }
 
+    public BlockFluidBase(Fluid fluid, Material material)
+    {
+        this(fluid, material, material.getMaterialMapColor());
+    }
+
     @Override
     @Nonnull
     protected BlockStateContainer createBlockState()

diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java
@@ -26,6 +26,7 @@
 
 import com.google.common.primitives.Ints;
 
+import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.EnumFacing;
@@ -55,12 +56,17 @@ public class BlockFluidClassic extends BlockFluidBase
 
     protected FluidStack stack;
 
-    public BlockFluidClassic(Fluid fluid, Material material)
+    public BlockFluidClassic(Fluid fluid, Material material, MapColor mapColor)
     {
-        super(fluid, material);
+        super(fluid, material, mapColor);
         stack = new FluidStack(fluid, Fluid.BUCKET_VOLUME);
     }
 
+    public BlockFluidClassic(Fluid fluid, Material material)
+    {
+        this(fluid, material, material.getMaterialMapColor());
+    }
+
     public BlockFluidClassic setFluidStack(FluidStack stack)
     {
         this.stack = stack;

diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java
@@ -21,6 +21,7 @@
 
 import java.util.Random;
 
+import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
@@ -39,9 +40,14 @@
  */
 public class BlockFluidFinite extends BlockFluidBase
 {
+    public BlockFluidFinite(Fluid fluid, Material material, MapColor mapColor)
+    {
+        super(fluid, material, mapColor);
+    }
+
     public BlockFluidFinite(Fluid fluid, Material material)
     {
-        super(fluid, material);
+        this(fluid, material, material.getMaterialMapColor());
     }
 
     @Override