diff --git a/.gitignore b/.gitignore index 624c313..4e69623 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ \ No newline at end of file diff --git a/src/main/java/fr/iglee42/createqualityoflife/config/CQOLEquipments.java b/src/main/java/fr/iglee42/createqualityoflife/config/CQOLEquipments.java index 0918d86..dd159f1 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/config/CQOLEquipments.java +++ b/src/main/java/fr/iglee42/createqualityoflife/config/CQOLEquipments.java @@ -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); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java index 00e6f1f..7e2419b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java @@ -111,8 +111,7 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java index 7e7378d..11515ad 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java @@ -94,18 +94,20 @@ public void addConfigurations(List> 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 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) @@ -135,8 +137,7 @@ public boolean elytraFlightTick(ItemStack stack, LivingEntity entity, int flight @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java index 2d37e32..aced071 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java @@ -83,22 +83,21 @@ public List renderTypes(ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index 7cf6e3c..41759ed 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -145,23 +145,22 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java index dbc1c0b..5c9dd7b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java @@ -190,13 +190,16 @@ private void pushVertically(Player p,double y){ @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List 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))); @@ -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_); } @@ -400,7 +402,6 @@ public void addConfigurations(List> list, ItemStack stack) { e = options[Math.floorMod(e.ordinal() + direction, options.length)]; return e; },(e,oe)->true)); - } @Override @@ -410,7 +411,6 @@ public boolean isBarVisible(ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java index bfdd41e..7ee1048 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java @@ -101,23 +101,22 @@ public int effectTime(ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java index 8c37b6f..eee33e1 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java @@ -110,8 +110,7 @@ public void addConfigurations(List> list, ItemStack stack) { } @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java index 207977b..98d07b6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java @@ -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 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(), @@ -110,8 +113,6 @@ public void addConfigurations(List> 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 @@ -121,7 +122,6 @@ public boolean isBarVisible(ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java index cad1e8b..3dd32e9 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java @@ -78,23 +78,22 @@ public List renderTypes(ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java index 01be1ef..a8191ee 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java @@ -116,23 +116,22 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java index 9d58c11..b74578e 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java @@ -108,8 +108,7 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java index a458496..49328a4 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java @@ -102,8 +102,7 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java index a459528..8b183a9 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java @@ -99,8 +99,7 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java index 162f949..c3891bc 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java @@ -133,26 +133,24 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, super.appendHoverText(stack, p_41422_, components, p_41424_); } - @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java index ace2a4a..3172ef8 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java @@ -6,6 +6,7 @@ import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.advancement.CreateAdvancement; + import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadianceAxe; @@ -48,6 +49,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; + public class ShadowRadianceAxe extends AxeItem implements QOLConfigurableItem { public ShadowRadianceAxe(Properties p_42964_) { super(QOLTiers.SHADOW_RADIANCE, p_42964_); @@ -111,23 +113,23 @@ public InteractionResultHolder use(Level level, Player player, Intera @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java index 76371e6..b24b98a 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java @@ -109,23 +109,22 @@ public InteractionResultHolder use(Level level, Player player, Intera @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java index 49e7b1d..8ab1383 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java @@ -96,23 +96,22 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java index 76f2343..a6b9689 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java @@ -98,23 +98,22 @@ public InteractionResultHolder use(Level level, Player player, Intera @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java index 61fae26..493b40c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java @@ -144,25 +144,30 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, super.appendHoverText(stack, p_41422_, components, p_41424_); } + @Override + public void addConfigurations(List> list, ItemStack stack) { + list.add(Configuration.ofBool("Reach",stack.getOrDefault(QOLDataComponents.REACH,true),QOLDataComponents.REACH, + List.of("Should extend the reach of the sword"),(e,oe)->CreateQOLConfigs.server().equipments.tools.reach.get())); + } + @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java index 2dbeff2..809b37c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java @@ -58,7 +58,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; -import java.util.List; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -117,23 +116,22 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } public static void mineBlock(BlockEvent.@NotNull BreakEvent event){ diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java index b0d25fb..537b0d8 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java @@ -134,23 +134,22 @@ public InteractionResult useOn(UseOnContext ctx) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java index 7bfc926..8f1ae68 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java @@ -150,23 +150,22 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java index c9f3d5f..8388d3a 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java @@ -105,23 +105,22 @@ public static void toggleAbility(ItemStack stack, Player p) { @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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); } public static void mineBlock(BlockEvent.BreakEvent event) { diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java index bbda013..7d4246b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java @@ -141,23 +141,22 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, @Override public int damageItem(ItemStack stack, int amount, @Nullable T entity, Consumer 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 diff --git a/src/main/java/fr/iglee42/createqualityoflife/registries/QOLDataComponents.java b/src/main/java/fr/iglee42/createqualityoflife/registries/QOLDataComponents.java index 032f9fb..675db52 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/registries/QOLDataComponents.java +++ b/src/main/java/fr/iglee42/createqualityoflife/registries/QOLDataComponents.java @@ -51,6 +51,7 @@ public class QOLDataComponents { public static final DataComponentType EFFECT = register("preferred_effect", b->b.persistent(ShadowRadianceEffects.CODEC).networkSynchronized(ShadowRadianceEffects.STREAM_CODEC)); public static final DataComponentType COPIED_DATAS = register("copied_datas",b->b.persistent(CompoundTag.CODEC).networkSynchronized(ByteBufCodecs.COMPOUND_TAG)); public static final DataComponentType ITEM_TOOLTIPS = register("item_tooltips", b->b.persistent(ItemTooltips.CODEC).networkSynchronized(ItemTooltips.STREAM_CODEC)); + public static final DataComponentType USE_AIR = register("use_air",b->b.persistent(Codec.BOOL).networkSynchronized(ByteBufCodecs.BOOL)); private static DataComponentType register(String name, UnaryOperator> builder) { DataComponentType type = builder.apply(DataComponentType.builder()).build(); diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index e6354b0..4e1504e 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -240,6 +240,10 @@ "createqol.armor.ability.dash_disabled": "Dashing is disabled on this server !", "createqol.armor.ability.dash_reloading": "Dashing is reloading, please wait!", + "createqol.ability.use_air": "Use Air", + "createqol.tooltip.use_air.powering": "Powering equipment with air", + "createqol.tooltip.use_air.breathing": "Underwater breathing only", + "createqol.ability.armor.disabled": "%s is disabled by the config", "createqol.ability.armor.unavailable": "%1$s can't be enabled while the %2$s is enabled", "createqol.ability.armor.reloading": "%s is reloading, please wait!", diff --git a/src/main/resources/assets/createqol/lang/ja_jp.json b/src/main/resources/assets/createqol/lang/ja_jp.json index 023f34c..8374d0c 100644 --- a/src/main/resources/assets/createqol/lang/ja_jp.json +++ b/src/main/resources/assets/createqol/lang/ja_jp.json @@ -230,6 +230,10 @@ "createqol.armor.ability.dash_disabled": "このサーバーではダッシュが無効化されています!", "createqol.armor.ability.dash_reloading": "ダッシュはリロード中です。お待ちください!", + "createqol.ability.use_air": "空気を使用", + "createqol.tooltip.use_air.powering": "空気で機器を電源供給", + "createqol.tooltip.use_air.breathing": "水中呼吸のみ", + "createqol.ability.armor.disabled": "%sは設定で無効化されています", "createqol.ability.armor.unavailable": "%1$sは%2$sが有効な間は有効化できません", "createqol.ability.armor.reloading": "%sはリロード中です。お待ちください!", diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 409f7dc..9a504bb 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -232,6 +232,10 @@ "createqol.ability.armor.dash_disabled": "Функция рывка запрещена настройками мира/сервера", "createqol.ability.armor.dash_reloading": "Рывок перезаряжается...", + "createqol.ability.use_air": "Используйте воздух", + "createqol.tooltip.use_air.powering": "Питание оборудования с помощью воздуха", + "createqol.tooltip.use_air.breathing": "Подводное дыхание только", + "createqol.ability.armor.disabled": "%s запрещён настройками мира/сервера", "createqol.ability.armor.unavailable": "%1$s не может быть включён, пока активен %2$s", "createqol.ability.armor.reloading": "%s перезаряжается...",