1.21.5 SCUBA Gear rework

gm4/modeldata_registry.json

@@ -975,6 +975,7 @@
     },
     "leather_leggings": {
       "gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
+      "gm4_scuba_gear:item/wetsuit": 2,
       "gm4_weighted_armour:shamir/helious": 103,
       "gm4_metallurgy:shamir/defuse": 106,
       "gm4_animi_shamir:shamir/animi": 124

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_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/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,6 +30,8 @@ meta:
     credits:
       Creator:
         - BPR
+      Updated by:
+        - TheEpyonProject
       Textures by:
         - BPR
       Icon Design:
@@ -44,6 +46,9 @@ meta:
       - item: player_head
         reference: item/scuba_helmet
         template: generated
+      - item: leather_leggings
+        reference: item/wetsuit
+        template: generated_overlay
       - item: player_head
         reference: gui/advancement/scuba_gear
         template:

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"
+    ]
+  }
+}

gm4_scuba_gear/data/gm4_scuba_gear/advancement/recipes/wetsuit.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "gm4_scuba_gear:wetsuit"
+      },
+      "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:wetsuit"
+    ]
+  }
+}

gm4_scuba_gear/data/gm4_scuba_gear/enchantment/flippers.json

@@ -0,0 +1,48 @@
+{
+  "description": "",
+  "exclusive_set": "minecraft:depth_strider",
+  "supported_items": "minecraft:leather_boots",
+  "weight": 1,
+  "max_level": 1,
+  "min_cost": {
+    "base": 0,
+    "per_level_above_first": 0
+  },
+  "max_cost": {
+    "base": 0,
+    "per_level_above_first": 0
+  },
+  "anvil_cost": 0,
+  "slots": [
+    "feet"
+  ],
+  "effects": {
+    "minecraft:location_changed": [
+      {
+        "requirements": [
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "condition": "minecraft:entity_properties",
+              "entity": "this",
+              "predicate": {
+                "location": {
+                  "fluid": {
+                    "fluids": "#minecraft:water"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "effect": {
+          "type": "minecraft:attribute",
+          "attribute": "minecraft:movement_speed",
+          "id": "gm4_scuba_gear:flippers/on_land",
+          "amount": -0.25,
+          "operation": "add_multiplied_base"
+        }
+      }
+    ]
+  }
+}