From fbc138ba3e197664c44faf6dfb58bbcff5632dc8 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 18 Feb 2024 04:00:29 -0500 Subject: [PATCH] [ci skip] Update comments (16/60) --- patches/server/0001-Rebrand.patch | 20 ++++++++-------- patches/server/0002-Leaf-Config.patch | 23 ++++--------------- ...005-Pufferfish-Optimize-mob-spawning.patch | 6 ++--- .../server/0009-Purpur-Server-Changes.patch | 4 ++-- ...-Purpur-Configurable-server-mod-name.patch | 4 ++-- patches/server/0012-Remove-Timings.patch | 11 ++++----- patches/server/0013-Bump-Dependencies.patch | 10 ++++---- .../0014-Remove-Mojang-username-check.patch | 9 ++++---- 8 files changed, 36 insertions(+), 51 deletions(-) diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index f8c2607a..3595c42a 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -27,7 +27,7 @@ index fefe852c5376274f606ededeaf6c741f43ab19f9..936c738fcaa8e97c36d0742d2398d63c "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 88102f6ba8352a080125512d0bbfacdf779f4f38..1ea04a20247c7154fc3e59693f28b993ff78e2b8 100644 +index 88102f6ba8352a080125512d0bbfacdf779f4f38..fe50cc484ebfe4d3ab8795c222b2abd45fe64310 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -35,7 +35,7 @@ index 88102f6ba8352a080125512d0bbfacdf779f4f38..1ea04a20247c7154fc3e59693f28b993 // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { - Metrics metrics = new Metrics("Gale", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics -+ Metrics metrics = new Metrics("Leaf", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics // Leaf - rebrand ++ Metrics metrics = new Metrics("Leaf", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics // Leaf metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); @@ -44,18 +44,18 @@ index 88102f6ba8352a080125512d0bbfacdf779f4f38..1ea04a20247c7154fc3e59693f28b993 metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); - final String galeVersion; // Gale - branding changes - metrics -+ final String leafVersion; // Gale - branding changes - metrics // Leaf - rebrand ++ final String leafVersion; // Gale - branding changes - metrics // Leaf final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); if (implVersion != null) { final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); - galeVersion = "git-Gale-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics -+ leafVersion = "git-Leaf-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Leaf - rebrand ++ leafVersion = "git-Leaf-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Leaf } else { - galeVersion = "unknown"; // Gale - branding changes - metrics -+ leafVersion = "unknown"; // Gale - branding changes - metrics // Leaf - rebrand ++ leafVersion = "unknown"; // Gale - branding changes - metrics // Leaf } - metrics.addCustomChart(new Metrics.SimplePie("gale_version", () -> galeVersion)); // Gale - branding changes - metrics -+ metrics.addCustomChart(new Metrics.SimplePie("leaf_version", () -> leafVersion)); // Gale - branding changes - metrics // Leaf - rebrand ++ metrics.addCustomChart(new Metrics.SimplePie("leaf_version", () -> leafVersion)); // Gale - branding changes - metrics // Leaf metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(2); // Gale - metrics - reduce HashMap capacity @@ -125,7 +125,7 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b if (stream != null) { diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java -index 7fee1c2779ab390586b2d3f75f56890846323500..d55adec004fd733859a75b34ce54e1f10b7336fc 100644 +index 7fee1c2779ab390586b2d3f75f56890846323500..0d7f8ad6b93b58927eba40aff71af6e2b01107fc 100644 --- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java +++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java @@ -68,7 +68,7 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher { @@ -133,12 +133,12 @@ index 7fee1c2779ab390586b2d3f75f56890846323500..d55adec004fd733859a75b34ce54e1f1 final Component history = getHistory(); - return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; -+ return history != null ? Component.textOfChildren(updateMessage, Component.newline(), history) : updateMessage; ++ return history != null ? Component.textOfChildren(updateMessage, Component.newline(), history) : updateMessage; // Leaf } protected @Nullable String getMinecraftVersion() { // Gale - branding changes - version fetcher diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java -index 3d674eca7d20202d8f811c5c3e3946a12046028a..a41db8627e8d153e4faeafbd34d524cf08f96925 100644 +index 3d674eca7d20202d8f811c5c3e3946a12046028a..aafa54b5d4abba941a7a87fdfe99f1bc4c2a9db8 100644 --- a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java +++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java @@ -5,7 +5,7 @@ package org.galemc.gale.version; @@ -146,7 +146,7 @@ index 3d674eca7d20202d8f811c5c3e3946a12046028a..a41db8627e8d153e4faeafbd34d524cf public GaleVersionFetcher() { - super("ver/1.20.2", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale"); -+ super("ver/1.20.4", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf - Use Leaf repo ++ super("ver/1.20.4", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf } } diff --git a/patches/server/0002-Leaf-Config.patch b/patches/server/0002-Leaf-Config.patch index dff55ca0..092432e2 100644 --- a/patches/server/0002-Leaf-Config.patch +++ b/patches/server/0002-Leaf-Config.patch @@ -5,40 +5,25 @@ Subject: [PATCH] Leaf Config diff --git a/build.gradle.kts b/build.gradle.kts -index 936c738fcaa8e97c36d0742d2398d63c20cd2f68..830161ffd2f109cc5bd78a59e3b42eed382f8de5 100644 +index 936c738fcaa8e97c36d0742d2398d63c20cd2f68..6a74e98d4795aac2e53579fd92a3e53bcf3e670f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,6 +56,13 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") -+ // Pufferfish start ++ // Leaf start + implementation("org.yaml:snakeyaml:2.2") + implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") { + exclude(group = "org.yaml", module = "snakeyaml") + } -+ // Pufferfish end ++ // Leaf end + testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") testImplementation("org.hamcrest:hamcrest:2.2") -diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 429cff43a9f0c74161fdab857f5d45771f774ac2..0756ee94251620d591cd11e935c579559afab589 100644 ---- a/src/main/java/co/aikar/timings/TimingsExport.java -+++ b/src/main/java/co/aikar/timings/TimingsExport.java -@@ -301,8 +301,9 @@ public class TimingsExport extends Thread { - pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), - // Gale start - Gale configuration - include in timings - pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), -- pair("gale", mapAsJSON(Bukkit.spigot().getGaleConfig(), null)) -+ pair("gale", mapAsJSON(Bukkit.spigot().getGaleConfig(), null)), - // Gale end - Gale configuration - include in timings -+ pair("leaf", mapAsJSON(org.dreeam.leaf.LeafConfig.getConfigCopy(), null)) // Leaf - )); - - new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index c51081e9e60003e116c21d628a8aec4d6caecb2a..387f367544464c73721219ec55cb42033f4bb9c3 100644 +index 2c8eb9294890955f71382ed3884874cc827bab5e..ee29ceff6804383edc229cd302ab07345f96658b 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -232,6 +232,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch b/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch index 1f14772a..e30cb194 100644 --- a/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch +++ b/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch @@ -58,7 +58,7 @@ index d8a3b28b38f2ac62fbf0f87f8b5ff811873f8701..42869d35abb8d006fb720ca7190a770c public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier persistentStateManagerFactory, int viewDistance, boolean dsync) { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 68ad7cb06d85c428f3560f95ed46bca32187e729..cd71e1127673e625746bce45174afb619ddebd3e 100644 +index 68ad7cb06d85c428f3560f95ed46bca32187e729..01fe42fea45a359714ca3fdeee05d85c561d0bb9 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -76,6 +76,9 @@ public class ServerChunkCache extends ChunkSource { @@ -84,7 +84,7 @@ index 68ad7cb06d85c428f3560f95ed46bca32187e729..cd71e1127673e625746bce45174afb61 // Paper end - per player mob spawning backoff } - spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true); -+ lastSpawnState = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true); ++ lastSpawnState = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true); // Pufferfish - async mob spawning + } // Pufferfish - (endif) moved down when async processing } else { - spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false); @@ -101,7 +101,7 @@ index 68ad7cb06d85c428f3560f95ed46bca32187e729..cd71e1127673e625746bce45174afb61 // Gale start - MultiPaper - skip unnecessary mob spawning computations } else { - spawnercreature_d = null; -+ lastSpawnState = null; // Pufferfish ++ lastSpawnState = null; // Leaf - Pufferfish - Optimize mob spawning } // Gale end - MultiPaper - skip unnecessary mob spawning computations diff --git a/patches/server/0009-Purpur-Server-Changes.patch b/patches/server/0009-Purpur-Server-Changes.patch index 4c2c67a1..7dda227b 100644 --- a/patches/server/0009-Purpur-Server-Changes.patch +++ b/patches/server/0009-Purpur-Server-Changes.patch @@ -30,12 +30,12 @@ MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch Fire-Immunity-API.patch diff --git a/build.gradle.kts b/build.gradle.kts -index 830161ffd2f109cc5bd78a59e3b42eed382f8de5..04d0a5827c454478b80c2da1b204e20ab7828370 100644 +index 6a74e98d4795aac2e53579fd92a3e53bcf3e670f..f1e1db576f08c1813bf9c7c7b216b3d91187a28f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,6 +63,10 @@ dependencies { } - // Pufferfish end + // Leaf end + implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur + implementation("org.mozilla:rhino-engine:1.7.14") // Purpur diff --git a/patches/server/0010-Purpur-Configurable-server-mod-name.patch b/patches/server/0010-Purpur-Configurable-server-mod-name.patch index c3670ffd..3f6283b7 100644 --- a/patches/server/0010-Purpur-Configurable-server-mod-name.patch +++ b/patches/server/0010-Purpur-Configurable-server-mod-name.patch @@ -7,7 +7,7 @@ Original license: MIT Original project: https://github.com/PurpurMC/Purpur diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 330f0f66ab16c88b2a827f09f99c42671a53a410..b0e87f3df1985c84d013db2a67c7e1b5b528a6fa 100644 +index 330f0f66ab16c88b2a827f09f99c42671a53a410..f9952df410ca862ee6573abaaa1c9b5634bdad5e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1845,7 +1845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop