A few recipe updates

GTNewHorizons · Dec 22, 2024 · 9b28d13 · 9b28d13
1 parent 58dc086
commit 9b28d13
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 74 deletions.
diff --git a/src/main/java/witchinggadgets/WitchingGadgets.java b/src/main/java/witchinggadgets/WitchingGadgets.java
@@ -46,9 +46,9 @@
         name = WitchingGadgets.MODNAME,
         version = WitchingGadgets.VERSION,
         dependencies = "required-after:Thaumcraft;" + "required-after:ForbiddenMagic;"
-                + "required-after:gregtech;"
                 + "required-after:TwilightForest;"
                 + "required-after:TaintedMagic;"
+                + "after:gregtech;"
                 + "after:miscutils;"
                 + "after:Mystcraft;"
                 + "after:TConstruct;"

diff --git a/src/main/java/witchinggadgets/common/recipes/arcane/WG_arcane_baubles.java b/src/main/java/witchinggadgets/common/recipes/arcane/WG_arcane_baubles.java
@@ -2,6 +2,7 @@
 
 import static witchinggadgets.common.recipes.WG_arcane_recipes.registerArcaneRecipe;
 
+import cpw.mods.fml.common.Loader;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -15,82 +16,144 @@
 public class WG_arcane_baubles {
 
     public static void registerArcaneBaubles() {
-        registerArcaneRecipe(
-                "WGBAUBLES",
-                "_BLANKCHARM",
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 7),
-                new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.ORDER, 15).add(Aspect.AIR, 15),
-                "SDS",
-                "PDP",
-                "P P",
-                'D',
-                "ringDamascusSteel",
-                'P',
-                new ItemStack(Items.leather, 1, 0),
-                'S',
-                new ItemStack(Items.string, 1, 0));
 
-        registerArcaneRecipe(
-                "WGBAUBLES",
-                "_BLANKVAMBRACES",
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 8),
-                new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25).add(Aspect.AIR, 25),
-                " P ",
-                "PDP",
-                " P ",
-                'D',
-                "ringDamascusSteel",
-                'P',
-                new ItemStack(Items.leather, 1, 0));
+        if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) {
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_BLANKCHARM",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 7),
+                    new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.ORDER, 15).add(Aspect.AIR, 15),
+                    "SDS",
+                    "PDP",
+                    "P P",
+                    'D',
+                    "ringSteel",
+                    'P',
+                    new ItemStack(Items.leather, 1, 0),
+                    'S',
+                    new ItemStack(Items.string, 1, 0));
 
-        registerArcaneRecipe(
-                "WGBAUBLES",
-                "_KNOCKBACKCHARM",
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 1),
-                new AspectList().add(Aspect.EARTH, 50).add(Aspect.AIR, 15),
-                "BSB",
-                "ETE",
-                "BHB",
-                'H',
-                "craftingToolHardHammer",
-                'E',
-                new ItemStack(ConfigBlocks.blockCrystal, 1, 3),
-                'B',
-                "boltStainlessSteel",
-                'S',
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 7),
-                'T',
-                "plateDenseLead");
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_BLANKVAMBRACES",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 8),
+                    new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25).add(Aspect.AIR, 25),
+                    " P ",
+                    "PDP",
+                    " P ",
+                    'D',
+                    "ringSteel",
+                    'P',
+                    new ItemStack(Items.leather, 1, 0));
 
-        registerArcaneRecipe(
-                "WGBAUBLES",
-                "_WOLFVAMBRACES",
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 2),
-                new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.FIRE, 25).add(Aspect.AIR, 15),
-                " P ",
-                "PVP",
-                " D ",
-                'D',
-                "ringDamascusSteel",
-                'P',
-                new ItemStack(WGContent.ItemMaterial, 1, 6),
-                'V',
-                new ItemStack(WGContent.ItemMagicalBaubles, 1, 8));
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_KNOCKBACKCHARM",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 1),
+                    new AspectList().add(Aspect.EARTH, 50).add(Aspect.AIR, 15),
+                    "BSB",
+                    "ETE",
+                    "BHB",
+                    'H',
+                    "craftingToolHardHammer",
+                    'E',
+                    new ItemStack(ConfigBlocks.blockCrystal, 1, 3),
+                    'B',
+                    "boltStainlessSteel",
+                    'S',
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 7),
+                    'T',
+                    "plateDenseLead");
 
-        ItemStack luckyCoin = new ItemStack(ConfigItems.itemResource, 1, 18);
-        luckyCoin.addEnchantment(Enchantment.fortune, 1);
-        luckyCoin.addEnchantment(Enchantment.looting, 1);
-        registerArcaneRecipe(
-                "WGBAUBLES",
-                "_COIN",
-                luckyCoin,
-                new AspectList().add(Aspect.ORDER, 30),
-                "BCB",
-                "CCC",
-                "BCB",
-                'C',
-                new ItemStack(ConfigItems.itemResource, 1, 18),
-                'B',
-                Items.enchanted_book);
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_WOLFVAMBRACES",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 2),
+                    new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.FIRE, 25).add(Aspect.AIR, 15),
+                    " P ",
+                    "PVP",
+                    " D ",
+                    'D',
+                    "ringSteel",
+                    'P',
+                    new ItemStack(WGContent.ItemMaterial, 1, 6),
+                    'V',
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 8));
+        } else {
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_BLANKCHARM",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 7),
+                    new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.ORDER, 15).add(Aspect.AIR, 15),
+                    "SDS",
+                    "PDP",
+                    "P P",
+                    'D',
+                    new ItemStack(Items.iron_ingot, 1, 0),
+                    'P',
+                    new ItemStack(Items.leather, 1, 0),
+                    'S',
+                    new ItemStack(Items.string, 1, 0));
+
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_BLANKVAMBRACES",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 8),
+                    new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25).add(Aspect.AIR, 25),
+                    " P ",
+                    "PDP",
+                    " P ",
+                    'D',
+                    new ItemStack(Items.iron_ingot, 1, 0),
+                    'P',
+                    new ItemStack(Items.leather, 1, 0));
+
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_KNOCKBACKCHARM",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 1),
+                    new AspectList().add(Aspect.EARTH, 50).add(Aspect.AIR, 15),
+                    "BSB",
+                    "EEE",
+                    "B B",
+                    'E',
+                    new ItemStack(ConfigBlocks.blockCrystal, 1, 3),
+                    'B',
+                    new ItemStack(Items.iron_ingot, 1, 0),
+                    'S',
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 7)
+            );
+
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_WOLFVAMBRACES",
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 2),
+                    new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.FIRE, 25).add(Aspect.AIR, 15),
+                    " P ",
+                    "PVP",
+                    " D ",
+                    'D',
+                    new ItemStack(Items.iron_ingot, 1, 0),
+                    'P',
+                    new ItemStack(WGContent.ItemMaterial, 1, 6),
+                    'V',
+                    new ItemStack(WGContent.ItemMagicalBaubles, 1, 8));
+        }
+
+            ItemStack luckyCoin = new ItemStack(ConfigItems.itemResource, 1, 18);
+            luckyCoin.addEnchantment(Enchantment.fortune, 1);
+            luckyCoin.addEnchantment(Enchantment.looting, 1);
+            registerArcaneRecipe(
+                    "WGBAUBLES",
+                    "_COIN",
+                    luckyCoin,
+                    new AspectList().add(Aspect.ORDER, 30),
+                    "BCB",
+                    "CCC",
+                    "BCB",
+                    'C',
+                    new ItemStack(ConfigItems.itemResource, 1, 18),
+                    'B',
+                    Items.enchanted_book);
     }
 }