From aba336eb43bb6cf08a5baeac0f0555a156a875ad Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 24 May 2025 02:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2Component.literal("")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../block/entity/FuMO25BlockEntity.java | 2 +- .../client/overlay/DroneHudOverlay.java | 2 +- .../client/screens/DogTagEditorScreen.java | 6 +++--- .../client/screens/FuMO25Screen.java | 4 ++-- .../client/screens/ReforgingTableScreen.java | 6 +++--- .../client/tooltip/ClientBocekImageTooltip.java | 2 +- .../client/tooltip/ClientCellImageTooltip.java | 4 ++-- .../ClientChargingStationImageTooltip.java | 4 ++-- .../client/tooltip/ClientEnergyImageTooltip.java | 4 ++-- .../client/tooltip/ClientGunImageTooltip.java | 16 ++++++++-------- .../tooltip/ClientLauncherImageTooltip.java | 4 ++-- .../ClientSecondaryCataclysmImageTooltip.java | 4 ++-- .../tooltip/ClientSentinelImageTooltip.java | 2 +- .../com/atsuishio/superbwarfare/item/DogTag.java | 2 +- .../atsuishio/superbwarfare/item/PerkItem.java | 2 +- .../item/common/ammo/box/AmmoBox.java | 2 +- .../item/gun/handgun/AureliaSceptre.java | 2 +- .../item/gun/handgun/Trachelium.java | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java b/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java index 88c82da09..d66d3e79a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/entity/FuMO25BlockEntity.java @@ -203,7 +203,7 @@ public class FuMO25BlockEntity extends BlockEntity implements MenuProvider, GeoB @Override public @NotNull Component getDisplayName() { - return Component.literal(""); + return Component.empty(); } @Nullable diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java index 8993dcfd5..2f6e8faa4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java @@ -133,7 +133,7 @@ public class DroneHudOverlay implements LayeredDraw.Layer { if (lookAtEntity) { // 实体距离 var displayName = lookingEntity.getDisplayName(); - if (displayName == null) displayName = Component.literal(""); + if (displayName == null) displayName = Component.empty(); guiGraphics.drawString(mc.font, Component.translatable("tips.superbwarfare.drone.range") .append(Component.literal(FormatTool.format1D(entityRange, "m ") + displayName.getString())), diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java index db71be82b..bbacf7d52 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java @@ -145,7 +145,7 @@ public class DogTagEditorScreen extends AbstractContainerScreen { class LockButton extends AbstractButton { public LockButton(int pX, int pY) { - super(pX, pY, 29, 15, Component.literal("")); + super(pX, pY, 29, 15, Component.empty()); } @Override @@ -318,7 +318,7 @@ public class FuMO25Screen extends AbstractContainerScreen { private final int mode; public ModeButton(int pX, int pY, int mode) { - super(pX, pY, 29, 15, Component.literal("")); + super(pX, pY, 29, 15, Component.empty()); this.mode = mode; } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java index 268b226f8..518ce1787 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/ReforgingTableScreen.java @@ -110,7 +110,7 @@ public class ReforgingTableScreen extends AbstractContainerScreen= 0 ? ("(" + FormatTool.format1D(shotDamage) + " + " + FormatTool.format1D(extraDamage) + ") * 10") : FormatTool.format1D(shotDamage, " * 10")) .withStyle(ChatFormatting.GREEN)) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientCellImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientCellImageTooltip.java index 5d088c00d..a90702e1e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientCellImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientCellImageTooltip.java @@ -49,7 +49,7 @@ public class ClientCellImageTooltip implements ClientTooltipComponent { int energy = storage.getEnergyStored(); int maxEnergy = storage.getMaxEnergyStored(); float percentage = Mth.clamp((float) energy / maxEnergy, 0, 1); - MutableComponent component = Component.literal(""); + MutableComponent component = Component.empty(); ChatFormatting format; if (percentage <= .2f) { @@ -64,7 +64,7 @@ public class ClientCellImageTooltip implements ClientTooltipComponent { for (int i = 0; i < count; i++) { component.append(Component.literal("|").withStyle(format)); } - component.append(Component.literal("").withStyle(ChatFormatting.RESET)); + component.append(Component.empty().withStyle(ChatFormatting.RESET)); for (int i = 0; i < 50 - count; i++) { component.append(Component.literal("|").withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientChargingStationImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientChargingStationImageTooltip.java index 800985288..6af4a2999 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientChargingStationImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientChargingStationImageTooltip.java @@ -41,7 +41,7 @@ public class ClientChargingStationImageTooltip implements ClientTooltipComponent int energy = stack.getOrDefault(ModDataComponents.ENERGY.get(), 0); int maxEnergy = ChargingStationBlockItem.MAX_ENERGY; float percentage = Mth.clamp((float) energy / maxEnergy, 0, 1); - MutableComponent component = Component.literal(""); + MutableComponent component = Component.empty(); ChatFormatting format; if (percentage <= .2f) { @@ -56,7 +56,7 @@ public class ClientChargingStationImageTooltip implements ClientTooltipComponent for (int i = 0; i < count; i++) { component.append(Component.literal("|").withStyle(format)); } - component.append(Component.literal("").withStyle(ChatFormatting.RESET)); + component.append(Component.empty().withStyle(ChatFormatting.RESET)); for (int i = 0; i < 50 - count; i++) { component.append(Component.literal("|").withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientEnergyImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientEnergyImageTooltip.java index 18bc01a12..53b9c6663 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientEnergyImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientEnergyImageTooltip.java @@ -66,7 +66,7 @@ public class ClientEnergyImageTooltip extends ClientGunImageTooltip { int energy = storage.getEnergyStored(); int maxEnergy = storage.getMaxEnergyStored(); float percentage = Mth.clamp((float) energy / maxEnergy, 0, 1); - MutableComponent component = Component.literal(""); + MutableComponent component = Component.empty(); ChatFormatting format; if (percentage <= .2f) { @@ -81,7 +81,7 @@ public class ClientEnergyImageTooltip extends ClientGunImageTooltip { for (int i = 0; i < count; i++) { component.append(Component.literal("|").withStyle(format)); } - component.append(Component.literal("").withStyle(ChatFormatting.RESET)); + component.append(Component.empty().withStyle(ChatFormatting.RESET)); for (int i = 0; i < 50 - count; i++) { component.append(Component.literal("|").withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java index e1b769ffd..c9e87419f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -113,7 +113,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { } return Component.translatable("des.superbwarfare.guns.damage").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(dmgStr) .withStyle(ChatFormatting.GREEN)); } @@ -126,11 +126,11 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { (GunData.from(this.stack).getAvailableFireModes().contains(FireMode.AUTO) || GunData.from(this.stack).getAvailableFireModes().contains(FireMode.BURST))) { return Component.translatable("des.superbwarfare.guns.rpm").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format0D(data.rpm())) .withStyle(ChatFormatting.GREEN)); } - return Component.literal(""); + return Component.empty(); } /** @@ -163,9 +163,9 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { } return Component.translatable("des.superbwarfare.guns.level").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(level + "").withStyle(formatting).withStyle(ChatFormatting.BOLD)) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(" (" + FormatTool.DECIMAL_FORMAT_2ZZZ.format(rate * 100) + "%)").withStyle(ChatFormatting.GRAY)); } @@ -175,7 +175,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { protected Component getUpgradePointComponent() { int upgradePoint = Mth.floor(data.upgradePoint.get()); return Component.translatable("des.superbwarfare.guns.upgrade_point").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(String.valueOf(upgradePoint)).withStyle(ChatFormatting.WHITE).withStyle(ChatFormatting.BOLD)); } @@ -203,7 +203,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { double bypassRate = Math.max(data.bypassArmor() + perkBypassArmorRate, 0); return Component.translatable("des.superbwarfare.guns.bypass").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format2D(bypassRate * 100, "%")).withStyle(ChatFormatting.GOLD)); } @@ -213,7 +213,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { protected Component getHeadshotComponent() { double headshot = data.headshot(); return Component.translatable("des.superbwarfare.guns.headshot").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format1D(headshot, "x")).withStyle(ChatFormatting.AQUA)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java index ef5748f6c..249a7bf90 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java @@ -26,9 +26,9 @@ public class ClientLauncherImageTooltip extends ClientGunImageTooltip { double explosionDamage = data.explosionDamage(); return Component.translatable("des.superbwarfare.guns.damage").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format1D(damage)).withStyle(ChatFormatting.GREEN) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(" + " + FormatTool.format1D(explosionDamage)).withStyle(ChatFormatting.GOLD))); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSecondaryCataclysmImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSecondaryCataclysmImageTooltip.java index 2ac0c6549..07bdd0cad 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSecondaryCataclysmImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSecondaryCataclysmImageTooltip.java @@ -26,9 +26,9 @@ public class ClientSecondaryCataclysmImageTooltip extends ClientEnergyImageToolt double explosionDamage = data.explosionDamage(); return Component.translatable("des.superbwarfare.guns.damage").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format1D(damage)).withStyle(ChatFormatting.GREEN) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(" + " + FormatTool.format1D(explosionDamage)).withStyle(ChatFormatting.GOLD))); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSentinelImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSentinelImageTooltip.java index 930fa6f9d..6e87e7d79 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSentinelImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientSentinelImageTooltip.java @@ -30,7 +30,7 @@ public class ClientSentinelImageTooltip extends ClientEnergyImageTooltip { } } return Component.translatable("des.superbwarfare.guns.damage").withStyle(ChatFormatting.GRAY) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format1D(damage) + (extraDamage >= 0 ? " + " + FormatTool.format1D(extraDamage) : "")) .withStyle(ChatFormatting.AQUA).withStyle(ChatFormatting.BOLD)); } else { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java index 9a0c00cbb..690d2a5b6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java @@ -45,7 +45,7 @@ public class DogTag extends Item implements ICurioItem { return InteractionResultHolder.success(stack); } else { player.openMenu(new SimpleMenuProvider((i, inventory, p) -> - new DogTagEditorMenu(i, ContainerLevelAccess.create(level, p.getOnPos()), stack), Component.literal(""))); + new DogTagEditorMenu(i, ContainerLevelAccess.create(level, p.getOnPos()), stack), Component.empty())); return InteractionResultHolder.consume(stack); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/PerkItem.java b/src/main/java/com/atsuishio/superbwarfare/item/PerkItem.java index d36173c23..0dfdca240 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/PerkItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/PerkItem.java @@ -40,7 +40,7 @@ public class PerkItem extends Item { }; tooltipComponents.add(Component.translatable("des.superbwarfare." + this.getPerk().descriptionId).withStyle(ChatFormatting.GRAY)); - tooltipComponents.add(Component.literal("")); + tooltipComponents.add(Component.empty()); tooltipComponents.add(Component.translatable("perk.superbwarfare.slot").withStyle(ChatFormatting.GOLD) .append(Component.translatable("perk.superbwarfare.slot_" + this.getPerk().type.getName()).withStyle(chatFormatting))); if (this.getPerk() instanceof AmmoPerk ammoPerk) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/box/AmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/box/AmmoBox.java index 54863e3ab..aeaa0b963 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/box/AmmoBox.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/box/AmmoBox.java @@ -121,7 +121,7 @@ public class AmmoBox extends Item { for (var ammo : Ammo.values()) { tooltipComponents.add(Component.translatable("des.superbwarfare.ammo_box." + ammo.name).withStyle(ammo.color) - .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.empty().withStyle(ChatFormatting.RESET)) .append(Component.literal(FormatTool.format0D(ammo.get(stack)) + ((type != ammo) ? " " : " ←-")).withStyle(ChatFormatting.BOLD))); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java index cdf41cecd..c3f0cb9a2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java @@ -84,7 +84,7 @@ public class AureliaSceptre extends GunItem implements GeoItem { tooltipComponents.add(Component.translatable("des.superbwarfare.aurelia_sceptre_1").withStyle(ChatFormatting.GRAY)); tooltipComponents.add(Component.translatable("des.superbwarfare.aurelia_sceptre_2").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); - TooltipTool.addHideText(tooltipComponents, Component.literal("")); + TooltipTool.addHideText(tooltipComponents, Component.empty()); TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.trachelium_3").withStyle(ChatFormatting.WHITE)); TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.aurelia_sceptre_3").withStyle(Style.EMPTY.withColor(0xABCDEF))); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index c4218feb1..d7dad276f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -211,11 +211,11 @@ public class Trachelium extends GunItem implements GeoItem { @Override @ParametersAreNonnullByDefault public void appendHoverText(ItemStack stack, TooltipContext context, List list, TooltipFlag tooltipFlag) { - list.add(Component.literal("")); + list.add(Component.empty()); list.add(Component.translatable("des.superbwarfare.trachelium_1").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); list.add(Component.translatable("des.superbwarfare.trachelium_2").withStyle(ChatFormatting.GRAY)); - TooltipTool.addHideText(list, Component.literal("")); + TooltipTool.addHideText(list, Component.empty()); TooltipTool.addHideText(list, Component.translatable("des.superbwarfare.trachelium_3").withStyle(ChatFormatting.WHITE)); TooltipTool.addHideText(list, Component.translatable("des.superbwarfare.trachelium_4").withStyle(Style.EMPTY.withColor(0xF4F0FF))); }