Fixed #212 - Some configs not being read
This commit is contained in:
parent
b10125b4d9
commit
c8e9e58761
4 changed files with 19 additions and 7 deletions
|
@ -104,9 +104,9 @@ public class ResonantInduction
|
||||||
blockDust = contentRegistry.createTile(BlockDust.class, TileMaterial.class);
|
blockDust = contentRegistry.createTile(BlockDust.class, TileMaterial.class);
|
||||||
|
|
||||||
// Items
|
// Items
|
||||||
itemRubble = new ItemOreResource(Settings.getNextItemID(), "oreRubble");
|
itemRubble = new ItemOreResource(Settings.getNextItemID("oreRubble"), "oreRubble");
|
||||||
itemDust = new ItemOreResource(Settings.getNextItemID(), "oreDust");
|
itemDust = new ItemOreResource(Settings.getNextItemID("oreDust"), "oreDust");
|
||||||
itemRefinedDust = new ItemOreResource(Settings.getNextItemID(), "oreRefinedDust");
|
itemRefinedDust = new ItemOreResource(Settings.getNextItemID("oreRefinedDust"), "oreRefinedDust");
|
||||||
|
|
||||||
GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
|
GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
|
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
|
||||||
|
@ -115,7 +115,6 @@ public class ResonantInduction
|
||||||
// Already registered wih ContentRegistry
|
// Already registered wih ContentRegistry
|
||||||
// GameRegistry.registerTileEntity(TileMaterial.class, "ri_material");
|
// GameRegistry.registerTileEntity(TileMaterial.class, "ri_material");
|
||||||
GameRegistry.registerTileEntity(TileFluidMixture.class, "ri_fluid_mixture");
|
GameRegistry.registerTileEntity(TileFluidMixture.class, "ri_fluid_mixture");
|
||||||
Settings.save();
|
|
||||||
proxy.preInit();
|
proxy.preInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,5 +132,6 @@ public class ResonantInduction
|
||||||
{
|
{
|
||||||
// Generate Resources
|
// Generate Resources
|
||||||
ResourceGenerator.generateOreResources();
|
ResourceGenerator.generateOreResources();
|
||||||
|
Settings.save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,11 +22,23 @@ public class Settings
|
||||||
return idManager.getNextBlockID();
|
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()
|
public static int getNextItemID()
|
||||||
{
|
{
|
||||||
return idManager.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 */
|
/** Settings */
|
||||||
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), Reference.NAME + ".cfg"));
|
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), Reference.NAME + ".cfg"));
|
||||||
private static boolean didLoad = false;
|
private static boolean didLoad = false;
|
||||||
|
|
|
@ -24,7 +24,7 @@ public class BlockFluidMaterial extends BlockFluidFinite
|
||||||
{
|
{
|
||||||
public BlockFluidMaterial(Fluid fluid)
|
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");
|
setTextureName(Reference.PREFIX + "molten_flow");
|
||||||
setUnlocalizedName(Reference.PREFIX + "fluidMaterial");
|
setUnlocalizedName(Reference.PREFIX + "fluidMaterial");
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ public class BlockFluidMixture extends BlockFluidFinite
|
||||||
{
|
{
|
||||||
public BlockFluidMixture(Fluid fluid)
|
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");
|
setTextureName(Reference.PREFIX + "mixture_flow");
|
||||||
this.setUnlocalizedName(Reference.PREFIX + "fluidMixture");
|
this.setUnlocalizedName(Reference.PREFIX + "fluidMixture");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue