Combine standard season ticking and TimeSkipHandler

Glitchfiend · Jan 15, 2024 · 0acb313 · 0acb313
1 parent 6c7800a
commit 0acb313
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 97 deletions.
diff --git a/src/main/java/sereneseasons/block/SeasonSensorBlock.java b/src/main/java/sereneseasons/block/SeasonSensorBlock.java
@@ -27,7 +27,7 @@
 import sereneseasons.api.season.SeasonHelper;
 import sereneseasons.config.ServerConfig;
 import sereneseasons.season.SeasonTime;
-import sereneseasons.tileentity.SeasonSensorBlockEntity;
+import sereneseasons.block.entity.SeasonSensorBlockEntity;
 
 import javax.annotation.Nullable;
 

diff --git a/...s/tileentity/SeasonSensorBlockEntity.java → ...block/entity/SeasonSensorBlockEntity.java b/...s/tileentity/SeasonSensorBlockEntity.java → ...block/entity/SeasonSensorBlockEntity.java
@@ -2,7 +2,7 @@
  * Copyright 2021, the Glitchfiend Team.
  * All rights reserved.
  ******************************************************************************/
-package sereneseasons.tileentity;
+package sereneseasons.block.entity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;

diff --git a/src/main/java/sereneseasons/handler/season/SeasonHandler.java b/src/main/java/sereneseasons/handler/season/SeasonHandler.java
@@ -13,6 +13,7 @@
 import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.level.storage.DimensionDataStorage;
@@ -21,6 +22,7 @@
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.network.PacketDistributor;
 import sereneseasons.api.SSGameRules;
 import sereneseasons.api.season.ISeasonState;
@@ -39,41 +41,53 @@
 
 public class SeasonHandler implements SeasonHelper.ISeasonDataProvider
 {
+    public static final HashMap<Level, Long> lastDayTimes = new HashMap<>();
+    public static final HashMap<Level, Integer> updateTicks = new HashMap<>();
+
     @SubscribeEvent
     public void onWorldTick(TickEvent.LevelTickEvent event)
     {
-        Level world = event.level;
+        Level level = event.level;
 
-        if (event.phase == TickEvent.Phase.END && !world.isClientSide)
-        {
-            if (!ServerConfig.progressSeasonWhileOffline.get())
-            {
-                MinecraftServer server = world.getServer();
-                if (server != null && server.getPlayerList().getPlayerCount() == 0)
-                    return;
-            }
+        if (event.phase != TickEvent.Phase.START || level.isClientSide() || !ServerConfig.isDimensionWhitelisted(level.dimension()))
+            return;
+
+        long dayTime = level.getDayTime();
+        long lastDayTime = lastDayTimes.getOrDefault(level, dayTime);
+        lastDayTimes.put(level, dayTime);
+
+        // Only tick seasons if the game rule is enabled
+        if (!level.getGameRules().getBoolean(SSGameRules.RULE_DOSEASONCYCLE))
+            return;
 
-            // Only tick seasons if the game rule is enabled
-            if (!world.getGameRules().getBoolean(SSGameRules.RULE_DOSEASONCYCLE))
+        if (!ServerConfig.progressSeasonWhileOffline.get())
+        {
+            MinecraftServer server = level.getServer();
+            if (server != null && server.getPlayerList().getPlayerCount() == 0)
                 return;
-
-            SeasonSavedData savedData = getSeasonSavedData(world);
+        }
 
-            // Clamp season cycle ticks to prevent a bad state occurring
-            savedData.seasonCycleTicks = Mth.clamp(savedData.seasonCycleTicks, 0, SeasonTime.ZERO.getCycleDuration());
+        long difference = dayTime - lastDayTime;
+        if (difference == 0)
+            return;
 
-            if (++savedData.seasonCycleTicks > SeasonTime.ZERO.getCycleDuration())
-            {
-                savedData.seasonCycleTicks = 0;
-            }
-
-            if (savedData.seasonCycleTicks % 20 == 0)
-            {
-                sendSeasonUpdate(world);
-            }
+        SeasonSavedData savedData = getSeasonSavedData(level);
+        savedData.seasonCycleTicks = Mth.positiveModulo(savedData.seasonCycleTicks + (int)difference, SeasonTime.ZERO.getCycleDuration());
 
-            savedData.setDirty();
+        int ticks = updateTicks.getOrDefault(level, 0);
+        if (ticks >= 20)
+        {
+            sendSeasonUpdate(level);
+            ticks %= 20;
         }
+        updateTicks.put(level, ticks + 1);
+        savedData.setDirty();
+    }
+
+    @SubscribeEvent
+    public static void onWorldLoaded(LevelEvent.Load event)
+    {
+        clientSeasonCycleTicks.clear();
     }
 
     @SubscribeEvent
@@ -92,12 +106,6 @@ public static SeasonTime getClientSeasonTime() {
     	return new SeasonTime(i == null ? 0 : i);
     }
 
-    @SubscribeEvent
-    public void onWorldLoaded(LevelEvent.Load event)
-    {
-        clientSeasonCycleTicks.clear();
-    }
-
     @SubscribeEvent
     public void onClientTick(TickEvent.ClientTickEvent event) 
     {

diff --git a/src/main/java/sereneseasons/handler/season/TimeSkipHandler.java b/src/main/java/sereneseasons/handler/season/TimeSkipHandler.java
diff --git a/src/main/java/sereneseasons/init/ModBlocks.java b/src/main/java/sereneseasons/init/ModBlocks.java
@@ -10,7 +10,7 @@
 import sereneseasons.api.SSBlocks;
 import sereneseasons.block.SeasonSensorBlock;
 import sereneseasons.core.SereneSeasons;
-import sereneseasons.tileentity.SeasonSensorBlockEntity;
+import sereneseasons.block.entity.SeasonSensorBlockEntity;
 
 import java.util.List;
 import java.util.function.Supplier;