Skip to content

Make new air usage setting to make it optional and toggleable for tools and armors. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iglee42 merged 8 commits into from
May 26, 2026
Merged

Make new air usage setting to make it optional and toggleable for tools and armors. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0dfb3a9
first test
Gytube Apr 24, 2026
fb6bb9f
Add use_air backtank support for tools/armors
Gytube May 2, 2026
5fd909f
Add per-item 'Use Air' backtank option
Gytube May 2, 2026
399a0e7
Add 'Use Air' localization keys
Gytube May 2, 2026
fbf09f8
small fixes
Gytube May 17, 2026
2851e43
globalized the setting + backtank tooltip
Gytube May 17, 2026
551d91e
Make air tooltip translatable
Gytube May 23, 2026
8939aef
Add use_air localization for JA and RU
Gytube May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,6 @@ run/
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
/src/generated/resources/.cache/

# ignore .vscode folder
.vscode/
2 changes: 2 additions & 0 deletions src/main/java/fr/iglee42/createqualityoflife/config/CQOLEquipments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

public class CQOLEquipments extends ConfigBase {

public final ConfigBool useAir = b(true, "useAir", "Use backtank air before item durability for Refined Radiance, Shadow Steel, and Shadow Radiance equipment.");

public final CQOLArmors armors = nested(1,CQOLArmors::new,Comments.armors);
public final CQOLTools tools = nested(1,CQOLTools::new,Comments.tools);

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,20 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {
.noneMatch(e -> e instanceof BooleanEntry oEntry && oEntry.getComponent().equals(QOLDataComponents.BACKTANK_FANS) && oEntry.getValue());
return CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() && flag;
}));

}
}

@Override
public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List<Component> components, TooltipFlag p_41424_) {
String airTooltip = " (" + Component.translatable(CreateQOLConfigs.server().equipments.useAir.get() ? "createqol.tooltip.use_air.powering" : "createqol.tooltip.use_air.breathing").getString() + ")";
if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return;
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString())
.withStyle(ChatFormatting.GOLD)
.append(Component.literal(String.valueOf(BacktankUtil.getAir(stack)))
.withStyle(ChatFormatting.YELLOW))
.append(Component.literal("/" + BacktankUtil.maxAir(stack))
.withStyle(ChatFormatting.GOLD))
.append(Component.literal(airTooltip)
.withStyle(ChatFormatting.GOLD)));
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.elytra").getString())
.withStyle(ChatFormatting.GOLD)
Expand Down Expand Up @@ -135,8 +137,7 @@ public boolean elytraFlightTick(ItemStack stack, LivingEntity entity, int flight

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

}
9 changes: 4 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,21 @@ public List<ArmorRenderType> renderTypes(ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}
}
9 changes: 4 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -145,23 +145,22 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return (CreateQOLConfigs.server().equipments.useAir.get()) ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return (CreateQOLConfigs.server().equipments.useAir.get()) ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,16 @@ private void pushVertically(Player p,double y){

@Override
public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List<Component> components, TooltipFlag p_41424_) {
String airTooltip = " (" + Component.translatable(CreateQOLConfigs.server().equipments.useAir.get() ? "createqol.tooltip.use_air.powering" : "createqol.tooltip.use_air.breathing").getString() + ")";
if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return;
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString())
.withStyle(ChatFormatting.GOLD)
.append(Component.literal(String.valueOf(BacktankUtil.getAir(stack)))
.withStyle(ChatFormatting.YELLOW))
.append(Component.literal("/"+BacktankUtil.maxAir(stack))
.withStyle(ChatFormatting.GOLD)));
.withStyle(ChatFormatting.GOLD)
.append(Component.literal(airTooltip)
.withStyle(ChatFormatting.GOLD))));
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.effect").getString())
.withStyle(ChatFormatting.GOLD)
.append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW)));
Expand Down Expand Up @@ -224,7 +227,6 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_,
.withStyle(ChatFormatting.GOLD)
.append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.hoverAllowed.get() ,true,isHoverEnable(stack),false,true)));
}

super.appendHoverText(stack, p_41422_, components, p_41424_);
}

Expand Down Expand Up @@ -400,7 +402,6 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {
e = options[Math.floorMod(e.ordinal() + direction, options.length)];
return e;
},(e,oe)->true));

}

@Override
Expand All @@ -410,7 +411,6 @@ public boolean isBarVisible(ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}
}
9 changes: 4 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,22 @@ public int effectTime(ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return (CreateQOLConfigs.server().equipments.useAir.get()) ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return (CreateQOLConfigs.server().equipments.useAir.get()) ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {
}
@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i

@Override
public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List<Component> components, TooltipFlag p_41424_) {
String airTooltip = " (" + Component.translatable(CreateQOLConfigs.server().equipments.useAir.get() ? "createqol.tooltip.use_air.powering" : "createqol.tooltip.use_air.breathing").getString() + ")";
if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return;
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString())
.withStyle(ChatFormatting.GOLD)
.append(Component.literal(String.valueOf(BacktankUtil.getAir(stack)))
.withStyle(ChatFormatting.YELLOW))
.append(Component.literal("/" + BacktankUtil.maxAir(stack))
.withStyle(ChatFormatting.GOLD)));
.withStyle(ChatFormatting.GOLD)
.append(Component.literal(airTooltip)
.withStyle(ChatFormatting.GOLD))));
components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.dash").getString())
.withStyle(ChatFormatting.GOLD)
.append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(),
Expand Down Expand Up @@ -110,8 +113,6 @@ public void addConfigurations(List<Configuration<?>> list, ItemStack stack) {
list.add(Configuration.ofBool("Enable Dash",stack.getOrDefault(QOLDataComponents.DASH,true),QOLDataComponents.DASH,
List.of("Should the player dash when pressing "+ KeyBindManager.DASH_KEY.getTranslatedKeyMessage().getString()),
(o,oe)->CreateQOLConfigs.server().equipments.armors.dashAllowed.get()));


}

@Override
Expand All @@ -121,7 +122,6 @@ public boolean isBarVisible(ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}
}
9 changes: 4 additions & 5 deletions src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,22 @@ public List<ArmorRenderType> renderTypes(ItemStack stack) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}

@Override
Expand Down
9 changes: 4 additions & 5 deletions ...n/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -116,23 +116,22 @@ public static void toggleAbility(ItemStack stack, Player p) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions ...n/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ public static void toggleAbility(ItemStack stack, Player p) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions ...va/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ public static void toggleAbility(ItemStack stack, Player p) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions ...ava/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public static void toggleAbility(ItemStack stack, Player p) {

@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
Expand Down
10 changes: 4 additions & 6 deletions ...java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java
View file
Open in desktop
Comment thread
iglee42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,24 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_,
super.appendHoverText(stack, p_41422_, components, p_41424_);
}


@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer<Item> onBroken) {
if (BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack))) return 0;
return super.damageItem(stack, amount, entity, onBroken);
return CreateQOLConfigs.server().equipments.useAir.get() && BacktankUtil.canAbsorbDamage(entity, getMaxDamage(stack)) ? 0 : super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
return (BacktankUtil.isBarVisible(stack, getMaxDamage(stack)) && CreateQOLConfigs.server().equipments.useAir.get()) || super.isBarVisible(stack);
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarWidth(stack, getMaxDamage(stack)) : super.getBarWidth(stack);
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
return CreateQOLConfigs.server().equipments.useAir.get() ? BacktankUtil.getBarColor(stack, getMaxDamage(stack)) : super.getBarColor(stack);
}

@Override
Expand Down
Loading
Loading