diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index df6c7b4a..ab17b0d6 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -487,7 +487,9 @@ public class EnderIO { itemGrindingBall = ItemGrindingBall.create(); itemAlloyEndergy = ItemAlloyEndergy.create(); itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); - itemPowderIngot = ItemPowderIngot.create(); + if (!hasGT5) { + itemPowderIngot = ItemPowderIngot.create(); + } registerFluids(); @@ -727,7 +729,9 @@ public class EnderIO { SkeletonHandler.registerSkeleton(this); } - MaterialRecipes.registerDependantOresInDictionary(); + if (!hasGT5) { + MaterialRecipes.registerDependantOresInDictionary(); + } EnderfaceRecipes.addRecipes(); MaterialRecipes.addRecipes(); diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 37f79b4b..7b06846d 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,5 +1,6 @@ package crazypants.enderio.material; +import static crazypants.enderio.EnderIO.hasGT5; import static crazypants.enderio.material.Alloy.DARK_STEEL; import static crazypants.enderio.material.Alloy.END_STEEL; import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY; @@ -58,10 +59,13 @@ public class MaterialRecipes { public static void registerOresInDictionary() { // Ore Dictionary Registration - for (PowderIngot powder : PowderIngot.values()) { - if (!powder.hasDependancy()) { - OreDictionary - .registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); + if (!hasGT5) { + for (PowderIngot powder : PowderIngot.values()) { + if (!powder.hasDependancy()) { + OreDictionary.registerOre( + powder.oreDictName, + new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); + } } } @@ -431,17 +435,19 @@ public class MaterialRecipes { RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); // Smelting - ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); - ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); - ItemStack ingotIron = new ItemStack(Items.iron_ingot); - ItemStack ingotGold = new ItemStack(Items.gold_ingot); + if (!hasGT5) { + ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); + ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); + ItemStack ingotIron = new ItemStack(Items.iron_ingot); + ItemStack ingotGold = new ItemStack(Items.gold_ingot); - GameRegistry.addSmelting(dustIron, ingotIron, 0); - GameRegistry.addSmelting(dustGold, ingotGold, 0); + GameRegistry.addSmelting(dustIron, ingotIron, 0); + GameRegistry.addSmelting(dustGold, ingotGold, 0); - // Ender Dusts - ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); - RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); + // Ender Dusts + ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); + } // Dark Iron Bars ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); @@ -564,24 +570,29 @@ public class MaterialRecipes { ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal()); RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget); - // Food - ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); - ItemStack bread = new ItemStack(Items.bread, 1, 0); + if (!hasGT5) { + // Food + ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); + ItemStack bread = new ItemStack(Items.bread, 1, 0); - GameRegistry.addSmelting(flour, bread, 0.35f); + GameRegistry.addSmelting(flour, bread, 0.35f); + } ItemStack enderios = EnderFood.ENDERIOS.getStack(); RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); - if (OreDictionaryHelper.hasCopper()) { - ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); - ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); - GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); - } - if (OreDictionaryHelper.hasTin()) { - ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); - ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); - GameRegistry.addSmelting(dustTin, ingotTin, 0); + if (!hasGT5) { + if (OreDictionaryHelper.hasCopper()) { + ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); + ItemStack ingotCoppper = OreDictionaryPreferences.instance + .getPreferred(OreDictionaryHelper.INGOT_COPPER); + GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); + } + if (OreDictionaryHelper.hasTin()) { + ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); + ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); + GameRegistry.addSmelting(dustTin, ingotTin, 0); + } } } } diff --git a/src/main/java/crazypants/util/EE3Util.java b/src/main/java/crazypants/util/EE3Util.java index 5ad0bcbf..17f86b93 100644 --- a/src/main/java/crazypants/util/EE3Util.java +++ b/src/main/java/crazypants/util/EE3Util.java @@ -1,5 +1,6 @@ package crazypants.util; +import static crazypants.enderio.EnderIO.hasGT5; import static crazypants.enderio.material.Material.BINDER_COMPOSITE; import static crazypants.enderio.material.Material.CONDUIT_BINDER; import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET; @@ -9,6 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Objects; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,6 +22,7 @@ import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.ItemEnderFood.EnderFood; @@ -93,47 +96,59 @@ public class EE3Util { */ public static void registerMiscRecipes() { if (IS_EE3_LOADED) { - ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); - ItemStack stick4 = new ItemStack(Items.stick, 4); - ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4); - registerRecipe(basicGear, stick4, cobble4); - - ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal()); - ItemStack wheat5 = new ItemStack(Items.wheat, 5); - ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1); - registerRecipe(flour10, wheat5, seeds1); + if (!hasGT5) { + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack stick4 = new ItemStack(Items.stick, 4); + ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4); + registerRecipe(basicGear, stick4, cobble4); + ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal()); + ItemStack wheat5 = new ItemStack(Items.wheat, 5); + ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1); + registerRecipe(flour10, wheat5, seeds1); + } ItemStack enderios = EnderFood.ENDERIOS.getStack(); ItemStack bowl = new ItemStack(Items.bowl, 1); ItemStack wheat = new ItemStack(Items.wheat, 1); ItemStack milkb = new ItemStack(Items.milk_bucket, 1); FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb); - ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + ItemStack dustEnderPearl; + if (hasGT5) { + dustEnderPearl = GameRegistry.findItemStack("gregtech", "gt.metaitem.01", 1); + Items.feather.setDamage(Objects.requireNonNull(dustEnderPearl), 2532); + } else { + dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + } if (milk != null) { registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl); } else { registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl); } - ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal()); - ItemStack coal = new ItemStack(Items.coal, 1); - registerRecipe(dustCoal, coal); + if (!hasGT5) { + ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal()); + ItemStack coal = new ItemStack(Items.coal, 1); + registerRecipe(dustCoal, coal); - ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); - ItemStack iron = new ItemStack(Items.iron_ingot, 1); - registerRecipe(dustIron, iron); + ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); + ItemStack iron = new ItemStack(Items.iron_ingot, 1); + registerRecipe(dustIron, iron); - ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); - ItemStack gold = new ItemStack(Items.gold_ingot, 1); - registerRecipe(dustGold, gold); + ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); + ItemStack gold = new ItemStack(Items.gold_ingot, 1); + registerRecipe(dustGold, gold); - ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal()); - ItemStack obsidian = new ItemStack(Blocks.obsidian, 1); - registerRecipe(dustObsidian4, obsidian); + ItemStack dustObsidian4 = new ItemStack( + EnderIO.itemPowderIngot, + 4, + PowderIngot.POWDER_OBSIDIAN.ordinal()); + ItemStack obsidian = new ItemStack(Blocks.obsidian, 1); + registerRecipe(dustObsidian4, obsidian); - ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal()); - ItemStack enderPearl = new ItemStack(Items.ender_pearl); - registerRecipe(enderDust9, enderPearl); + ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal()); + ItemStack enderPearl = new ItemStack(Items.ender_pearl); + registerRecipe(enderDust9, enderPearl); + } ItemStack cbc8 = BINDER_COMPOSITE.getStack(8); ItemStack sand2 = new ItemStack(Blocks.sand, 2);