Merge pull request #5 from mezz/update-jei

Update JEI version and Revert "Changed module recipe so that modpacks stop acting up"
Leclowndu93150 · Sep 3, 2024 · a919a9a · a919a9a
2 parents a91b425 + 322efe7
commit a919a9a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -91,7 +91,7 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     implementation "curse.maven:curios-1037991:5476603"
-    runtimeOnly("mezz.jei:jei-1.21-neoforge:${jei_version}")
+    runtimeOnly("mezz.jei:jei-${jei_mc_version}-neoforge:${jei_version}")
 }
 
 minecraft {

diff --git a/gradle.properties b/gradle.properties
@@ -23,15 +23,16 @@ neo_version_range=[21.0.10-beta,)
 
 loader_version_range=[2,)
 
-jei_version = 19.5.2.66
+jei_mc_version = 1.21.1
+jei_version = 19.16.4.163
 
 mod_id=modular_angelring
 
 mod_name=Modular Angel Ring
 
 mod_license=All Rights Reserved
 
-mod_version=1.3.2
+mod_version=1.3.1
 
 mod_group_id=com.leclowndu93150.modular_angelring
 

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21	2024-09-03T10:16:19.5684869	Recipes
+// 1.21	2024-07-30T20:04:02.1024129	Recipes
 f17592b4c061b661cf746015e75f22fcf01645b6 data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json
 60e10bfceda809b0d29bccfbf515bbc8108d0a36 data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json
 77aaca00c49d23276780e641d94ace386e07d571 data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json
@@ -36,10 +36,10 @@ af726588555948e0f0e6e4845b1dab4f6d49eb07 data/modular_angelring/recipe/smithing/
 d6169c70ce43550d661b37da27a0fa0477721504 data/modular_angelring/recipe/smithing/golden_ring.json
 4024587a665571a880a0a1ccad9dd4893952329b data/modular_angelring/recipe/smithing/gold_ring.json
 4a64dbc2945e0dc540683f0887cabe80f44f6b84 data/modular_angelring/recipe/smithing/inertia_modifier.json
-f723b74516ad6291d383ea3ed969fb8d8f0b74c9 data/modular_angelring/recipe/smithing/inertia_module.json
+c5dc2b2592e671c413a9a829934d4499e5d361a1 data/modular_angelring/recipe/smithing/inertia_module.json
 d1a7a0ceb72cb10c980a74abad99a4dc9763577a data/modular_angelring/recipe/smithing/mining_modifier.json
-dffda0873204dc6b8b028a592e99464874b6e918 data/modular_angelring/recipe/smithing/mining_module.json
+f685d562402e5a1cc2005ab166d2c9b2d0a43c81 data/modular_angelring/recipe/smithing/mining_module.json
 b95080909de0a567e64cf73bad4f9cba45d063b8 data/modular_angelring/recipe/smithing/night_vision_modifier.json
-b67736dd56650939547b66fade466f9266840921 data/modular_angelring/recipe/smithing/night_vision_module.json
+a583373da457971bb320680107353d2ea8a86fe7 data/modular_angelring/recipe/smithing/night_vision_module.json
 cd4540c2177dc441f76ac5b854f48888b19dd510 data/modular_angelring/recipe/smithing/speed_modifier.json
-b3023c9aeb7c4a23559963ba74e50873acb2aefc data/modular_angelring/recipe/smithing/speed_module.json
+79ab4bc8ccf70b42ce30c72323509331f6398a71 data/modular_angelring/recipe/smithing/speed_module.json
diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/inertia_module.json b/src/generated/resources/data/modular_angelring/recipe/smithing/inertia_module.json
@@ -10,7 +10,5 @@
     "count": 1,
     "id": "modular_angelring:inertia_module"
   },
-  "template": {
-    "item": "modular_angelring:angel_ring_upgrade_smithing_template"
-  }
+  "template": []
 }
diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/mining_module.json b/src/generated/resources/data/modular_angelring/recipe/smithing/mining_module.json
@@ -10,7 +10,5 @@
     "count": 1,
     "id": "modular_angelring:mining_module"
   },
-  "template": {
-    "item": "modular_angelring:angel_ring_upgrade_smithing_template"
-  }
+  "template": []
 }
diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/night_vision_module.json b/src/generated/resources/data/modular_angelring/recipe/smithing/night_vision_module.json
@@ -10,7 +10,5 @@
     "count": 1,
     "id": "modular_angelring:night_vision_module"
   },
-  "template": {
-    "item": "modular_angelring:angel_ring_upgrade_smithing_template"
-  }
+  "template": []
 }
diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/speed_module.json b/src/generated/resources/data/modular_angelring/recipe/smithing/speed_module.json
@@ -10,7 +10,5 @@
     "count": 1,
     "id": "modular_angelring:speed_module"
   },
-  "template": {
-    "item": "modular_angelring:angel_ring_upgrade_smithing_template"
-  }
+  "template": []
 }
diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java
@@ -91,7 +91,6 @@ public static void onClientTick(ClientTickEvent.Pre event){
         double initialGamma = 1.0;
         double maxGamma = 9999.0;
         Player player = Minecraft.getInstance().player;
-        //Im not proud of this, but it works
         if (player == null || ModList.get().isLoaded("fullbrightnesstoggle")) return;
         Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
         if (slotResult.isPresent()) {

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java b/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java
@@ -57,19 +57,19 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/night_vision_modifier");
 
-        SmithingTransformRecipeBuilder.smithing(Ingredient.of(ItemRegistry.UPGRADE_TEMPLATE), Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.DIAMOND_PICKAXE), RecipeCategory.MISC, ItemRegistry.MINING_MODULE.asItem())
+        SmithingTransformRecipeBuilder.smithing(Ingredient.EMPTY, Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.DIAMOND_PICKAXE), RecipeCategory.MISC, ItemRegistry.MINING_MODULE.asItem())
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/mining_module");
 
-        SmithingTransformRecipeBuilder.smithing(Ingredient.of(ItemRegistry.UPGRADE_TEMPLATE), Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.PHANTOM_MEMBRANE), RecipeCategory.MISC, ItemRegistry.INERTIA_MODULE.asItem())
+        SmithingTransformRecipeBuilder.smithing(Ingredient.EMPTY, Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.PHANTOM_MEMBRANE), RecipeCategory.MISC, ItemRegistry.INERTIA_MODULE.asItem())
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/inertia_module");
 
-        SmithingTransformRecipeBuilder.smithing(Ingredient.of(ItemRegistry.UPGRADE_TEMPLATE), Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.SUGAR), RecipeCategory.MISC, ItemRegistry.SPEED_MODULE.asItem())
+        SmithingTransformRecipeBuilder.smithing(Ingredient.EMPTY, Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.SUGAR), RecipeCategory.MISC, ItemRegistry.SPEED_MODULE.asItem())
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/speed_module");
 
-        SmithingTransformRecipeBuilder.smithing(Ingredient.of(ItemRegistry.UPGRADE_TEMPLATE), Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.GOLDEN_CARROT), RecipeCategory.MISC, ItemRegistry.NIGHT_VISION_MODULE.asItem())
+        SmithingTransformRecipeBuilder.smithing(Ingredient.EMPTY, Ingredient.of(ItemRegistry.BLANK_MODULE), Ingredient.of(Items.GOLDEN_CARROT), RecipeCategory.MISC, ItemRegistry.NIGHT_VISION_MODULE.asItem())
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/night_vision_module");