Skip to content

Commit

Permalink
Update some Leaf server patches * 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dreeam-qwq
Dreeam-qwq committed May 25, 2024
1 parent 9beeeff commit 714571a
Show file tree
Hide file tree
Showing 54 changed files with 2,747 additions and 854 deletions.
461 changes: 298 additions & 163 deletions patches/server/0002-Leaf-Config.patch
View file

Large diffs are not rendered by default.

250 changes: 250 additions & 0 deletions patches/server/0003-Leaf-Config-legacy-converter.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <[email protected]>
Date: Tue, 27 Feb 2024 19:42:03 -0500
Subject: [PATCH] Leaf Config legacy converter


diff --git a/build.gradle.kts b/build.gradle.kts
index 812435d3912426865a651456de111aa76c53dc00..9f31e013809ab490442c0f6f629de7de9f89cfb4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,13 @@ dependencies {

implementation("com.electronwill.night-config:toml:3.6.7") // Leaf - Night config // Dreeam TODO: Bump to 3.7.1

+ // Leaf start - Legacy config
+ implementation("org.yaml:snakeyaml:2.2")
+ implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
+ exclude(group = "org.yaml", module = "snakeyaml")
+ }
+ // Leaf end - Legacy config
+
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
diff --git a/src/main/java/org/dreeam/leaf/config/LeafConfig.java b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
index b20ad36bb89e5226d94928832fdbcce7e096d6e2..c8da60bfb123079e85dd2f4b1f8925513e018297 100644
--- a/src/main/java/org/dreeam/leaf/config/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
@@ -24,7 +24,9 @@ import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;

public class LeafConfig {
public static final Logger LOGGER = LogManager.getLogger(LeafConfig.class.getName());
- private static final File baseConfigFolder = new File("leaf_config");
+ public static long beginTime; // Leaf legacy config convert timer
+ private static final File legacyConfig = new File("leaf.yml"); // Leaf legacy config
+ public static final File baseConfigFolder = new File("leaf_config");
private static final File baseConfigFile = new File(baseConfigFolder, "leaf_global_config.toml");
private static final Set<IConfigModule> allInstanced = new HashSet<>();
private static CommentedFileConfig configFileInstance;
@@ -76,6 +78,7 @@ public class LeafConfig {
}

configFileInstance.save();
+ upgradeLeagcyConfig(); // Upgrade legacy leaf config
}

private static void loadAllModules() throws IllegalAccessException {
@@ -217,4 +220,21 @@ public class LeafConfig {
}
}
}
+
+ private static void upgradeLeagcyConfig() {
+ if (legacyConfig.exists()) {
+ beginTime = System.nanoTime();
+ LOGGER.info("Detected legacy config file!");
+
+ try {
+ Class<?> clazz = Class.forName("org.dreeam.leaf.config.legacy.upgrader.V1ToV200");
+ if (IConfigModule.class.isAssignableFrom(clazz)) {
+ loadForSingle((IConfigModule) clazz.getConstructor().newInstance());
+ }
+ } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
+ InstantiationException | IllegalAccessException e) {
+ LOGGER.error("Error in v1.x to v2.0.0 config upgrading process, this should not happen!", e);
+ }
+ }
+ }
}
diff --git a/src/main/java/org/dreeam/leaf/config/legacy/upgrader/V1ToV200.java b/src/main/java/org/dreeam/leaf/config/legacy/upgrader/V1ToV200.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ead848b0b65af3cfd2e4c7715751f80e89be188
--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/config/legacy/upgrader/V1ToV200.java
@@ -0,0 +1,175 @@
+package org.dreeam.leaf.config.legacy.upgrader;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import org.dreeam.leaf.config.EnumConfigCategory;
+import org.dreeam.leaf.config.IConfigModule;
+import org.dreeam.leaf.config.LeafConfig;
+import org.simpleyaml.configuration.file.YamlFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class V1ToV200 implements IConfigModule {
+
+ private static final YamlFile legacyConfig = new YamlFile();
+ private static final File legacyConfigFile = new File("leaf.yml");
+
+ private static Object version, serverModName, serverGuiName, removeMojangUsernameCheck, removeSpigotCheckBungeeConfig, removeUseItemOnPacketTooFar,
+ maxUseItemDistance, disableMovedWronglyThreshold, enableAsyncMobSpawning, dabEnabled, startDistance, maximumActivationPrio, activationDistanceMod,
+ blackedEntities, throttleInactiveGoalSelectorTick, useSpigotItemMergingMechanism, optimizedPoweredRails, asyncPathfinding, asyncPathfindingMaxThreads,
+ asyncPathfindingKeepalive, asyncEntityTracker, asyncEntityTrackerMaxThreads, asyncEntityTrackerKeepalive, cacheMinecartCollision,
+ skipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer, jadeProtocol, appleskinProtocol, xaeroMapProtocol, xaeroMapServerID, syncmaticaProtocol, syncmaticaQuota,
+ syncmaticaQuotaLimit, sentryDsn, useVanillaEndTeleport, snowballCanKnockback, eggCanKnockback, fixTripwireDupe, including5sIngetTPS;
+ private static final Map<String, Object> ttls = new ConcurrentHashMap<>();
+
+ private static void initKeys() {
+ version = getKey("info.version");
+ serverModName = getKey("server-mod-name");
+ serverGuiName = getKey("server-Gui-name");
+ removeMojangUsernameCheck = getKey("remove-Mojang-username-check");
+ removeSpigotCheckBungeeConfig = getKey("remove-Spigot-check-bungee-config");
+ removeUseItemOnPacketTooFar = getKey("remove-UseItemOnPacket-too-far-check");
+ maxUseItemDistance = getKey("max-UseItem-distance");
+ disableMovedWronglyThreshold = getKey("disable-MovedWronglyThreshold");
+ enableAsyncMobSpawning = getKey("performance.enable-async-mob-spawning");
+ dabEnabled = getKey("performance.dab.enabled", "dab.enabled");
+ startDistance = getKey("performance.dab.start-distance", "dab.start-distance");
+ maximumActivationPrio = getKey("performance.dab.max-tick-freq", "dab.max-tick-freq");
+ activationDistanceMod = getKey("performance.dab.activation-dist-mod", "dab.activation-dist-mod");
+ blackedEntities = getKey("performance.dab.blacklisted-entities", "dab.blacklisted-entities");
+ throttleInactiveGoalSelectorTick = getKey("performance.inactive-goal-selector-throttle", "inactive-goal-selector-throttle");
+ legacyConfig.getMapValues(true).forEach((key, ttl) -> {
+ if (key.startsWith("performance.entity_timeouts.")) {
+ String e = key.replaceAll("performance.entity_timeouts.", "");
+ ttls.putIfAbsent(e, ttl);
+ }
+ });
+ useSpigotItemMergingMechanism = getKey("performance.use-spigot-item-merging-mechanism");
+ optimizedPoweredRails = getKey("performance.optimizedPoweredRails");
+ asyncPathfinding = getKey("performance.async-pathfinding.enable");
+ asyncPathfindingMaxThreads = getKey("performance.async-pathfinding.max-threads");
+ asyncPathfindingKeepalive = getKey("performance.async-pathfinding.keepalive");
+ asyncEntityTracker = getKey("performance.async-entity-tracker.enable");
+ asyncEntityTrackerMaxThreads = getKey("performance.async-entity-tracker.max-threads");
+ asyncEntityTrackerKeepalive = getKey("performance.async-entity-tracker.keepalive");
+ cacheMinecartCollision = getKey("performance.cache-minecart-collision");
+ skipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer = getKey("performance.skip-map-item-data-updates-if-map-does-not-have-craftmaprenderer");
+ jadeProtocol = getKey("network.protocol.jade-protocol");
+ appleskinProtocol = getKey("network.protocol.appleskin-protocol");
+ xaeroMapProtocol = getKey("network.protocol.xaero-map-protocol");
+ xaeroMapServerID = getKey("network.protocol.xaero-map-server-id");
+ syncmaticaProtocol = getKey("network.protocol.syncmatica.enable");
+ syncmaticaQuota = getKey("network.protocol.syncmatica.quota");
+ syncmaticaQuotaLimit = getKey("network.protocol.syncmatica.quota-limit");
+ sentryDsn = getKey("sentry-dsn", "performance.sentry-dsn");
+ useVanillaEndTeleport = getKey("use-vanilla-end-teleport");
+ snowballCanKnockback = getKey("playerKnockback.snowball-knockback-players");
+ eggCanKnockback = getKey("playerKnockback.egg-knockback-players");
+ fixTripwireDupe = getKey("gameplay.fix-tripwire-dupe");
+ including5sIngetTPS = getKey("including-5s-in-getTPS");
+ }
+
+ @Override
+ public EnumConfigCategory getCategory() {
+ return EnumConfigCategory.MISC;
+ }
+
+ @Override
+ public String getBaseName() {
+ return "converter";
+ }
+
+ @Override
+ public void onLoaded(CommentedFileConfig config) {
+ loadLegacyConfig();
+
+ LeafConfig.LOGGER.info("Converting config from v{} to v2.0.0 format...", version);
+
+ updateConfig("misc.rebrand.server-mod-name", serverModName, config);
+ updateConfig("misc.rebrand.server-gui-name", serverGuiName, config);
+ updateConfig("misc.remove_vanilla_username_check.enabled", removeMojangUsernameCheck, config);
+ updateConfig("misc.remove_spigot_check_bungee_config.enabled", removeSpigotCheckBungeeConfig, config);
+ updateConfig("misc.configurable_max_use_item_distance.remove-max-distance-check", removeUseItemOnPacketTooFar, config);
+ updateConfig("gameplay.configurable_max_use_item_distance.max-use-item-distance", maxUseItemDistance, config);
+ updateConfig("gameplay.disable_moved_wrongly_threshold.enabled", disableMovedWronglyThreshold, config);
+ updateConfig("async.async_mob_spawning.enabled", enableAsyncMobSpawning, config);
+ updateConfig("performance.dab.enabled", dabEnabled, config);
+ updateConfig("performance.dab.start-distance", startDistance, config);
+ updateConfig("performance.dab.max-tick-freq", maximumActivationPrio, config);
+ updateConfig("performance.dab.activation-dist-mod", activationDistanceMod, config);
+ updateConfig("performance.dab.blacklisted-entities", blackedEntities, config);
+ updateConfig("performance.inactive_goal_selector_throttle.enabled", throttleInactiveGoalSelectorTick, config);
+ ttls.forEach((e, ttl) -> updateConfig("performance.entity_timeouts." + e, ttl, config));
+ updateConfig("gameplay.use-spigot-item-merging-mechanism.enabled", useSpigotItemMergingMechanism, config);
+ updateConfig("performance.optimized_powered_rails.enabled", optimizedPoweredRails, config);
+ updateConfig("async.async_pathfinding.enabled", asyncPathfinding, config);
+ updateConfig("async.async_pathfinding.max-threads", asyncPathfindingMaxThreads, config);
+ updateConfig("async.async_pathfinding.keepalive", asyncPathfindingKeepalive, config);
+ updateConfig("async.async_entity_tracker.enabled", asyncEntityTracker, config);
+ updateConfig("async.async_entity_tracker.max-threads", asyncEntityTrackerMaxThreads, config);
+ updateConfig("async.async_entity_tracker.keepalive", asyncEntityTrackerKeepalive, config);
+ updateConfig("performance.cache_minecart_collision.enabled", cacheMinecartCollision, config);
+ updateConfig("performance.skip_map_item_data_updates_if_map_does_not_have_craftmaprenderer.enabled", skipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer, config);
+ updateConfig("network.protocol_support.jade-protocol", jadeProtocol, config);
+ updateConfig("network.protocol_support.appleskin-protocol", appleskinProtocol, config);
+ updateConfig("network.protocol_support.xaero-map-protocol", xaeroMapProtocol, config);
+ updateConfig("network.protocol_support.xaero-map-server-id", xaeroMapServerID, config);
+ updateConfig("network.protocol_support.syncmatica-enabled", syncmaticaProtocol, config);
+ updateConfig("network.protocol_support.syncmatica-quota", syncmaticaQuota, config);
+ updateConfig("network.protocol_support.syncmatica-quota-limit", syncmaticaQuotaLimit, config);
+ updateConfig("misc.sentry_dsn.sentry-dsn", sentryDsn, config);
+ updateConfig("gameplay.use_vanilla_end_teleport.enabled", useVanillaEndTeleport, config);
+ updateConfig("gameplay.knockback.snowball-knockback-players", snowballCanKnockback, config);
+ updateConfig("gameplay.knockback.egg-knockback-players", eggCanKnockback, config);
+ updateConfig("fixes.fix_tripwire_dupe.enabled", fixTripwireDupe, config);
+ updateConfig("misc.including_5s_in_get_tps.enabled", including5sIngetTPS, config);
+
+ config.save();
+
+ File backupFolder = new File(LeafConfig.baseConfigFolder + "/legacy_backup");
+
+ if (!backupFolder.exists()) {
+ backupFolder.mkdirs();
+ }
+
+ try {
+ Files.move(Path.of(legacyConfigFile.getPath()), Path.of(LeafConfig.baseConfigFolder + "/legacy_backup/leaf_v" + version + "_backup.yml"), StandardCopyOption.REPLACE_EXISTING);
+ } catch (IOException e) {
+ LeafConfig.LOGGER.error("Config upgraded failed!");
+ return;
+ }
+
+ LeafConfig.LOGGER.info("Config upgraded successfully!, elapsed {}ms.", (System.nanoTime() - LeafConfig.beginTime) / 1000000);
+ }
+
+ private static void loadLegacyConfig() {
+ try {
+ legacyConfig.load(legacyConfigFile);
+ initKeys();
+ } catch (IOException e) {
+ LeafConfig.LOGGER.error("Failed to load legacy config! Config upgraded failed!");
+ }
+ }
+
+ private static Object getKey(String key) {
+ return legacyConfig.contains(key) ? legacyConfig.get(key) : null;
+ }
+
+ // In v1.x config, the old key still exists after converting to new key
+ // So check the new key whether exists first, then check the old key.
+ private static Object getKey(String key, String oldKey) {
+ return legacyConfig.contains(key) ? legacyConfig.get(key) :
+ legacyConfig.contains(oldKey) ? legacyConfig.get(oldKey) :
+ null;
+ }
+
+ // TOML doesn't allow null key value, so do a null check.
+ private static void updateConfig(String key, Object value, CommentedFileConfig config) {
+ if (value != null) config.set(key, value);
+ }
+}
0 patches/server/0003-Pufferfish-Utils.patch → patches/server/0004-Pufferfish-Utils.patch
View file
File renamed without changes.
47 changes: 35 additions & 12 deletions patches/server/0004-Pufferfish-Sentry.patch → patches/server/0005-Pufferfish-Sentry.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,22 +192,45 @@ index 0000000000000000000000000000000000000000..ab7a4acec52320c30623023c5fc9423e
+ }
+
+}
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index d924db6378b2c60c7b96cf5c45a6d50a091f9790..b1fcd3588c22143f9852805a6cea3b6cf6c33a1f 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -168,4 +168,14 @@ public class LeafConfig {

private static void network() {
}
diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java b/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java
new file mode 100644
index 0000000000000000000000000000000000000000..286af0f0e1d20d39e514e261dc8c0abd03284c5c
--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java
@@ -0,0 +1,36 @@
+package org.dreeam.leaf.config.modules.misc;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import org.dreeam.leaf.config.ConfigInfo;
+import org.dreeam.leaf.config.EnumConfigCategory;
+import org.dreeam.leaf.config.IConfigModule;
+
+public class SentryDSN implements IConfigModule {
+
+ @Override
+ public EnumConfigCategory getCategory() {
+ return EnumConfigCategory.MISC;
+ }
+
+ @Override
+ public String getBaseName() {
+ return "sentry_dsn";
+ }
+
+ @ConfigInfo(baseName = "sentry-dsn")
+ public static String sentryDsn = "";
+ private static void sentryDsn() {
+
+ @Override
+ public void onLoaded(CommentedFileConfig config) {
+ config.setComment("misc.sentry_dsn", """
+ Sentry DSN for improved error logging, leave blank to disable,
+ Obtain from https://sentry.io/welcome/
+ """);
+
+ String sentryEnvironment = System.getenv("SENTRY_DSN");
+ String sentryConfig = getString("sentry-dsn", sentryDsn, "Sentry DSN for improved error logging, leave blank to disable", "Obtain from https://sentry.io/welcome/");
+ sentryDsn = sentryEnvironment == null ? sentryConfig : sentryEnvironment;
+ sentryDsn = sentryEnvironment == null ? sentryDsn : sentryEnvironment;
+ if (sentryDsn != null && !sentryDsn.isBlank()) {
+ gg.pufferfish.pufferfish.sentry.SentryManager.init();
+ }
+ }
}
+}
Loading

0 comments on commit 714571a

Please sign in to comment.