tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Toyed with fluids

Browse source 
Most likely will not fix the issue but i'll keep working on it.
This commit is contained in:
DarkGuardsman 2013-09-04 14:19:16 -04:00
parent b8c95c191a
commit e4261ab264
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/dark/fluid/common/FluidMech.java
View file

@ -65,6 +65,11 @@ public class FluidMech extends ModPrefab
public static final String MOD_ID = "FluidMech"; public static final String MOD_ID = "FluidMech";
public static final String MOD_NAME = "Fluid_Mechanics"; 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 // @NetworkMod
public static final String CHANNEL = "FluidMech"; public static final String CHANNEL = "FluidMech";
@ -137,15 +142,17 @@ public class FluidMech extends ModPrefab
CONFIGURATION.load(); CONFIGURATION.load();
if (FluidMech.CONFIGURATION.get("general", "EnableWasteFluid", true).getBoolean(true)) if (FluidMech.CONFIGURATION.get("general", "EnableWasteFluid", true).getBoolean(true))
{ {
Fluid waste = new Fluid("waste"); Fluid waste = new Fluid("mixedWaste").setUnlocalizedName("fluid.mixedWaste.name").setDensity(5000).setViscosity(1800);
FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, getNextID());
FluidRegistry.registerFluid(waste); 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"); Fluid oil = new Fluid("oil").setUnlocalizedName("fluid.oil.name").setDensity(4000).setViscosity(4700);
FMRecipeLoader.blockWasteLiquid = new BlockFluid(oil, getNextID());
FluidRegistry.registerFluid(oil); FluidRegistry.registerFluid(oil);
FMRecipeLoader.blockWasteLiquid = new BlockFluid(oil, getNextID());
} }
/* BLOCK DECLARATION -- CONFIG LOADER */ /* BLOCK DECLARATION -- CONFIG LOADER */
FMRecipeLoader.blockGenPipe = new BlockPipe(getNextID(), "GenericPipe"); FMRecipeLoader.blockGenPipe = new BlockPipe(getNextID(), "GenericPipe");

1
src/dark/fluid/common/machines/BlockFluid.java
View file

@ -17,6 +17,7 @@ public class BlockFluid extends BlockFluidFinite
{ {
super(FluidMech.CONFIGURATION.getBlock(fluid.getName(), id).getInt(), fluid, Material.water); super(FluidMech.CONFIGURATION.getBlock(fluid.getName(), id).getInt(), fluid, Material.water);
this.fluid = fluid; this.fluid = fluid;
} }
@Override @Override