From 4e525cb50669cde3a20d7002ee67b8a0f6c103c1 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Thu, 30 Jan 2025 13:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/overlay/CannonHudOverlay.java | 4 ++-- .../superbwarfare/client/overlay/DroneUIOverlay.java | 10 +++++----- .../client/overlay/HelicopterHudOverlay.java | 4 ++-- .../client/overlay/MortarInfoOverlay.java | 4 ++-- .../client/overlay/SpyglassRangeOverlay.java | 4 ++-- .../client/overlay/VehicleHudOverlay.java | 12 ++++++------ .../client/overlay/VehicleTeamOverlay.java | 6 +++--- .../client/tooltip/ClientGunImageTooltip.java | 4 ++-- .../atsuishio/superbwarfare/entity/TargetEntity.java | 2 +- .../entity/projectile/ProjectileEntity.java | 2 +- .../superbwarfare/entity/vehicle/Lav150Entity.java | 2 +- .../superbwarfare/event/LivingEventHandler.java | 8 ++++---- .../com/atsuishio/superbwarfare/item/Monitor.java | 2 +- .../com/atsuishio/superbwarfare/item/Transcript.java | 2 +- .../network/message/AdjustMortarAngleMessage.java | 4 ++-- .../network/message/AdjustZoomFovMessage.java | 2 +- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java index 9d5255737..dbab7d5d3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java @@ -98,7 +98,7 @@ public class CannonHudOverlay { } if (lookAtEntity) { event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(entityRange) + "M " + lookingEntity.getDisplayName().getString())), + .append(Component.literal(new DecimalFormat("##.#M ").format(entityRange) + lookingEntity.getDisplayName().getString())), w / 2 + 14, h / 2 - 20, -1, false); } else { if (blockRange > 511) { @@ -106,7 +106,7 @@ public class CannonHudOverlay { .append(Component.literal("---M")), w / 2 + 14, h / 2 - 20, -1, false); } else { event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(blockRange) + "M")), + .append(Component.literal(new DecimalFormat("##.#M").format(blockRange))), w / 2 + 14, h / 2 - 20, -1, false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java index 1ef2bfd1c..2e154350d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneUIOverlay.java @@ -70,7 +70,7 @@ public class DroneUIOverlay { guiGraphics.blit(ModUtils.loc("textures/screens/drone_fov.png"), w / 2 + 100, h / 2 - 64, 0, 0, 64, 129, 64, 129); preciseBlit(guiGraphics, ModUtils.loc("textures/screens/drone_fov_move.png"), (float) w / 2 + 100, (float) (h / 2 - 64 - ((ClientEventHandler.droneFovLerp - 1) * 23.8)), 0, 0, 64, 129, 64, 129); - guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##.#").format(ClientEventHandler.droneFovLerp) + "x"), + guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##.#x").format(ClientEventHandler.droneFovLerp)), w / 2 + 144, h / 2 + 56 - (int) ((ClientEventHandler.droneFovLerp - 1) * 23.8), -1, false); DroneEntity entity = EntityFindUtil.findDrone(player.level(), stack.getOrCreateTag().getString("LinkedDrone")); @@ -101,7 +101,7 @@ public class DroneUIOverlay { // 距离 guiGraphics.drawString(mc.font, Component.translatable("tips.superbwarfare.drone.distance") - .append(Component.literal(new DecimalFormat("##.#").format(distance) + "M")), + .append(Component.literal(new DecimalFormat("##.#M").format(distance))), w / 2 + 10, h / 2 + 33, color, false); // 血量 @@ -111,7 +111,7 @@ public class DroneUIOverlay { if (entity.getEntityData().get(KAMIKAZE_MODE) == 0) { // 弹药 guiGraphics.drawString(mc.font, Component.translatable("tips.superbwarfare.drone.ammo") - .append(Component.literal(new DecimalFormat("##.#").format(entity.getEntityData().get(AMMO)) + " / 6")), + .append(Component.literal(new DecimalFormat("##.# / 6").format(entity.getEntityData().get(AMMO)))), w / 2 + 12, h / 2 - 37, -1, false); } else { // 神风 @@ -122,7 +122,7 @@ public class DroneUIOverlay { if (lookAtEntity) { // 实体距离 guiGraphics.drawString(mc.font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(entityRange) + "M " + lookingEntity.getDisplayName().getString())), + .append(Component.literal(new DecimalFormat("##.#M ").format(entityRange) + lookingEntity.getDisplayName().getString())), w / 2 + 12, h / 2 - 28, color, false); } else { // 方块距离 @@ -131,7 +131,7 @@ public class DroneUIOverlay { .append(Component.literal("---M")), w / 2 + 12, h / 2 - 28, color, false); } else { guiGraphics.drawString(mc.font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(blockRange) + "M")), + .append(Component.literal(new DecimalFormat("##.#M").format(blockRange))), w / 2 + 12, h / 2 - 28, color, false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java index 83cc4c902..dbc42933a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java @@ -107,12 +107,12 @@ public class HelicopterHudOverlay { preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_power.png"), (float) w / 2 + 130f, ((float) h / 2 - 64 + 124 - power * 980), 0, 0, 4, power * 980, 4, power * 980); lerpVy = (float) Mth.lerp(0.021f * event.getPartialTick(), lerpVy, mobileVehicle.getDeltaMovement().y()); preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/heli_vy_move.png"), (float) w / 2 + 138, ((float) h / 2 - 3 - Math.max(lerpVy * 20, -24) * 2.5f), 0, 0, 8, 8, 8, 8); - guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(new DecimalFormat("##").format(lerpVy * 20) + "m/s"), + guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(new DecimalFormat("##m/s").format(lerpVy * 20) ), w / 2 + 146, (int) (h / 2 - 3 - Math.max(lerpVy * 20, -24) * 2.5), (lerpVy * 20 < -24 || ((lerpVy * 20 < -10 || (lerpVy * 20 < -1 && length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72 > 100)) && height < 36) || (length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72 > 40 && blockInWay < 72) ? -65536 : 0x66FF00), false); guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(new DecimalFormat("##").format(mobileVehicle.getY())), w / 2 + 104, h / 2, 0x66FF00, false); preciseBlit(guiGraphics, ModUtils.loc("textures/screens/helicopter/speed_frame.png"), (float) w / 2 - 144, (float) h / 2 - 6, 0, 0, 50, 18, 50, 18); - guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(new DecimalFormat("##").format(length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72) + "KM/H"), + guiGraphics.drawString(Minecraft.getInstance().font, Component.literal(new DecimalFormat("##KM/H").format(length(mobileVehicle.getDeltaMovement().x, mobileVehicle.getDeltaMovement().y, mobileVehicle.getDeltaMovement().z) * 72)), w / 2 - 140, h / 2, 0x66FF00, false); if (mobileVehicle instanceof Ah6Entity ah6Entity) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java index 5ddd84069..b32b36c36 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/MortarInfoOverlay.java @@ -28,10 +28,10 @@ public class MortarInfoOverlay { } if (lookingEntity instanceof MortarEntity mortar) { event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.yaw") - .append(Component.literal(new DecimalFormat("##.#").format(mortar.getEntityData().get(MortarEntity.Y_ROT)) + "°")), + .append(Component.literal(new DecimalFormat("##.#°").format(mortar.getEntityData().get(MortarEntity.Y_ROT)))), w / 2 + 12, h / 2 - 36, -1, false); event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.pitch") - .append(Component.literal(new DecimalFormat("##.#").format(mortar.getEntityData().get(MortarEntity.PITCH)) + "°")), + .append(Component.literal(new DecimalFormat("##.#°").format(mortar.getEntityData().get(MortarEntity.PITCH)))), w / 2 + 12, h / 2 - 28, -1, false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java index 7d07756f2..4fe1bb96c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java @@ -40,7 +40,7 @@ public class SpyglassRangeOverlay { if (lookAtEntity) { event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(entityRange) + "M " + lookingEntity.getDisplayName().getString())), + .append(Component.literal(new DecimalFormat("##.#M ").format(entityRange) + lookingEntity.getDisplayName().getString())), w / 2 + 12, h / 2 - 28, -1, false); } else { if (blockRange > 512) { @@ -48,7 +48,7 @@ public class SpyglassRangeOverlay { .append(Component.literal("---M")), w / 2 + 12, h / 2 - 28, -1, false); } else { event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.drone.range") - .append(Component.literal(new DecimalFormat("##.#").format(blockRange) + "M")), + .append(Component.literal(new DecimalFormat("##.#M").format(blockRange))), w / 2 + 12, h / 2 - 28, -1, false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java index b708fac52..fb06aae98 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java @@ -174,7 +174,7 @@ public class VehicleHudOverlay { return 9; } - public static void renderLandArmorHud(RenderGuiEvent.Pre event ,int w, int h) { + public static void renderLandArmorHud(RenderGuiEvent.Pre event, int w, int h) { Minecraft mc = Minecraft.getInstance(); Player player = mc.player; GuiGraphics guiGraphics = event.getGuiGraphics(); @@ -230,13 +230,13 @@ public class VehicleHudOverlay { //炮塔方向 poseStack.pushPose(); - poseStack.rotateAround(Axis.ZP.rotationDegrees(Mth.lerp(event.getPartialTick(), iLand.turretYRotO(), iLand.turretYRot())),w / 2 + 112, h - 56, 0); + poseStack.rotateAround(Axis.ZP.rotationDegrees(Mth.lerp(event.getPartialTick(), iLand.turretYRotO(), iLand.turretYRot())), w / 2 + 112, h - 56, 0); preciseBlit(guiGraphics, ModUtils.loc("textures/screens/land/body.png"), w / 2 + 96, h - 72, 0, 0.0F, 32, 32, 32, 32); poseStack.popPose(); //时速 - guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##").format(mobileVehicle.getDeltaMovement().length() * 72) + " KM/H"), + guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("## KM/H").format(mobileVehicle.getDeltaMovement().length() * 72)), w / 2 + 160, h / 2 - 48, 0x66FF00, false); //低电量警告 @@ -265,14 +265,14 @@ public class VehicleHudOverlay { } if (lookAtEntity) { - guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##").format(entityRange)), + guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##.#M").format(entityRange)), w / 2 - 6, h - 53, 0x66FF00, false); } else { if (blockRange > 512) { guiGraphics.drawString(mc.font, Component.literal("---"), w / 2 - 6, h - 53, 0x66FF00, false); } else { - guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##").format(blockRange)), - w / 2 - 6, h - 53, 0x66FF00, false); + guiGraphics.drawString(mc.font, Component.literal(new DecimalFormat("##.#M").format(blockRange)), + w / 2 - 6, h - 53, 0x66FF00, false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java index 9168480f1..db7ec67ae 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java @@ -46,14 +46,14 @@ public class VehicleTeamOverlay { poseStack.scale(0.8f, 0.8f, 1); if (lookingEntity.getFirstPassenger() instanceof Player player1) { event.getGuiGraphics().drawString(Minecraft.getInstance().font, - Component.literal(player1.getDisplayName().getString() + (player1.getTeam() == null ? "" : " <" + (player1.getTeam().getName()) + ">")), + Component.literal(player1.getDisplayName().getString() + (player1.getTeam() == null ? "" : " <" + (player1.getTeam().getName()) + ">")), w / 2 + 90, h / 2 - 4, player1.getTeamColor(), false); event.getGuiGraphics().drawString(Minecraft.getInstance().font, - Component.literal(lookingEntity.getDisplayName().getString() + " " + new DecimalFormat("##.#").format(entityRange) + "M"), + Component.literal(lookingEntity.getDisplayName().getString() + new DecimalFormat(" ##.#M").format(entityRange)), w / 2 + 90, h / 2 + 5, player1.getTeamColor(), false); } else { event.getGuiGraphics().drawString(Minecraft.getInstance().font, - Component.literal(lookingEntity.getDisplayName().getString() + " " + new DecimalFormat("##.#").format(entityRange) + "M"), + Component.literal(lookingEntity.getDisplayName().getString() + new DecimalFormat(" ##.#M").format(entityRange)), w / 2 + 90, h / 2 + 5, -1, false); } poseStack.popPose(); 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 690b70bc1..7709b94c1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -180,7 +180,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { return Component.translatable("des.superbwarfare.guns.bypass").withStyle(ChatFormatting.GRAY) .append(Component.literal("").withStyle(ChatFormatting.RESET)) - .append(Component.literal(new DecimalFormat("##.##").format(bypassRate * 100) + "%").withStyle(ChatFormatting.GOLD)); + .append(Component.literal(new DecimalFormat("##.##%").format(bypassRate * 100)).withStyle(ChatFormatting.GOLD)); } /** @@ -190,7 +190,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { double headshot = GunsTool.getGunDoubleTag(stack, "Headshot", 0); return Component.translatable("des.superbwarfare.guns.headshot").withStyle(ChatFormatting.GRAY) .append(Component.literal("").withStyle(ChatFormatting.RESET)) - .append(Component.literal(new DecimalFormat("##.#").format(headshot) + "x").withStyle(ChatFormatting.AQUA)); + .append(Component.literal(new DecimalFormat("##.#x").format(headshot)).withStyle(ChatFormatting.AQUA)); } /** diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java index 7c1f55097..330cf75be 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java @@ -129,7 +129,7 @@ public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEnt if (sourceEntity instanceof Player player) { player.displayClientMessage(Component.translatable("tips.superbwarfare.target.down", - new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceEntity.position()))) + "M"), true); + new java.text.DecimalFormat("##.#M").format((entity.position()).distanceTo((sourceEntity.position())))), true); SoundTool.playLocalSound(player, ModSounds.TARGET_DOWN.get(), 1, 1); targetEntity.entityData.set(DOWN_TIME, 40); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java index 26ef79353..10f08c39e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java @@ -411,7 +411,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa player.displayClientMessage(Component.literal(String.valueOf(score)) .append(Component.translatable("tips.superbwarfare.shoot.rings")) - .append(Component.literal(" " + new DecimalFormat("##.#").format(distance) + "m")), false); + .append(Component.literal(" " + new DecimalFormat("##.#m").format(distance) )), false); if (!this.shooter.level().isClientSide() && this.shooter instanceof ServerPlayer serverPlayer) { var holder = score == 10 ? Holder.direct(ModSounds.HEADSHOT.get()) : Holder.direct(ModSounds.INDICATION.get()); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java index 5dd123e97..d59ca5980 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java @@ -237,7 +237,7 @@ public class Lav150Entity extends ContainerMobileEntity implements GeoEntity, IC } if (this.level() instanceof ServerLevel) { - if (this.getFirstPassenger() instanceof Player player) { + if (this.getFirstPassenger() instanceof Player) { if ((this.getItemStacks().stream().filter(stack -> stack.is(ModItems.RIFLE_AMMO_BOX.get())).mapToInt(ItemStack::getCount).sum() > 0 && this.getEntityData().get(LOADED_COAX_AMMO) < 500)) { this.entityData.set(LOADED_COAX_AMMO, this.getEntityData().get(LOADED_COAX_AMMO) + 30); this.getItemStacks().stream().filter(stack -> stack.is(ModItems.RIFLE_AMMO_BOX.get())).findFirst().ifPresent(stack -> stack.shrink(1)); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java index 4301b2117..16a4473fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java @@ -63,7 +63,7 @@ public class LivingEventHandler { || event.getSource().is(ModDamageTypes.CUSTOM_EXPLOSION) || event.getSource().is(ModDamageTypes.MINE) || event.getSource().is(ModDamageTypes.PROJECTILE_BOOM))) { - vehicle.hurt(event.getSource(),event.getAmount()); + vehicle.hurt(event.getSource(), event.getAmount()); } event.setCanceled(true); } @@ -105,7 +105,7 @@ public class LivingEventHandler { var vehicle = event.getEntity().getVehicle(); if (vehicle instanceof VehicleEntity) { if (vehicle instanceof IArmedVehicleEntity iArmedVehicle) { - if (iArmedVehicle.hidePassenger()){ + if (iArmedVehicle.hidePassenger()) { if (!event.getSource().is(ModDamageTypes.VEHICLE_EXPLOSION)) { event.setCanceled(true); } @@ -115,7 +115,7 @@ public class LivingEventHandler { || event.getSource().is(ModDamageTypes.CUSTOM_EXPLOSION) || event.getSource().is(ModDamageTypes.MINE) || event.getSource().is(ModDamageTypes.PROJECTILE_BOOM))) { - vehicle.hurt(event.getSource(),0.7f * event.getAmount()); + vehicle.hurt(event.getSource(), 0.7f * event.getAmount()); } event.setAmount(0.3f * event.getAmount()); @@ -190,7 +190,7 @@ public class LivingEventHandler { if (entity instanceof TargetEntity && sourceEntity instanceof Player player) { player.displayClientMessage(Component.translatable("tips.superbwarfare.target.damage", new DecimalFormat("##.##").format(damage), - new DecimalFormat("##.#").format(entity.position().distanceTo(sourceEntity.position())) + "m"), false); + new DecimalFormat("##.#m").format(entity.position().distanceTo(sourceEntity.position()))), false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Monitor.java b/src/main/java/com/atsuishio/superbwarfare/item/Monitor.java index 687c1cc8e..8bf223882 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/Monitor.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/Monitor.java @@ -128,7 +128,7 @@ public class Monitor extends Item { Vec3 droneVec = new Vec3(stack.getOrCreateTag().getDouble("PosX"), stack.getOrCreateTag().getDouble("PosY"), stack.getOrCreateTag().getDouble("PosZ")); - list.add(Component.translatable("des.superbwarfare.monitor", new DecimalFormat("##.#").format(player.position().distanceTo(droneVec)) + "m").withStyle(ChatFormatting.GRAY)); + list.add(Component.translatable("des.superbwarfare.monitor", new DecimalFormat("##.#m").format(player.position().distanceTo(droneVec))).withStyle(ChatFormatting.GRAY)); list.add(Component.literal("X: " + new DecimalFormat("##.#").format(droneVec.x) + " Y: " + new DecimalFormat("##.#").format(droneVec.y) + " Z: " + new DecimalFormat("##.#").format(droneVec.z) diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java b/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java index 0cefccf55..7c8206e53 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java @@ -42,7 +42,7 @@ public class Transcript extends Item { tooltip.add(Component.translatable("des.superbwarfare.transcript.score").withStyle(ChatFormatting.GRAY) .append(Component.literal(score + " ").withStyle(score == 10 ? ChatFormatting.GOLD : ChatFormatting.WHITE)) .append(Component.translatable("des.superbwarfare.transcript.distance").withStyle(ChatFormatting.GRAY)) - .append(Component.literal(new DecimalFormat("##.#").format(tag.getDouble("Distance")) + "m").withStyle(ChatFormatting.WHITE))); + .append(Component.literal(new DecimalFormat("##.#m").format(tag.getDouble("Distance"))).withStyle(ChatFormatting.WHITE))); } tooltip.add(Component.translatable("des.superbwarfare.transcript.total").withStyle(ChatFormatting.YELLOW) diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustMortarAngleMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustMortarAngleMessage.java index 03069800c..5bde22070 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustMortarAngleMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustMortarAngleMessage.java @@ -51,8 +51,8 @@ public class AdjustMortarAngleMessage { } player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.angle", - new DecimalFormat("##.##").format(angle) + "°", - new DecimalFormat("##.#").format((int) RangeHelper.getRange(angle)) + "m"), true); + new DecimalFormat("##.##°").format(angle), + new DecimalFormat("##.#m").format((int) RangeHelper.getRange(angle))), true); SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f); }); context.get().setPacketHandled(true); diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java index ff3a1f6e4..53f53e4bf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java @@ -59,7 +59,7 @@ public class AdjustZoomFovMessage { if (GunsTool.getGunIntTag(stack, "RPM", 0) == 1095) { GunsTool.setGunIntTag(stack, "RPM", 1100); } - player.displayClientMessage(Component.literal("RPM: " + new DecimalFormat("##").format(GunsTool.getGunIntTag(stack, "RPM", 0))), true); + player.displayClientMessage(Component.literal(new DecimalFormat("RPM: ##").format(GunsTool.getGunIntTag(stack, "RPM", 0))), true); int rpm = GunsTool.getGunIntTag(stack, "RPM", 0); if (rpm > minRpm && rpm < maxRpm) { SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f);