diff --git a/gradle.properties b/gradle.properties index 0c2c81c..c98053f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ release=true # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -luminolRef=ba28403ff6d15da3cf8b1af9828bbd1f997a7b9e +luminolRef=b796645fdaae7d6b3d3c84fd79f9c090a6458a48 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch index b469053..679a28b 100644 --- a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Rebrand to Lophine diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index a2f5a99ee45a0810fd338ccf6f71df3a077ca62b..05e1aa84586284ac0389e7023f975bfb08438535 100644 +index 3b700b214ac6818cd75c34b207aa1436f52231e7..315c137cb9dbac51a8ac0d63f0ae0127e57c6c9f 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java -@@ -24,6 +24,7 @@ public class ConfigManager { +@@ -25,6 +25,7 @@ public class ConfigManager { public static void initConfigs() { - registerConfig("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules")); -+ registerConfig("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config + registerConfig("luminol", builder.of("luminol", "me.earthme.luminol.config.modules")); ++ registerConfig("lophine", builder.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config preLoad(); } diff --git a/lophine-server/luminol-patches/features/0007-Carpet-features.patch b/lophine-server/luminol-patches/features/0007-Carpet-features.patch index 5b1b734..fa402f4 100644 --- a/lophine-server/luminol-patches/features/0007-Carpet-features.patch +++ b/lophine-server/luminol-patches/features/0007-Carpet-features.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Carpet features diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index 05e1aa84586284ac0389e7023f975bfb08438535..5a8c94337e42584ddaf25ef289327777e7ac675e 100644 +index 315c137cb9dbac51a8ac0d63f0ae0127e57c6c9f..2a2d6aff636ad960638b357d224a631c89d23d33 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java -@@ -25,6 +25,15 @@ public class ConfigManager { +@@ -26,6 +26,15 @@ public class ConfigManager { public static void initConfigs() { - registerConfig("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules")); - registerConfig("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config + registerConfig("luminol", builder.of("luminol", "me.earthme.luminol.config.modules")); + registerConfig("lophine", builder.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config + // Lophine start - add carpet config -+ registerConfig("lophine_carpet", ConfigsInstance.of( ++ registerConfig("lophine_carpet", builder.of( + new java.io.File("lophine_config"), + "lophine_carpet", + "lophine_carpet_config.toml", diff --git a/lophine-server/luminol-patches/features/0009-TEMP-Temporarily-transform-config-between-different-.patch b/lophine-server/luminol-patches/features/0009-TEMP-Temporarily-transform-config-between-different-.patch index ebedf29..0d80413 100644 --- a/lophine-server/luminol-patches/features/0009-TEMP-Temporarily-transform-config-between-different-.patch +++ b/lophine-server/luminol-patches/features/0009-TEMP-Temporarily-transform-config-between-different-.patch @@ -7,10 +7,10 @@ Subject: [PATCH] TEMP: Temporarily transform config between different config Should be removed in Minecraft 26.2 Update diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index 5a8c94337e42584ddaf25ef289327777e7ac675e..b652525f243c23e09c4e13f67617e99a3ce0db04 100644 +index 2a2d6aff636ad960638b357d224a631c89d23d33..536e8d7df4ce9de1dbe587c1af6b2474a530a165 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java -@@ -64,6 +64,12 @@ public class ConfigManager { +@@ -65,6 +65,12 @@ public class ConfigManager { CompletableFuture.allOf(futures).join(); CommandRegister.register(); // register command after config loaded to enable some command didn't depend on config files initialized = true; diff --git a/lophine-server/minecraft-patches/features/0002-Fix-datapack-command-save-function.patch b/lophine-server/minecraft-patches/features/0002-Fix-datapack-command-save-function.patch index f1e258d..fd159e3 100644 --- a/lophine-server/minecraft-patches/features/0002-Fix-datapack-command-save-function.patch +++ b/lophine-server/minecraft-patches/features/0002-Fix-datapack-command-save-function.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix datapack command save function diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 28384f9ebfcdbfbd07fc7fe3c929786eb9e2ccd3..d1cc2f956213add0e04d51db7b9da7076b521d8b 100644 +index e7eec08a4d8943b35a76173e39529498c348140c..61983a80191e64942bfdac74c6d2f23cf781484d 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2472,6 +2472,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(final Function factory) { ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system AtomicReference serverReference = new AtomicReference<>(); -@@ -1226,6 +1228,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { // Folia - region threading - this is complicated to implement, and even if done correctly is messy @@ -71,7 +71,7 @@ index 54ba8a2bc70f3a7f9754a872f6b9c22b40887d8e..c4685bb540e95d889dfbc10792387604 this.emptyTicks++; } else { this.emptyTicks = 0; -@@ -1827,6 +1839,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { this.playerList.saveAll(playerSaveInterval); @@ -79,7 +79,7 @@ index 54ba8a2bc70f3a7f9754a872f6b9c22b40887d8e..c4685bb540e95d889dfbc10792387604 } if (region == null && fullSave) { // Folia - region threading - don't auto save level data this.saveGlobalData(false); -@@ -2065,6 +2078,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= limit) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index c4685bb540e95d889dfbc107923876045be29848..f99c02b4d88cea924e20ca8dced67873c83c093f 100644 +index 9837d8388e6fe73ef87d021c7370c2a7c236c634..5889aa815ab02261f26048c5ef43f5bdfa2939fc 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1930,7 +1930,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { // Folia - region threading // Paper start - Expand PlayerGameModeChangeEvent org.bukkit.event.player.PlayerGameModeChangeEvent event = updatedPlayer.setGameMode(gameType, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null); // Folia - region threading -@@ -2550,7 +2550,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop