OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 23:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source 
By: durron597 <martin.jared@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2011-01-03 20:21:02 -05:00
commit 87d246c1ae
4 changed files with 83 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
paper-server/pom.xml
View file

@ -27,6 +27,11 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>3.2</version>
</dependency>
</dependencies>
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -27,7 +27,7 @@ public final class CraftServer implements Server {
pluginManager.RegisterInterface(JavaPluginLoader.class);
File pluginFolder = new File("plugins");
File pluginFolder = (File)console.options.valueOf("plugins");
if (pluginFolder.exists()) {
try {

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -42,6 +42,10 @@ public class CraftWorld implements World {
return block;
}
public int getHighestBlockYAt(int x, int z) {
return world.d(x, z);
}
public Chunk getChunkAt(int x, int z) {
ChunkCoordinate loc = new ChunkCoordinate(x, z);

76
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View file

@ -1,16 +1,86 @@
package org.bukkit.craftbukkit;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import net.minecraft.server.MinecraftServer;
public class Main {
public static void main(String[] args) {
// Todo: Installation script
OptionParser parser = new OptionParser() {
{
acceptsAll(asList("?", "help"), "Show the help");
acceptsAll(asList("c", "config"), "Properties file to use")
.withRequiredArg()
.ofType(File.class)
.defaultsTo(new File("server.properties"))
.describedAs("Properties file");
acceptsAll(asList("P", "plugins"), "Plugin directory to use")
.withRequiredArg()
.ofType(File.class)
.defaultsTo(new File("plugins"))
.describedAs("Plugin directory");
acceptsAll(asList("h", "host", "server-ip"), "Host to listen on")
.withRequiredArg()
.ofType(String.class)
.describedAs("Hostname or IP");
acceptsAll(asList("w", "world", "level-name"), "World directory")
.withRequiredArg()
.ofType(String.class)
.describedAs("World dir");
acceptsAll(asList("p", "port", "server-port"), "Port to listen on")
.withRequiredArg()
.ofType(Integer.class)
.describedAs("Port");
acceptsAll(asList("o", "online-mode"), "Whether to use online authentication")
.withRequiredArg()
.ofType(Boolean.class)
.describedAs("Authentication");
acceptsAll(asList("s", "size", "max-players"), "Maximum amount of players")
.withRequiredArg()
.ofType(Integer.class)
.describedAs("Server size");
}
};
OptionSet options = null;
try {
MinecraftServer.main(args);
} catch (Throwable t) {
t.printStackTrace();
options = parser.parse(args);
} catch (joptsimple.OptionException ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, ex.getLocalizedMessage());
}
if ((options == null) || (options.has("?"))) {
try {
parser.printHelpOn(System.out);
} catch (IOException ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
}
} else {
try {
MinecraftServer.main(options);
} catch (Throwable t) {
t.printStackTrace();
}
}
}
private static List<String> asList(String... params) {
return Arrays.asList(params);
}
}