Skip to content

Commit 7afc1b4

Browse files
committed
Replaced "-" with "_" in config key names of sentry and secure seed and cleaned patches
1 parent e6e33b3 commit 7afc1b4

20 files changed

+44
-56
lines changed

patches/server/0058-Pufferfish-Sentry.patch renamed to patches/server/0039-Pufferfish-Sentry.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ index 0000000000000000000000000000000000000000..c01e5b5de685eca7edbe8a87732efd45
195195
+}
196196
diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/SentryConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/SentryConfig.java
197197
new file mode 100644
198-
index 0000000000000000000000000000000000000000..270dfd41ebec4329977f771d3f3cdb99a211e483
198+
index 0000000000000000000000000000000000000000..55d6bb635b182d15471bfcd481a2b7c6ce26c00b
199199
--- /dev/null
200200
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/SentryConfig.java
201201
@@ -0,0 +1,47 @@
@@ -214,10 +214,10 @@ index 0000000000000000000000000000000000000000..270dfd41ebec4329977f771d3f3cdb99
214214
+ " Obtain from https://sentry.io/")
215215
+ public static String sentryDsn = "";
216216
+
217-
+ @ConfigInfo(baseName = "log-level", comments = " Logs with a level higher than or equal to this level will be recorded.")
217+
+ @ConfigInfo(baseName = "log_level", comments = " Logs with a level higher than or equal to this level will be recorded.")
218218
+ public static String logLevel = "WARN";
219219
+
220-
+ @ConfigInfo(baseName = "only-log-thrown", comments = " Only log with a Throwable will be recorded after enabling this.")
220+
+ @ConfigInfo(baseName = "only_log_thrown", comments = " Only log with a Throwable will be recorded after enabling this.")
221221
+ public static boolean onlyLogThrown = true;
222222
+
223223
+ @Override

patches/server/0056-Leaf-Secure-Seed.patch renamed to patches/server/0052-Leaf-Secure-Seed-with-SecureSeed-command.patch

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: adabugra <57899270+adabugra@users.noreply.github.com>
33
Date: Sun, 5 Jan 2025 12:32:26 +0300
4-
Subject: [PATCH] Leaf: Secure Seed
4+
Subject: [PATCH] Leaf Secure Seed with SecureSeed command
55

66

7+
diff --git a/build.gradle.kts b/build.gradle.kts
8+
index fbf51f738e98ac6e8358a7fa81b7fc545469a5a6..6e1a9ee0ebea5c313d568ac276db1f38476681e2 100644
9+
--- a/build.gradle.kts
10+
+++ b/build.gradle.kts
11+
@@ -33,7 +33,7 @@ dependencies {
12+
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
13+
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
14+
implementation("net.minecrell:terminalconsoleappender:1.3.0")
15+
- implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
16+
+ implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file // Leaves - Fix color in console
17+
/*
18+
Required to add the missing Log4j2Plugins.dat file from log4j-core
19+
which has been removed by Mojang. Without it, log4j has to classload
720
diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/SecureSeedConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/SecureSeedConfig.java
821
new file mode 100644
9-
index 0000000000000000000000000000000000000000..fc4a7abc3b814edf6b19333b326d3d47f4ccaf78
22+
index 0000000000000000000000000000000000000000..2eb28e30ae3a80fd9f758127f2d2d5e382fcaba5
1023
--- /dev/null
1124
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/SecureSeedConfig.java
1225
@@ -0,0 +1,23 @@
@@ -30,10 +43,32 @@ index 0000000000000000000000000000000000000000..fc4a7abc3b814edf6b19333b326d3d47
3043
+
3144
+ @Override
3245
+ public String getBaseName() {
33-
+ return "secure-seed";
46+
+ return "secure_seed";
3447
+ }
3548
+}
3649
\ No newline at end of file
50+
diff --git a/src/main/java/net/minecraft/server/commands/SeedCommand.java b/src/main/java/net/minecraft/server/commands/SeedCommand.java
51+
index 0b500b19a99fa6c2740c0db350a166462668df9c..1b82a5cc73cf7916146d6687a225256615551507 100644
52+
--- a/src/main/java/net/minecraft/server/commands/SeedCommand.java
53+
+++ b/src/main/java/net/minecraft/server/commands/SeedCommand.java
54+
@@ -12,6 +12,17 @@ public class SeedCommand {
55+
long l = context.getSource().getLevel().getSeed();
56+
Component component = ComponentUtils.copyOnClickText(String.valueOf(l));
57+
context.getSource().sendSuccess(() -> Component.translatable("commands.seed.success", component), false);
58+
+
59+
+ // Leaf start - Matter - SecureSeed Command
60+
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
61+
+ su.plo.matter.Globals.setupGlobals(context.getSource().getLevel());
62+
+ String seedStr = su.plo.matter.Globals.seedToString(su.plo.matter.Globals.worldSeed);
63+
+ Component featureSeedComponent = ComponentUtils.copyOnClickText(seedStr);
64+
+
65+
+ context.getSource().sendSuccess(() -> Component.translatable(("Feature seed: %s"), featureSeedComponent), false);
66+
+ }
67+
+ // Leaf end - Matter - SecureSeed Command
68+
+
69+
return (int)l;
70+
}));
71+
}
3772
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
3873
index c3ec370b83b895be0f03662e3884fa4a2442a2a6..d53679891422a4a9cd13382869469c4848db8ede 100644
3974
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
@@ -484,7 +519,7 @@ index 4791e013e8257f57b5db6f974dc05829b911cfa0..f9eb72f761d50c585145c3a43e2c88ae
484519

485520
@Override
486521
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
487-
index 4fe9d348b6f14224d4095dcd8ff0a16a1d61589c..e8a9351f40fdcd8ea47632677be52308f9f72b5d 100644
522+
index 20cf4ce4f73f681bdbe092d4693812800c953be9..aecd4c5767a5c91ca60db395b6f412950aa77b26 100644
488523
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
489524
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
490525
@@ -1426,7 +1426,11 @@ public final class CraftServer implements Server {

patches/server/0055-Leaves-Fix-color-in-console.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

patches/server/0054-FoliaPR-Add-TPS-From-Region.patch renamed to patches/server/0056-FoliaPR-Add-TPS-From-Region.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] FoliaPR Add TPS From Region
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
8-
index 20cf4ce4f73f681bdbe092d4693812800c953be9..4fe9d348b6f14224d4095dcd8ff0a16a1d61589c 100644
8+
index aecd4c5767a5c91ca60db395b6f412950aa77b26..e8a9351f40fdcd8ea47632677be52308f9f72b5d 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11-
@@ -3105,6 +3105,42 @@ public final class CraftServer implements Server {
11+
@@ -3109,6 +3109,42 @@ public final class CraftServer implements Server {
1212
};
1313
}
1414

patches/server/0057-Leaf-SecureSeed-Command.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)