Replace hacky respiration logic with the vanilla enchantment

Grants the fog benefit and just helps things run smoother
SlimeKnights · Feb 11, 2023 · dde7939 · dde7939
1 parent a98fb9c
commit dde7939
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 54 deletions.
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/respiration.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/respiration.json
@@ -0,0 +1,8 @@
+{
+  "type": "tconstruct:enchantment",
+  "level_display": "tconstruct:default",
+  "enchantment": {
+    "name": "minecraft:respiration",
+    "level": 1
+  }
+}
diff --git a/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java b/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java
@@ -194,7 +194,6 @@
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.ItemFrameModifier;
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.LeapingModifier;
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.LightspeedArmorModifier;
-import slimeknights.tconstruct.tools.modifiers.upgrades.armor.RespirationModifier;
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.RicochetModifier;
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.SoulSpeedModifier;
 import slimeknights.tconstruct.tools.modifiers.upgrades.armor.SpringyModifier;
@@ -338,7 +337,6 @@ public TinkerModifiers() {
   public static final StaticModifier<ThornsModifier> thorns = MODIFIERS.register("thorns", ThornsModifier::new);
   public static final StaticModifier<SpringyModifier> springy = MODIFIERS.register("springy", SpringyModifier::new);
   // helmet
-  public static final StaticModifier<RespirationModifier> respiration = MODIFIERS.register("respiration", RespirationModifier::new);
   public static final StaticModifier<ItemFrameModifier> itemFrame = MODIFIERS.register("item_frame", ItemFrameModifier::new);
   public static final StaticModifier<ZoomModifier> zoom = MODIFIERS.register("zoom", ZoomModifier::new);
   public static final StaticModifier<SlurpingModifier> slurping = MODIFIERS.register("slurping", SlurpingModifier::new);

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierIds.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierIds.java
@@ -54,6 +54,8 @@ public class ModifierIds {
   public static final ModifierId knockbackResistance = id("knockback_resistance");
   // defense
   public static final ModifierId revitalizing = id("revitalizing");
+  // helmet
+  public static final ModifierId respiration = id("respiration");
   // chestplate
   public static final ModifierId strength = id("strength");
   // leggings

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java
@@ -175,6 +175,8 @@ protected void addModifiers() {
     // defense
     // TODO: floor?
     addModifier(ModifierIds.revitalizing, StatBoostModifier.builder().attribute("tconstruct.modifier.revitalizing", Attributes.MAX_HEALTH, Operation.ADDITION, 2, armorSlots).build());
+    // helmet
+    addModifier(ModifierIds.respiration, new EnchantmentModifier(Enchantments.RESPIRATION, 1, ModifierLevelDisplay.DEFAULT));
     // chestplate
     addModifier(ModifierIds.strength, StatBoostModifier.builder().attribute("tconstruct.modifier.strength", Attributes.ATTACK_DAMAGE, Operation.MULTIPLY_TOTAL, 0.1f, armorSlots).build());
     addRedirect(id("armor_power"), redirect(ModifierIds.strength));

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -756,7 +756,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .saveSalvage(consumer, prefix(TinkerModifiers.springy, upgradeSalvage))
                          .save(consumer, prefix(TinkerModifiers.springy, upgradeFolder));
     // upgrade - helmet
-    ModifierRecipeBuilder.modifier(TinkerModifiers.respiration)
+    ModifierRecipeBuilder.modifier(ModifierIds.respiration)
                          .setTools(TinkerTags.Items.HELMETS)
                          .addInput(ItemTags.FISHES)
                          .addInput(Tags.Items.GLASS_COLORLESS)
@@ -765,8 +765,8 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(Items.KELP)
                          .setMaxLevel(3)
                          .setSlots(SlotType.UPGRADE, 1)
-                         .saveSalvage(consumer, prefix(TinkerModifiers.respiration, upgradeSalvage))
-                         .save(consumer, prefix(TinkerModifiers.respiration, upgradeFolder));
+                         .saveSalvage(consumer, prefix(ModifierIds.respiration, upgradeSalvage))
+                         .save(consumer, prefix(ModifierIds.respiration, upgradeFolder));
     ModifierRecipeBuilder.modifier(TinkerModifiers.itemFrame)
                          .setTools(TinkerTags.Items.HELMETS)
                          .addInput(Ingredient.of(Arrays.stream(FrameType.values())

diff --git a/...main/java/slimeknights/tconstruct/tools/modifiers/upgrades/armor/RespirationModifier.java b/...main/java/slimeknights/tconstruct/tools/modifiers/upgrades/armor/RespirationModifier.java