diff --git a/build.gradle.kts b/build.gradle.kts index cb376299..a49d3bae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ subprojects { mavenCentral() maven(paperMavenPublicUrl) maven(leafMavenPublicUrl) - maven("https://ci.pluginwiki.us/plugin/repository/everything/") // Leaf Config - ConfigurationMaster-API + maven("https://ci.pluginwiki.us/plugin/repository/everything/") // Leaf - Leaf config - ConfigurationMaster-API } tasks.withType().configureEach { diff --git a/leaf-api/paper-patches/features/0002-Leaf-config-files.patch b/leaf-api/paper-patches/features/0002-Leaf-config.patch similarity index 96% rename from leaf-api/paper-patches/features/0002-Leaf-config-files.patch rename to leaf-api/paper-patches/features/0002-Leaf-config.patch index 2a68f024..85c17f3f 100644 --- a/leaf-api/paper-patches/features/0002-Leaf-config-files.patch +++ b/leaf-api/paper-patches/features/0002-Leaf-config.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 11 Aug 2022 04:13:27 +0800 -Subject: [PATCH] Leaf config files +Subject: [PATCH] Leaf config diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/leaf-server/build.gradle.kts.patch b/leaf-server/build.gradle.kts.patch index 7791b7d4..1b06de2d 100644 --- a/leaf-server/build.gradle.kts.patch +++ b/leaf-server/build.gradle.kts.patch @@ -76,7 +76,7 @@ + implementation(project(":leaf-api")) // Gale - project setup - Depend on own API // Leaf - project setup + + // Leaf start - Libraries -+ implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.2") { // Leaf Config ++ implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.2") { // Leaf config + exclude(group = "org.yaml", module = "snakeyaml") + } + implementation("com.github.luben:zstd-jni:1.5.6-9") // LinearPaper diff --git a/leaf-server/gale-patches/features/0001-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/gale-patches/features/0001-Fix-Pufferfish-and-Purpur-patches.patch index a0bbeb3a..f2f568a6 100644 --- a/leaf-server/gale-patches/features/0001-Fix-Pufferfish-and-Purpur-patches.patch +++ b/leaf-server/gale-patches/features/0001-Fix-Pufferfish-and-Purpur-patches.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Pufferfish and Purpur patches diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java -index fab5d5af9ec6a20810ce5e437dd617684cc5768f..d0a031014ec410142d59c8edd577bf035b7e407b 100644 +index fab5d5af9ec6a20810ce5e437dd617684cc5768f..1d9acb46d69e34b7e0a38b6a02334b1a3472ff2b 100644 --- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java +++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java @@ -101,10 +101,10 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher { @@ -16,10 +16,10 @@ index fab5d5af9ec6a20810ce5e437dd617684cc5768f..d0a031014ec410142d59c8edd577bf03 - case 0 -> text("You are running the latest version", NamedTextColor.GREEN); - case DISTANCE_UNKNOWN -> text("Unknown version", NamedTextColor.YELLOW); - default -> text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW) -+ case DISTANCE_ERROR -> text("* Error obtaining version information", NamedTextColor.RED); // Purpur -+ case 0 -> text("* You are running the latest version", NamedTextColor.GREEN); // Purpur -+ case DISTANCE_UNKNOWN -> text("* Unknown version", NamedTextColor.YELLOW); // Purpur -+ default -> text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur ++ case DISTANCE_ERROR -> text("* Error obtaining version information", NamedTextColor.RED); // Purpur - Rebrand ++ case 0 -> text("* You are running the latest version", NamedTextColor.GREEN); // Purpur - Rebrand ++ case DISTANCE_UNKNOWN -> text("* Unknown version", NamedTextColor.YELLOW); // Purpur - Rebrand ++ default -> text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur - Rebrand .append(Component.newline()) .append(text("Download the new version at: ") .append(text(this.downloadPage, NamedTextColor.GOLD) // Gale - branding changes - version fetcher @@ -28,6 +28,6 @@ index fab5d5af9ec6a20810ce5e437dd617684cc5768f..d0a031014ec410142d59c8edd577bf03 } - return text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC); -+ return text("Previous: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC); // Purpur ++ return text("Previous: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC); // Purpur - Rebrand } } diff --git a/leaf-server/gale-patches/features/0003-Reduce-items-finding-hopper-nearby-check.patch b/leaf-server/gale-patches/features/0003-Reduce-items-finding-hopper-nearby-check.patch index 2bd4f609..1d0e4419 100644 --- a/leaf-server/gale-patches/features/0003-Reduce-items-finding-hopper-nearby-check.patch +++ b/leaf-server/gale-patches/features/0003-Reduce-items-finding-hopper-nearby-check.patch @@ -9,14 +9,14 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive` Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 37896174667b884fcdc83b0a613686d76b66f247..c449e8cbe66a751800072f4b77186dc1ee09865e 100644 +index 37896174667b884fcdc83b0a613686d76b66f247..e91809338be21d0bded2b700e80800ef33c768e0 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -78,6 +78,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public int duration = 100; public int nearbyItemMaxAge = 1200; public int checkForMinecartNearItemInterval = 20; -+ public boolean checkForMinecartNearItemWhileActive = false; // Leaf - Make it configurable and reorder code ++ public boolean checkForMinecartNearItemWhileActive = false; // Leaf - Reduce items finding hopper nearby check public boolean checkForMinecartNearItemWhileInactive = true; public double maxItemHorizontalDistance = 24.0; public double maxItemVerticalDistance = 4.0; diff --git a/leaf-server/minecraft-patches/features/0001-Rebrand.patch b/leaf-server/minecraft-patches/features/0001-Rebrand.patch index 1659cd08..6f09cec2 100644 --- a/leaf-server/minecraft-patches/features/0001-Rebrand.patch +++ b/leaf-server/minecraft-patches/features/0001-Rebrand.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Encode42 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 16 Sep 2021 20:39:45 -0400 Subject: [PATCH] Rebrand diff --git a/leaf-server/minecraft-patches/features/0002-Leaf-Config.patch b/leaf-server/minecraft-patches/features/0002-Leaf-config.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0002-Leaf-Config.patch rename to leaf-server/minecraft-patches/features/0002-Leaf-config.patch index c0b7b02e..81711623 100644 --- a/leaf-server/minecraft-patches/features/0002-Leaf-Config.patch +++ b/leaf-server/minecraft-patches/features/0002-Leaf-config.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:42:15 -0400 -Subject: [PATCH] Leaf Config +Subject: [PATCH] Leaf config Leaf Config v3 including load config, backup old or outdated config, and add config to spark profiler automatically.