Added Fishron Wings

gradle.properties

@@ -31,7 +31,7 @@ mod_name=Modular Angel Ring
 
 mod_license=All Rights Reserved
 
-mod_version=1.2.0
+mod_version=1.2.1
 
 mod_group_id=com.leclowndu93150.modular_angelring
 

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,16 +1,18 @@
-// 1.21	2024-07-21T12:25:32.8076596	Recipes
+// 1.21	2024-07-21T15:40:26.5492721	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
 04a06356d896629269e200ddbdf34d5e4af4299d data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json
 aa6d3293522b91fdd14f9a7eb7474be41355e17c data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json
+3f8fa5cfcc6f4e51185066f9f6515effbb6c9383 data/modular_angelring/advancement/recipes/misc/shapeless/fishron_wings.json
 687ed025f23a6adfacba4eae9c34b0b8cdbdae7c data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json
 65202209cc88b99ab965dc01f3f760800da0120e data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json
 00e147d4f016b3199064d4bfd84d7493e1232b37 data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json
 4f655a562774fe3a1332f8dc87f6597706350a27 data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json
 2dacaefa20920ee8a0a84f0012869493fb66ccdf data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json
 4ce2ea21e509be494bfe97fb18e5a63cfa6b2b1b data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json
 c6c4decb45826dd77e59331251d5b79dd73f3ee5 data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json
+104a27e04c09bb21bf723ec64e73a0605ccd7227 data/modular_angelring/advancement/recipes/misc/smithing/fishron_ring.json
 f92cd203cb2f209f45649bf11c5767900f9f412e data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json
 3c49e4070752f43d72430b7853a509f4ccdc8fae data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json
 029b5d630f07cd1c858cabae289779749780bb82 data/modular_angelring/advancement/recipes/misc/smithing/inertia_modifier.json
@@ -24,13 +26,15 @@ c67e97befc317e7aa403b24548e0cb56bce37945 data/modular_angelring/advancement/reci
 05a14336ea6244f3495c28f470f3dc7eb020243e data/modular_angelring/recipe/shapeless/blue_dragon_wings.json
 c0f80736525f2a785fecc2676e0cd08369b2c16e data/modular_angelring/recipe/shapeless/butterfly_wings.json
 1c4c361b74109b88806af2df77b19ba925e95785 data/modular_angelring/recipe/shapeless/dragon_wings.json
+212c1f4fcd1edde5d17945571a4e1e2f45c69a92 data/modular_angelring/recipe/shapeless/fishron_wings.json
 812a547bade21c6bb505ac8f1a3ac889459b4604 data/modular_angelring/recipe/shapeless/golden_wings.json
 3b42d7b9986dfed67044555309f1de4ff0140669 data/modular_angelring/recipe/shapeless/gold_wings.json
 7a40eeb1be907f2488bbcaa9144352ab72a55836 data/modular_angelring/recipe/smithing/bat_ring.json
 1a54f7ac84c1294fdec1b1a20f8be1d6ae1cc78e data/modular_angelring/recipe/smithing/big_dragon_ring.json
 157320876ad579ba776b5eeaf39410c1d8e2cc7b data/modular_angelring/recipe/smithing/blue_dragon_ring.json
 1669692a6804987d19da46bb68b333bf32a736cf data/modular_angelring/recipe/smithing/butterfly_ring.json
 af726588555948e0f0e6e4845b1dab4f6d49eb07 data/modular_angelring/recipe/smithing/dragon_ring.json
+42384eb1e8b31b65931719f2f6ce00f4a52e1c44 data/modular_angelring/recipe/smithing/fishron_ring.json
 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

src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/fishron_wings.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "criteria": {
+      "conditions": {
+        "items": [
+          {
+            "items": "modular_angelring:angel_wings"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "modular_angelring:shapeless/fishron_wings"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "criteria"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "modular_angelring:shapeless/fishron_wings"
+    ]
+  }
+}

src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/fishron_ring.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "criteria": {
+      "conditions": {
+        "items": [
+          {
+            "items": "modular_angelring:angel_ring"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "modular_angelring:smithing/fishron_ring"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "criteria"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "modular_angelring:smithing/fishron_ring"
+    ]
+  }
+}

src/generated/resources/data/modular_angelring/recipe/shapeless/fishron_wings.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "modular_angelring:angel_wings"
+    },
+    {
+      "item": "minecraft:prismarine_shard"
+    },
+    {
+      "item": "minecraft:prismarine_crystals"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "id": "modular_angelring:fishron_wings"
+  }
+}

src/generated/resources/data/modular_angelring/recipe/smithing/fishron_ring.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:smithing_transform",
+  "addition": {
+    "item": "modular_angelring:fishron_wings"
+  },
+  "base": {
+    "item": "modular_angelring:angel_ring"
+  },
+  "result": {
+    "components": {
+      "minecraft:custom_model_data": 8,
+      "modular_angelring:wing_component": "FISHRON"
+    },
+    "count": 1,
+    "id": "modular_angelring:angel_ring"
+  },
+  "template": {
+    "item": "modular_angelring:angel_ring_upgrade_smithing_template"
+  }
+}

src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java

@@ -118,6 +118,14 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {
                 .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
                 .save(pRecipeOutput, AngelRingMain.MODID+":smithing/golden_ring");
 
+        ItemStack itemStackFishron = ItemRegistry.ANGEL_RING.asItem().getDefaultInstance();
+        itemStackFishron.set(DataComponentRegistry.WING, "FISHRON");
+        itemStackFishron.set(DataComponents.CUSTOM_MODEL_DATA,new CustomModelData(8));
+
+        AdvancedSmithingRecipeBuilder.smithing(Ingredient.of(ItemRegistry.UPGRADE_TEMPLATE), Ingredient.of(ItemRegistry.ANGEL_RING), Ingredient.of(ItemRegistry.FISHRON_WINGS), RecipeCategory.MISC, itemStackFishron)
+                .unlocks("criteria", has(ItemRegistry.ANGEL_RING))
+                .save(pRecipeOutput, AngelRingMain.MODID+":smithing/fishron_ring");
+
         ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,ItemRegistry.BAT_WINGS)
                 .requires(ItemRegistry.ANGEL_WINGS)
                 .requires(Items.COCOA_BEANS)
@@ -166,6 +174,13 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {
                 .requires(Items.DIAMOND)
                 .unlockedBy("criteria", has(ItemRegistry.ANGEL_WINGS))
                 .save(pRecipeOutput,AngelRingMain.MODID+":shapeless/golden_wings");
+
+        ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,ItemRegistry.FISHRON_WINGS)
+                .requires(ItemRegistry.ANGEL_WINGS)
+                .requires(Items.PRISMARINE_SHARD)
+                .requires(Items.PRISMARINE_CRYSTALS)
+                .unlockedBy("criteria", has(ItemRegistry.ANGEL_WINGS))
+                .save(pRecipeOutput,AngelRingMain.MODID+":shapeless/fishron_wings");
     }
 
     @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = AngelRingMain.MODID)

src/main/java/com/leclowndu93150/modular_angelring/registry/CreativeTabRegistry.java

@@ -34,6 +34,7 @@ public class CreativeTabRegistry {
                 output.accept(GOLDEN_WINGS.get());
                 output.accept(GOLD_WINGS.get());
                 output.accept(BAT_WINGS.get());
+                output.accept(FISHRON_WINGS.get());
 
             }).build());
 

src/main/java/com/leclowndu93150/modular_angelring/registry/ItemRegistry.java

@@ -36,7 +36,7 @@ public class ItemRegistry {
     public static final DeferredItem<Item> BAT_WINGS = ITEMS.registerSimpleItem("bat_wings");
     public static final DeferredItem<Item> GOLDEN_WINGS = ITEMS.registerSimpleItem("golden_wings");
     public static final DeferredItem<Item> GOLD_WINGS = ITEMS.registerSimpleItem("gold_wings");
-
+    public static final DeferredItem<Item> FISHRON_WINGS = ITEMS.registerSimpleItem("fishron_wings");
 
     public static final DeferredItem<Item> ANGEL_WINGS_BOTH = ITEMS.registerSimpleItem("angel_wings_both");
     public static final DeferredItem<Item> BIG_DRAGON_WINGS_BOTH = ITEMS.registerSimpleItem("big_dragon_wings_both");
@@ -46,5 +46,6 @@ public class ItemRegistry {
     public static final DeferredItem<Item> GOLDEN_WINGS_BOTH = ITEMS.registerSimpleItem("golden_wings_both");
     public static final DeferredItem<Item> GOLD_WINGS_BOTH = ITEMS.registerSimpleItem("gold_wings_both");
     public static final DeferredItem<Item> BLUE_DRAGON_WINGS_BOTH = ITEMS.registerSimpleItem("blue_dragon_wings_both");
+    public static final DeferredItem<Item> FISHRON_WINGS_BOTH = ITEMS.registerSimpleItem("fishron_wings_both");
 
 }

src/main/java/com/leclowndu93150/modular_angelring/render/AngelRingRenderer.java

@@ -77,6 +77,9 @@ public void render(@NotNull PoseStack matrixStack, @NotNull MultiBufferSource bu
                 case"GOLDEN":
                     Minecraft.getInstance().getItemRenderer().renderStatic(player, new ItemStack(ItemRegistry.GOLDEN_WINGS_BOTH.get()), ItemDisplayContext.NONE, false, matrixStack, buffer, player.level(), 0xF000F0, OverlayTexture.NO_OVERLAY, player.getId());
                     break;
+                case "FISHRON":
+                    Minecraft.getInstance().getItemRenderer().renderStatic(player, new ItemStack(ItemRegistry.FISHRON_WINGS_BOTH.get()), ItemDisplayContext.NONE, false, matrixStack, buffer, player.level(), 0xF000F0, OverlayTexture.NO_OVERLAY, player.getId());
+                    break;
                 default:
                     Minecraft.getInstance().getItemRenderer().renderStatic(player, new ItemStack(ItemRegistry.ANGEL_WINGS_BOTH.get()), ItemDisplayContext.NONE, false, matrixStack, buffer, player.level(), 0xF000F0, OverlayTexture.NO_OVERLAY, player.getId());
                     break;

src/main/resources/assets/modular_angelring/lang/en_us.json

@@ -14,5 +14,6 @@
   "item.modular_angelring.blue_dragon_wings": "Blue Dragon Wings",
   "item.modular_angelring.butterfly_wings": "Butterfly Wings",
   "item.modular_angelring.gold_wings": "Gold Wings",
-  "item.modular_angelring.golden_wings": "Golden Wings"
+  "item.modular_angelring.golden_wings": "Golden Wings",
+  "item.modular_angelring.fishron_wings": "Fishron Wings"
 }

src/main/resources/assets/modular_angelring/models/item/angel_ring.json

@@ -10,6 +10,7 @@
     { "predicate": { "custom_model_data": 4 }, "model": "modular_angelring:item/butterfly_ring" },
     { "predicate": { "custom_model_data": 5 }, "model": "modular_angelring:item/dragon_ring" },
     { "predicate": { "custom_model_data": 6 }, "model": "modular_angelring:item/gold_ring2" },
-    { "predicate": { "custom_model_data": 7 }, "model": "modular_angelring:item/golden_ring" }
+    { "predicate": { "custom_model_data": 7 }, "model": "modular_angelring:item/golden_ring" },
+    { "predicate": { "custom_model_data": 8 }, "model": "modular_angelring:item/fishron_ring" }
   ]
 }

src/main/resources/assets/modular_angelring/models/item/fishron_ring.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+      "layer0": "modular_angelring:item/fishron_ring"
+    }
+}

src/main/resources/assets/modular_angelring/models/item/fishron_wings.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+      "layer0": "modular_angelring:item/fishron_wings"
+    }
+  }
+

src/main/resources/assets/modular_angelring/models/item/fishron_wings_both.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+      "layer0": "modular_angelring:item/fishron_wings_both"
+    }
+  }
+