From 017a7f70585d36e6ff9d204d63c6c41a8ac8f42a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 20 Apr 2015 16:31:47 +0200 Subject: [PATCH] Fix fluid icons when default changes the used liquid --- src/main/java/tconstruct/smeltery/TinkerSmeltery.java | 3 +++ .../java/tconstruct/smeltery/blocks/TConstructFluid.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 2209c4cb..f2c684c0 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1026,6 +1026,9 @@ public class TinkerSmeltery block.setBlockName(blockName); GameRegistry.registerBlock(block, blockName); + fluid.setBlock(block); + block.setFluid(fluid); + // if the fluid was already registered we use that one instead if (isFluidPreRegistered) { diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index a26f160a..94e9ea71 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -14,6 +14,7 @@ public class TConstructFluid extends BlockFluidClassic public IIcon stillIcon; public IIcon flowIcon; boolean overwriteFluidIcons = true; + private Fluid fluid = null; public TConstructFluid(Fluid fluid, Material material, String texture) { @@ -42,6 +43,9 @@ public class TConstructFluid extends BlockFluidClassic if (overwriteFluidIcons) this.getFluid().setIcons(stillIcon, flowIcon); + + if(this.getFluid().getBlock() != this && fluid != null) + fluid.setIcons(stillIcon, flowIcon); } @Override @@ -58,4 +62,7 @@ public class TConstructFluid extends BlockFluidClassic overwriteFluidIcons = false; } + public void setFluid(Fluid fluid) { + this.fluid = fluid; + } } \ No newline at end of file