Paper/CraftBukkit-Patches/0004-Spigot-Configuration.patch

290 lines
11 KiB
Diff
Raw Normal View History

From ac7ad239ca0a822289a8263e803be7d48eb5c307 Mon Sep 17 00:00:00 2001
2013-05-14 04:08:11 +02:00
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
2013-05-14 04:08:11 +02:00
Subject: [PATCH] Spigot Configuration
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 0ce6c49..160d749 100644
2013-05-14 04:08:11 +02:00
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -89,6 +89,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2013-07-02 05:03:56 +02:00
if (this.I() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
+ // Spigot start
+ this.a((PlayerList) (new DedicatedPlayerList(this)));
+ org.spigotmc.SpigotConfig.init();
+ org.spigotmc.SpigotConfig.registerCommands();
+ // Spigot end
this.getLogger().info("Generating keypair");
this.a(MinecraftEncryption.b());
@@ -103,7 +108,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
- this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
+ // Spigot Start - Move DedicatedPlayerList up and bring plugin loading from CraftServer to here
+ // this.a((PlayerList) (new DedicatedPlayerList(this)));
+ server.loadPlugins();
+ server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
+ // Spigot End
2013-05-14 04:08:11 +02:00
if (!this.getOnlineMode()) {
this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
2013-06-15 14:01:15 +02:00
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
2013-07-02 05:03:56 +02:00
index f134856..0dc673d 100644
2013-06-15 14:01:15 +02:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2013-06-20 09:31:40 +02:00
@@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess {
int lastXAccessed = Integer.MIN_VALUE;
int lastZAccessed = Integer.MIN_VALUE;
final Object chunkLock = new Object();
+ public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public CraftWorld getWorld() {
return this.world;
@@ -110,6 +111,7 @@ public abstract class World implements IBlockAccess {
2013-06-15 14:01:15 +02:00
// Changed signature
public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, IConsoleLogManager iconsolelogmanager, ChunkGenerator gen, org.bukkit.World.Environment env) {
2013-06-20 09:31:40 +02:00
+ this.spigotConfig = new org.spigotmc.SpigotWorldConfig( s ); // Spigot
2013-06-15 14:01:15 +02:00
this.generator = gen;
2013-06-20 09:31:40 +02:00
this.world = new CraftWorld((WorldServer) this, gen, env);
2013-06-15 14:01:15 +02:00
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
2013-06-21 10:14:27 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 00326c1..8148f9b 100644
2013-06-21 10:14:27 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -214,8 +214,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
- loadPlugins();
- enablePlugins(PluginLoadOrder.STARTUP);
+ // Spigot Start - Moved to old location of new DedicatedPlayerList in DedicatedServer
+ // loadPlugins();
+ // enablePlugins(PluginLoadOrder.STARTUP);
+ // Spigot End
}
private File getConfigFile() {
@@ -556,6 +558,7 @@ public final class CraftServer implements Server {
2013-06-21 10:14:27 +02:00
playerList.getIPBans().load();
playerList.getNameBans().load();
+ org.spigotmc.SpigotConfig.init(); // Spigot
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -570,11 +573,13 @@ public final class CraftServer implements Server {
2013-06-21 10:14:27 +02:00
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
+ world.spigotConfig.init(); // Spigot
}
pluginManager.clearPlugins();
commandMap.clearCommands();
resetRecipes();
+ org.spigotmc.SpigotConfig.registerCommands(); // Spigot
int pollCount = 0;
2013-06-20 09:31:40 +02:00
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
2013-06-25 10:12:27 +02:00
index 0000000..b7dbda4
2013-06-20 09:31:40 +02:00
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +1,114 @@
2013-06-20 09:31:40 +02:00
+package org.spigotmc;
+
+import com.google.common.base.Throwables;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
2013-06-21 10:21:29 +02:00
+import java.util.HashMap;
2013-06-20 10:16:28 +02:00
+import java.util.List;
2013-06-21 10:21:29 +02:00
+import java.util.Map;
2013-06-20 09:31:40 +02:00
+import java.util.logging.Level;
+import net.minecraft.server.MinecraftServer;
2013-06-20 09:31:40 +02:00
+import org.bukkit.Bukkit;
2013-06-21 10:21:29 +02:00
+import org.bukkit.command.Command;
2013-06-20 09:31:40 +02:00
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class SpigotConfig
+{
+
+ private static final File CONFIG_FILE = new File( "spigot.yml" );
+ private static final String HEADER = "This is the main configuration file for Spigot.\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"
+ + "For a reference for any variable inside this file, check out the Spigot wiki at\n"
+ + "http://www.spigotmc.org/wiki/spigot-configuration/\n"
+ + "\n"
+ + "If you need help with the configuration or have any questions related to Spigot,\n"
+ + "join us at the IRC or drop by our forums and leave a post.\n"
+ + "\n"
+ + "IRC: #spigot @ irc.esper.net ( http://webchat.esper.net/?channel=spigot )\n"
+ + "Forums: http://www.spigotmc.org/forum/\n";
2013-06-20 09:31:40 +02:00
+ /*========================================================================*/
+ static YamlConfiguration config;
+ static int version;
2013-06-21 10:21:29 +02:00
+ static Map<String, Command> commands;
2013-06-20 09:31:40 +02:00
+ /*========================================================================*/
+
+ public static void init()
+ {
+ config = YamlConfiguration.loadConfiguration( CONFIG_FILE );
+ config.options().header( HEADER );
+ config.options().copyDefaults( true );
+
2013-06-21 10:21:29 +02:00
+ commands = new HashMap<String, Command>();
+
2013-06-20 09:36:06 +02:00
+ version = getInt( "config-version", 1 );
2013-06-20 10:16:28 +02:00
+ readConfig( SpigotConfig.class, null );
+ }
2013-06-15 14:01:15 +02:00
+
+ public static void registerCommands()
+ {
2013-06-21 10:21:29 +02:00
+ for ( Map.Entry<String, Command> entry : commands.entrySet() )
+ {
+ MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
2013-06-21 10:21:29 +02:00
+ }
+ }
+
2013-06-20 10:16:28 +02:00
+ static void readConfig(Class<?> clazz, Object instance)
2013-06-20 09:31:40 +02:00
+ {
2013-06-21 11:10:58 +02:00
+ for ( Method method : clazz.getDeclaredMethods() )
2013-06-20 09:31:40 +02:00
+ {
2013-06-20 10:16:28 +02:00
+ if ( Modifier.isPrivate( method.getModifiers() ) )
2013-06-20 09:31:40 +02:00
+ {
+ if ( method.getParameterTypes().length == 0 && method.getReturnType() == Void.TYPE )
2013-06-20 09:31:40 +02:00
+ {
+ try
+ {
+ method.setAccessible( true );
2013-06-20 10:16:28 +02:00
+ method.invoke( instance );
2013-06-20 09:31:40 +02:00
+ } catch ( InvocationTargetException ex )
+ {
+ Throwables.propagate( ex.getCause() );
2013-06-25 10:12:27 +02:00
+ } catch ( Exception ex )
2013-06-20 09:31:40 +02:00
+ {
+ Bukkit.getLogger().log( Level.SEVERE, "Error invoking " + method, ex );
+ }
+ }
+ }
+ }
2013-06-11 04:56:24 +02:00
+
2013-06-20 09:31:40 +02:00
+ try
+ {
+ config.save( CONFIG_FILE );
+ } catch ( IOException ex )
+ {
+ Bukkit.getLogger().log( Level.SEVERE, "Could not save " + CONFIG_FILE, ex );
+ }
+ }
2013-06-11 04:56:24 +02:00
+
2013-06-20 09:36:06 +02:00
+ private static boolean getBoolean(String path, boolean def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( path, def );
+ return config.getBoolean( path, config.getBoolean( path ) );
+ }
+
2013-06-20 09:36:06 +02:00
+ private static int getInt(String path, int def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( path, def );
+ return config.getInt( path, config.getInt( path ) );
+ }
+
2013-06-21 10:57:20 +02:00
+ private static <T> List getList(String path, T def)
2013-06-20 10:16:28 +02:00
+ {
+ config.addDefault( path, def );
+ return (List<T>) config.getList( path, config.getList( path ) );
+ }
+
2013-06-20 09:36:06 +02:00
+ private static String getString(String path, String def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( path, def );
+ return config.getString( path, config.getString( path ) );
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
new file mode 100644
index 0000000..3f8562f
2013-06-20 09:31:40 +02:00
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -0,0 +1,66 @@
2013-06-20 09:31:40 +02:00
+package org.spigotmc;
2013-06-11 04:56:24 +02:00
+
2013-06-20 10:16:28 +02:00
+import java.util.List;
2013-06-20 09:31:40 +02:00
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class SpigotWorldConfig
+{
+
+ private final String worldName;
2013-06-20 09:36:06 +02:00
+ private final YamlConfiguration config;
2013-06-21 10:14:27 +02:00
+ private boolean verbose;
2013-06-20 09:31:40 +02:00
+
+ public SpigotWorldConfig(String worldName)
+ {
+ this.worldName = worldName;
2013-06-20 09:36:06 +02:00
+ this.config = SpigotConfig.config;
2013-06-21 10:14:27 +02:00
+ init();
+ }
+
+ public void init()
+ {
2013-06-20 09:36:06 +02:00
+ this.verbose = getBoolean( "verbose", true );
2013-06-20 09:31:40 +02:00
+
+ log( "-------- World Settings For [" + worldName + "] --------" );
2013-06-20 10:16:28 +02:00
+ SpigotConfig.readConfig( SpigotWorldConfig.class, this );
2013-06-20 09:31:40 +02:00
+ }
+
+ private void log(String s)
+ {
+ if ( verbose )
2013-06-11 04:56:24 +02:00
+ {
2013-06-20 09:31:40 +02:00
+ Bukkit.getLogger().info( s );
2013-06-11 04:56:24 +02:00
+ }
2013-06-20 09:31:40 +02:00
+ }
+
2013-06-20 09:36:06 +02:00
+ private boolean getBoolean(String path, boolean def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( "world-settings.default." + path, def );
+ return config.getBoolean( "world-settings." + worldName + "." + path, config.getBoolean( "world-settings.default." + path ) );
+ }
+
2013-06-21 09:00:01 +02:00
+ private double getDouble(String path, double def)
+ {
+ config.addDefault( "world-settings.default." + path, def );
2013-06-21 10:14:27 +02:00
+ return config.getDouble( "world-settings." + worldName + "." + path, config.getDouble( "world-settings.default." + path ) );
2013-06-21 09:00:01 +02:00
+ }
+
2013-06-20 09:36:06 +02:00
+ private int getInt(String path, int def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( "world-settings.default." + path, def );
+ return config.getInt( "world-settings." + worldName + "." + path, config.getInt( "world-settings.default." + path ) );
+ }
+
2013-06-21 09:41:26 +02:00
+ private <T> List getList(String path, T def)
2013-06-20 10:16:28 +02:00
+ {
+ config.addDefault( "world-settings.default." + path, def );
+ return (List<T>) config.getList( "world-settings." + worldName + "." + path, config.getList( "world-settings.default." + path ) );
+ }
+
2013-06-20 09:36:06 +02:00
+ private String getString(String path, String def)
2013-06-20 09:31:40 +02:00
+ {
+ config.addDefault( "world-settings.default." + path, def );
+ return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
+ }
+}
2013-05-14 04:08:11 +02:00
--
1.8.1.2
2013-05-14 04:08:11 +02:00