Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add tuinity.yml and server.properties to timings config tab

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 15:27:59 -05:00
parent a32448bda1
commit aefaadb08f
9 changed files with 111 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
patches/server/0003-Purpur-config-files.patch
View File

@@ -1,19 +1,20 @@
From c9be48cc2164c8c8aa6d1e8c0003c48dcc2b5f0e Mon Sep 17 00:00:00 2001
From 33b955d71a7fe318ade45591dad05f8f7f100069 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
---
.../com/destroystokyo/paper/PaperConfig.java | 2 +
.../tuinity/tuinity/config/TuinityConfig.java | 2 +-
.../net/minecraft/server/DedicatedServer.java | 9 +
src/main/java/net/minecraft/server/World.java | 2 +
src/main/java/net/pl3x/purpur/Metrics.java | 598 ++++++++++++++++++
.../java/net/pl3x/purpur/PurpurCommand.java | 66 ++
.../java/net/pl3x/purpur/PurpurConfig.java | 135 ++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 67 ++
.../org/bukkit/craftbukkit/CraftServer.java | 11 +
.../org/bukkit/craftbukkit/CraftServer.java | 20 +
.../java/org/bukkit/craftbukkit/Main.java | 8 +
9 files changed, 898 insertions(+)
10 files changed, 908 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -36,6 +37,19 @@ index 1d7d1ffbf..d886f1d14 100644
}
static void readConfig(Class<?> clazz, Object instance) {
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
index 5edae85e7..76d8e55ca 100644
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -19,7 +19,7 @@ public final class TuinityConfig {
private static final Object[] EMPTY = new Object[0];
private static File configFile;
- private static YamlConfiguration config;
+ public static YamlConfiguration config; // Purpur - private -> public
private static int configVersion;
public static void init(final File file) {
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index ede436939..8c7156bb5 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -967,7 +981,7 @@ index 000000000..eda37fa43
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 23c3a69fa..b64413084 100644
index 23c3a69fa..0e4cea4db 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -797,6 +797,7 @@ public final class CraftServer implements Server {
@@ -994,16 +1008,25 @@ index 23c3a69fa..b64413084 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2065,6 +2068,14 @@ public final class CraftServer implements Server {
@@ -2065,6 +2068,23 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}
+ // Purpur start
+ @Override
+ public YamlConfiguration getPurpurConfig()
+ {
+ public YamlConfiguration getTuinityConfig() {
+ return com.tuinity.tuinity.config.TuinityConfig.config;
+ }
+
+ @Override
+ public YamlConfiguration getPurpurConfig() {
+ return net.pl3x.purpur.PurpurConfig.config;
+ }
+
+ @Override
+ public java.util.Properties getServerProperties() {
+ return getProperties().properties;
+ }
+ // Purpur end
+
@Override

6
patches/server/0051-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 004331f50a3cc77a2d50470add031656636aa32b Mon Sep 17 00:00:00 2001
From 42536b66da5e998b17a32575fa4a188ee81902bf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 28 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b64413084..85c7fc177 100644
index 0e4cea4db..26e76df12 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2202,4 +2202,21 @@ public final class CraftServer implements Server {
@@ -2211,4 +2211,21 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.currentTick;
}
// Paper end

6
patches/server/0053-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 0233b14a5cb692e047870000eaba4701e309d311 Mon Sep 17 00:00:00 2001
From 172f860ac4786be57a1d686a6e40e0c25810263f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -46,10 +46,10 @@ index e1a1ef860..2537a5add 100644
public static double packetRateLimitInterval = 10.0; // seconds
public static String packetRateLimitKickMessage = "Sent too many packets";
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 85c7fc177..2b5ae8c86 100644
index 26e76df12..7ba8c8f59 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2218,5 +2218,10 @@ public final class CraftServer implements Server {
@@ -2227,5 +2227,10 @@ public final class CraftServer implements Server {
}
return ((double) total / (double) tickTimes.length) * 1.0E-6D;
}

6
patches/server/0059-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From e8b75fc5bfd3619380d62b876fc5c8da828f37ba Mon Sep 17 00:00:00 2001
From 70088fccf5b04d58f38c9126e3825c8991d93e1b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec8357..309f5562b 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2b5ae8c86..0c63f5ed7 100644
index 7ba8c8f59..7fae8ffd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2204,6 +2204,11 @@ public final class CraftServer implements Server {
@@ -2213,6 +2213,11 @@ public final class CraftServer implements Server {
// Paper end
// Purpur start