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

Add more details in purpur config header

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-21 14:43:09 -05:00
parent 222ce27b6e
commit 90f0fd289f
10 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 4e655a9a968797ea5ba3b56d3e7735d0f97e3abf Mon Sep 17 00:00:00 2001
From 135c65d603a658d4a6c5690a34b48c6f5b347b40 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
@@ -6,16 +6,16 @@ Subject: [PATCH] Purpur config files
---
.../net/minecraft/server/DedicatedServer.java | 8 ++
src/main/java/net/minecraft/server/World.java | 3 +
.../java/net/pl3x/purpur/PurpurConfig.java | 105 ++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 63 +++++++++++
.../java/net/pl3x/purpur/PurpurConfig.java | 113 ++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 63 ++++++++++
.../org/bukkit/craftbukkit/CraftServer.java | 2 +
.../java/org/bukkit/craftbukkit/Main.java | 8 ++
6 files changed, 189 insertions(+)
6 files changed, 197 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3d452fe0e..22e81ee10 100644
index 3d452fe0e3..22e81ee105 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -172,6 +172,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -34,7 +34,7 @@ index 3d452fe0e..22e81ee10 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e4f2aeed2..030d44c2e 100644
index 1defbd9747..b37e081fc3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -56,10 +56,10 @@ index e4f2aeed2..030d44c2e 100644
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 000000000..e91bd0a36
index 0000000000..108450adcb
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,105 @@
@@ -0,0 +1,113 @@
+package net.pl3x.purpur;
+
+import com.google.common.base.Throwables;
@@ -77,7 +77,15 @@ index 000000000..e91bd0a36
+
+public class PurpurConfig {
+ private static final int CONFIG_VERSION = 1;
+ private static final String HEADER = "This is the main configuration file for Purpur.";
+ private static final String HEADER = "This is the main configuration file for Purpur.\n"
+ + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
+ + "with caution, and make sure you know what each option does before configuring.\n"
+ + "\n"
+ + "If you need help with the configuration or have any questions related to Purpur,\n"
+ + "join us in our Discord guild.\n"
+ + "\n"
+ + "Website: https://pl3x.net \n"
+ + "Docs: https://purpur.readthedocs.org/ \n";
+ private static File CONFIG_FILE;
+ static YamlConfiguration config;
+ private static int version;
@@ -167,7 +175,7 @@ index 000000000..e91bd0a36
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644
index 000000000..30f11fe26
index 0000000000..30f11fe261
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,63 @@
@@ -235,7 +243,7 @@ index 000000000..30f11fe26
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5500c3a22..b04abedb2 100644
index 9f78e85438..e7d80fd58c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -788,6 +788,7 @@ public final class CraftServer implements Server {
@@ -255,7 +263,7 @@ index 5500c3a22..b04abedb2 100644
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 405ea5c46..2d60e7588 100644
index 405ea5c465..2d60e75883 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -137,6 +137,14 @@ public class Main {