Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 32 insertions, 0 deletions

diff --git a/patches/server/0671-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0671-Option-to-have-default-CustomSpawners-in-custom-worl.patch
new file mode 100644
index 0000000000..3d41fa27d1
--- /dev/null
+++ b/patches/server/0671-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 19 Feb 2022 20:15:41 -0800
+Subject: [PATCH] Option to have default CustomSpawners in custom worlds
+
+By default, only LevelStem's that specifically match the ResourceKey for
+OVERWORLD will have the 5 (currently) impls of CustomSpawner (for
+phantoms, wandering traders, etc.). This adds an option to instead of
+just looking at the LevelStem key, look at the DimensionType key which
+is one level below that. Defaults to off to keep vanilla behavior.
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index ca6be44c6b2d0176ea41b1735106c5af7cf9f868..aa1fbbe55e3dc8fd6bbf021806c66686f8de3d9a 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -632,7 +632,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 this.commandStorage = new CommandStorage(worldpersistentdata);
+             } else {
+                 ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(this.worldData.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS));
+-                world = new ServerLevel(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, ImmutableList.of(), true, this.overworld().getRandomSequences(), org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
++                // Paper start - option to use the dimension_type to check if spawners should be added. I imagine mojang will add some datapack-y way of managing this in the future.
++                final List<CustomSpawner> spawners;
++                if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.useDimensionTypeForCustomSpawners && this.registryAccess().registryOrThrow(Registries.DIMENSION_TYPE).getResourceKey(worlddimension.type().value()).orElseThrow() == net.minecraft.world.level.dimension.BuiltinDimensionTypes.OVERWORLD) {
++                    spawners = list;
++                } else {
++                    spawners = Collections.emptyList();
++                }
++                world = new ServerLevel(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, spawners, true, this.overworld().getRandomSequences(), org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
++                // Paper end - option to use the dimension_type to check if spawners should be added
+             }
+ 
+             worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());