Merge branch 'scuba-enchants' of https://github.com/EpyonProjects/GM4_Datapacks into ps11-resource-pack-combo

Author: runcows

gm4/modeldata_registry.json

@@ -717,7 +717,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,
@@ -1027,9 +1026,7 @@
     },
     "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,
       "gm4_weighted_armour:shamir/helious": 103,
       "gm4_metallurgy:shamir/defuse": 106,
@@ -1350,7 +1347,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,
@@ -1376,7 +1372,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/assets/translations.csv

@@ -3,7 +3,6 @@ advancement.gm4.boots_of_ostara.description,Wear the Boots of Ostara
 advancement.gm4.boots_of_ostara.title,Green Feet
 item.gm4.boots_of_ostara,Boots of Ostara
 item.gm4.boots_of_ostara.lore,Brings abundance beneath you!
-item.gm4.flippers_of_ostara,Flippers of Ostara
 text.gm4.guidebook.module_desc.boots_of_ostara,"A pair of boots every gardener would love to have! Boots of Ostara allow you to easily spread Grass and Moss, and they even stop the Desire Lines module from creating that pesky dirt."
 text.gm4.guidebook.boot_of_ostara.description,Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a Custom Crafter.
 text.gm4.guidebook.boots_of_ostara.crafting,The recipe for the Boots of Ostara is as follows:

gm4_boots_of_ostara/beet.yaml

@@ -23,7 +23,6 @@ meta:
         template: generated_overlay
         broadcast:
           - reference: item/boots_of_ostara
-          - reference: item/flippers_of_ostara
       - item: leather_boots
         reference: gui/advancement/boots_of_ostara
         template:

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