mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-12-12 20:37:26 +01:00
985b5655f5
This has been in work for a bunch of time. Zoe ( duplexsystem or budgidiere, whatever ) has put a ton of work into this. We now have a bugfree build system that works flawlessly. Co-authored-by: Ivan Pekov <ivan@mrivanplays.com> Co-authored-by: Simon Gardling <titaniumtown@gmail.com> Co-authored-by: toinouH <toinouh2003@gmail.com> P.s the one who merged this is ivan and not bud.
67 lines
3.7 KiB
Diff
67 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Wed, 5 Aug 2020 08:17:46 -0500
|
|
Subject: [PATCH] Redirect Configs
|
|
|
|
|
|
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
index 15aa603a771c327879a4088609850fb86c6347bd..553d6fafbcabafeb008fcf5b60adb8d1a5ffeb6b 100644
|
|
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
|
|
@@ -20,6 +20,8 @@ public final class OrigamiConfig {
|
|
private static int configVersion;
|
|
|
|
public static void init(final File file) {
|
|
+ // Yatopia start
|
|
+ /*
|
|
OrigamiConfig.configFile = file;
|
|
OrigamiConfig.config = new YamlConfiguration();
|
|
config.options().header(CONFIG_HEADER);
|
|
@@ -39,13 +41,16 @@ public final class OrigamiConfig {
|
|
System.out.println("Failure to load origami config");
|
|
throw new RuntimeException(ex);
|
|
}
|
|
- }
|
|
-
|
|
- OrigamiConfig.load(OrigamiConfig.class, null);
|
|
+ }*/
|
|
+ config = org.yatopiamc.yatopia.server.YatopiaConfig.config;
|
|
+ configFile = org.yatopiamc.yatopia.server.YatopiaConfig.CONFIG_FILE;
|
|
+ configVersion = org.yatopiamc.yatopia.server.YatopiaConfig.version;
|
|
+ //OrigamiConfig.load(OrigamiConfig.class, null); // todo: uncomment when config options are ported
|
|
+ // Yatopia end
|
|
}
|
|
|
|
public static void load(Class<?> clazz, Object instance) {
|
|
- OrigamiConfig.configVersion = OrigamiConfig.getInt("config-version-please-do-not-modify-me", CURRENT_CONFIG_VERSION);
|
|
+ //OrigamiConfig.configVersion = OrigamiConfig.getInt("config-version-please-do-not-modify-me", CURRENT_CONFIG_VERSION); // Yatopia - NO
|
|
|
|
for (final Method method : clazz.getDeclaredMethods()) {
|
|
if (method.getReturnType() != void.class || method.getParameterCount() != 0 ||
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index 0a9f03526abf0638ada15d9810b949887fca9f9a..64b662dc9146d0d414a9668d9b93e07aa6665f32 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -188,7 +188,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
return false;
|
|
}
|
|
// Yatopia end
|
|
-
|
|
+ de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings"));
|
|
this.setPVP(dedicatedserverproperties.pvp);
|
|
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
|
this.setResourcePack(dedicatedserverproperties.resourcePack, this.ba());
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index e65f4b990c24e6cee850521f9ad02c2bf4c85ad6..756be0886856aabc31e436f82948d3d069f66fef 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -303,7 +303,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 // Yatopia - no load here for u
|
|
System.out.println("Loading libraries, please wait...");
|
|
net.minecraft.server.Main.main(options);
|
|
} catch (Throwable t) {
|