diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 8d3fee35..75d63b6e 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -182,10 +182,10 @@ public class DarkMain extends ModPrefab /* CONFIGS */ CONFIGURATION.load(); /* BLOCKS */ - blockMulti = new BlockMulti(DarkMain.CONFIGURATION.getBlock("MultiBlock", getNextID()).getInt()); - CoreRecipeLoader.blockOre = new BlockOre(getNextID(), CONFIGURATION); - CoreRecipeLoader.blockWire = new BlockWire(CONFIGURATION, getNextID()); - CoreRecipeLoader.blockDebug = new BlockDebug(getNextID(), CONFIGURATION); + blockMulti = new BlockMulti(getNextID()); + CoreRecipeLoader.blockOre = new BlockOre(getNextID()); + CoreRecipeLoader.blockWire = new BlockWire(getNextID()); + CoreRecipeLoader.blockDebug = new BlockDebug(getNextID()); CoreRecipeLoader.blockStainGlass = new BlockColorGlass(getNextID(), "StainedGlass"); CoreRecipeLoader.blockColorSand = new BlockColorSand(getNextID()); CoreRecipeLoader.blockBasalt = new BlockBasalt(getNextID()); diff --git a/src/dark/core/common/blocks/BlockOre.java b/src/dark/core/common/blocks/BlockOre.java index 1a62d0f1..ac0dabac 100644 --- a/src/dark/core/common/blocks/BlockOre.java +++ b/src/dark/core/common/blocks/BlockOre.java @@ -24,9 +24,9 @@ public class BlockOre extends Block implements IExtraObjectInfo { Icon[] icons = new Icon[EnumMeterials.values().length]; - public BlockOre(int par1, Configuration config) + public BlockOre(int par1) { - super(config.getBlock("Ore", par1).getInt(), Material.rock); + super(DarkMain.CONFIGURATION.getBlock("Ore", par1).getInt(), Material.rock); this.setCreativeTab(CreativeTabs.tabBlock); this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Ore"); } diff --git a/src/dark/core/common/debug/BlockDebug.java b/src/dark/core/common/debug/BlockDebug.java index c9481308..001a6093 100644 --- a/src/dark/core/common/debug/BlockDebug.java +++ b/src/dark/core/common/debug/BlockDebug.java @@ -22,9 +22,9 @@ public class BlockDebug extends BlockMachine implements IExtraObjectInfo { public static float DebugWattOut, DebugWattDemand; - public BlockDebug(int blockID, Configuration config) + public BlockDebug(int blockID) { - super("DebugBlock", config, blockID, Material.clay); + super("DebugBlock", DarkMain.CONFIGURATION, blockID, Material.clay); this.setCreativeTab(CreativeTabs.tabRedstone); } diff --git a/src/dark/core/common/transmit/BlockWire.java b/src/dark/core/common/transmit/BlockWire.java index 40fad98b..07f9c197 100644 --- a/src/dark/core/common/transmit/BlockWire.java +++ b/src/dark/core/common/transmit/BlockWire.java @@ -29,9 +29,9 @@ public class BlockWire extends BlockMachine implements IExtraObjectInfo public Vector3 minVector = new Vector3(0.3, 0.3, 0.3); public Vector3 maxVector = new Vector3(0.7, 0.7, 0.7); - public BlockWire(Configuration config, int blockID) + public BlockWire(int blockID) { - super("DMWire", config, blockID, Material.cloth); + super("DMWire", DarkMain.CONFIGURATION, blockID, Material.cloth); this.setStepSound(soundClothFootstep); this.setResistance(0.2F); this.setHardness(0.1f); diff --git a/src/dark/core/prefab/BlockMulti.java b/src/dark/core/prefab/BlockMulti.java index 70c9ad06..98f154c5 100644 --- a/src/dark/core/prefab/BlockMulti.java +++ b/src/dark/core/prefab/BlockMulti.java @@ -14,6 +14,7 @@ import universalelectricity.core.UniversalElectricity; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.core.common.DarkMain; public class BlockMulti extends BlockContainer { @@ -22,7 +23,7 @@ public class BlockMulti extends BlockContainer public BlockMulti(int id) { - super(id, UniversalElectricity.machine); + super(DarkMain.CONFIGURATION.getBlock("MultiBlock", id).getInt(), UniversalElectricity.machine); this.setHardness(0.8F); this.setUnlocalizedName("multiBlock"); }