Merge pull request #9 from KELETU66666/master

Verdant ring and charm exchange now requires arcane workbench.
Elite-Modding-Team · Jan 29, 2025 · 8379f4c · 8379f4c
2 parents 509a2c3 + 5013f9f
commit 8379f4c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/mod/icarus/crimsonrevelations/init/CRItems.java b/src/main/java/mod/icarus/crimsonrevelations/init/CRItems.java
@@ -16,8 +16,6 @@
 import mod.icarus.crimsonrevelations.item.tools.CRItemPrimordialScribingTools;
 import mod.icarus.crimsonrevelations.item.tools.CRItemSanitationScribingTools;
 import mod.icarus.crimsonrevelations.item.weapons.CRItemBoneBow;
-import mod.icarus.crimsonrevelations.recipe.VerdantCharmToRing;
-import mod.icarus.crimsonrevelations.recipe.VerdantRingToCharm;
 import mod.icarus.crimsonrevelations.tile.CRTileManaPod;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.BlockSlab;
@@ -143,8 +141,6 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
                 ThaumcraftApiHelper.makeCrystal(Aspect.SENSES)).setRegistryName(NewCrimsonRevelations.MODID, "knowledge_scribing_tools_refill"));
         registry.register(new ShapelessOreRecipe(new ResourceLocation(Thaumcraft.MODID, "inkwell"), SANITATION_SCRIBING_TOOLS, new ItemStack(SANITATION_SCRIBING_TOOLS, 1, OreDictionary.WILDCARD_VALUE),
                 ThaumcraftApiHelper.makeCrystal(Aspect.MIND)).setRegistryName(NewCrimsonRevelations.MODID, "sanitation_scribing_tools_refill"));
-        registry.register(new VerdantCharmToRing().setRegistryName(NewCrimsonRevelations.MODID, "verdant_charm_to_ring"));
-        registry.register(new VerdantRingToCharm().setRegistryName(NewCrimsonRevelations.MODID, "verdant_ring_to_charm"));
     }
 
     @SubscribeEvent

diff --git a/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java b/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java
@@ -1,6 +1,8 @@
 package mod.icarus.crimsonrevelations.init;
 
 import mod.icarus.crimsonrevelations.NewCrimsonRevelations;
+import mod.icarus.crimsonrevelations.recipe.VerdantCharmToRing;
+import mod.icarus.crimsonrevelations.recipe.VerdantRingToCharm;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -178,6 +180,8 @@ public static void initArcaneCrafting() {
                 new ItemStack(CRItems.SANITATION_SCRIBING_TOOLS),
                 new Object[]{new ItemStack(ItemsTC.scribingTools, 1, OreDictionary.WILDCARD_VALUE),
                         new ItemStack(ItemsTC.sanitySoap, 1, OreDictionary.WILDCARD_VALUE), ThaumcraftApiHelper.makeCrystal(Aspect.MIND), ThaumcraftApiHelper.makeCrystal(Aspect.MIND)}));
+        ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "verdant_charm_to_ring"), new VerdantCharmToRing());
+        ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "verdant_ring_to_charm"), new VerdantRingToCharm());
     }
 
     public static void initCrucible() {

diff --git a/src/main/java/mod/icarus/crimsonrevelations/recipe/VerdantCharmToRing.java b/src/main/java/mod/icarus/crimsonrevelations/recipe/VerdantCharmToRing.java
@@ -4,18 +4,18 @@
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.ShapelessArcaneRecipe;
 import thaumcraft.api.items.ItemsTC;
 
 import javax.annotation.Nonnull;
 
-public class VerdantCharmToRing extends ShapelessRecipes {
+public class VerdantCharmToRing extends ShapelessArcaneRecipe {
     private static final Item charm = ItemsTC.charmVerdant;
 
     public VerdantCharmToRing() {
-        super("", ItemStack.EMPTY, NonNullList.from(Ingredient.EMPTY, Ingredient.fromItem(charm)));
+        super(new ResourceLocation(""), /*Research Required*/"", 5, new AspectList(), ItemStack.EMPTY, new Object[]{charm});
     }
 
     @Nonnull

diff --git a/src/main/java/mod/icarus/crimsonrevelations/recipe/VerdantRingToCharm.java b/src/main/java/mod/icarus/crimsonrevelations/recipe/VerdantRingToCharm.java
@@ -4,18 +4,18 @@
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.ShapelessArcaneRecipe;
 import thaumcraft.api.items.ItemsTC;
 
 import javax.annotation.Nonnull;
 
-public class VerdantRingToCharm extends ShapelessRecipes {
+public class VerdantRingToCharm extends ShapelessArcaneRecipe {
     private static final Item ring = CRItems.VERDANT_RING;
 
     public VerdantRingToCharm() {
-        super("", ItemStack.EMPTY, NonNullList.from(Ingredient.EMPTY, Ingredient.fromItem(ring)));
+        super(new ResourceLocation(""), /*Research Required*/"", 5, new AspectList(), ItemStack.EMPTY, new Object[]{ring});
     }
 
     @Nonnull