Re-added JEI support for fillet recipes. Closes #392

TeamMetallurgy · Apr 10, 2023 · 2410180 · 2410180
1 parent c85b43c
commit 2410180
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,9 +56,9 @@ minecraft {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
-    //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
-    //runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
     //compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.1:${ct_version}")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 minecraft_version=1.19.4
-forge_version=45.0.9
-mod_version=2.4.12
-jei_version=11.4.0.290
+forge_version=45.0.43
+mod_version=2.4.13
+jei_version=13.1.0.2
 ct_version=9.0.81
 
 org.gradle.jvmargs=-Xmx4G

diff --git a/src/main/java/com/teammetallurgy/aquaculture/integration/jei/JEIIntegration.java b/src/main/java/com/teammetallurgy/aquaculture/integration/jei/JEIIntegration.java
@@ -1,4 +1,4 @@
-/*package com.teammetallurgy.aquaculture.integration.jei;
+package com.teammetallurgy.aquaculture.integration.jei;
 
 import com.teammetallurgy.aquaculture.Aquaculture;
 import com.teammetallurgy.aquaculture.integration.jei.recipes.FilletKnifeRecipeMaker;
@@ -26,4 +26,4 @@ public void registerRecipes(@Nonnull IRecipeRegistration registration) {
             registration.addRecipes(RecipeTypes.CRAFTING, FilletKnifeRecipeMaker.createFilletKnifeRecipes());
         }
     }
-}*/
+}
diff --git a/...n/java/com/teammetallurgy/aquaculture/integration/jei/recipes/FilletKnifeRecipeMaker.java b/...n/java/com/teammetallurgy/aquaculture/integration/jei/recipes/FilletKnifeRecipeMaker.java
@@ -1,4 +1,4 @@
-/*package com.teammetallurgy.aquaculture.integration.jei.recipes;
+package com.teammetallurgy.aquaculture.integration.jei.recipes;
 
 import com.teammetallurgy.aquaculture.Aquaculture;
 import com.teammetallurgy.aquaculture.api.AquacultureAPI;
@@ -37,4 +37,4 @@ public static List<CraftingRecipe> createFilletKnifeRecipes() {
         }
         return recipes;
     }
-}*/
+}
diff --git a/src/main/java/com/teammetallurgy/aquaculture/loot/BiomeTagPredicate.java b/src/main/java/com/teammetallurgy/aquaculture/loot/BiomeTagPredicate.java
@@ -143,7 +143,7 @@ public JsonElement serialize() {
                     object.add("exclude", object.getAsJsonArray(tagKey.location().toString()));
                 }
             }
-            object.addProperty("add", object.getAsBoolean());
+            object.addProperty("add", GsonHelper.getAsBoolean(object, "add", false));
             return object;
         }
     }