215 Zeilen
8.4 KiB
Diff
215 Zeilen
8.4 KiB
Diff
From 0abff71f90ac188f2bc11f81faa224f58179f1c8 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Thu, 20 Jun 2013 17:35:57 +1000
|
|
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 7261dc9..6668b7e 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -47,6 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
System.setOut(new PrintStream(new LoggerOutputStream(this.getLogger().getLogger(), Level.INFO), true));
|
|
System.setErr(new PrintStream(new LoggerOutputStream(this.getLogger().getLogger(), Level.SEVERE), true));
|
|
// CraftBukkit end
|
|
+ org.spigotmc.SpigotConfig.init(); // Spigot
|
|
|
|
this.getLogger().info("Starting minecraft server version 1.5.2");
|
|
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 3a4ddea..de052bd 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -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 {
|
|
|
|
// Changed signature
|
|
public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, IConsoleLogManager iconsolelogmanager, ChunkGenerator gen, org.bukkit.World.Environment env) {
|
|
+ this.spigotConfig = new org.spigotmc.SpigotWorldConfig( s ); // Spigot
|
|
this.generator = gen;
|
|
this.world = new CraftWorld((WorldServer) this, gen, env);
|
|
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
new file mode 100644
|
|
index 0000000..bf297bc
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -0,0 +1,98 @@
|
|
+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;
|
|
+import java.util.List;
|
|
+import java.util.logging.Level;
|
|
+import org.bukkit.Bukkit;
|
|
+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/";
|
|
+ /*========================================================================*/
|
|
+ static YamlConfiguration config;
|
|
+ static int version;
|
|
+ /*========================================================================*/
|
|
+
|
|
+ public static void init()
|
|
+ {
|
|
+ config = YamlConfiguration.loadConfiguration( CONFIG_FILE );
|
|
+ config.options().header( HEADER );
|
|
+ config.options().copyDefaults( true );
|
|
+
|
|
+ version = getInt( "config-version", 1 );
|
|
+ readConfig( SpigotConfig.class, null );
|
|
+ }
|
|
+
|
|
+ static void readConfig(Class<?> clazz, Object instance)
|
|
+ {
|
|
+ for ( Method method : SpigotConfig.class.getDeclaredMethods() )
|
|
+ {
|
|
+ if ( Modifier.isPrivate( method.getModifiers() ) )
|
|
+ {
|
|
+ if ( method.getParameterTypes().length == 0 )
|
|
+ {
|
|
+ try
|
|
+ {
|
|
+ method.invoke( instance );
|
|
+ } catch ( InvocationTargetException ex )
|
|
+ {
|
|
+ Throwables.propagate( ex.getCause() );
|
|
+ } catch ( ReflectiveOperationException ex )
|
|
+ {
|
|
+ Bukkit.getLogger().log( Level.SEVERE, "Error invoking " + method, ex );
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ try
|
|
+ {
|
|
+ config.save( CONFIG_FILE );
|
|
+ } catch ( IOException ex )
|
|
+ {
|
|
+ Bukkit.getLogger().log( Level.SEVERE, "Could not save " + CONFIG_FILE, ex );
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static boolean getBoolean(String path, boolean def)
|
|
+ {
|
|
+ config.addDefault( path, def );
|
|
+ return config.getBoolean( path, config.getBoolean( path ) );
|
|
+ }
|
|
+
|
|
+ private static int getInt(String path, int def)
|
|
+ {
|
|
+ config.addDefault( path, def );
|
|
+ return config.getInt( path, config.getInt( path ) );
|
|
+ }
|
|
+
|
|
+ private <T> List<T> getList(String path, T def)
|
|
+ {
|
|
+ config.addDefault( path, def );
|
|
+ return (List<T>) config.getList( path, config.getList( path ) );
|
|
+ }
|
|
+
|
|
+ private static String getString(String path, String def)
|
|
+ {
|
|
+ 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..6642e86
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@@ -0,0 +1,63 @@
|
|
+package org.spigotmc;
|
|
+
|
|
+import java.util.List;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.configuration.file.YamlConfiguration;
|
|
+
|
|
+public class SpigotWorldConfig
|
|
+{
|
|
+
|
|
+ private final String worldName;
|
|
+ private final YamlConfiguration config;
|
|
+ private final boolean verbose;
|
|
+
|
|
+ public SpigotWorldConfig(String worldName)
|
|
+ {
|
|
+ this.worldName = worldName;
|
|
+ this.config = SpigotConfig.config;
|
|
+ this.verbose = getBoolean( "verbose", true );
|
|
+
|
|
+ log( "-------------- Spigot ----------------" );
|
|
+ log( "-------- World Settings For [" + worldName + "] --------" );
|
|
+ log( "-------------------------------------------------" );
|
|
+ SpigotConfig.readConfig( SpigotWorldConfig.class, this );
|
|
+ }
|
|
+
|
|
+ private void log(String s)
|
|
+ {
|
|
+ if ( verbose )
|
|
+ {
|
|
+ Bukkit.getLogger().info( s );
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private boolean getBoolean(String path, boolean def)
|
|
+ {
|
|
+ config.addDefault( "world-settings.default." + path, def );
|
|
+ return config.getBoolean( "world-settings." + worldName + "." + path, config.getBoolean( "world-settings.default." + path ) );
|
|
+ }
|
|
+
|
|
+ private double getDouble(String path, double def)
|
|
+ {
|
|
+ config.addDefault( "world-settings.default." + path, def );
|
|
+ return config.getDouble("world-settings." + worldName + "." + path, config.getDouble("world-settings.default." + path ) );
|
|
+ }
|
|
+
|
|
+ private int getInt(String path, int def)
|
|
+ {
|
|
+ config.addDefault( "world-settings.default." + path, def );
|
|
+ return config.getInt( "world-settings." + worldName + "." + path, config.getInt( "world-settings.default." + path ) );
|
|
+ }
|
|
+
|
|
+ private <T> List<T> getList(String path, T def)
|
|
+ {
|
|
+ config.addDefault( "world-settings.default." + path, def );
|
|
+ return (List<T>) config.getList( "world-settings." + worldName + "." + path, config.getList( "world-settings.default." + path ) );
|
|
+ }
|
|
+
|
|
+ private String getString(String path, String def)
|
|
+ {
|
|
+ config.addDefault( "world-settings.default." + path, def );
|
|
+ return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
|
|
+ }
|
|
+}
|
|
--
|
|
1.8.1.2
|
|
|