Fix two regressions from 1.16 - only set the weather once for each wo…

…rld, and additionally set weather cycle to false to prevent beds from clearing the storm. Closes #60
alcatrazEscapee · Jun 26, 2022 · ddc67c8 · ddc67c8
1 parent a6298ed
commit ddc67c8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/Common/src/main/java/com/alcatrazescapee/primalwinter/util/EventHandler.java b/Common/src/main/java/com/alcatrazescapee/primalwinter/util/EventHandler.java
@@ -7,6 +7,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.biome.Biome;
@@ -79,8 +80,11 @@ public static void setLevelToThunder(LevelAccessor maybeLevel)
     {
         if (maybeLevel instanceof ServerLevel level && Config.INSTANCE.isWinterDimension(level.dimension().location()))
         {
-            // Copied from WeatherCommand
-            level.setWeatherParameters(0, Integer.MAX_VALUE, true, true);
+            NewWorldSavedData.onlyForNewWorlds(level, () -> {
+                LOGGER.info("Modifying weather for world {}", level.dimension().location());
+                level.setWeatherParameters(0, Integer.MAX_VALUE, true, true);  // Copied from WeatherCommand
+                level.getGameRules().getRule(GameRules.RULE_WEATHER_CYCLE).set(false, level.getServer());
+            });
         }
     }
 }
diff --git a/Common/src/main/java/com/alcatrazescapee/primalwinter/util/NewWorldSavedData.java b/Common/src/main/java/com/alcatrazescapee/primalwinter/util/NewWorldSavedData.java
@@ -0,0 +1,29 @@
+package com.alcatrazescapee.primalwinter.util;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.saveddata.SavedData;
+
+import com.alcatrazescapee.primalwinter.PrimalWinter;
+
+public final class NewWorldSavedData extends SavedData
+{
+    private static final String ID = PrimalWinter.MOD_ID;
+
+    public static void onlyForNewWorlds(ServerLevel level, Runnable action)
+    {
+        level.getDataStorage().computeIfAbsent(tag -> new NewWorldSavedData(), () -> {
+            final NewWorldSavedData data = new NewWorldSavedData();
+            data.setDirty();
+            action.run();
+            return data;
+        }, ID);
+    }
+
+    @Override
+    public CompoundTag save(CompoundTag tag)
+    {
+        tag.putBoolean("new_world", false);
+        return tag;
+    }
+}