feat: victory medal smelting (#2156)

#2074
The-Aether-Team · May 13, 2024 · 2a85ab4 · 2a85ab4
1 parent 40dac80
commit 2a85ab4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.20.4	2024-03-21T20:12:24.2940489	Recipes
+// 1.20.4	2024-05-06T15:12:13.183353	Recipes
 677229eff00099e5ef402be1ab8f30aed900069d data/aether/advancements/recipes/building_blocks/aerogel_slab.json
 5df758ef8ac62e1c2c9f75056306fd9b4a95cfb0 data/aether/advancements/recipes/building_blocks/aerogel_slab_from_aerogel_stonecutting.json
 e093ed5a0f506d259f063268945b9afeb0e1e046 data/aether/advancements/recipes/building_blocks/aerogel_stairs.json
@@ -208,8 +208,8 @@ a0f792f071447512cc8edcd2aa8633669b0ed0c5 data/aether/advancements/recipes/food/m
 ccc483f9d8187224a683ec1aaec9a1390d497b24 data/aether/advancements/recipes/incubation/black_moa_incubation.json
 b2e226aeb14932e39da314c6d0c218ac83a7c593 data/aether/advancements/recipes/incubation/blue_moa_incubation.json
 cbae3aa93e95b07c81edac46f6ad1f7d59f1d964 data/aether/advancements/recipes/incubation/white_moa_incubation.json
-02e4148592d5671a2da262e19a7e5699aa22cef7 data/aether/advancements/recipes/misc/aether_gold_nugget_from_blasting.json
-20e3e578e0098810a77e5c7ef2ba3556f5f4a302 data/aether/advancements/recipes/misc/aether_gold_nugget_from_smelting.json
+a9a5aefb439075da58ca21a7784feffd73139721 data/aether/advancements/recipes/misc/aether_gold_nugget_from_blasting.json
+3e05f575633dfa64cf97847eee8abe8951e7a454 data/aether/advancements/recipes/misc/aether_gold_nugget_from_smelting.json
 db3c748f0e1c9305fdcbd614b28482597cf779c6 data/aether/advancements/recipes/misc/aether_iron_nugget_from_blasting.json
 0618c191d1aa58c06d1674e7eb882d182e5d670d data/aether/advancements/recipes/misc/aether_iron_nugget_from_smelting.json
 f5262b341adac47d62c741396f79d1cf92971921 data/aether/advancements/recipes/misc/aether_tune_enchanting.json
@@ -317,8 +317,8 @@ dc936d19476ccf7ced000d6b51a0eb4c5ba9653e data/aether/recipes/aerogel_slab.json
 b86b7fb30456ff6f186ab7a8d9862275151218f1 data/aether/recipes/aerogel_stairs_from_aerogel_stonecutting.json
 914d51c84b09cd2b196cab36193af7a299013b79 data/aether/recipes/aerogel_wall.json
 cc8707e81ffb76bebe922b86a0a8543f87ec08f4 data/aether/recipes/aerogel_wall_from_aerogel_stonecutting.json
-4c5d25f34c1ca30f723c979df22709b408a59c84 data/aether/recipes/aether_gold_nugget_from_blasting.json
-c978ad29d62a992f1a45c13793d45564e8718de1 data/aether/recipes/aether_gold_nugget_from_smelting.json
+79c5ecce04ff5f2a747aaa9f6b88d1f652dfab54 data/aether/recipes/aether_gold_nugget_from_blasting.json
+be190a8f2aa3e7e1721abdb90201f9a325183b2b data/aether/recipes/aether_gold_nugget_from_smelting.json
 212bb3693bc2733772e10984b7a9a80775bfd6fc data/aether/recipes/aether_iron_nugget_from_blasting.json
 d6ea60e365df69ac31671107d7c4b87d96adcb24 data/aether/recipes/aether_iron_nugget_from_smelting.json
 7eee988b40a021b7ce5e36189bf0ab8e928f586f data/aether/recipes/aether_saddle.json

diff --git a/...ted/resources/data/aether/advancements/recipes/misc/aether_gold_nugget_from_blasting.json b/...ted/resources/data/aether/advancements/recipes/misc/aether_gold_nugget_from_blasting.json
@@ -42,14 +42,27 @@
         "recipe": "aether:aether_gold_nugget_from_blasting"
       },
       "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_victory_medal": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "aether:victory_medal"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
       "has_golden_gloves",
       "has_golden_pendant",
-      "has_golden_ring"
+      "has_golden_ring",
+      "has_victory_medal"
     ]
   ],
   "rewards": {

diff --git a/...ted/resources/data/aether/advancements/recipes/misc/aether_gold_nugget_from_smelting.json b/...ted/resources/data/aether/advancements/recipes/misc/aether_gold_nugget_from_smelting.json
@@ -42,14 +42,27 @@
         "recipe": "aether:aether_gold_nugget_from_smelting"
       },
       "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_victory_medal": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "aether:victory_medal"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
       "has_golden_gloves",
       "has_golden_pendant",
-      "has_golden_ring"
+      "has_golden_ring",
+      "has_victory_medal"
     ]
   ],
   "rewards": {

diff --git a/src/generated/resources/data/aether/recipes/aether_gold_nugget_from_blasting.json b/src/generated/resources/data/aether/recipes/aether_gold_nugget_from_blasting.json
@@ -13,6 +13,9 @@
     },
     {
       "item": "aether:golden_ring"
+    },
+    {
+      "item": "aether:victory_medal"
     }
   ],
   "result": "minecraft:gold_nugget"

diff --git a/src/generated/resources/data/aether/recipes/aether_gold_nugget_from_smelting.json b/src/generated/resources/data/aether/recipes/aether_gold_nugget_from_smelting.json
@@ -13,6 +13,9 @@
     },
     {
       "item": "aether:golden_ring"
+    },
+    {
+      "item": "aether:victory_medal"
     }
   ],
   "result": "minecraft:gold_nugget"

diff --git a/src/main/java/com/aetherteam/aether/data/generators/AetherRecipeData.java b/src/main/java/com/aetherteam/aether/data/generators/AetherRecipeData.java
@@ -630,10 +630,10 @@ protected void buildRecipes(RecipeOutput consumer) {
         this.smeltingOreRecipe(AetherItems.ZANITE_GEMSTONE.get(), AetherBlocks.ZANITE_ORE.get(), 0.7F).save(consumer, this.name("zanite_gemstone_from_smelting"));
         this.blastingOreRecipe(AetherItems.ZANITE_GEMSTONE.get(), AetherBlocks.ZANITE_ORE.get(), 0.7F).save(consumer, this.name("zanite_gemstone_from_blasting"));
 
-        SimpleCookingRecipeBuilder.smelting(Ingredient.of(AetherItems.GOLDEN_GLOVES.get(), AetherItems.GOLDEN_PENDANT.get(), AetherItems.GOLDEN_RING.get()), RecipeCategory.MISC, Items.GOLD_NUGGET, 0.1F, 100).unlockedBy("has_golden_gloves", has(AetherItems.GOLDEN_GLOVES.get())).unlockedBy("has_golden_pendant", has(AetherItems.GOLDEN_PENDANT.get())).unlockedBy("has_golden_ring", has(AetherItems.GOLDEN_RING.get())).group(getSmeltingRecipeName(Items.GOLD_NUGGET)).save(consumer, this.name("aether_" + getSmeltingRecipeName(Items.GOLD_NUGGET)));
+        SimpleCookingRecipeBuilder.smelting(Ingredient.of(AetherItems.GOLDEN_GLOVES.get(), AetherItems.GOLDEN_PENDANT.get(), AetherItems.GOLDEN_RING.get(), AetherItems.VICTORY_MEDAL.get()), RecipeCategory.MISC, Items.GOLD_NUGGET, 0.1F, 100).unlockedBy("has_golden_gloves", has(AetherItems.GOLDEN_GLOVES.get())).unlockedBy("has_golden_pendant", has(AetherItems.GOLDEN_PENDANT.get())).unlockedBy("has_golden_ring", has(AetherItems.GOLDEN_RING.get())).unlockedBy("has_victory_medal", has(AetherItems.VICTORY_MEDAL.get())).group(getSmeltingRecipeName(Items.GOLD_NUGGET)).save(consumer, this.name("aether_" + getSmeltingRecipeName(Items.GOLD_NUGGET)));
         SimpleCookingRecipeBuilder.smelting(Ingredient.of(AetherItems.IRON_GLOVES.get(), AetherItems.IRON_PENDANT.get(), AetherItems.IRON_RING.get(), AetherItems.CHAINMAIL_GLOVES.get()), RecipeCategory.MISC, Items.IRON_NUGGET, 0.1F, 100).unlockedBy("has_iron_gloves", has(AetherItems.IRON_GLOVES.get())).unlockedBy("has_iron_pendant", has(AetherItems.IRON_PENDANT.get())).unlockedBy("has_iron_ring", has(AetherItems.IRON_RING.get())).unlockedBy("has_chainmail_gloves", has(AetherItems.CHAINMAIL_GLOVES.get())).group(getSmeltingRecipeName(Items.IRON_NUGGET)).save(consumer, this.name("aether_" + getSmeltingRecipeName(Items.IRON_NUGGET)));
 
-        SimpleCookingRecipeBuilder.blasting(Ingredient.of(AetherItems.GOLDEN_GLOVES.get(), AetherItems.GOLDEN_PENDANT.get(), AetherItems.GOLDEN_RING.get()), RecipeCategory.MISC, Items.GOLD_NUGGET, 0.1F, 100).unlockedBy("has_golden_gloves", has(AetherItems.GOLDEN_GLOVES.get())).unlockedBy("has_golden_pendant", has(AetherItems.GOLDEN_PENDANT.get())).unlockedBy("has_golden_ring", has(AetherItems.GOLDEN_RING.get())).group(getBlastingRecipeName(Items.GOLD_NUGGET)).save(consumer, this.name("aether_" + getBlastingRecipeName(Items.GOLD_NUGGET)));
+        SimpleCookingRecipeBuilder.blasting(Ingredient.of(AetherItems.GOLDEN_GLOVES.get(), AetherItems.GOLDEN_PENDANT.get(), AetherItems.GOLDEN_RING.get(), AetherItems.VICTORY_MEDAL.get()), RecipeCategory.MISC, Items.GOLD_NUGGET, 0.1F, 100).unlockedBy("has_golden_gloves", has(AetherItems.GOLDEN_GLOVES.get())).unlockedBy("has_golden_pendant", has(AetherItems.GOLDEN_PENDANT.get())).unlockedBy("has_golden_ring", has(AetherItems.GOLDEN_RING.get())).unlockedBy("has_victory_medal", has(AetherItems.VICTORY_MEDAL.get())).group(getBlastingRecipeName(Items.GOLD_NUGGET)).save(consumer, this.name("aether_" + getBlastingRecipeName(Items.GOLD_NUGGET)));
         SimpleCookingRecipeBuilder.blasting(Ingredient.of(AetherItems.IRON_GLOVES.get(), AetherItems.IRON_PENDANT.get(), AetherItems.IRON_RING.get(), AetherItems.CHAINMAIL_GLOVES.get()), RecipeCategory.MISC, Items.IRON_NUGGET, 0.1F, 100).unlockedBy("has_iron_gloves", has(AetherItems.IRON_GLOVES.get())).unlockedBy("has_iron_pendant", has(AetherItems.IRON_PENDANT.get())).unlockedBy("has_iron_ring", has(AetherItems.IRON_RING.get())).unlockedBy("has_chainmail_gloves", has(AetherItems.CHAINMAIL_GLOVES.get())).group(getBlastingRecipeName(Items.IRON_NUGGET)).save(consumer, this.name("aether_" + getBlastingRecipeName(Items.IRON_NUGGET)));