mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-10-05 19:07:52 +02:00
140 lines
6.5 KiB
Diff
140 lines
6.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Tue, 4 Aug 2020 19:26:12 -0500
|
|
Subject: [PATCH] Redirect Configs
|
|
|
|
|
|
diff --git a/src/main/java/app/akarin/server/Config.java b/src/main/java/app/akarin/server/Config.java
|
|
index 1742facec843dd87897d62e4aab819835fab4a38..358ac3361c814b7cf5f9650a6a49c6efce7dd56a 100644
|
|
--- a/src/main/java/app/akarin/server/Config.java
|
|
+++ b/src/main/java/app/akarin/server/Config.java
|
|
@@ -4,6 +4,8 @@ import org.bukkit.Bukkit;
|
|
import org.bukkit.configuration.ConfigurationSection;
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
|
+import dev.tr7zw.yatopia.YatopiaConfig;
|
|
+
|
|
import java.io.File;
|
|
import java.lang.reflect.Method;
|
|
import java.lang.reflect.Modifier;
|
|
@@ -22,8 +24,8 @@ public final class Config {
|
|
private static int configVersion;
|
|
|
|
public static void init(final File file) {
|
|
- Config.configFile = file;
|
|
- final YamlConfiguration config = new YamlConfiguration();
|
|
+ Config.configFile = YatopiaConfig.CONFIG_FILE;
|
|
+ /*final YamlConfiguration config = new YamlConfiguration();
|
|
config.options().header(CONFIG_HEADER);
|
|
config.options().copyDefaults(true);
|
|
|
|
@@ -40,9 +42,9 @@ public final class Config {
|
|
Bukkit.getLogger().log(Level.SEVERE, "Failure to load Akarin config", ex);
|
|
throw new RuntimeException(ex);
|
|
}
|
|
- }
|
|
+ }*/
|
|
|
|
- Config.load(config);
|
|
+ Config.load(YatopiaConfig.config);
|
|
}
|
|
|
|
public static void load(final YamlConfiguration config) {
|
|
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
index bd107a376eaf660ba1ad61c035f8ed2d9d04749c..157a5c1be65b6b39787e5be11d1a8d5ea4aeb2b8 100644
|
|
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
@@ -3,6 +3,8 @@ package de.minebench.origami;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
|
+import dev.tr7zw.yatopia.YatopiaConfig;
|
|
+
|
|
import java.io.File;
|
|
import java.lang.reflect.Method;
|
|
import java.lang.reflect.Modifier;
|
|
@@ -20,7 +22,7 @@ public final class OrigamiConfig {
|
|
private static int configVersion;
|
|
|
|
public static void init(final File file) {
|
|
- OrigamiConfig.configFile = file;
|
|
+ /*OrigamiConfig.configFile = file;
|
|
OrigamiConfig.config = new YamlConfiguration();
|
|
config.options().header(CONFIG_HEADER);
|
|
config.options().copyDefaults(true);
|
|
@@ -39,7 +41,9 @@ public final class OrigamiConfig {
|
|
System.out.println("Failure to load origami config");
|
|
throw new RuntimeException(ex);
|
|
}
|
|
- }
|
|
+ }*/
|
|
+ config = YatopiaConfig.config;
|
|
+ configFile = YatopiaConfig.CONFIG_FILE;
|
|
|
|
OrigamiConfig.load(OrigamiConfig.class, null);
|
|
}
|
|
diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
index 9f04500e167b8403c7487044a4ae03a6be61062a..fb3bf0731512b5517ca7ccb3240085b40e7f2abb 100644
|
|
--- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
+++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
@@ -33,7 +33,7 @@ import org.spigotmc.WatchdogThread;
|
|
|
|
public class YatopiaConfig {
|
|
|
|
- private static File CONFIG_FILE;
|
|
+ public static File CONFIG_FILE;
|
|
private static final String HEADER = "This is the main configuration file for Yatopia.\n"
|
|
+ "Yatopia contains many breaking changes and settings, so know what you are doing!\n"
|
|
+ "You have been warned!\n";
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index f8033f57cdf8528199203506a9db92be7b1351ac..d6f7d31418459fedaf486f2eeaa0d7ec0151552c 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -169,6 +169,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
return false;
|
|
}
|
|
com.destroystokyo.paper.PaperConfig.registerCommands();
|
|
+ // Yatopia start
|
|
+ try {
|
|
+ dev.tr7zw.yatopia.YatopiaConfig.init(new File("yatopia.yml"));
|
|
+ } catch (Exception e) {
|
|
+ DedicatedServer.LOGGER.error("Unable to load server configuration", e);
|
|
+ return false;
|
|
+ }
|
|
+ dev.tr7zw.yatopia.YatopiaConfig.registerCommands();
|
|
+ // Yatopia end
|
|
// Purpur start
|
|
try {
|
|
net.pl3x.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
|
|
@@ -182,16 +191,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
// Paper end
|
|
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
|
app.akarin.server.Config.init((java.io.File) options.valueOf("akarin-settings")); // Akarin - Server Config
|
|
-
|
|
- // Yatopia start
|
|
- try {
|
|
- dev.tr7zw.yatopia.YatopiaConfig.init(new File("yatopia.yml"));
|
|
- } catch (Exception e) {
|
|
- DedicatedServer.LOGGER.error("Unable to load server configuration", e);
|
|
- return false;
|
|
- }
|
|
- dev.tr7zw.yatopia.YatopiaConfig.registerCommands();
|
|
- // Yatopia end
|
|
+ de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings"));
|
|
|
|
this.setPVP(dedicatedserverproperties.pvp);
|
|
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index 1a454f74b322605b1006da5be13760b13cc5f931..6820905bf16eb4e8a97615a7ef49b6d3337ab247 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -304,7 +304,7 @@ public class Main {
|
|
}
|
|
// Paper end
|
|
System.setProperty( "library.jansi.version", "Paper" ); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
|
|
- de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings")); // Origami - Server Config
|
|
+ //de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings")); // Origami - Server Config
|
|
System.out.println("Loading libraries, please wait...");
|
|
net.minecraft.server.Main.main(options);
|
|
} catch (Throwable t) {
|