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

changed block IDs to called getNextID()

Browse source
This commit is contained in:
DarkGuardsman 2013-07-24 15:27:22 -04:00
parent e9fcf18193
commit cb9292bdec
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/minecraft/dark/fluid/common/FluidMech.java
View file

@ -181,26 +181,26 @@ public class FluidMech extends ModPrefab
if (FluidMech.CONFIGURATION.get("general", "EnableWasteFluid", true).getBoolean(true))
{
Fluid waste = new Fluid("waste");
FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, BLOCK_ID_PREFIX++);
FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, getNextID());
FluidRegistry.registerFluid(waste);
}
if (FluidMech.CONFIGURATION.get("general", "EnableOilFluid", true).getBoolean(true))
{
Fluid waste = new Fluid("oil");
FMRecipeLoader.blockWasteLiquid = new BlockFluid(waste, BLOCK_ID_PREFIX++);
FluidRegistry.registerFluid(waste);
Fluid oil = new Fluid("oil");
FMRecipeLoader.blockWasteLiquid = new BlockFluid(oil, getNextID());
FluidRegistry.registerFluid(oil);
}
/* BLOCK DECLARATION -- CONFIG LOADER */
FMRecipeLoader.blockGenPipe = new BlockPipe(BLOCK_ID_PREFIX++, "GenericPipe");
FMRecipeLoader.blockMachine = new BlockPumpMachine(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockRod = new BlockRod(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockGenerator = new BlockGenerator(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockReleaseValve = new BlockReleaseValve(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockTank = new BlockTank(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockSink = new BlockSink(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockDrain = new BlockDrain(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockConPump = new BlockConstructionPump(BLOCK_ID_PREFIX++);
FMRecipeLoader.blockPipe = new BlockPipe(BLOCK_ID_PREFIX++, "RestrictedPipe");
FMRecipeLoader.blockGenPipe = new BlockPipe(getNextID(), "GenericPipe");
FMRecipeLoader.blockMachine = new BlockPumpMachine(getNextID());
FMRecipeLoader.blockRod = new BlockRod(getNextID());
FMRecipeLoader.blockGenerator = new BlockGenerator(getNextID());
FMRecipeLoader.blockReleaseValve = new BlockReleaseValve(getNextID());
FMRecipeLoader.blockTank = new BlockTank(getNextID());
FMRecipeLoader.blockSink = new BlockSink(getNextID());
FMRecipeLoader.blockDrain = new BlockDrain(getNextID());
FMRecipeLoader.blockConPump = new BlockConstructionPump(getNextID());
FMRecipeLoader.blockPipe = new BlockPipe(getNextID(), "RestrictedPipe");
/* ITEM DECLARATION */
FMRecipeLoader.itemParts = new ItemParts(FluidMech.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX++).getInt());

2
src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java
View file

@ -111,7 +111,7 @@ public abstract class TileEntityFluidStorage extends TileEntityFluidDevice imple
super.writeToNBT(nbt);
if (this.tank != null && this.tank.getFluid() != null)
{
nbt.setTag("FluidTank", this.tank.getFluid().writeToNBT(new NBTTagCompound()));
nbt.setCompoundTag("FluidTank", this.tank.getFluid().writeToNBT(new NBTTagCompound()));
}
}