diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index cacaa7fb..b97edffc 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -366,6 +366,7 @@ public class EnderIO { packetPipeline.postInitialise(); MaterialRecipes.addOreDictionaryRecipes(); MachineRecipes.addOreDictionaryRecipes(); + ItemRecipes.addOreDictionaryRecipes(); CrusherRecipeManager.getInstance().loadRecipesFromConfig(); AlloyRecipeManager.getInstance().loadRecipesFromConfig(); diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index f4ebbf2a..f8fe89da 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -18,8 +18,7 @@ public class ItemRecipes { // Wrench GameRegistry.addShapedRecipe(wrench, "s s", " b ", " s ", 's', electricalSteel, 'b', basicGear); - ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); - ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), "sss", "s s", " ", 's', darkSteel); GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), " ", "sss", "s s", 's', darkSteel); @@ -33,13 +32,13 @@ public class ItemRecipes { GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), " ", "s s", "s s", 's', darkSteel); - - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 't', "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 't', "woodStick")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'c', vibCry, 'w', - "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'c', vibCry, 'w', - "woodStick")); - + } + + public static void addOreDictionaryRecipes() { + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick")); + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick")); } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 13966975..63b78b0f 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -27,6 +27,8 @@ public class MaterialRecipes { OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); OreDictionary.registerOre("glass", Blocks.glass); + OreDictionary.registerOre("stickWood", Items.stick); + OreDictionary.registerOre("woodStick", Items.stick); ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); OreDictionary.registerOre("glass", pureGlass); diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index dbbd33aa..85957a1d 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -236,7 +236,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta } public void setFull(ItemStack container) { - setEnergy(container, Config.darkSteelPowerStorageBase); + setEnergy(container, Config.darkSteelPowerStorageLevelTwo); } private void updateDamage(ItemStack stack) { diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index 6b09aaeb..251a83f9 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -2,6 +2,7 @@ package crazypants.enderio.teleport; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; @@ -27,12 +28,15 @@ public class TeleportRecipes { if(Config.travelStaffEnabled) { //travel staff ItemStack travelStaff = new ItemStack(EnderIO.itemTravelStaff); + EnderIO.itemTravelStaff.setEnergy(travelStaff, 0); ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); - GameRegistry + IRecipe rec = GameRegistry .addShapedRecipe(travelStaff, " g", " s ", "c ", 's', electricalSteel, 'c', enderCapacitor, 'g', vibCry); - GameRegistry + rec = GameRegistry .addShapedRecipe(travelStaff, "g ", " s ", " c", 's', electricalSteel, 'c', enderCapacitor, 'g', vibCry); + + System.out.println("TeleportRecipes.addRecipes: " + rec); } }