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

Fixed error with two pipes loading with same config

Browse source
This commit is contained in:
DarkGuardsman 2013-07-23 03:39:44 -04:00
parent 13f8546989
commit d7379a6545
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,6 @@ public class FluidMech extends ModPrefab
/* BLOCKS */
@SidedProxy(clientSide = "dark.fluid.client.ClientProxy", serverSide = "dark.fluid.common.CommonProxy")
public static CommonProxy proxy;
@ -97,27 +96,12 @@ public class FluidMech extends ModPrefab
/* LOGGER - EXTENDS FORGE'S LOG SYSTEM */
public static Logger FMLog = Logger.getLogger(FluidMech.MOD_NAME);
public FluidMech()
{
super("fm");
// TODO Auto-generated constructor stub
}
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
/* LOGGER SETUP */
FMLog.setParent(FMLLog.getLogger());
FMLog.info("Initializing...");
instance = this;
recipeLoader = new FMRecipeLoader();
super.preInit(event);
/* CONFIG END */
proxy.preInit();
/* BLOCK REGISTER CALLS */
GameRegistry.registerBlock(FMRecipeLoader.blockPipe, ItemBlockPipe.class, "lmPipe");
GameRegistry.registerBlock(FMRecipeLoader.blockGenPipe, ItemBlockPipe.class, "lmGenPipe");
@ -130,6 +114,7 @@ public class FluidMech extends ModPrefab
GameRegistry.registerBlock(FMRecipeLoader.blockDrain, "lmDrain");
GameRegistry.registerBlock(FMRecipeLoader.blockConPump, "lmConPump");
proxy.preInit();
}
@EventHandler
@ -155,7 +140,6 @@ public class FluidMech extends ModPrefab
/* LANG LOADING */
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
/* ORE DIRECTORY REGISTER */
OreDictionary.registerOre("bronzeTube", new ItemStack(FMRecipeLoader.itemParts, 1, Parts.Bronze.ordinal()));
OreDictionary.registerOre("ironTube", new ItemStack(FMRecipeLoader.itemParts, 1, Parts.Iron.ordinal()));
@ -180,13 +164,16 @@ public class FluidMech extends ModPrefab
/* /******** RECIPES ************* */
recipeLoader.loadRecipes();
FMLog.info("Done Loading");
}
@Override
public void loadConfig()
{
if(recipeLoader == null)
{
recipeLoader = new FMRecipeLoader();
}
/* CONFIGS */
CONFIGURATION.load();
@ -194,7 +181,7 @@ public class FluidMech extends ModPrefab
Fluid waste = new Fluid("waste").setBlockID(FluidMech.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX++).getInt());
/* BLOCK DECLARATION -- CONFIG LOADER */
FMRecipeLoader.blockGenPipe = new BlockPipe(BLOCK_ID_PREFIX++);
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++);
@ -204,7 +191,7 @@ public class FluidMech extends ModPrefab
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++);
FMRecipeLoader.blockPipe = new BlockPipe(BLOCK_ID_PREFIX++, "RestrictedPipe");
/* ITEM DECLARATION */
FMRecipeLoader.itemParts = new ItemParts(FluidMech.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX++).getInt());
@ -241,4 +228,10 @@ public class FluidMech extends ModPrefab
return new ItemStack(FMRecipeLoader.blockPipe, 1, 4);
}
};
@Override
public String getDomain()
{
return "fm";
}
}

4
src/minecraft/dark/fluid/common/pipes/BlockPipe.java
View file

@ -18,9 +18,9 @@ import dark.fluid.common.FluidMech;
public class BlockPipe extends BlockFM
{
public BlockPipe(int id)
public BlockPipe(int id, String name)
{
super("FluidPipe", id, Material.iron);
super(name, id, Material.iron);
this.setBlockBounds(0.30F, 0.30F, 0.30F, 0.70F, 0.70F, 0.70F);
this.setHardness(1f);
this.setResistance(3f);