diff --git a/gradle.properties b/gradle.properties index e5168559..8c992e6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group=com.infernalsuite.asp apiVersion=4.0.0-SNAPSHOT -version=1.21.3-R0.1-SNAPSHOT +version=1.21.4-R0.1-SNAPSHOT -mcVersion=1.21.3 -paperRef=da7138233f6392e791d790d1c3407414c855f9c2 +mcVersion=1.21.4 +paperRef=bb76819589fcd1a7ccac245998ca32f63d99772a org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Slime-World-Manager.patch b/patches/api/0001-Slime-World-Manager.patch index ca201dbe..e1cf9d83 100644 --- a/patches/api/0001-Slime-World-Manager.patch +++ b/patches/api/0001-Slime-World-Manager.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Slime World Manager diff --git a/build.gradle.kts b/build.gradle.kts -index e29e5024fa693baae469d47fe77b57118f14627c..a1ab3bc4f7853c83e79de52d2549586655ca569e 100644 +index 571534b42cd9c33d6a7bb6fe3bf3a28e33f8e5de..8e785e4d244abcfcfc3e37fc457baf62050670aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { @@ -13,8 +13,8 @@ index e29e5024fa693baae469d47fe77b57118f14627c..a1ab3bc4f7853c83e79de52d25495866 api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api // api dependencies are listed transitively to API consumers + api(project(":api")) // ASWM - api("com.google.guava:guava:32.1.2-jre") - api("com.google.code.gson:gson:2.10.1") + api("com.google.guava:guava:33.3.1-jre") + api("com.google.code.gson:gson:2.11.0") // Paper start - adventure diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java index 652ff54e7c50412503725d628bfe72ed03059790..9c5118e6193b0e9852ef6b52cb4ae92ded1ba464 100644 diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index 59c6e6b1..a5cf793b 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Build Changes Update shadow plugin diff --git a/build.gradle.kts b/build.gradle.kts -index faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b5b5c099e61f828edbcd18aba9d379a6e45fb8b4 100644 +index 2da91ed6363c0851e4c459188f5e8ef5475e0c97..f0bfc068301c4a908a5856b7c72e7306adeeb38d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ import java.time.Instant @@ -29,10 +29,10 @@ index faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b5b5c099e61f828edbcd18aba9d379a6 + exclude("io.papermc.paper", "paper-api") + } + // ASWM end + implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ - implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -99,14 +106,14 @@ tasks.jar { +@@ -100,14 +107,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -52,17 +52,17 @@ index faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b5b5c099e61f828edbcd18aba9d379a6 "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -172,7 +179,7 @@ fun TaskContainer.registerRunTask( +@@ -173,7 +180,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { - group = "paper" -+ group = "slimeworldmanager" ++ group = "asp" mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java -index b3c993a790fc3fab6a408c731deb297f74c959ce..0bbd557602932b67212b8951ef769bbce70c5477 100644 +index d21ce54ebb5724c04eadf56a2cde701d5eeb5db2..d0a2d1d8dd41980b95303add867ca906dd089af6 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java @@ -42,7 +42,7 @@ public final class ChunkEntitySlices { @@ -70,12 +70,12 @@ index b3c993a790fc3fab6a408c731deb297f74c959ce..0bbd557602932b67212b8951ef769bbc private final Reference2ObjectOpenHashMap, EntityCollectionBySection> entitiesByClass; private final Reference2ObjectOpenHashMap, EntityCollectionBySection> entitiesByType; - private final EntityList entities = new EntityList(); -+ public final EntityList entities = new EntityList(); //ASWM ++ public final EntityList entities = new EntityList(); // ASP - private -> public public FullChunkStatus status; public final ChunkData chunkData; diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java -index 91a6f57f35fc1553159cca138a0619e703b2b014..0474325958293ea36bae0e44849e95a2fde819b8 100644 +index 3990834a41116682d6ae779a3bf24b0fd989d97d..2bc81d274769ed5bb33f94889e0cab0f37fa01a5 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java @@ -185,7 +185,8 @@ public final class ChunkHolderManager { @@ -2062,7 +2062,7 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..2d6b062c4a3cf682d8e4cdbb7b7c84a7 @Override diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4158473fd553a16fec23bcbcf9a278d413120600..e49e329b4713fefb153b64aee35f5e2c9eaa51a4 100644 +index ae4ebf509837e8d44255781c61d02873f8b74be8..876be700dea01f8361c37cff8e17f9140ff8ba26 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -288,7 +288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor this.pvpMode = minecraftserver.isPvpAllowed(); this.convertable = convertable_conversionsession; -@@ -623,6 +628,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -624,6 +629,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen); } // CraftBukkit end @@ -2221,7 +2221,7 @@ index 585e2b43a0326f0b81597fa1234d3c67c76af550..7eb21e0c8fc4103a4eb656bd1d81ae10 boolean flag2 = minecraftserver.forceSynchronousWrites(); DataFixer datafixer = minecraftserver.getFixerUpper(); EntityPersistentStorage entitypersistentstorage = new EntityStorage(new SimpleRegionStorage(new RegionStorageInfo(convertable_conversionsession.getLevelId(), resourcekey, "entities"), convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, DataFixTypes.ENTITY_CHUNK), this, minecraftserver); -@@ -633,7 +644,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -634,7 +645,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe int k = this.spigotConfig.simulationDistance; // Spigot // Paper - rewrite chunk system @@ -2230,7 +2230,7 @@ index 585e2b43a0326f0b81597fa1234d3c67c76af550..7eb21e0c8fc4103a4eb656bd1d81ae10 return minecraftserver.overworld().getDataStorage(); }); this.chunkSource.getGeneratorState().ensureStructuresGenerated(); -@@ -692,6 +703,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -693,6 +704,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.dragonFight = enderDragonFight; } diff --git a/patches/server/0012-Compile-fixes.patch b/patches/server/0012-Compile-fixes.patch index 03548c89..7c831a66 100644 --- a/patches/server/0012-Compile-fixes.patch +++ b/patches/server/0012-Compile-fixes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Compile fixes diff --git a/build.gradle.kts b/build.gradle.kts -index b5b5c099e61f828edbcd18aba9d379a6e45fb8b4..838639a8bbeb59700037c3e101714f68f8b79671 100644 +index f0bfc068301c4a908a5856b7c72e7306adeeb38d..e6414d33e65233836db36040206c32a16b4d10ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,9 +29,6 @@ dependencies { @@ -16,8 +16,8 @@ index b5b5c099e61f828edbcd18aba9d379a6e45fb8b4..838639a8bbeb59700037c3e101714f68 - exclude("io.papermc.paper", "paper-api") - } // ASWM end + implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start - implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ diff --git a/src/main/java/com/infernalsuite/asp/level/NMSSlimeChunk.java b/src/main/java/com/infernalsuite/asp/level/NMSSlimeChunk.java index 4c627f8af92f29d9ba50745812acc83726a85683..6972d6399628eda41756a98fb54fbe93eb827716 100644 --- a/src/main/java/com/infernalsuite/asp/level/NMSSlimeChunk.java diff --git a/patches/server/0013-Separate-plugin-and-server-rework-API-to-v3.patch b/patches/server/0013-Separate-plugin-and-server-rework-API-to-v3.patch index a1675292..69eed2b5 100644 --- a/patches/server/0013-Separate-plugin-and-server-rework-API-to-v3.patch +++ b/patches/server/0013-Separate-plugin-and-server-rework-API-to-v3.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Separate plugin and server, rework API (to v3) diff --git a/build.gradle.kts b/build.gradle.kts -index 838639a8bbeb59700037c3e101714f68f8b79671..26be7ff48f2eb50a140e71372cfef54d4ff570f1 100644 +index e6414d33e65233836db36040206c32a16b4d10ca..2f52145f996e5055030d7960c4ad616ba0ea5321 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { @@ -14,8 +14,8 @@ index 838639a8bbeb59700037c3e101714f68f8b79671..26be7ff48f2eb50a140e71372cfef54d implementation(project(":core")) + implementation("commons-io:commons-io:2.11.0") // ASWM end + implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start - implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ diff --git a/src/main/java/com/infernalsuite/asp/AdvancedSlimePaper.java b/src/main/java/com/infernalsuite/asp/AdvancedSlimePaper.java new file mode 100644 index 0000000000000000000000000000000000000000..06e91530198d9075434045893f95f7a6ae5bfbb3 @@ -712,7 +712,7 @@ index 26422904751647a061397ce978bba752149003cd..4940083475948eac4fc06446f7ee7e1e } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ac8af406180bc680d46e8edc3da0fc2e5211345a..2bd2aa53b656012f49f3c4692a092b9f9d4a4d9a 100644 +index 97b5d6ba2b19a7c730730c74175a29157aed1840..4297100fea7f0053ad624e5eee12bbd8e15e55b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -8,6 +8,7 @@ import com.google.common.collect.ImmutableList; diff --git a/patches/server/0015-1.21-compatibility.patch b/patches/server/0015-1.21-compatibility.patch index 59deac80..5afa0965 100644 --- a/patches/server/0015-1.21-compatibility.patch +++ b/patches/server/0015-1.21-compatibility.patch @@ -249,7 +249,7 @@ index d6e5eac7732f32cabd6ed5ac6b10af20074a39b8..33af1d7e671c5aeb06482038e205efc8 @Override public void setDefaultSpawnPos(BlockPos pos, float angle) { diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..589cb65f79bb05ee8c44b526c707e81dc02a4761 100644 +index 97937e3bd211997f0a0a3e9e671a1c59712d0003..7154f6050b01c234e00fab22f5e5f1d6a944500a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -1,5 +1,7 @@ @@ -260,7 +260,7 @@ index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..589cb65f79bb05ee8c44b526c707e81d import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.common.collect.UnmodifiableIterator; -@@ -23,6 +25,7 @@ import net.minecraft.core.registries.Registries; +@@ -24,6 +26,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData; @@ -268,7 +268,7 @@ index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..589cb65f79bb05ee8c44b526c707e81d import net.minecraft.server.level.FullChunkStatus; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.profiling.Profiler; -@@ -322,6 +325,12 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -327,6 +330,12 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p } } diff --git a/patches/server/0017-fix-disable-dragon-fights.patch b/patches/server/0017-fix-disable-dragon-fights.patch index 09a8543b..8bf690d8 100644 --- a/patches/server/0017-fix-disable-dragon-fights.patch +++ b/patches/server/0017-fix-disable-dragon-fights.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix disable dragon fights diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7eb21e0c8fc4103a4eb656bd1d81ae10e7ee9dc4..fecee66cf0ab3fe820273a6850c9d2f6c51501b6 100644 +index 18fe62b5f6f90099d321ad381a941d8e3bd1ea66..4e0550e917bc9110a87f92e75d6a2f31408386fc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,6 +2,7 @@ package net.minecraft.server.level; @@ -16,7 +16,7 @@ index 7eb21e0c8fc4103a4eb656bd1d81ae10e7ee9dc4..fecee66cf0ab3fe820273a6850c9d2f6 import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.util.Pair; import com.mojang.logging.LogUtils; -@@ -662,7 +663,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -663,7 +664,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), this.getTypeKey(), chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer); // Paper - Fix missing CB diff this.structureManager = new StructureManager(this, this.serverLevelData.worldGenOptions(), this.structureCheck); // CraftBukkit if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END