Water Breathing Upgrade

src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0

@@ -1,4 +1,4 @@
-// 1.21.1	2024-10-08T15:55:42.5454343	Item Models: justdirethings
+// 1.21.1	2024-11-02T12:18:32.2867034	Item Models: justdirethings
 c197a1b2a5ae31fcfabfe6cab9ab95a9dc0e1af6 assets/justdirethings/models/item/blazegold_axe.json
 dddf215922d40d92c2d8bce4229f2e2af8b3c7ba assets/justdirethings/models/item/blazegold_axe_active.json
 6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json
@@ -368,5 +368,6 @@ a3679c6341273d0028d1f6882e467e290189eb35 assets/justdirethings/models/item/upgra
 896e3f073667fb9c0af84f4abc78275cc67c42ea assets/justdirethings/models/item/upgrade_time_protection.json
 0af186d271e80543d4bc2b38307337807c61af8d assets/justdirethings/models/item/upgrade_treefeller.json
 24c722112f9d85c53ea12020657451e156b57e1c assets/justdirethings/models/item/upgrade_walkspeed.json
+237c578da62953b16ce2f03058080fc05ae36175 assets/justdirethings/models/item/upgrade_waterbreathing.json
 b713dac946a919bd3c78bdd84396c681905676bb assets/justdirethings/models/item/voidshift_wand.json
 a7b09b6500bbaed0170e4ebbf38cac862e0b2f20 assets/justdirethings/models/item/xp_fluid_bucket.json

src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb

@@ -1,2 +1,2 @@
-// 1.21.1	2024-10-18T20:34:14.9851392	Languages: en_us for mod: justdirethings
-8688cf4f7590dcf15b5692827931cc7556bd9a23 assets/justdirethings/lang/en_us.json
+// 1.21.1	2024-11-02T12:28:26.4511303	Languages: en_us for mod: justdirethings
+4ff3b6a68d255c3b31a948225798aba73dd3eb61 assets/justdirethings/lang/en_us.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21.1	2024-10-08T15:55:42.557444	Recipes
+// 1.21.1	2024-11-02T12:45:23.0801389	Recipes
 39cd44c838de7f56aeac73aec8b3bfb64ad7fec2 data/justdirethings/advancement/recipes/building_blocks/blazegold_ingot_9x9.json
 2f2a0f948f272df9713010dbcb75beb81c328b01 data/justdirethings/advancement/recipes/building_blocks/celestigem_9x9.json
 4c183b67eff4bc24117606cdc45ebcd987dd4138 data/justdirethings/advancement/recipes/building_blocks/charcoal_9x9.json
@@ -112,6 +112,7 @@ c11006e1805ef977024830bb6fb8ef73c27bd19b data/justdirethings/advancement/recipes
 df757aa034ff759f561119fe2717a0aca89bbc19 data/justdirethings/advancement/recipes/misc/celestigem_helmet-nightvision.json
 4938738d3bbb1eeedbea95063e51db708643b83e data/justdirethings/advancement/recipes/misc/celestigem_helmet-stupefy.json
 e0c19499820e6757dedfb7b7537aa3af1bf073b4 data/justdirethings/advancement/recipes/misc/celestigem_helmet-templateupgrade.json
+9d740778f6736be144e2d1439f901609ce4d1f32 data/justdirethings/advancement/recipes/misc/celestigem_helmet-waterbreathing.json
 1d0327c23c6894e94a679340b7585bf7848550fa data/justdirethings/advancement/recipes/misc/celestigem_helmet.json
 dc00f1e650ebc4ea9c0cdd38e38a534ae8bf4886 data/justdirethings/advancement/recipes/misc/celestigem_hoe-dropteleport.json
 cc2d98102f3a39123200b999995567001a3de051 data/justdirethings/advancement/recipes/misc/celestigem_hoe-hammer.json
@@ -197,6 +198,7 @@ c28a40f3874d104453f6b30d29cd45a1c4a3715a data/justdirethings/advancement/recipes
 8ccc2f5cd4f89d57faeb3d1f20e468d7002d5988 data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet-noai.json
 c4c532b52125e654f1485253576bc1d6bd208a81 data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet-stupefy.json
 54c0d38cd63d86f97d832df6c167470ba79977d1 data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet-templateupgrade.json
+a27807fe361130f845bc1e5debeb35522544f095 data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet-waterbreathing.json
 4c174c2eaa2a7f062b644315b1b8067cdee4a0c3 data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet.json
 8e4666d5cb5e88ca22a75d7830805009ed311a00 data/justdirethings/advancement/recipes/misc/eclipsealloy_hoe-dropteleport.json
 cd3d38e21854362da8327a122cbf84fe2bcee068 data/justdirethings/advancement/recipes/misc/eclipsealloy_hoe-hammer.json
@@ -385,6 +387,7 @@ bb9f757b20069d7b7a9babd691cb1129fefd7a6b data/justdirethings/advancement/recipes
 54be3d6b86c08b4a827cf21df0441d126e180389 data/justdirethings/advancement/recipes/misc/upgrade_time_protection.json
 fc7120b19887a847f6cab8a4306e7fa63511a993 data/justdirethings/advancement/recipes/misc/upgrade_treefeller.json
 43ede888a6350d2b81e8c2b0fba27eeef3f19cf5 data/justdirethings/advancement/recipes/misc/upgrade_walkspeed.json
+e373c02315a610ac4cd80518e125e0b2ce8a04b9 data/justdirethings/advancement/recipes/misc/upgrade_waterbreathing.json
 a4ef3ab8a03f77c8fd4519ac5b523259c31c558d data/justdirethings/advancement/recipes/misc/voidshift_wand.json
 ed96449aaeccde5941e6d5f59bedf567d0031ef4 data/justdirethings/recipe/blazegold_axe-leafbreaker.json
 1b78f639d3076882256f685dc8dc2438c4e237e8 data/justdirethings/recipe/blazegold_axe-smelter.json
@@ -491,6 +494,7 @@ c90161d393c051f8905cf673172da3b8e6178cf2 data/justdirethings/recipe/celestigem_h
 b130751b510ad7768df3df4d9effb1dfb9808d64 data/justdirethings/recipe/celestigem_helmet-nightvision.json
 616d141fb8ca10e325e00f5da6c794f7dc3ab583 data/justdirethings/recipe/celestigem_helmet-stupefy.json
 136347ec7bbe242096f56990c78417e5a0155664 data/justdirethings/recipe/celestigem_helmet-templateupgrade.json
+c1d837f78d4f5c75d205353b01fb8365e5e24f34 data/justdirethings/recipe/celestigem_helmet-waterbreathing.json
 fc16127d6e28b8db9420938a9bfa06abc8dbee71 data/justdirethings/recipe/celestigem_helmet.json
 9c236ce56d694dc832f415d1bf324da38fa4339c data/justdirethings/recipe/celestigem_hoe-dropteleport.json
 b4f4face0265fa8062ec25332c4994b0cd9388d7 data/justdirethings/recipe/celestigem_hoe-hammer.json
@@ -581,6 +585,7 @@ e71d41cb25bff537ace931a0a86c7082947cf861 data/justdirethings/recipe/eclipsealloy
 90a2ee0c5cc747934cc3b01620952517aa338fce data/justdirethings/recipe/eclipsealloy_helmet-noai.json
 2817a996e81cad48bbaed7d7b425a4151406374a data/justdirethings/recipe/eclipsealloy_helmet-stupefy.json
 61a1ea13919dbf6e6ff97bbf60bafddf9bb3bc92 data/justdirethings/recipe/eclipsealloy_helmet-templateupgrade.json
+d587c022e0a435067cfc6f717decb9b3f8a400eb data/justdirethings/recipe/eclipsealloy_helmet-waterbreathing.json
 c984fd1c0ed273bb79d92cb7e587238cdea82681 data/justdirethings/recipe/eclipsealloy_helmet.json
 a681bee58b393fccf2e9ab173513168b39e2d53c data/justdirethings/recipe/eclipsealloy_hoe-dropteleport.json
 c66f4342d4334a738319656b1553c8b132b5c237 data/justdirethings/recipe/eclipsealloy_hoe-hammer.json
@@ -772,4 +777,5 @@ ad14a863d1ba6278c77da097833b9527ec0dea1f data/justdirethings/recipe/upgrade_swim
 45816196f32103053704c03bd38e19fa266fdd7e data/justdirethings/recipe/upgrade_time_protection.json
 08721915ed82fde25f7c38846bd86531ef31552e data/justdirethings/recipe/upgrade_treefeller.json
 9d772af64197a1bc8fd749a4e26aefa13408e04f data/justdirethings/recipe/upgrade_walkspeed.json
+6ec914750cc0defc18ea4eb06fb91eb44dcd12a5 data/justdirethings/recipe/upgrade_waterbreathing.json
 96ad6a09a9a58c82b1c74ac612aaa52b6487636f data/justdirethings/recipe/voidshift_wand.json

src/generated/resources/assets/justdirethings/lang/en_us.json

@@ -210,6 +210,7 @@
   "item.justdirethings.upgrade_time_protection": "Upgrade: Time Protection",
   "item.justdirethings.upgrade_treefeller": "Upgrade: Treefeller",
   "item.justdirethings.upgrade_walkspeed": "Upgrade: Walk Speed",
+  "item.justdirethings.upgrade_waterbreathing": "Upgrade: Water Breathing",
   "item.justdirethings.voidshift_wand": "Voidshift Wand",
   "item.justdirethings.xp_fluid_bucket": "XP Fluid Bucket",
   "itemGroup.DeferredHolder{ResourceKey[minecraft:creative_mode_tab / justdirethings:justdirethings]}": "Just Dire Things",
@@ -264,6 +265,7 @@
   "justdirethings.ability.treefeller": "Tree Feller",
   "justdirethings.ability.voidshift": "Void Shift",
   "justdirethings.ability.walkspeed": "Walk Speed",
+  "justdirethings.ability.waterbreathing": "Water Breathing",
   "justdirethings.airburst.detailtext": "Launch yourself in the direction you're looking",
   "justdirethings.airburst.flavortext": "Safer than Fireworks",
   "justdirethings.bindfailed": "Binding Failed",
@@ -466,5 +468,7 @@
   "justdirethings.unbound": " -Not Bound",
   "justdirethings.unbound-screen": "Not Bound",
   "justdirethings.voidshift.detailtext": "Teleport to where you're looking",
-  "justdirethings.walkspeed.detailtext": "Walk Faster"
+  "justdirethings.walkspeed.detailtext": "Walk Faster",
+  "justdirethings.waterbreathing.detailtext": "Allows player to breath under water",
+  "justdirethings.waterbreathing.flavortext": "Just keep swimming, just keep swimming!"
 }

src/generated/resources/assets/justdirethings/models/item/upgrade_waterbreathing.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "justdirethings:item/abilityupgrades/waterbreathing"
+  }
+}

src/generated/resources/data/justdirethings/advancement/recipes/misc/celestigem_helmet-waterbreathing.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "justdirethings:celestigem_helmet-waterbreathing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": "justdirethings:upgrade_blank"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_upgrade_base"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "justdirethings:celestigem_helmet-waterbreathing"
+    ]
+  }
+}

src/generated/resources/data/justdirethings/advancement/recipes/misc/eclipsealloy_helmet-waterbreathing.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "justdirethings:eclipsealloy_helmet-waterbreathing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": "justdirethings:upgrade_blank"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_upgrade_base"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "justdirethings:eclipsealloy_helmet-waterbreathing"
+    ]
+  }
+}

src/generated/resources/data/justdirethings/recipe/celestigem_helmet-waterbreathing.json

@@ -0,0 +1,10 @@
+{
+  "type": "justdirethings:ability",
+  "addition": {
+    "item": "justdirethings:upgrade_waterbreathing"
+  },
+  "base": {
+    "item": "justdirethings:celestigem_helmet"
+  },
+  "template": []
+}

src/generated/resources/data/justdirethings/recipe/eclipsealloy_helmet-waterbreathing.json

@@ -0,0 +1,10 @@
+{
+  "type": "justdirethings:ability",
+  "addition": {
+    "item": "justdirethings:upgrade_waterbreathing"
+  },
+  "base": {
+    "item": "justdirethings:eclipsealloy_helmet"
+  },
+  "template": []
+}

src/main/java/com/direwolf20/justdirethings/common/items/armors/CelestigemHelmet.java

@@ -15,6 +15,7 @@ public CelestigemHelmet() {
         registerAbility(Ability.MINDFOG);
         registerAbility(Ability.STUPEFY, new AbilityParams(1, 1, 1, 1, 100, 400));
         registerAbility(Ability.NIGHTVISION);
+        registerAbility(Ability.WATERBREATHING);
     }
 
     @Override

src/main/java/com/direwolf20/justdirethings/common/items/armors/EclipseAlloyHelmet.java

@@ -17,7 +17,7 @@ public EclipseAlloyHelmet() {
         registerAbility(Ability.NIGHTVISION);
         registerAbility(Ability.NOAI, new AbilityParams(1, 1, 1, 1, 0, 2400));
         registerAbility(Ability.DEBUFFREMOVER, new AbilityParams(1, 1, 1, 1, 0, 400));
-
+        registerAbility(Ability.WATERBREATHING);
     }
 
     @Override

src/main/java/com/direwolf20/justdirethings/common/items/interfaces/Ability.java

@@ -75,7 +75,7 @@ public enum Ability {
             ResourceLocation.fromNamespaceAndPath(JustDireThings.MODID, "textures/gui/overlay/decoy.png"), Registration.UPGRADE_DECOY),
     LINGERING(SettingType.TOGGLE, 50, 1000, UseType.PASSIVE, BindingType.CUSTOM_ONLY, Registration.UPGRADE_LINGERING),
     HOMING(SettingType.TOGGLE, 50, 2000, UseType.PASSIVE, BindingType.CUSTOM_ONLY, CustomSettingType.TARGET, Registration.UPGRADE_HOMING),
-
+    WATERBREATHING(SettingType.TOGGLE, 50, 500, UseType.PASSIVE_TICK, BindingType.CUSTOM_ONLY, AbilityMethods::waterBreathing, CustomSettingType.NONE, Registration.UPGRADE_WATERBREATHING),
 
     //Tier 4
     OREXRAY(SettingType.TOGGLE, 100, 5000, UseType.USE, BindingType.LEFT_AND_CUSTOM,

src/main/java/com/direwolf20/justdirethings/common/items/interfaces/AbilityMethods.java

@@ -405,6 +405,15 @@ public static boolean swimSpeed(Level level, Player player, ItemStack itemStack)
         return false;
     }
 
+    public static boolean waterBreathing(Level level, Player player, ItemStack itemStack) {
+        if (player.isInWater() && player.getAirSupply() < (0.5 * player.getMaxAirSupply())) {
+            player.setAirSupply(player.getMaxAirSupply());
+            Helpers.damageTool(itemStack, player, Ability.WATERBREATHING);
+            player.playNotifySound(SoundEvents.PLAYER_BREATH, SoundSource.PLAYERS, .5F, 1.0F);
+        }
+        return false;
+    }
+
     public static boolean jumpBoost(Level level, Player player, ItemStack itemStack) {
         if (!player.isInWaterOrBubble() && !player.isFallFlying()) {
             float speed = (float) ToggleableTool.getToolValue(itemStack, Ability.JUMPBOOST.getName()) / 7.5f;

src/main/java/com/direwolf20/justdirethings/datagen/JustDireLanguageProvider.java

@@ -241,6 +241,7 @@ protected void addTranslations() {
         add(Registration.UPGRADE_HOMING.get(), "Upgrade: Homing Arrow");
         add(Registration.UPGRADE_EPICARROW.get(), "Upgrade: Yondu Arrow");
         add(Registration.UPGRADE_TIMEPROTECTION.get(), "Upgrade: Time Protection");
+        add(Registration.UPGRADE_WATERBREATHING.get(), "Upgrade: Water Breathing");
 
         //Upgrade Text
         add("justdirethings." + Ability.MOBSCANNER.getName() + ".detailtext", "Show the location of nearby mobs");
@@ -335,6 +336,8 @@ protected void addTranslations() {
         add("justdirethings." + Ability.EPICARROW.getName() + ".flavortext", "I'm Mary Poppins Ya'll");
         add("justdirethings." + Ability.TIMEPROTECTION.getName() + ".detailtext", "Protection from Time Altering Effects");
         //add("justdirethings." + Ability.RUNSPEED.getName() + ".flavortext", "");
+        add("justdirethings." + Ability.WATERBREATHING.getName() + ".detailtext", "Allows player to breath under water");
+        add("justdirethings." + Ability.WATERBREATHING.getName() + ".flavortext", "Just keep swimming, just keep swimming!");
 
 
         //Misc
@@ -440,6 +443,7 @@ protected void addTranslations() {
         add(Ability.HOMING.getLocalization(), "Homing Arrow");
         add(Ability.EPICARROW.getLocalization(), "Yondu Arrow");
         add(Ability.TIMEPROTECTION.getLocalization(), "Time Protection");
+        add(Ability.WATERBREATHING.getLocalization(), "Water Breathing");
 
         //GUI
         add("justdirethings.screen.energy", "Energy: %s/%s FE");

src/main/java/com/direwolf20/justdirethings/datagen/JustDireRecipes.java

@@ -746,6 +746,17 @@ protected void buildRecipes(RecipeOutput consumer) {
                 .define('e', Items.KELP)
                 .unlockedBy("has_upgrade_base", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.UPGRADE_BASE.get()))
                 .save(consumer);
+        ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Registration.UPGRADE_WATERBREATHING.get())
+                .pattern("fep")
+                .pattern("gbg")
+                .pattern("pef")
+                .define('b', Registration.UPGRADE_BASE.get())
+                .define('g', Registration.BlazegoldIngot.get())
+                .define('f', Items.PRISMARINE_SHARD)
+                .define('p', Items.PUFFERFISH)
+                .define('e', Items.KELP)
+                .unlockedBy("has_upgrade_base", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.UPGRADE_BASE.get()))
+                .save(consumer);
         ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Registration.UPGRADE_GROUNDSTOMP.get())
                 .pattern(" e ")
                 .pattern("fbf")

src/main/java/com/direwolf20/justdirethings/setup/Registration.java

@@ -604,6 +604,7 @@ public static void init(IEventBus eventBus) {
     public static final DeferredHolder<Item, Upgrade> UPGRADE_DECOY = UPGRADES.register("upgrade_decoy", Upgrade::new);
     public static final DeferredHolder<Item, Upgrade> UPGRADE_LINGERING = UPGRADES.register("upgrade_lingering", Upgrade::new);
     public static final DeferredHolder<Item, Upgrade> UPGRADE_HOMING = UPGRADES.register("upgrade_homing", Upgrade::new);
+    public static final DeferredHolder<Item, Upgrade> UPGRADE_WATERBREATHING = UPGRADES.register("upgrade_waterbreathing", Upgrade::new);
 
     //Tier 4 Abilities
     public static final DeferredHolder<Item, Upgrade> UPGRADE_OREXRAY = UPGRADES.register("upgrade_orexray", Upgrade::new);