Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable)
This commit is contained in:
Aidan C. Brady
parent
f5d94ca1dc
commit
ad2a354f45
15 changed files with 149 additions and 330 deletions
|
|
@ -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()));
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ public enum Resource
|
|||
COPPER("Copper"),
|
||||
TIN("Tin"),
|
||||
SILVER("Silver"),
|
||||
OBSIDIAN("Obsidian"),
|
||||
LEAD("Lead");
|
||||
|
||||
private String name;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
{
|
||||
|
|
|
|||
54
src/main/java/mekanism/common/item/ItemOtherDust.java
Normal file
54
src/main/java/mekanism/common/item/ItemOtherDust.java
Normal file
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 227 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 235 B After Width: | Height: | Size: 227 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 235 B |
Loading…
Reference in a new issue