diff --git a/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java b/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java index 80f09d8..9fc6d77 100644 --- a/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java +++ b/src/main/java/me/melontini/recipebookispain/client/RecipeBookIsPainClient.java @@ -18,10 +18,6 @@ public class RecipeBookIsPainClient implements ClientModInitializer { public static Map ADDED_GROUPS = new HashMap<>(); public static Map AAAAAAAA = new HashMap<>(); - - static { - RecipeBookGroup.values(); - } @Override public void onInitializeClient() { //null pointers are epic diff --git a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java index 34f658a..a4c1a3d 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java @@ -22,7 +22,9 @@ public class ClientRecipeBookMixin { ItemGroup group = itemStack.getItem().getGroup(); if (group != null) { if (group != ItemGroup.HOTBAR && group != ItemGroup.INVENTORY && group != ItemGroup.SEARCH) - if (RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_")) != null) cir.setReturnValue(RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_"))); + if (RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + group.toString().toUpperCase().replace(".", "_")) != null) + cir.setReturnValue(RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + group.toString().toUpperCase().replace(".", "_"))); + else cir.setReturnValue(RecipeBookIsPainClient.ADDED_GROUPS.get("P_CRAFTING_" + ItemGroup.MISC.toString().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 ed7600a..10d1f10 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java @@ -49,8 +49,9 @@ 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); - RecipeBookIsPainClient.AAAAAAAA.put("P_CRAFTING_" + group.getName().toUpperCase().replace(".", "_"), group); + String name = "P_CRAFTING_" + group.toString().toUpperCase().replace(".", "_"); + RecipeBookIsPainClient.ADDED_GROUPS.put(name, group1); + RecipeBookIsPainClient.AAAAAAAA.put(name, group); groups.add(group1); } }