Dimension type fixes

SpongePowered · Oct 20, 2024 · c4b70ac · c4b70ac
1 parent 1a21393
commit c4b70ac
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java b/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java
@@ -55,6 +55,7 @@
 import net.minecraft.world.level.LevelSettings;
 import net.minecraft.world.level.WorldDataConfiguration;
 import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.PatrolSpawner;
@@ -816,8 +817,14 @@ private ServerLevel createNonDefaultLevel(
             dataTag = null; // ((MinecraftServerAccessor) this.server).accessor$storageSource().getDataTag(); // Fallback to overworld level.dat
         }
         final PrimaryLevelData levelData = this.getOrCreateLevelData(dataTag, levelStem, directoryName);
+        final List<CustomSpawner> spawners;
+        if (levelStem.type().is(BuiltinDimensionTypes.OVERWORLD) || levelStem.type().is(BuiltinDimensionTypes.OVERWORLD_CAVES)) {
+            spawners = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(levelData));
+        } else {
+            spawners = ImmutableList.of();
+        }
         ((ResourceKeyBridge) levelData).bridge$setKey(worldKey);
-        return this.createLevel(registryKey, levelStem, worldKey, worldTypeKey, storageSource, levelData, ImmutableList.of(), chunkStatusListener);
+        return this.createLevel(registryKey, levelStem, worldKey, worldTypeKey, storageSource, levelData, spawners, chunkStatusListener);
     }
 
     private ServerLevel createLevel(

diff --git a/...s/java/org/spongepowered/common/mixin/core/world/level/storage/PrimaryLevelDataMixin.java b/...s/java/org/spongepowered/common/mixin/core/world/level/storage/PrimaryLevelDataMixin.java
@@ -56,6 +56,9 @@
 import org.spongepowered.api.world.SerializationBehavior;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.server.MinecraftServerAccessor;
 import org.spongepowered.common.accessor.world.level.LevelSettingsAccessor;
@@ -406,4 +409,18 @@ public String toString() {
                 .add("difficulty=" + ((LevelData) this).getDifficulty())
                 .toString();
     }
+
+    @Inject(method = "isRaining", at = @At(value = "HEAD"), cancellable = true)
+    private void impl$onIsRaining(final CallbackInfoReturnable<Boolean> cir) {
+        if (this.impl$dimensionType.hasCeiling()) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @Inject(method = "isThundering", at = @At(value = "HEAD"), cancellable = true)
+    private void impl$onIsThundering(final CallbackInfoReturnable<Boolean> cir) {
+        if (this.impl$dimensionType.hasCeiling()) {
+            cir.setReturnValue(false);
+        }
+    }
 }