From 9efe6499d0c0ad3f17dbe5a3047e24f93550b062 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Wed, 24 Sep 2025 01:08:36 +0800 Subject: [PATCH] Update Luminol --- gradle.properties | 2 +- .../features/0010-Leaves-Item-overstack-util.patch | 4 ++-- .../lophine/config/modules/function/SurvuxProtocolConfig.java | 1 + .../bm/lophine/config/modules/function/VillagerConfig.java | 3 ++- .../src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java | 4 ++-- settings.gradle.kts | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index e0f07fa..d88ef3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=fe2b7d2f1b19cb752f50ac63c102c27271a2b73d +luminolRef=b9904879bdfc881766da6df63a0f43236b0bf223 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch index 3e749d1..619760f 100644 --- a/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch +++ b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch @@ -446,10 +446,10 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b } diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 1ddc320ab18fbd2793eb10a178cf77e0c55cf880..f871712cbca93ac4b3e1f0d3ebed6a815b8b6b59 100644 +index aca3303a043144894ae20ddc43abc55790db44ad..55cbf9b4cc568fb9b418433f597ed6b64e4409b0 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -@@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -148,7 +148,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen public void setItem(int index, ItemStack stack) { this.unpackLootTable(null); this.getItems().set(index, stack); diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java index 22d990b..c066252 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java @@ -48,6 +48,7 @@ public class SurvuxProtocolConfig implements IConfigModule { @ConfigInfo(baseName = "litematics-max-nbt-size") public static int litematicsMaxNbtSize = 2097152; + @CommandSuggestions(suggest = {"-1", "1200"}) @ConfigInfo(baseName = "litematics-print-max-delay-ticks", comments = "The max delay ticks for printing litematics, -1 to disable") public static int maxDelay = 1200; } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java index ce80e1c..3a18086 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java @@ -13,6 +13,7 @@ public class VillagerConfig implements IConfigModule { @ConfigInfo(baseName = "villager-infinite-trade", comments = """ Allow villager infinite trade (limit of 524288 times) - ---- we won't edit saved data, only edit in send data to client.""") + ---- we won't edit saved data, only edit in send data to client. + (after we fixed void trade, this config will drop to void trade)""") public static boolean villagerInfiniteTrade = false; } diff --git a/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java b/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java index f807576..f5e5f32 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java +++ b/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java @@ -83,8 +83,8 @@ public class ServerI18nUtil { logger.warn("Unsupported language: {}", LanguageConfig.lang); // Fallback to English final ConfigsInstance configsInstance = ConfigManager.configfiles.get("lophine"); - configsInstance.setConfig(new String[]{"optimizations", "lang"}, "en_us"); - configsInstance.reloadAsync(); + configsInstance.setConfig(new String[]{"function", "language", "lang"}, "en_us"); + configsInstance.reloadAsync(true); } catch (Exception e) { if (e instanceof MalformedJsonException malformedJson) { malformedJson.clean(); diff --git a/settings.gradle.kts b/settings.gradle.kts index be75fca..0c63a49 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "lophine"