fix night/day

Author: arnokeesman

src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java

@@ -7,24 +7,33 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.clock.ClockTimeMarkers;
+import net.minecraft.world.clock.WorldClock;
 import net.minecraft.world.level.storage.ServerLevelData;
 
+import java.util.Optional;
+
 public class DayCommand implements Command<CommandSourceStack> {
     @Override
     public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         CommandSourceStack source = context.getSource();
         PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
-        ServerLevel world = source.getServer().overworld();
-        if (world.isBrightOutside()) {
+        ServerLevel level = source.getPlayer().level();
+
+        if (level.isBrightOutside()) {
             playerData.sendCommandFeedback("cmd.day.error.already_daytime");
             return -1;
         }
-        long time = world.getGameTime();
-        long timeToDay = 24000L - time % 24000L;
 
-        ((ServerLevelData)world.getLevelData()).setGameTime(time + timeToDay);
+        Optional<Holder<WorldClock>> defaultClock = level.dimensionType().defaultClock();
+        if (defaultClock.isEmpty()) {
+            playerData.sendCommandError("generic.level.no_clock");
+            return -2;
+        }
 
+        level.getServer().clockManager().moveToTimeMarker(defaultClock.get(), ClockTimeMarkers.DAY);
         playerData.sendCommandFeedback("cmd.day.feedback");
         return 1;
     }

src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java

@@ -7,24 +7,33 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.clock.ClockTimeMarkers;
+import net.minecraft.world.clock.WorldClock;
 import net.minecraft.world.level.storage.ServerLevelData;
 
+import java.util.Optional;
+
 public class NightCommand implements Command<CommandSourceStack> {
     @Override
     public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         CommandSourceStack source = context.getSource();
         PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
-        ServerLevel world = source.getServer().overworld();
-        if (world.isDarkOutside()) {
+        ServerLevel level = source.getPlayer().level();
+
+        if (level.isDarkOutside()) {
             playerData.sendCommandFeedback("cmd.night.error.already_nighttime");
             return -1;
         }
-        long time = world.getGameTime();
-        long timeToNight = 13000L - time % 24000L;
 
-        ((ServerLevelData)world.getLevelData()).setGameTime(time + timeToNight);
+        Optional<Holder<WorldClock>> defaultClock = level.dimensionType().defaultClock();
+        if (defaultClock.isEmpty()) {
+            playerData.sendCommandError("generic.level.no_clock");
+            return -2;
+        }
 
+        level.getServer().clockManager().moveToTimeMarker(defaultClock.get(), ClockTimeMarkers.NIGHT);
         playerData.sendCommandFeedback("cmd.night.feedback");
         return 1;
     }

src/main/resources/data/essential_commands/lang/en_us.json

@@ -103,6 +103,7 @@
   "generic.confirm": "Confirm",
   "generic.deny": "Deny",
   "generic.accept": "Accept",
+  "generic.level.no_clock": "This dimension does not have a clock",
 
   "essentialcommands.fullprefix": "[Essential Commands] ",
   "essentialcommands.smallprefix": "[EC] ",