From e9c39bcf3d80c698dc28ea4c398fa695233f6e45 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 2 Dec 2013 11:32:45 -0500 Subject: [PATCH] Fix ore gen --- common/mekanism/common/CommonProxy.java | 6 +++--- common/mekanism/common/Mekanism.java | 6 +++--- common/mekanism/common/OreHandler.java | 7 ++++--- common/mekanism/common/item/ItemBlockOre.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index aae1d3255..213f3ffca 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -170,9 +170,9 @@ public class CommonProxy Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); Mekanism.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt(); - Mekanism.osmiumGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumGenerationAmount", 8).getInt(); - Mekanism.copperGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperGenerationAmount", 12).getInt(); - Mekanism.tinGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinGenerationAmount", 10).getInt(); + Mekanism.osmiumGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumGenerationAmount", 12).getInt(); + Mekanism.copperGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperGenerationAmount", 16).getInt(); + Mekanism.tinGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinGenerationAmount", 14).getInt(); Mekanism.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10).getDouble(10); Mekanism.TO_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EUToJoules", .1).getDouble(.1); Mekanism.FROM_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToMJ", 25).getDouble(25); diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 4d7ee8858..b27bfb5ea 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -236,9 +236,9 @@ public class Mekanism public static boolean forceBuildcraft = false; public static boolean overrideUERatios = true; public static int obsidianTNTBlastRadius = 12; - public static int osmiumGenerationAmount = 8; - public static int copperGenerationAmount = 12; - public static int tinGenerationAmount = 10; + public static int osmiumGenerationAmount = 12; + public static int copperGenerationAmount = 16; + public static int tinGenerationAmount = 14; public static int obsidianTNTDelay = 100; public static int UPDATE_DELAY = 10; public static int VOICE_PORT = 36123; diff --git a/common/mekanism/common/OreHandler.java b/common/mekanism/common/OreHandler.java index 3a231c39d..8f57e72b4 100644 --- a/common/mekanism/common/OreHandler.java +++ b/common/mekanism/common/OreHandler.java @@ -2,6 +2,7 @@ package mekanism.common; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -22,7 +23,7 @@ public class OreHandler implements IWorldGenerator int randPosX = (chunkX*16) + random.nextInt(16); int randPosY = random.nextInt(60); int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(new ItemStack(Mekanism.OreBlock, 1, 0).itemID, 8).generate(world, random, randPosX, randPosY, randPosZ); + new WorldGenMinable(Mekanism.oreBlockID, 0, 8, Block.stone.blockID).generate(world, random, randPosX, randPosY, randPosZ); } for(int i = 0; i < Mekanism.copperGenerationAmount; i++) @@ -30,7 +31,7 @@ public class OreHandler implements IWorldGenerator int randPosX = (chunkX*16) + random.nextInt(16); int randPosY = random.nextInt(60); int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(new ItemStack(Mekanism.OreBlock, 1, 1).itemID, 8).generate(world, random, randPosX, randPosY, randPosZ); + new WorldGenMinable(Mekanism.oreBlockID, 1, 8, Block.stone.blockID).generate(world, random, randPosX, randPosY, randPosZ); } for(int i = 0; i < Mekanism.tinGenerationAmount; i++) @@ -38,7 +39,7 @@ public class OreHandler implements IWorldGenerator int randPosX = (chunkX*16) + random.nextInt(16); int randPosY = random.nextInt(60); int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(new ItemStack(Mekanism.OreBlock, 1, 2).itemID, 8).generate(world, random, randPosX, randPosY, randPosZ); + new WorldGenMinable(Mekanism.oreBlockID, 2, 8, Block.stone.blockID).generate(world, random, randPosX, randPosY, randPosZ); } } } diff --git a/common/mekanism/common/item/ItemBlockOre.java b/common/mekanism/common/item/ItemBlockOre.java index 29a4837b8..d5c5f93c2 100644 --- a/common/mekanism/common/item/ItemBlockOre.java +++ b/common/mekanism/common/item/ItemBlockOre.java @@ -60,7 +60,7 @@ public class ItemBlockOre extends ItemBlock { list.add("A lightweight, yet sturdy, conductive"); list.add("material that is found slighly less"); - list.add("commonly than Copper."); + list.add("commonly than Copper."); } } }