Replace pearl returns with Enhanced Infusion Recipe

dependencies.gradle

@@ -3,6 +3,7 @@ dependencies {
     api("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev")
 
     implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.9.20:dev")
 
     compileOnly('com.github.GTNewHorizons:ThaumicBases:1.9.7:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Thaumic_Exploration:1.5.18-GTNH:dev') {transitive=false}
@@ -29,10 +30,11 @@ dependencies {
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.4-GTNH:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.17-GTNH:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:Electro-Magic-Tools:1.7.17:dev")
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:MagicBees:2.10.4-GTNH:dev")
-    runtimeOnlyNonPublishable rfg.deobf("curse.maven:ztones-224369:2223720")
-    runtimeOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.28-GTNH:dev") { transitive = false }
-
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Chisel:2.17.14-GTNH")
+    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:MagicBees:2.10.4-GTNH:dev")
+    //runtimeOnlyNonPublishable rfg.deobf("curse.maven:ztones-224369:2223720")
+    //runtimeOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.28-GTNH:dev") { transitive = false }
+    runtimeOnlyNonPublishable(rfg.deobf("curse.maven:thaumcraft-nei-plugin-225095:2241913")) { transitive = false }
 
     // deps may transitively add Baubles, so we replace it
     project.getConfigurations()

src/main/java/com/gtnewhorizon/randomboubles/RandomBoubles.java

@@ -1,17 +1,13 @@
 package com.gtnewhorizon.randomboubles;
 
-import net.minecraftforge.common.MinecraftForge;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.gtnewhorizon.randomboubles.handler.EventHandler;
 import com.gtnewhorizon.randomboubles.recipes.rings.ArcaneRecipes;
 import com.gtnewhorizon.randomboubles.recipes.rings.InfusionRecipes;
 import com.gtnewhorizon.randomboubles.research.RingResearch;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
@@ -30,16 +26,9 @@ public class RandomBoubles {
     public static final String MODID = "randomboubles";
     public static final Logger LOGGER = LogManager.getLogger(MODID);
 
-    public EventHandler eventHandler;
-
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         BaubleItems.init();
-        eventHandler = new EventHandler();
-        MinecraftForge.EVENT_BUS.register(eventHandler);
-        FMLCommonHandler.instance()
-            .bus()
-            .register(eventHandler);
     }
 
     @Mod.EventHandler

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemAerRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemAerRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemAerRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemAquaRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemAquaRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemAquaRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemCombinationRings.java

@@ -16,19 +16,14 @@
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
 
-import com.dreammaster.item.NHItemList;
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
-import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.common.Thaumcraft;
-import thaumcraft.common.config.ConfigItems;
-import witchinggadgets.common.WGContent;
 
-public class ItemCombinationRings extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemCombinationRings extends ItemBaubleRingBase {
 
     Random _mRnd = new Random();
 
@@ -214,27 +209,4 @@ public int getRunicCharge(ItemStack itemstack) {
             default -> 0;
         };
     }
-
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        switch (stack.getItemDamage()) {
-            case 0, 1, 3, 4 -> {
-                if (Constants.WitchingGadgets) {
-                    return new ItemStack(WGContent.ItemMaterial, 1, 12);
-                } else {
-                    return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-                }
-            }
-            case 2, 5, 6 -> {
-                if (Constants.GTNH) {
-                    return NHItemList.PrimordialPearlFragment.get(1);
-                } else {
-                    return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-                }
-            }
-            default -> {
-                return null;
-            }
-        }
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemIgnisRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemIgnisRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemIgnisRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemOrdoRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemOrdoRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemOrdoRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemPerditioRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemPerditioRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemPerditioRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }

src/main/java/com/gtnewhorizon/randomboubles/items/rings/ItemTerraRing.java

@@ -14,15 +14,13 @@
 import net.minecraft.util.StatCollector;
 
 import com.gtnewhorizon.randomboubles.RandomBoubles;
-import com.gtnewhorizon.randomboubles.items.IPrimordialGemCrafting;
 import com.gtnewhorizon.randomboubles.util.Constants;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
-import thaumcraft.common.config.ConfigItems;
 
-public class ItemTerraRing extends ItemBaubleRingBase implements IPrimordialGemCrafting {
+public class ItemTerraRing extends ItemBaubleRingBase {
 
     static final int RING_COUNT = 3;
     private IIcon[] icons;
@@ -112,11 +110,4 @@ public int getRunicCharge(ItemStack stack) {
         return 0;
     }
 
-    @Override
-    public ItemStack getReturnItem(ItemStack stack) {
-        if (stack.getItemDamage() == 2) {
-            return new ItemStack(ConfigItems.itemEldritchObject, 1, 3);
-        }
-        return null;
-    }
 }