Merge pull request #21 from POPlol333/master

tweaked infinity egg recipe to fit further use
GTNewHorizons · Aug 9, 2022 · cbb82e4 · cbb82e4
2 parents 5d2d9ea + 2e1b11f
commit cbb82e4
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java
@@ -17,7 +17,7 @@
 import fox.spiteful.avaritia.crafting.Grinder;
 import fox.spiteful.avaritia.items.LudicrousItems;
 import net.minecraft.block.Block;
-import net.minecraft.init.Items;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -406,15 +406,15 @@ public static void compatify(){
                 te = false;
             }
         }
+        if(!Loader.isModLoaded("dreamcraft")) {
+            if (Loader.isModLoaded("witchery") && Config.witch) {
+                try {
+                    Item ingredient = getItem("witchery", "ingredient");
+                    Grinder.catalyst.getInput().add(new ItemStack(ingredient, 1, 150));
 
-        if(Loader.isModLoaded("witchery") && Config.witch){
-            try {
-                Item ingredient = getItem("witchery", "ingredient");
-                Grinder.catalyst.getInput().add(new ItemStack(ingredient, 1, 150));
-
-                Block egg = getBlock("witchery", "infinityegg");
+                    Block egg = getBlock("witchery", "infinityegg");
 
-                ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(new ItemStack(egg, 1, 0),
+                    ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(new ItemStack(egg, 1, 0),
                         "   NNN   ",
                         "  NNNNN  ",
                         "  NNNNN  ",
@@ -425,11 +425,11 @@ public static void compatify(){
                         " NNNINNN ",
                         "  NNNNN  ",
                         'N', new ItemStack(LudicrousItems.resource, 1, 4),
-                        'E', new ItemStack(Items.egg),
+                        'E', new ItemStack(Blocks.dragon_egg),
                         'I', new ItemStack(LudicrousItems.resource, 1, 6));
-            }
-            catch (Throwable e){
-                Lumberjack.log(Level.INFO, e, "Avaritia suffered from Curse of the Incompatibility.");
+                } catch (Throwable e) {
+                    Lumberjack.log(Level.INFO, e, "Avaritia suffered from Curse of the Incompatibility.");
+                }
             }
         }
 
@@ -442,7 +442,7 @@ public static void compatify(){
                 Lumberjack.log(Level.INFO, e, "Avaritia couldn't figure out how torque works.");
             }
         }
-        
+
         if(Loader.isModLoaded("Tails")){
             try
             {