diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 39764f8b..b2841042 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -300,19 +300,19 @@ public class EnderIO { Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); - blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water, 0x449944); + blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water); f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidHootch = FluidRegistry.getFluid(f.getName()); - blockHootch = BlockFluidEio.create(fluidHootch, Material.water, 0x779977); + blockHootch = BlockFluidEio.create(fluidHootch, Material.water); IronEngineFuel.addFuel(Fluids.HOOTCH_NAME, Config.hootchPowerPerCycle, Config.hootchPowerTotalBurnTime); FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH_NAME + "@" + (Config.hootchPowerPerCycle * Config.hootchPowerTotalBurnTime)); f = new Fluid(Fluids.ROCKET_FUEL_NAME).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidRocketFuel = FluidRegistry.getFluid(f.getName()); - blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, Material.water, 0x99CC99); + blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, Material.water); IronEngineFuel.addFuel(Fluids.ROCKET_FUEL_NAME, Config.rocketFuelPowerPerCycle, Config.rocketFuelPowerTotalBurnTime); FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL_NAME + "@" + (Config.rocketFuelPowerPerCycle * Config.rocketFuelPowerTotalBurnTime)); @@ -320,7 +320,7 @@ public class EnderIO { f = new Fluid(Fluids.FIRE_WATER_NAME).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidFireWater = FluidRegistry.getFluid(f.getName()); - blockFireWater = BlockFluidEio.create(fluidFireWater, Material.lava, 0x994400); + blockFireWater = BlockFluidEio.create(fluidFireWater, Material.lava); IronEngineFuel.addFuel(Fluids.FIRE_WATER_NAME, Config.fireWaterPowerPerCycle, Config.fireWaterPowerTotalBurnTime); FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER_NAME + "@" + (Config.fireWaterPowerPerCycle * Config.fireWaterPowerTotalBurnTime)); diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index 8b1a070e..b8e850b6 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -22,9 +22,7 @@ import crazypants.enderio.EnderIO; public class BlockFluidEio extends BlockFluidClassic { - private int color; - - public static BlockFluidEio create(Fluid fluid, Material material, int color) { + public static BlockFluidEio create(Fluid fluid, Material material) { BlockFluidEio res = new BlockFluidEio(fluid, material); res.init(); fluid.setBlock(res); @@ -40,11 +38,6 @@ public class BlockFluidEio extends BlockFluidClassic { protected void init() { GameRegistry.registerBlock(this, "block" + StringUtils.capitalize(fluidName)); - this.fluid.setDensity(10); - } - - protected void setColor(int color) { - this.color = color; } @SideOnly(Side.CLIENT) @@ -80,11 +73,6 @@ public class BlockFluidEio extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } - @Override - public int getBlockColor() { - return color; - } - @Override public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { if(entity.worldObj.isRemote) {