From c8e9e587613d641b30fd1ca242a1b19d4f717554 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 8 Feb 2014 11:01:05 +0800 Subject: [PATCH] Fixed #212 - Some configs not being read --- .../resonantinduction/core/ResonantInduction.java | 10 +++++----- src/main/java/resonantinduction/core/Settings.java | 12 ++++++++++++ .../core/resource/fluid/BlockFluidMaterial.java | 2 +- .../core/resource/fluid/BlockFluidMixture.java | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index 5078dd65..8903a2d0 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -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(); } } diff --git a/src/main/java/resonantinduction/core/Settings.java b/src/main/java/resonantinduction/core/Settings.java index 622eef19..75790ef6 100644 --- a/src/main/java/resonantinduction/core/Settings.java +++ b/src/main/java/resonantinduction/core/Settings.java @@ -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; diff --git a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java index cefc16a2..83300076 100644 --- a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java +++ b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java @@ -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"); } diff --git a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMixture.java b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMixture.java index d1370b13..e07b9d9d 100644 --- a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMixture.java +++ b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMixture.java @@ -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"); }