From ad2a354f45a7ad705a6244747171db9f9e8b6ca9 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 17 Mar 2015 19:16:36 -0400 Subject: [PATCH] Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable) --- src/main/java/mekanism/common/Mekanism.java | 56 ++-- .../java/mekanism/common/MekanismItems.java | 3 + src/main/java/mekanism/common/Resource.java | 1 - .../common/integration/MekanismHooks.java | 60 +--- .../common/integration/OreDictManager.java | 276 +++--------------- .../java/mekanism/common/item/ItemDust.java | 18 +- .../java/mekanism/common/item/ItemIngot.java | 4 +- .../mekanism/common/item/ItemOtherDust.java | 54 ++++ .../resources/assets/mekanism/lang/en_US.lang | 7 +- .../textures/items/DirtyObsidianDust.png | Bin 227 -> 0 bytes .../mekanism/textures/items/ObsidianClump.png | Bin 1649 -> 0 bytes .../textures/items/ObsidianCrystal.png | Bin 1592 -> 0 bytes .../mekanism/textures/items/ObsidianDust.png | Bin 235 -> 227 bytes .../mekanism/textures/items/ObsidianShard.png | Bin 1639 -> 0 bytes .../textures/items/RefinedObsidianDust.png | Bin 0 -> 235 bytes 15 files changed, 149 insertions(+), 330 deletions(-) create mode 100644 src/main/java/mekanism/common/item/ItemOtherDust.java delete mode 100644 src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianClump.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianShard.png create mode 100644 src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 9010038d2..d29c307d6 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -665,7 +665,7 @@ public class Mekanism new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[] { - " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), new ItemStack(MekanismItems.Dust, 1, 2) + " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dustOsmium" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), new Object[] { "SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i) @@ -676,16 +676,16 @@ public class Mekanism FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 0), new ItemStack(Items.iron_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 1), new ItemStack(Items.gold_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 5), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 6), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 7), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.DirtyDust, 2, 6)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.OtherDust, 2, 6)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(MekanismItems.CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(MekanismItems.CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(MekanismItems.CompressedRedstone)); @@ -720,9 +720,9 @@ public class Mekanism RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(MekanismItems.Ingot, 1, 3)); //Crusher Recipes - RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.Dust, 1, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.Dust, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(MekanismItems.Dust, 1, 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.OtherDust, 1, 0)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal())); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal())); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.gravel)); @@ -751,13 +751,11 @@ public class Mekanism RecipeHandler.addCrusherRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(MekanismItems.BioFuel, 2)); //Purification Chamber Recipes - RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.Clump, 3, 6)); RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint)); //Chemical Injection Chamber Recipes - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.obsidian), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 6)); RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.dirt), "water", new ItemStack(Blocks.clay)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.gunpowder), "hydrogenChloride", new ItemStack(MekanismItems.Dust, 1, 10)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.gunpowder), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3)); //Precision Sawmill Recipes RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.ladder, 3), new ItemStack(Items.stick, 7)); @@ -778,7 +776,7 @@ public class Mekanism //Metallurgic Infuser Recipes RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.EnrichedIron)); - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(MekanismItems.EnrichedIron), new ItemStack(MekanismItems.Dust, 1, 5)); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(MekanismItems.EnrichedIron), new ItemStack(MekanismItems.OtherDust, 1, 1)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.EnrichedAlloy)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Blocks.dirt), new ItemStack(Blocks.mycelium)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.mossy_cobblestone)); @@ -803,7 +801,7 @@ public class Mekanism RecipeHandler.addSolarEvaporationRecipe(FluidRegistry.getFluidStack("brine", 10), FluidRegistry.getFluidStack("lithium", 1)); //Chemical Crystallizer Recipes - RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new ItemStack(MekanismItems.Dust, 1, 11)); + RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new ItemStack(MekanismItems.OtherDust, 1, 4)); //T4 Processing Recipes for(Gas gas : GasRegistry.getRegisteredGasses()) @@ -816,9 +814,6 @@ public class Mekanism RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(MekanismItems.Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); } } - - //Chemical Dissolution Chamber Recipes - RecipeHandler.addChemicalDissolutionChamberRecipe(new ItemStack(Blocks.obsidian), new GasStack(GasRegistry.getGas("obsidian"), 1000)); //Pressurized Reaction Chamber Recipes RecipeHandler.addPRCRecipe( @@ -896,25 +891,17 @@ public class Mekanism OreDictionary.registerOre("alloyElite", new ItemStack(MekanismItems.ReinforcedAlloy)); OreDictionary.registerOre("alloyUltimate", new ItemStack(MekanismItems.AtomicAlloy)); - //for RailCraft/IC2. - OreDictionary.registerOre("dustObsidian", new ItemStack(MekanismItems.DirtyDust, 1, 6)); - //GregoriousT? OreDictionary.registerOre("itemSalt", MekanismItems.Salt); OreDictionary.registerOre("dustSalt", MekanismItems.Salt); - OreDictionary.registerOre("dustIron", new ItemStack(MekanismItems.Dust, 1, 0)); - OreDictionary.registerOre("dustGold", new ItemStack(MekanismItems.Dust, 1, 1)); - OreDictionary.registerOre("dustOsmium", new ItemStack(MekanismItems.Dust, 1, 2)); - OreDictionary.registerOre("dustRefinedObsidian", new ItemStack(MekanismItems.Dust, 1, 3)); - OreDictionary.registerOre("dustDiamond", new ItemStack(MekanismItems.Dust, 1, 4)); - OreDictionary.registerOre("dustSteel", new ItemStack(MekanismItems.Dust, 1, 5)); - OreDictionary.registerOre("dustCopper", new ItemStack(MekanismItems.Dust, 1, 6)); - OreDictionary.registerOre("dustTin", new ItemStack(MekanismItems.Dust, 1, 7)); - OreDictionary.registerOre("dustSilver", new ItemStack(MekanismItems.Dust, 1, 8)); - OreDictionary.registerOre("dustLead", new ItemStack(MekanismItems.Dust, 1, 9)); - OreDictionary.registerOre("dustSulfur", new ItemStack(MekanismItems.Dust, 1, 10)); - OreDictionary.registerOre("dustLithium", new ItemStack(MekanismItems.Dust, 1, 11)); + OreDictionary.registerOre("dustDiamond", new ItemStack(MekanismItems.OtherDust, 1, 0)); + OreDictionary.registerOre("dustSteel", new ItemStack(MekanismItems.OtherDust, 1, 1)); + OreDictionary.registerOre("dustLead", new ItemStack(MekanismItems.OtherDust, 1, 2)); + OreDictionary.registerOre("dustSulfur", new ItemStack(MekanismItems.OtherDust, 1, 3)); + OreDictionary.registerOre("dustLithium", new ItemStack(MekanismItems.OtherDust, 1, 4)); + OreDictionary.registerOre("dustRefinedObsidian", new ItemStack(MekanismItems.OtherDust, 1, 5)); + OreDictionary.registerOre("dustObsidian", new ItemStack(MekanismItems.OtherDust, 1, 6)); OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(MekanismItems.Ingot, 1, 0)); OreDictionary.registerOre("ingotOsmium", new ItemStack(MekanismItems.Ingot, 1, 1)); @@ -935,6 +922,7 @@ public class Mekanism for(Resource resource : Resource.values()) { + OreDictionary.registerOre("dust" + resource.getName(), new ItemStack(MekanismItems.Dust, 1, resource.ordinal())); OreDictionary.registerOre("dustDirty" + resource.getName(), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); OreDictionary.registerOre("clump" + resource.getName(), new ItemStack(MekanismItems.Clump, 1, resource.ordinal())); OreDictionary.registerOre("shard" + resource.getName(), new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index a9af79f56..b688261bf 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -22,6 +22,7 @@ import mekanism.common.item.ItemIngot; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemMekanism; import mekanism.common.item.ItemNetworkReader; +import mekanism.common.item.ItemOtherDust; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemProxy; import mekanism.common.item.ItemRobit; @@ -87,6 +88,7 @@ public class MekanismItems public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon"); //Multi-ID Items + public static final Item OtherDust = new ItemOtherDust(); public static final Item Dust = new ItemDust(); public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust"); public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt"); @@ -152,6 +154,7 @@ public class MekanismItems GameRegistry.registerItem(Flamethrower, "Flamethrower"); GameRegistry.registerItem(GaugeDropper, "GaugeDropper"); GameRegistry.registerItem(FactoryInstaller, "FactoryInstaller"); + GameRegistry.registerItem(OtherDust, "OtherDust"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET); diff --git a/src/main/java/mekanism/common/Resource.java b/src/main/java/mekanism/common/Resource.java index fbd40993c..f54a5c833 100644 --- a/src/main/java/mekanism/common/Resource.java +++ b/src/main/java/mekanism/common/Resource.java @@ -8,7 +8,6 @@ public enum Resource COPPER("Copper"), TIN("Tin"), SILVER("Silver"), - OBSIDIAN("Obsidian"), LEAD("Lead"); private String name; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index ed8d451af..7b6f0afc1 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -1,30 +1,28 @@ package mekanism.common.integration; +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; + import java.util.List; import java.util.Map; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Resource; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; - -import net.minecraft.block.Block; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.event.FMLInterModComms; - import dan200.computercraft.api.ComputerCraftAPI; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeInputOreDict; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Hooks for Mekanism. Use to grab items or blocks out of different mods. @@ -100,25 +98,21 @@ public final class MekanismHooks } try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal())); } catch(Exception e) {} try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.Dust, 1, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.OtherDust, 1, 5)); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.glowstone_dust)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.Dust, 1, 5)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.OtherDust, 1, 1)); } catch(Exception e) {} try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpIron"), null, new ItemStack(MekanismItems.DirtyDust, 1, 0)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpGold"), null, new ItemStack(MekanismItems.DirtyDust, 1, 1)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpOsmium"), null, new ItemStack(MekanismItems.DirtyDust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpCopper"), null, new ItemStack(MekanismItems.DirtyDust, 1, 3)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpTin"), null, new ItemStack(MekanismItems.DirtyDust, 1, 4)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpSilver"), null, new ItemStack(MekanismItems.DirtyDust, 1, 5)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpObsidian"), null, new ItemStack(MekanismItems.DirtyDust, 1, 6)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpLead"), null, new ItemStack(MekanismItems.DirtyDust, 1, 7)); + for(Resource resource : Resource.values()) + { + Recipes.macerator.addRecipe(new RecipeInputOreDict("clump" + resource.getName()), null, new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); + } } catch(Exception e) {} NBTTagCompound tag = new NBTTagCompound(); @@ -146,28 +140,4 @@ public final class MekanismHooks FMLInterModComms.sendMessage("mekanism", "PulverizerRecipe", nbtTags); } - - public ItemStack getBuildCraftItem(String name) - { - try { - if(BuildCraftEnergy == null) BuildCraftEnergy = Class.forName("buildcraft.BuildCraftEnergy"); - if(BuildCraftEnergy == null) BuildCraftEnergy = Class.forName("net.minecraft.src.buildcraft.BuildCraftEnergy"); - Object ret = BuildCraftEnergy.getField(name).get(null); - - if(ret instanceof Item) - { - return new ItemStack((Item)ret); - } - else if(ret instanceof Block) - { - return new ItemStack((Block)ret); - } - else { - throw new Exception("not instanceof ItemStack"); - } - } catch(Exception e) { - Mekanism.logger.error("Unable to retrieve BuildCraft item " + name + "."); - return null; - } - } } diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index f4d2ccf09..5495c22ef 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -13,6 +13,7 @@ import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Resource; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; @@ -51,7 +52,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("oreNetherSteel")) { - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 4, 5)); + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 4, 1)); } if(OreDictionary.getOres("itemRubber").size() > 0) @@ -75,221 +76,41 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustRefinedObsidian")) { RecipeHandler.addOsmiumCompressorRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Ingot, 1, 0)); - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 6)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 6)); RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.CompressedObsidian)); InfuseRegistry.registerInfuseObject(MekanismUtils.size(ore, 1), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 10)); } - for(ItemStack ore : OreDictionary.getOres("clumpIron")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 0)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpGold")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 1)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpOsmium")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 2)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpCopper")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 3)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpTin")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 4)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpSilver")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 5)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpObsidian")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 6)); - } - - for(ItemStack ore : OreDictionary.getOres("clumpLead")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 7)); - } - - for(ItemStack ore : OreDictionary.getOres("shardIron")) + for(Resource resource : Resource.values()) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 0)); - } - - for(ItemStack ore : OreDictionary.getOres("shardGold")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 1)); - } - - for(ItemStack ore : OreDictionary.getOres("shardOsmium")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 2)); - } - - for(ItemStack ore : OreDictionary.getOres("shardCopper")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 3)); - } - - for(ItemStack ore : OreDictionary.getOres("shardTin")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 4)); - } - - for(ItemStack ore : OreDictionary.getOres("shardSilver")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 5)); - } - - for(ItemStack ore : OreDictionary.getOres("shardObsidian")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 6)); - } - - for(ItemStack ore : OreDictionary.getOres("shardLead")) - { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 7)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalIron")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 0)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalGold")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 1)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalOsmium")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 2)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalCopper")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 3)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalTin")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 4)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalSilver")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 5)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalObsidian")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 6)); - } - - for(ItemStack ore : OreDictionary.getOres("crystalLead")) - { - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, 7)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyIron")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 0)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyGold")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 1)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyOsmium")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 2)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyCopper")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 6)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyTin")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 7)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtySilver")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); - } - - for(ItemStack ore : OreDictionary.getOres("dustDirtyLead")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 9)); - } - - for(ItemStack ore : OreDictionary.getOres("oreCopper")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 6)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 3)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 3)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("copper"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreTin")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 7)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 4)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 4)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("tin"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreOsmium")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 2)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 2)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 2)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("osmium"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreIron")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 0)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 0)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 0)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("iron"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreGold")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 1)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 1)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 1)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("gold"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreSilver")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 8)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 5)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 5)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("silver"), 1000)); - } - - for(ItemStack ore : OreDictionary.getOres("oreLead")) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 9)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 7)); - RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, 7)); - RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("lead"), 1000)); + for(ItemStack ore : OreDictionary.getOres("clump" + resource.getName())) + { + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); + } + + for(ItemStack ore : OreDictionary.getOres("shard" + resource.getName())) + { + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, resource.ordinal())); + } + + for(ItemStack ore : OreDictionary.getOres("crystal" + resource.getName())) + { + RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); + } + + for(ItemStack ore : OreDictionary.getOres("dustDirty" + resource.getName())) + { + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, resource.ordinal())); + } + + for(ItemStack ore : OreDictionary.getOres("ore" + resource.getName())) + { + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, resource.ordinal())); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, resource.ordinal())); + RecipeHandler.addChemicalInjectionChamberRecipe(MekanismUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, resource.ordinal())); + RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getName().toLowerCase()), 1000)); + } } for(ItemStack ore : OreDictionary.getOres("oreNickel")) @@ -362,32 +183,33 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("ingotCopper")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 6)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal())); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("TIN"), 10, MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Ingot, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("ingotTin")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 7)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal())); } for(ItemStack ore : OreDictionary.getOres("ingotLead")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 9)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, Resource.LEAD.ordinal())); } for(ItemStack ore : OreDictionary.getOres("ingotSilver")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, Resource.SILVER.ordinal())); } for(ItemStack ore : OreDictionary.getOres("ingotRefinedObsidian")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 3)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("ingotOsmium")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 2)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); } @@ -418,11 +240,11 @@ public final class OreDictManager } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 8), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.SILVER.ordinal()), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 9), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.LEAD.ordinal()), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); } catch(Exception e) {} try { @@ -442,13 +264,6 @@ public final class OreDictManager RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Items.gunpowder)); } - try { - for(ItemStack ore : OreDictionary.getOres("ingotSilver")) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); - } - } catch(Exception e) {} - for(ItemStack ore : OreDictionary.getOres("dustIron")) { RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(Blocks.iron_ore)); @@ -456,7 +271,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("ingotSteel")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 5)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("dustGold")) @@ -477,7 +292,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustObsidian")) { RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 4), new ItemStack(Blocks.obsidian)); - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 3)); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("dustOsmium")) @@ -495,11 +310,6 @@ public final class OreDictManager { RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(MekanismBlocks.OreBlock, 1, 1)); } - - for(ItemStack ore : OreDictionary.getOres("ingotCopper")) - { - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("TIN"), 10, MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Ingot, 1, 2)); - } for(ItemStack ore : OreDictionary.getOres("dustTin")) { @@ -530,7 +340,6 @@ public final class OreDictManager } } } catch(Exception e) {} - } @Method(modid = "IC2") @@ -548,6 +357,7 @@ public final class OreDictManager public static void addLogRecipes() { Container tempContainer = new Container() { + @Override public boolean canInteractWith(EntityPlayer player) { return false; diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index 5cf27e38e..be7e50e71 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -2,6 +2,7 @@ package mekanism.common.item; import java.util.List; +import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,12 +12,7 @@ import net.minecraft.util.IIcon; public class ItemDust extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - - public static String[] en_USNames = {"Iron", "Gold", "Osmium", - "Obsidian", "Diamond", "Steel", - "Copper", "Tin", "Silver", - "Lead", "Sulfur", "Lithium"}; - + public ItemDust() { super(); @@ -26,9 +22,9 @@ public class ItemDust extends ItemMekanism @Override public void registerIcons(IIconRegister register) { - for(int i = 0; i <= 11; i++) + for(int i = 0; i < Resource.values().length; i++) { - icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Dust"); + icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "Dust"); } } @@ -41,15 +37,15 @@ public class ItemDust extends ItemMekanism @Override public void getSubItems(Item item, CreativeTabs tabs, List itemList) { - for(int counter = 0; counter <= 11; counter++) + for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } @Override public String getUnlocalizedName(ItemStack item) { - return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Dust"; + return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Dust"; } } diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index d0af42e02..7f03241c3 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -12,7 +12,9 @@ public class ItemIngot extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel", "Copper", "Tin"}; + public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", + "Glowstone", "Steel", "Copper", + "Tin"}; public ItemIngot() { diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java new file mode 100644 index 000000000..aec331e0d --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -0,0 +1,54 @@ +package mekanism.common.item; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class ItemOtherDust extends ItemMekanism +{ + public IIcon[] icons = new IIcon[256]; + + public static String[] subtypes = {"Diamond", "Steel", "Lead", + "Sulfur", "Lithium", "RefinedObsidian", + "Obsidian"}; + + public ItemOtherDust() + { + super(); + setHasSubtypes(true); + } + + @Override + public void registerIcons(IIconRegister register) + { + for(int i = 0; i < subtypes.length; i++) + { + icons[i] = register.registerIcon("mekanism:" + subtypes[i] + "Dust"); + } + } + + @Override + public IIcon getIconFromDamage(int meta) + { + return icons[meta]; + } + + @Override + public void getSubItems(Item item, CreativeTabs tabs, List itemList) + { + for(int counter = 0; counter < subtypes.length; counter++) + { + itemList.add(new ItemStack(this, 1, counter)); + } + } + + @Override + public String getUnlocalizedName(ItemStack item) + { + return "item." + subtypes[item.getItemDamage()].toLowerCase() + "Dust"; + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index b3b264766..efadef2fe 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -193,7 +193,8 @@ item.eliteFactoryInstaller.name=Elite Factory Installer item.ironDust.name=Iron Dust item.goldDust.name=Gold Dust item.osmiumDust.name=Osmium Dust -item.obsidianDust.name=Refined Obsidian Dust +item.obsidianDust.name=Obsidian Dust +item.refinedobsidianDust.name=Refined Obsidian Dust item.diamondDust.name=Diamond Dust item.steelDust.name=Steel Dust item.copperDust.name=Copper Dust @@ -210,7 +211,6 @@ item.osmiumClump.name=Osmium Clump item.copperClump.name=Copper Clump item.tinClump.name=Tin Clump item.silverClump.name=Silver Clump -item.obsidianClump.name=Obsidian Clump item.leadClump.name=Lead Clump //Shards @@ -220,7 +220,6 @@ item.osmiumShard.name=Osmium Shard item.copperShard.name=Copper Shard item.tinShard.name=Tin Shard item.silverShard.name=Silver Shard -item.obsidianShard.name=Obsidian Shard item.leadShard.name=Lead Shard //Crystals @@ -230,7 +229,6 @@ item.osmiumCrystal.name=Osmium Crystal item.copperCrystal.name=Copper Crystal item.tinCrystal.name=Tin Crystal item.silverCrystal.name=Silver Crystal -item.obsidianCrystal.name=Obsidian Crystal item.leadCrystal.name=Lead Crystal //Dirty Dust @@ -240,7 +238,6 @@ item.dirtyOsmiumDust.name=Dirty Osmium Dust item.dirtyCopperDust.name=Dirty Copper Dust item.dirtyTinDust.name=Dirty Tin Dust item.dirtySilverDust.name=Dirty Silver Dust -item.dirtyObsidianDust.name=Dirty Obsidian Dust item.dirtyLeadDust.name=Dirty Lead Dust //Ingots diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png deleted file mode 100644 index 5ce8e60ea9b1f9de11a074bcaea6fbe64016ea78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJRh}-6Ar-gYUN_`wFyLXmAan5G z!IR7#i|?IGuK3K+$}h#?o4asj*^lOglZ!i}I%lp-TfuC#Ao75N@%_*83|#9pc$FLt9X5V4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006ANklzAd z@LP$Uiap4zCD6|7G65}Z0edSX_EOafV{TU=Dw0t}Dzg2MjTB(1s04m)ti~V$+aOZY z0#|Cb10>Lrxn00SZ27?7yJ`qTfS>-q+hZu!*nKKmk^!NEj*`rZdkGZiYe7ngMG}}A zAai7=>axZj2%P!*-W-pB_sV6(@FPn8%MXW=fI3vmBT-Io299EV3N+ofKuOH(+FtAy zDQU4?$>A983}{c)M*hTJ!^2u{_8iO-9L_^KXIPe#oSoqkpkxT74PYgM+e7O8PNOgT zNHsrgX~%Zf{aqxo%#$}I#k&M}T1vRIJL8QR!~Mi=f(b(9LSEl02~6edmPtrpoqF78 zWly2D*8&AazADADk^uc-r*x2CfpLhT^A-r<0XdC?&oXZZXL%zO$2rKA!zk^^de7oD1Q?tCKfr-^oy7sJr09={E-;I(Lx4HlTaYMM v1pgCMbA}K=olKQjxEfrEjP|I&&J_3t6||f`o$(Eh00000NkvXXu0mjf4#E)b diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png b/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png deleted file mode 100644 index a196e9e069d0a3b0b84234e7717cffe339908ae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1592 zcmV-82FLk{P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005cNkl5{>Lw`z%V!8c_qMbBWqR9 z3Q+@)i}0Bnq69E3;^93m~uZ=mlwQgEUqw#W(;+8b{FV%!t|F%6+!o(~3y|J%kvSvV@q; zrK)8{g@p^i8TFPFahz&FmCY`|Pcnk{QnjGRYylQqd4f*9i+0)^;u4RTw)oj=o%S8YbBxWKh#V9$>CCIReOu+FWXowvx7 z0DKlahc!L7D?IDIEfoQ3nZYstYI<>fN#ZB1DVXYk=(krLp6 zcKCx}$)kx{iJ7Tpr~^8nS-?Ou-}4^;3a)fK@)pt#00nkBLr{36C1j#4Bo*Qxpl!Jf z0I3ka0Bd0hKugf77{nhy8#Xy~xW;|51=g1M1!x7WLuh?G{Xhb+P;Rvqklli601YBR zF+j2RKsA7N@UU)m@ozyjKn#?7G;0sg{|i0`xB&HBy0~0M#Owe7002ovPDHLkV1j@1 BQ&Io` delta 207 zcmV;=05JdK0qX&fB!99=L_t(|+U?iD34kyR1<)KiftYwBPa+QV#$H7RNp)Jk#Mb(&iHj zDIcJVr{*AmstHWs^&XYuqPCU>!-h07$K%bqO(wdI5M)w%Q6v z9ziyM29Y2{wi4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER00060Nkl;Y^M;A5kpcRb(|AAS!9I2mCjpjp5kmXc?v))945_0;xD!kU2LT!pZ2t;EIW7*_^c z;4xOE!~kWx!JHm39BT)oWGBiuB3#~kHUgooP&~pn9HBPTt7akYT22RIL6Dn zD!`w=CMB6pNPq38_x-vmz*nM4Nyc__4m?T8t_nECwTUOG7GfNfL16*P&OuecGj7cN zXGbVR_=qX)h_#5U3Xm%FlRDcRrbX%;dR-DQU*QffxYz!1tt;c2?Up%^j(p)T{(J#G z*~|kOd-x`BUr2oA`g1Mf)sy|=mO8+AL(Ymlxt@cbTuAw2uF<SeCe4mx2F7ptubs35gt1kvJ*Ka?!0OaY*l#5xFvP6cYF37 zb@v2W&z%fw7nE`uc2zM}1Z=y-