Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #212 - Some configs not being read

Browse source
This commit is contained in:
Calclavia 2014-02-08 11:01:05 +08:00
parent b10125b4d9
commit c8e9e58761
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/resonantinduction/core/ResonantInduction.java
View file

@ -97,16 +97,16 @@ public class ResonantInduction
MinecraftForge.EVENT_BUS.register(ResourceGenerator.INSTANCE);
MinecraftForge.EVENT_BUS.register(new TextureHookHandler());
MinecraftForge.EVENT_BUS.register(new MicroblockHighlightHandler());
/**
* Melting dusts
*/
blockDust = contentRegistry.createTile(BlockDust.class, TileMaterial.class);
// Items
itemRubble = new ItemOreResource(Settings.getNextItemID(), "oreRubble");
itemDust = new ItemOreResource(Settings.getNextItemID(), "oreDust");
itemRefinedDust = new ItemOreResource(Settings.getNextItemID(), "oreRefinedDust");
itemRubble = new ItemOreResource(Settings.getNextItemID("oreRubble"), "oreRubble");
itemDust = new ItemOreResource(Settings.getNextItemID("oreDust"), "oreDust");
itemRefinedDust = new ItemOreResource(Settings.getNextItemID("oreRefinedDust"), "oreRefinedDust");
GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
@ -115,7 +115,6 @@ public class ResonantInduction
// Already registered wih ContentRegistry
// GameRegistry.registerTileEntity(TileMaterial.class, "ri_material");
GameRegistry.registerTileEntity(TileFluidMixture.class, "ri_fluid_mixture");
Settings.save();
proxy.preInit();
}
@ -133,5 +132,6 @@ public class ResonantInduction
{
// Generate Resources
ResourceGenerator.generateOreResources();
Settings.save();
}
}

12
src/main/java/resonantinduction/core/Settings.java
View file

@ -22,11 +22,23 @@ public class Settings
return idManager.getNextBlockID();
}
public static int getNextBlockID(String key)
{
int id = idManager.getNextBlockID();
return Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, key, id).getInt(id);
}
public static int getNextItemID()
{
return idManager.getNextItemID();
}
public static int getNextItemID(String key)
{
int id = idManager.getNextItemID();
return Settings.CONFIGURATION.get(Configuration.CATEGORY_ITEM, key, id).getInt(id);
}
/** Settings */
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), Reference.NAME + ".cfg"));
private static boolean didLoad = false;

2
src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java
View file

@ -24,7 +24,7 @@ public class BlockFluidMaterial extends BlockFluidFinite
{
public BlockFluidMaterial(Fluid fluid)
{
super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, fluid.getName(), Settings.getNextBlockID()).getInt(), fluid, Material.lava);
super(Settings.getNextBlockID(fluid.getName()), fluid, Material.lava);
setTextureName(Reference.PREFIX + "molten_flow");
setUnlocalizedName(Reference.PREFIX + "fluidMaterial");
}

2
src/main/java/resonantinduction/core/resource/fluid/BlockFluidMixture.java
View file

@ -25,7 +25,7 @@ public class BlockFluidMixture extends BlockFluidFinite
{
public BlockFluidMixture(Fluid fluid)
{
super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, fluid.getName(), Settings.getNextBlockID()).getInt(), fluid, Material.water);
super(Settings.getNextBlockID(fluid.getName()), fluid, Material.water);
setTextureName(Reference.PREFIX + "mixture_flow");
this.setUnlocalizedName(Reference.PREFIX + "fluidMixture");
}