Swimming up with the wetsuit actually gives upward gravity instead of downward

EpyonProjects · EpyonProjects · commit 02250b497abf · 2026-01-31T13:13:19.000-05:00
diff --git a/gm4/modeldata_registry.json b/gm4/modeldata_registry.json
@@ -949,7 +949,6 @@
     "leather_boots": {
       "gm4_boots_of_ostara:item/boots_of_ostara": 1,
       "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,
diff --git a/gm4_boots_of_ostara/assets/translations.csv b/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:
diff --git a/gm4_boots_of_ostara/beet.yaml b/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:
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/flippers.json
@@ -1,6 +1,5 @@
 {
   "description": "",
-  "exclusive_set": "minecraft:depth_strider",
   "supported_items": "minecraft:leather_boots",
   "weight": 1,
   "max_level": 1,
@@ -19,22 +18,40 @@
   "effects": {
     "minecraft:location_changed": [
       {
-        "requirements": [
-          {
-            "condition": "minecraft:inverted",
-            "term": {
-              "condition": "minecraft:entity_properties",
-              "entity": "this",
-              "predicate": {
-                "location": {
-                  "fluid": {
-                    "fluids": "#minecraft:water"
-                  }
+        "requirements": {
+          "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"
+        }
+      },
+      {
+        "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",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/function/wetsuit_buoyancy/positive.mcfunction b/gm4_scuba_gear/data/gm4_scuba_gear/function/wetsuit_buoyancy/positive.mcfunction
@@ -3,6 +3,6 @@
 # located at @s, in water
 # run from enchant, gm4_scuba_gear:enchantment/wetsuit
 
-item modify entity @s armor.legs gm4_scuba_gear:wetsuit_buoyancy/negative
+item modify entity @s armor.legs gm4_scuba_gear:wetsuit_buoyancy/positive
 
 scoreboard players set @s gm4_sg_buoyancy 1
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/flippers.json
@@ -17,7 +17,7 @@
   "output": {
     "result": {
       "type": "loot_table",
-      "name": "gm4_scuba_gear:items/flippers",
+      "name": "gm4_scuba_gear:item/flippers",
       "count": 1,
       "guidebook": {
         "display_color": 2367281
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_helmet.json
@@ -17,7 +17,7 @@
   "output": {
     "result": {
       "type": "loot_table",
-      "name": "gm4_scuba_gear:items/scuba_helmet",
+      "name": "gm4_scuba_gear:item/scuba_helmet",
       "count": 1
     }
   }
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_tank.json
@@ -21,7 +21,7 @@
     "type": "normal",
     "result": {
       "type": "loot_table",
-      "name": "gm4_scuba_gear:items/scuba_tank",
+      "name": "gm4_scuba_gear:item/scuba_tank",
       "count": 1
     }
   }
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/wetsuit.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/wetsuit.json
@@ -18,7 +18,7 @@
   "output": {
     "result": {
       "type": "loot_table",
-      "name": "gm4_scuba_gear:items/wetsuit",
+      "name": "gm4_scuba_gear:item/wetsuit",
       "count": 1,
       "guidebook": {
         "display_color": 2367281
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/flippers.json
@@ -15,7 +15,7 @@
       "entries": [
         {
           "type": "minecraft:loot_table",
-          "value": "gm4_scuba_gear:items/flippers",
+          "value": "gm4_scuba_gear:item/flippers",
           "functions": [
             {
               "function": "minecraft:set_count",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_helmet.json
@@ -15,7 +15,7 @@
       "entries": [
         {
           "type": "minecraft:loot_table",
-          "value": "gm4_scuba_gear:items/scuba_helmet",
+          "value": "gm4_scuba_gear:item/scuba_helmet",
           "functions": [
             {
               "function": "minecraft:set_count",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_tank.json
@@ -15,7 +15,7 @@
       "entries": [
         {
           "type": "minecraft:loot_table",
-          "value": "gm4_scuba_gear:items/scuba_tank",
+          "value": "gm4_scuba_gear:item/scuba_tank",
           "functions": [
             {
               "function": "minecraft:set_count",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/wetsuit.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/wetsuit.json
@@ -15,7 +15,7 @@
       "entries": [
         {
           "type": "minecraft:loot_table",
-          "value": "gm4_scuba_gear:items/wetsuit",
+          "value": "gm4_scuba_gear:item/wetsuit",
           "functions": [
             {
               "function": "minecraft:set_count",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/flippers.json
@@ -38,7 +38,9 @@
                   }
                 },
                 "minecraft:item_model": "gm4_scuba_gear:flippers",
-                "!minecraft:enchantable": {},
+                "minecraft:enchantable": {
+                  "value": 8
+                },
                 "minecraft:enchantments": {
                   "gm4_scuba_gear:flippers": 1
                 },
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/scuba_helmet.json
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/scuba_tank.json
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/wetsuit.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/item/wetsuit.json
@@ -22,16 +22,17 @@
                   }
                 },
                 "minecraft:item_model": "gm4_scuba_gear:wetsuit",
+                "minecraft:equippable": {
+                  "slot": "legs",
+                  "asset_id": "gm4_scuba_gear:scuba",
+                  "equip_sound": "minecraft:intentionally_empty"
+                },
                 "minecraft:enchantments": {
                   "gm4_scuba_gear:wetsuit": 1
                 },
                 "minecraft:enchantment_glint_override": false,
                 "minecraft:max_damage": 180,
                 "!minecraft:enchantable": {},
-                "minecraft:equippable": {
-                  "slot": "legs",
-                  "asset_id": "gm4_scuba_gear:scuba"
-                },
                 "minecraft:lore": [
                   {
                     "translate": "item.modifiers.gm4.scuba_gear.in_water",
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/recipe/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/flippers.json
@@ -45,7 +45,9 @@
         }
       },
       "minecraft:dyed_color": 2367281,
-      "!minecraft:enchantable": {},
+      "minecraft:enchantable": {
+        "value": 8
+      },
       "minecraft:enchantments": {
         "gm4_scuba_gear:flippers": 1
       },
diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/recipe/wetsuit.json b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/wetsuit.json
@@ -38,7 +38,8 @@
       "minecraft:enchantment_glint_override": false,
       "minecraft:equippable": {
         "slot": "legs",
-        "asset_id": "gm4_scuba_gear:scuba"
+        "asset_id": "gm4_scuba_gear:scuba",
+        "equip_sound": "minecraft:intentionally_empty"
       },
       "minecraft:rarity": "common",
       "minecraft:tooltip_display": {
diff --git a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json
@@ -362,7 +362,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 4,
-          "value": "gm4_scuba_gear:items/scuba_helmet",
+          "value": "gm4_scuba_gear:item/scuba_helmet",
           "conditions": [
             {
               "condition": "minecraft:value_check",
@@ -383,7 +383,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 3,
-          "value": "gm4_scuba_gear:items/scuba_tank",
+          "value": "gm4_scuba_gear:item/scuba_tank",
           "conditions": [
             {
               "condition": "minecraft:value_check",
diff --git a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json
@@ -534,7 +534,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 4,
-          "value": "gm4_scuba_gear:items/scuba_helmet",
+          "value": "gm4_scuba_gear:item/scuba_helmet",
           "conditions": [
             {
               "condition": "minecraft:value_check",
@@ -555,7 +555,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 3,
-          "value": "gm4_scuba_gear:items/scuba_tank",
+          "value": "gm4_scuba_gear:item/scuba_tank",
           "conditions": [
             {
               "condition": "minecraft:value_check",

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"output": {`
`18`	`18`	`"result": {`
`19`	`19`	`"type": "loot_table",`
`20`		`- "name": "gm4_scuba_gear:items/scuba_helmet",`
	`20`	`+ "name": "gm4_scuba_gear:item/scuba_helmet",`
`21`	`21`	`"count": 1`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"type": "normal",`
`22`	`22`	`"result": {`
`23`	`23`	`"type": "loot_table",`
`24`		`- "name": "gm4_scuba_gear:items/scuba_tank",`
	`24`	`+ "name": "gm4_scuba_gear:item/scuba_tank",`
`25`	`25`	`"count": 1`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"entries": [`
`16`	`16`	`{`
`17`	`17`	`"type": "minecraft:loot_table",`
`18`		`- "value": "gm4_scuba_gear:items/flippers",`
	`18`	`+ "value": "gm4_scuba_gear:item/flippers",`
`19`	`19`	`"functions": [`
`20`	`20`	`{`
`21`	`21`	`"function": "minecraft:set_count",`