From 822c62af0af1a0e6cbe549a8fae3e616031681c0 Mon Sep 17 00:00:00 2001 From: Steveplays28 Date: Sun, 1 Oct 2023 22:33:37 +0200 Subject: [PATCH] refactor: Refactor thunderstorm translation into `sleepMessage` Also improved the readability of the way the translation is built. --- .../realisticsleep/mixin/ServerWorldMixin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/steveplays28/realisticsleep/mixin/ServerWorldMixin.java b/src/main/java/com/github/steveplays28/realisticsleep/mixin/ServerWorldMixin.java index 97f0fbf..1e6d3b0 100644 --- a/src/main/java/com/github/steveplays28/realisticsleep/mixin/ServerWorldMixin.java +++ b/src/main/java/com/github/steveplays28/realisticsleep/mixin/ServerWorldMixin.java @@ -98,8 +98,9 @@ public void tickInject(BooleanSupplier shouldKeepTicking, CallbackInfo ci) { nightTimeStepPerTick = SleepMath.calculateNightTimeStepPerTick(sleepingRatio, config.sleepSpeedMultiplier, nightTimeStepPerTick); nightTimeStepPerTickRounded = (int) Math.round(nightTimeStepPerTick); - var nightOrDayText = worldProperties.getTimeOfDay() > DAY_LENGTH / 2 ? Text.translatable( - String.format("%s.text.night", MOD_ID)) : Text.translatable(String.format("%s.text.day", MOD_ID)); + var isNight = worldProperties.getTimeOfDay() > DAY_LENGTH / 2; + var nightDayOrThunderstormText = Text.translatable( + String.format("%s.text.%s", MOD_ID, worldProperties.isThundering() ? "thunderstorm" : isNight ? "night" : "day")); int blockEntityTickSpeedMultiplier = (int) Math.round(config.blockEntityTickSpeedMultiplier); int chunkTickSpeedMultiplier = (int) Math.round(config.chunkTickSpeedMultiplier); @@ -119,7 +120,7 @@ public void tickInject(BooleanSupplier shouldKeepTicking, CallbackInfo ci) { for (ServerPlayerEntity player : players) { player.sendMessage( Text.translatable(String.format("%s.text.not_enough_players_sleeping_message", MOD_ID), sleepingPlayerCount, - playerCount, playersRequiredToSleep, playerCount, nightOrDayText + playerCount, playersRequiredToSleep, playerCount, nightDayOrThunderstormText ), true); } @@ -156,7 +157,7 @@ public void tickInject(BooleanSupplier shouldKeepTicking, CallbackInfo ci) { if (config.sendSleepingMessage) { sleepMessage = Text.translatable(String.format("%s.text.sleep_message", MOD_ID), sleepingPlayerCount, playerCount).append( - worldProperties.isThundering() ? Text.translatable(String.format("%s.text.thunderstorm", MOD_ID)) : nightOrDayText); + nightDayOrThunderstormText); if (config.showTimeUntilDawn) { sleepMessage.append(Text.translatable(String.format("%s.text.time_until_dawn", MOD_ID), secondsUntilAwake));