From e4261ab264c2ede968432668dc7e8b662d2ce1db Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 4 Sep 2013 14:19:16 -0400 Subject: [PATCH] Toyed with fluids Most likely will not fix the issue but i'll keep working on it. --- src/dark/fluid/common/FluidMech.java | 17 ++++++++++++----- src/dark/fluid/common/machines/BlockFluid.java | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index 777471d1d..27dda581d 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -65,6 +65,11 @@ public class FluidMech extends ModPrefab public static final String MOD_ID = "FluidMech"; public static final String MOD_NAME = "Fluid_Mechanics"; + public static final String WASTE_FLUID_NAME = "mixedWaste"; + public static final String OIL_FLUID_NAME = "oil"; + public static final String FUEL_FLUID_NAME = "fuel"; + public static final String BIO_FUEL_Name = ""; + // @NetworkMod public static final String CHANNEL = "FluidMech"; @@ -137,15 +142,17 @@ public class FluidMech extends ModPrefab CONFIGURATION.load(); if (FluidMech.CONFIGURATION.get("general", "EnableWasteFluid", true).getBoolean(true)) { - Fluid waste = new Fluid("waste"); - FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, getNextID()); + Fluid waste = new Fluid("mixedWaste").setUnlocalizedName("fluid.mixedWaste.name").setDensity(5000).setViscosity(1800); FluidRegistry.registerFluid(waste); + FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, getNextID()); + } - if (FluidMech.CONFIGURATION.get("general", "EnableOilFluid", true).getBoolean(true)) + if (FluidMech.CONFIGURATION.get("general", "EnableOilFluid", true).getBoolean(true) && FluidRegistry.getFluid("oil") == null) { - Fluid oil = new Fluid("oil"); - FMRecipeLoader.blockWasteLiquid = new BlockFluid(oil, getNextID()); + Fluid oil = new Fluid("oil").setUnlocalizedName("fluid.oil.name").setDensity(4000).setViscosity(4700); FluidRegistry.registerFluid(oil); + FMRecipeLoader.blockWasteLiquid = new BlockFluid(oil, getNextID()); + } /* BLOCK DECLARATION -- CONFIG LOADER */ FMRecipeLoader.blockGenPipe = new BlockPipe(getNextID(), "GenericPipe"); diff --git a/src/dark/fluid/common/machines/BlockFluid.java b/src/dark/fluid/common/machines/BlockFluid.java index 331884986..c3f2b9d66 100644 --- a/src/dark/fluid/common/machines/BlockFluid.java +++ b/src/dark/fluid/common/machines/BlockFluid.java @@ -17,6 +17,7 @@ public class BlockFluid extends BlockFluidFinite { super(FluidMech.CONFIGURATION.getBlock(fluid.getName(), id).getInt(), fluid, Material.water); this.fluid = fluid; + } @Override