From 36c6fb197239eb13cf8e961a4bf7446c2d529348 Mon Sep 17 00:00:00 2001
From: melontini <104443436+melontini@users.noreply.github.com>
Date: Tue, 12 Jul 2022 18:57:00 +0700
Subject: [PATCH] no more reliance on Fabric ASM

---
 build.gradle                                               | 7 -------
 .../recipebookispain/client/RecipeBookIsPainClient.java    | 6 ++++++
 .../recipebookispain/mixin/ClientRecipeBookMixin.java      | 4 ++--
 .../recipebookispain/mixin/RecipeBookGroupMixin.java       | 1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0e03b79..c37e1e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,13 +23,6 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    // modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-    modImplementation include("com.github.Chocohead:Fabric-ASM:v2.3") {
-        exclude (group: "net.fabricmc.fabric-api")
-    }
 }
 
 processResources {
diff --git a/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java b/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java
index 5e1ab7e..d897916 100644
--- a/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java
+++ b/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java
@@ -3,13 +3,19 @@ package me.melontini.recipebookispain.client;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.recipebook.RecipeBookGroup;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Environment(EnvType.CLIENT)
 public class RecipeBookIsPainClient implements ClientModInitializer {
 
     public static final Logger LOGGER = LogManager.getLogger("RBIP");
+
+    public static Map<String, RecipeBookGroup> ADDED_GROUPS = new HashMap<>();
     @Override
     public void onInitializeClient() {
     }
diff --git a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java
index c5cf6cf..51675a9 100644
--- a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java
+++ b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java
@@ -1,6 +1,6 @@
 package me.melontini.recipebookispain.mixin;
 
-import com.chocohead.mm.api.ClassTinkerers;
+import me.melontini.recipebookispain.client.RecipeBookIsPainClient;
 import net.minecraft.client.recipebook.ClientRecipeBook;
 import net.minecraft.client.recipebook.RecipeBookGroup;
 import net.minecraft.item.ItemGroup;
@@ -22,7 +22,7 @@ public class ClientRecipeBookMixin {
             ItemGroup group = itemStack.getItem().getGroup();
             if (group != null) {
                 if (group != ItemGroup.HOTBAR && group != ItemGroup.INVENTORY && group != ItemGroup.SEARCH)
-                    cir.setReturnValue(ClassTinkerers.getEnum(RecipeBookGroup.class, "P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_")));
+                    cir.setReturnValue(RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_")));
             }
         }
     }
diff --git a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java
index a3988fb..80659fd 100644
--- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java
+++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java
@@ -49,6 +49,7 @@ public class RecipeBookGroupMixin {
         for (ItemGroup group : ItemGroup.GROUPS) {
             if (group != ItemGroup.HOTBAR && group != ItemGroup.INVENTORY && group != ItemGroup.SEARCH) {
                 var group1 = Accessor.newGroup("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_"), last.ordinal() + 1, new ItemStack(group.getIcon().getItem()));
+                RecipeBookIsPainClient.ADDED_GROUPS.put("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_"), group1);
                 groups.add(group1);
             }
         }
-- 
2.51.2