9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-23 08:59:23 +00:00

Purpur: Configurable server mod name

This commit is contained in:
Dreeam
2023-07-17 08:44:45 +08:00
parent 5e7e4e6456
commit e40b0bd553
26 changed files with 71 additions and 20 deletions

View File

@@ -0,0 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Mon, 17 Jul 2023 08:31:51 +0800
Subject: [PATCH] Purpur: Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2758e02d6f3a66b2fdd47f1db69f71940ab7a81a..724c67fd1d534339d3006d92da613fec1efd42c9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1678,7 +1678,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
- return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return org.dreeam.leaf.LeafConfig.serverModName; // Leaf - Leaf > // Purpur - Purpur > // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
}
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 37399feb26f51c0f198124444ed427056e3f9da4..1a1c867b2602cc6a4dd63ad8c81d95f5ad4dd488 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -164,6 +164,11 @@ public class LeafConfig {
return builder.build();
}
+ public static String serverModName = "Leaf";
+ private static void serverModName() {
+ serverModName = getString("server-mod-name", serverModName);
+ }
+
private static void removal() {
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index b974b59d421cf97bc9547ea75fe4643d89639bc1..0f771b628481ce98e3a6c248ce771894e4d9c1e6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -229,11 +229,6 @@ public class PurpurConfig {
deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
}
- public static String serverModName = "Purpur";
- private static void serverModName() {
- serverModName = getString("settings.server-mod-name", serverModName);
- }
-
public static double laggingThreshold = 19.0D;
private static void tickLoopSettings() {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);

View File

@@ -30,11 +30,11 @@ index 5ed89ce9d2c29927f48c1f7f8f9288f39d68b56c..30371f1a6dfb6fc170ac0cbdb3a7c78c
ServerLoginPacketListenerImpl.this.disconnect("Failed to verify username!"); ServerLoginPacketListenerImpl.this.disconnect("Failed to verify username!");
return; return;
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 37399feb26f51c0f198124444ed427056e3f9da4..79ff7e8ab613a77b663e81377e72d51c28894083 100644 index 1a1c867b2602cc6a4dd63ad8c81d95f5ad4dd488..8db36e248902a78b07b487707ee51ee8e4058f3d 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -164,7 +164,11 @@ public class LeafConfig { @@ -169,7 +169,11 @@ public class LeafConfig {
return builder.build(); serverModName = getString("server-mod-name", serverModName);
} }
+ public static boolean removeMojangUsernameCheck = true; + public static boolean removeMojangUsernameCheck = true;

View File

@@ -26,10 +26,10 @@ index 2821de09a36fc315897129f4691ba713386737db..3f60c1e5bf49784ac2a812157a5d22ce
this.connection.send(new ClientboundLoginDisconnectPacket(chatmessage)); this.connection.send(new ClientboundLoginDisconnectPacket(chatmessage));
this.connection.disconnect(chatmessage); this.connection.disconnect(chatmessage);
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 79ff7e8ab613a77b663e81377e72d51c28894083..be360d6e3cb736aef768302aadf12bebbd7eed99 100644 index 8db36e248902a78b07b487707ee51ee8e4058f3d..f4ef9e1f9e42ac86696f0718576d404d3a8db3c9 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -165,10 +165,14 @@ public class LeafConfig { @@ -170,10 +170,14 @@ public class LeafConfig {
} }
public static boolean removeMojangUsernameCheck = true; public static boolean removeMojangUsernameCheck = true;

View File

@@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x update by Mojang.
By removing this check, it enable hackers to use some modules of hack clients. By removing this check, it enable hackers to use some modules of hack clients.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 0b3c784f6138db19594b443073430a9ec0dda052..0102343ea691c574eead8fb43bc132abeb05233a 100644 index a912462dcd381956c31f19ccd4de826594af65b9..c1431af927a203c16b04a82e0f779fe40dcf0f88 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -189,6 +189,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; @@ -189,6 +189,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -28,10 +28,10 @@ index 0b3c784f6138db19594b443073430a9ec0dda052..0102343ea691c574eead8fb43bc132ab
this.player.resetLastActionTime(); this.player.resetLastActionTime();
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index be360d6e3cb736aef768302aadf12bebbd7eed99..8a52957ef46e68b31459bea5bbfcabdade69de20 100644 index f4ef9e1f9e42ac86696f0718576d404d3a8db3c9..03769f251ee07c168d93be962bfca6dad921d582 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -166,6 +166,8 @@ public class LeafConfig { @@ -171,6 +171,8 @@ public class LeafConfig {
public static boolean removeMojangUsernameCheck = true; public static boolean removeMojangUsernameCheck = true;
public static boolean removeSpigotCheckBungeeConfig = true; public static boolean removeSpigotCheckBungeeConfig = true;
@@ -40,7 +40,7 @@ index be360d6e3cb736aef768302aadf12bebbd7eed99..8a52957ef46e68b31459bea5bbfcabda
private static void removal() { private static void removal() {
removeMojangUsernameCheck = getBoolean("remove-Mojang-username-check", removeMojangUsernameCheck, removeMojangUsernameCheck = getBoolean("remove-Mojang-username-check", removeMojangUsernameCheck,
"Remove username check of Mojang", "Remove username check of Mojang",
@@ -173,6 +175,9 @@ public class LeafConfig { @@ -178,6 +180,9 @@ public class LeafConfig {
removeSpigotCheckBungeeConfig = getBoolean("remove-Spigot-check-bungee-config", removeSpigotCheckBungeeConfig, removeSpigotCheckBungeeConfig = getBoolean("remove-Spigot-check-bungee-config", removeSpigotCheckBungeeConfig,
"Enable player enter backend server through proxy", "Enable player enter backend server through proxy",
"without backend server enabling its bungee mode"); "without backend server enabling its bungee mode");

View File

@@ -28,10 +28,10 @@ index ec319f30250df17d247f4bd8fc77709dfaf9da01..d88e93b4fd50102b43f63f00d45b28ac
} else { } else {
ItemEntity.merge(other, itemstack1, this, itemstack); ItemEntity.merge(other, itemstack1, this, itemstack);
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 8a52957ef46e68b31459bea5bbfcabdade69de20..18976e4b84146422daf262af469abcaff5e6fbbe 100644 index 03769f251ee07c168d93be962bfca6dad921d582..8d975b996432d98c2f3cc9d01f2a7b85488415ae 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -190,6 +190,7 @@ public class LeafConfig { @@ -195,6 +195,7 @@ public class LeafConfig {
public static int activationDistanceMod; public static int activationDistanceMod;
public static boolean throttleInactiveGoalSelectorTick; public static boolean throttleInactiveGoalSelectorTick;
public static Map<String, Integer> projectileTimeouts; public static Map<String, Integer> projectileTimeouts;
@@ -39,7 +39,7 @@ index 8a52957ef46e68b31459bea5bbfcabdade69de20..18976e4b84146422daf262af469abcaf
private static void performance() { private static void performance() {
String sentryEnvironment = System.getenv("SENTRY_DSN"); String sentryEnvironment = System.getenv("SENTRY_DSN");
String sentryConfig = getString("performance.sentry-dsn", sentryDsn, "Sentry DSN for improved error logging, leave blank to disable", "Obtain from https://sentry.io/"); String sentryConfig = getString("performance.sentry-dsn", sentryDsn, "Sentry DSN for improved error logging, leave blank to disable", "Obtain from https://sentry.io/");
@@ -245,6 +246,7 @@ public class LeafConfig { @@ -250,6 +251,7 @@ public class LeafConfig {
String type = EntityType.getKey(entityType).getPath().toUpperCase(Locale.ROOT); String type = EntityType.getKey(entityType).getPath().toUpperCase(Locale.ROOT);
entityType.ttl = config.getInt("entity_timeouts." + type, -1); entityType.ttl = config.getInt("entity_timeouts." + type, -1);
} }

View File

@@ -89,10 +89,10 @@ index f00dc5b06519f2827a068649394e09ecbdf1a131..2b185b0f8dc9b7f2da0b30f2b393fcf7
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 18976e4b84146422daf262af469abcaff5e6fbbe..f77a8b729846dc9be3adad659ccc02df0467cd9e 100644 index 8d975b996432d98c2f3cc9d01f2a7b85488415ae..56937d552394bb652032e7150c7a8529c0d88c3e 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -249,6 +249,8 @@ public class LeafConfig { @@ -254,6 +254,8 @@ public class LeafConfig {
useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism); useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism);
} }

View File

@@ -7,7 +7,7 @@ Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves Original project: https://github.com/LeavesMC/Leaves
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2758e02d6f3a66b2fdd47f1db69f71940ab7a81a..a3573ffdbf4d644d7098254072e78838a7436bb6 100644 index 724c67fd1d534339d3006d92da613fec1efd42c9..89ed7ae9546f3ff76fb7d3114b9bebdceebfaa3b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1586,6 +1586,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1586,6 +1586,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -58,10 +58,10 @@ index 2b185b0f8dc9b7f2da0b30f2b393fcf7025f87b2..75cf48291652016c664e035ce467b17d
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index f77a8b729846dc9be3adad659ccc02df0467cd9e..2e3a7d57996532259d9559da9451df9fd58e9ccb 100644 index 56937d552394bb652032e7150c7a8529c0d88c3e..695b17baa36cb81fd1d5562bb458e1c0add1583b 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -250,7 +250,9 @@ public class LeafConfig { @@ -255,7 +255,9 @@ public class LeafConfig {
} }
public static boolean jadeProtocol = false; public static boolean jadeProtocol = false;

View File

@@ -19,7 +19,7 @@ index 621875cc5ecb613b7a64067d1c0805305977b9a3..a29f58dce847b4cdcf276906011f8450
// CraftBukkit start - handle player weather // CraftBukkit start - handle player weather
// entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F)); // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 2e3a7d57996532259d9559da9451df9fd58e9ccb..076234351d6a6647f017ed4e46a0554ae6053151 100644 index 695b17baa36cb81fd1d5562bb458e1c0add1583b..79b2f7a8f8d71d6a0c9e383a89785a170183a009 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -19,6 +19,7 @@ import java.util.Collections; @@ -19,6 +19,7 @@ import java.util.Collections;
@@ -30,7 +30,7 @@ index 2e3a7d57996532259d9559da9451df9fd58e9ccb..076234351d6a6647f017ed4e46a0554a
public class LeafConfig { public class LeafConfig {
@@ -251,8 +252,12 @@ public class LeafConfig { @@ -256,8 +257,12 @@ public class LeafConfig {
public static boolean jadeProtocol = false; public static boolean jadeProtocol = false;
public static boolean appleskinProtocol = false; public static boolean appleskinProtocol = false;

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix: Make log4j compatible with future release
This patch fixes the warnning "WARN StatusConsoleListener The use of package scanning to locate plugins is deprecated and will be removed in a future release" during server launching. This patch fixes the warnning "WARN StatusConsoleListener The use of package scanning to locate plugins is deprecated and will be removed in a future release" during server launching.
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ed4965b6db250090b0a9f6175e116bbe9c71fef3..afa3fdc10960f906629c12651a96f6c3de022336 100644 index 0769f5c4711a3b7f59489e611ed01ad8367e5db1..a056aa167887abef9e6d531a9edd2cda433567d2 100644
--- a/src/main/resources/log4j2.xml --- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@