diff --git a/build.gradle.kts b/build.gradle.kts index ca15751..fc12cf3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,7 +69,6 @@ subprojects { options.encoding = Charsets.UTF_8.name() options.release = 21 options.isFork = true - options.forkOptions.memoryMaximumSize = "6g" // Prevent OOM during building } tasks.withType { options.encoding = Charsets.UTF_8.name() diff --git a/gradle.properties b/gradle.properties index 3b2c5b5..4c44d81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=fun.bm.lophine version=1.21.7-R0.1-SNAPSHOT mcVersion=1.21.7 -luminolRef=83e90d6c0829b505ba89b31b2e7e0b2efae07057 +luminolRef=1ce39bcde942ab2c5972c345fd63f7cc6552b26a org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch index 6570bd8..8bbb7c7 100644 --- a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch +++ b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch @@ -20,13 +20,14 @@ index 0d5ed9602492c8393088954105e9a19032067b8b..e2fc15d84fafde6847ecead23c551694 DefaultGameModeCommands.register(this.dispatcher); //DialogCommand.register(this.dispatcher, context); // Folia - region threading - TODO diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..8e7c65538290b6bb3650d01652216d75ad65cd1a 100644 +index c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..065f6fcf20939f79b647ffeee63dd4d8f5133bae 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2348,6 +2348,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop selectedIds) { + this.packRepository.setSelected(selectedIds, false); // Paper - add pendingReload flag to determine required pack loading - false as this is *after* a reload (see above) + WorldDataConfiguration worldDataConfiguration = new WorldDataConfiguration( @@ -34,22 +35,25 @@ index c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..8e7c65538290b6bb3650d01652216d75 + ); + this.worldData.setDataConfiguration(worldDataConfiguration); + } ++ // Lophine end - region thread skip reload // TODO - add reload support + public CompletableFuture reloadResources(Collection selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) { // Paper end - Add ServerResourcesReloadedEvent CompletableFuture completableFuture = CompletableFuture.supplyAsync( diff --git a/net/minecraft/server/commands/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java -index b540a3c3a02f7242578a63477e34b9063e86f1d2..d4f8cb40040dcd2a5175845b5faf3b994fc64fac 100644 +index b540a3c3a02f7242578a63477e34b9063e86f1d2..9f0adf157872e1c68cd7752a24eacdc636e8d17a 100644 --- a/net/minecraft/server/commands/ReloadCommand.java +++ b/net/minecraft/server/commands/ReloadCommand.java -@@ -16,6 +16,10 @@ public class ReloadCommand { +@@ -16,6 +16,12 @@ public class ReloadCommand { private static final Logger LOGGER = LogUtils.getLogger(); public static void reloadPacks(Collection selectedIds, CommandSourceStack source) { ++ // Lophine start - region thread skip reload // TODO - add reload support + if (true) { + source.getServer().saveDatapacks(selectedIds); + return; -+ } // Lophine - region thread skip reload // TODO - add reload support ++ } ++ // Lophine end - region thread skip reload // TODO - add reload support source.getServer().reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally(throwable -> { // Paper - Add ServerResourcesReloadedEvent LOGGER.warn("Failed to execute reload", throwable); source.sendFailure(Component.translatable("commands.reload.failure"));