1.21.5 SCUBA Gear rework

gm4/modeldata_registry.json

@@ -639,7 +639,6 @@
       "gm4_animi_shamir:shamir/animi": 124
     },
     "golden_chestplate": {
-      "gm4_scuba_gear:item/scuba_tank": 1,
       "gm4_zauber_cauldrons:item/zauber_armor/health_boost": 2,
       "gm4_zauber_cauldrons:item/zauber_armor/attack_boost": 3,
       "gm4_zauber_cauldrons:item/zauber_armor/speed_boost": 4,
@@ -949,7 +948,6 @@
     },
     "leather_boots": {
       "gm4_boots_of_ostara:item/boots_of_ostara": 1,
-      "gm4_scuba_gear:item/flippers": 2,
       "gm4_boots_of_ostara:gui/advancement/boots_of_ostara": 3,
       "gm4_boots_of_ostara:item/flippers_of_ostara": 4,
       "gm4_boots_of_ostara:guidebook_icon/boots_of_ostara": 5,
@@ -1257,7 +1255,6 @@
       "gm4_heart_canisters:gui/advancement/heart_canisters_max": 6,
       "gm4_heart_canisters:item/heart_canister_tier_1": 7,
       "gm4_heart_canisters:item/heart_canister_tier_2": 8,
-      "gm4_scuba_gear:item/scuba_helmet": 9,
       "gm4_heart_canisters:guidebook_icon/heart_canisters": 10,
       "gm4_zauber_cauldrons:item/crystal/speed": 12,
       "gm4_zauber_cauldrons:item/crystal/regeneration": 13,
@@ -1283,7 +1280,6 @@
       "gm4_tnt_landmines:item/tnt_landmine_crafting_table": 45,
       "gm4_tnt_landmines:item/tnt_landmine_netherrack": 46,
       "gm4_tnt_landmines:item/tnt_landmine_invisible": 47,
-      "gm4_scuba_gear:gui/advancement/scuba_gear": 48,
       "gm4_metallurgy:gui/advancement/metallurgy_blast_ore": 49,
       "gm4_metallurgy:gui/advancement/metallurgy_cast": 50,
       "gm4_relocators:gui/advancement/relocators": 51,

gm4/skin_cache.json

@@ -706,13 +706,13 @@
     },
     "gm4_scuba_gear:scuba_helmet": {
       "uuid": [
-        -68336571,
-        19415274,
-        -1818733955,
-        -1859858872
+        -1411342862,
+        -1228846809,
+        -1234065086,
+        1387403600
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyODUzNDg1MTY2MCwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDExZTAyOTJlZTgzZDUwZTQzM2MxNTkxNzE5OGZhNDRjYjZkMTMyODhiNmFhNjZmYmUzY2QxZTZkZjY1OGRhNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
-      "hash": "9b2ea1635d53878417688b505a8875422100d314",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWY2YWVlYzM2ZjQ2MmRlYjUzOTc0NWFhMzY4MThiNmQ0NGIwYzk1OGViNTY4NTJlYTAyZTM0YzMzZmRiZGZmMCd9fX0=",
+      "hash": "4a257159fd9d30ceff7484d393efe9ed2e399abf",
       "parent_module": "gm4_scuba_gear"
     },
     "gm4_smelteries:smeltery": {

gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json

@@ -51,47 +51,5 @@
                 "italic": true
             }
         ]
-    },
-    {
-        "function": "minecraft:set_components",
-        "components": {
-            "minecraft:custom_model_data": "gm4_scuba_gear:item/flippers"
-        },
-        "conditions": [
-            {
-                "condition": "minecraft:value_check",
-                "value": {
-                    "type": "minecraft:score",
-                    "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$boa_flippers"
-                    },
-                    "score": "gm4_crafting"
-                },
-                "range": 1
-            }
-        ]
-    },
-    {
-        "function": "minecraft:set_name",
-        "name": {
-            "translate": "item.gm4.flippers_of_ostara",
-            "fallback": "Flippers of Ostara",
-            "italic": false
-        },
-        "conditions": [
-            {
-                "condition": "minecraft:value_check",
-                "value": {
-                    "type": "minecraft:score",
-                    "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$boa_flippers"
-                    },
-                    "score": "gm4_crafting"
-                },
-                "range": 1
-            }
-        ]
     }
 ]

gm4_scuba_gear/README.md

@@ -3,6 +3,7 @@
 Ease ocean exploration with craftable scuba gear!<!--$pmc:headerSize-->
 
 ### Features
-- Adds Flippers which allow players to swim faster in Water.
-- Adds the SCUBA Tank and Helmet which gives 4 minutes of conduit power when submerged.
-- When worn on land, the player is given a slowness debuff.
+- Adds the Wetsuit and Flippers which aids players in underwater movement.
+- When wearing Flippers on land, players are given a slowness debuff.
+- Adds the SCUBA Tank which adds 4 minutes of submerged air time.
+- Adds the SCUBA Helmet which hastens underwater mining.

gm4_scuba_gear/assets/gm4_scuba_gear/equipment/scuba.json

@@ -0,0 +1,26 @@
+{
+  "layers": {
+    "humanoid": [
+      {
+        "texture": "gm4_scuba_gear:scuba"
+      },
+      {
+        "dyeable": {
+          "color_when_undyed": 2321353
+        },
+        "texture": "gm4_scuba_gear:scuba_overlay"
+      }
+    ],
+    "humanoid_leggings": [
+      {
+        "texture": "gm4_scuba_gear:scuba"
+      },
+      {
+        "dyeable": {
+          "color_when_undyed": 2321353
+        },
+        "texture": "gm4_scuba_gear:scuba_overlay"
+      }
+    ]
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/items/flippers.json

@@ -0,0 +1,12 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_scuba_gear:item/flippers",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -14455863
+      }
+    ]
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/items/scuba_helmet.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_scuba_gear:item/scuba_helmet"
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/items/scuba_tank.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_scuba_gear:item/scuba_tank"
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/items/wetsuit.json

@@ -0,0 +1,12 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_scuba_gear:item/wetsuit",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -14455863
+      }
+    ]
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/models/item/flippers.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gm4_scuba_gear:item/flippers",
+    "layer1": "gm4_scuba_gear:item/flippers_overlay"
+  }
+}

gm4_scuba_gear/assets/gm4_scuba_gear/models/item/scuba_helmet.json

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

gm4_scuba_gear/assets/gm4_scuba_gear/models/item/scuba_tank.json

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

gm4_scuba_gear/assets/gm4_scuba_gear/models/item/wetsuit.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gm4_scuba_gear:item/wetsuit",
+    "layer1": "gm4_scuba_gear:item/wetsuit_overlay"
+  }
+}

gm4_scuba_gear/assets/translations.csv

@@ -2,13 +2,20 @@ key,en_us
 item.gm4.flippers,Flippers
 item.gm4.scuba_helmet,SCUBA Helmet
 item.gm4.scuba_tank,SCUBA Tank
+item.gm4.wetsuit,Wetsuit
 advancement.gm4.scuba_gear.title,Things Are Going Swimmingly!
 advancement.gm4.scuba_gear.description,Suit up with a full set of SCUBA gear
 text.gm4.guidebook.module_desc.scuba_gear,Ease ocean exploration with craftable scuba gear!
-text.gm4.guidebook.scuba_gear.description,SCUBA Gear can be crafted in a Custom Crafter to aid in ocean travel.\n\nScutes and gold are main components for each piece.
+text.gm4.guidebook.scuba_gear.description,SCUBA Gear can be crafted to aid in ocean travel.\n\nCopper and dried kelp are main components for each piece.
 text.gm4.guidebook.scuba_gear.crafting_flippers,Flippers can be crafted with the following recipe:
 text.gm4.guidebook.scuba_gear.crafting_scuba_helmet,The SCUBA Helmet can be crafted with the following recipe:
 text.gm4.guidebook.scuba_gear.crafting_scuba_tank,The SCUBA Tank can be crafted with the following recipe:
-text.gm4.guidebook.scuba_gear.scuba_tank_extended,"An extended water breathing potion can be used to craft the tank, but it won't provide any extra benefits.\n\nA SCUBA tank and helmet must be used in conjunction."
+text.gm4.guidebook.scuba_gear.crafting_wetsuit,The Wetsuit can be crafted with the following recipe:
 text.gm4.guidebook.scuba_gear.usage_flippers,"Flippers allow the user to swim much faster, but land traversal is greatly slowed."
-text.gm4.guidebook.scuba_gear.usage_scuba_tank,Wearing both the scuba tank and helmet will grant 4 minutes of Conduit Power when underwater.
+text.gm4.guidebook.scuba_gear.usage_wetsuit,"The Wetsuit allows the user to swim up or down much faster, and maintains their current depth."
+text.gm4.guidebook.scuba_gear.usage_scuba_tank,Wearing the scuba tank adds 4 minutes of underwater breathing time.
+text.gm4.guidebook.scuba_gear.usage_scuba_helmet,Wearing the scuba helmet increases underwater mining speed by 6 times.
+item.modifiers.gm4.scuba_gear.in_water,"When in Water:"
+item.modifiers.gm4.scuba_gear.on_land,"When on Land:"
+item.modifiers.gm4.scuba_gear.neutral_buoyancy,"Neutral Buoyancy"
+item.modifiers.gm4.scuba_gear.vertical_swimming_speed,"Vertical Swimming Speed"

gm4_scuba_gear/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_scuba_gear
 name: SCUBA Gear
-version: 1.6.X
+version: 2.0.X
 
 data_pack:
   load: .
@@ -30,22 +30,9 @@ meta:
     credits:
       Creator:
         - BPR
+      Updated by:
+        - TheEpyonProject
       Textures by:
         - BPR
       Icon Design:
         - DuckJr
-    model_data:
-      - item: leather_boots
-        reference: item/flippers
-        template: generated_overlay
-      - item: golden_chestplate
-        reference: item/scuba_tank
-        template: generated
-      - item: player_head
-        reference: item/scuba_helmet
-        template: generated
-      - item: player_head
-        reference: gui/advancement/scuba_gear
-        template:
-          name: advancement
-          forward: item/scuba_helmet

gm4_scuba_gear/data/gm4/advancement/scuba_gear.json

@@ -1,9 +1,9 @@
 {
   "display": {
     "icon": {
-      "id": "minecraft:player_head",
+      "id": "minecraft:leather_helmet",
       "components": {
-        "minecraft:custom_model_data": "gui/advancement/scuba_gear",
+        "minecraft:item_model": "gm4_scuba_gear:scuba_helmet",
         "minecraft:profile": "$scuba_helmet"
       }
     },

gm4_scuba_gear/data/gm4_scuba_gear/advancement/recipes/flippers.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "gm4_scuba_gear:flippers"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "in_deep_water": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:reference",
+            "name": "gm4_scuba_gear:in_deep_water"
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "in_deep_water"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_scuba_gear:flippers"
+    ]
+  }
+}

gm4_scuba_gear/data/gm4_scuba_gear/advancement/recipes/scuba_helmet.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "gm4_scuba_gear:scuba_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "in_deep_water": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:reference",
+            "name": "gm4_scuba_gear:in_deep_water"
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "in_deep_water"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_scuba_gear:scuba_helmet"
+    ]
+  }
+}

gm4_scuba_gear/data/gm4_scuba_gear/advancement/recipes/scuba_tank.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "gm4_scuba_gear:scuba_tank"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "in_deep_water": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:reference",
+            "name": "gm4_scuba_gear:in_deep_water"
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "in_deep_water"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "gm4_scuba_gear:scuba_tank"
+    ]
+  }
+}