Minecraft/asys
Archived
0
Fork 0
Code Activity

Обновление модуля: обновление до последнего API

Browse Source
This commit is contained in:
DmitriyMX
2016-08-20 14:33:50 +03:00
parent 86e8fde7ec
commit 404f85ad89
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
McProcessServer/pom.xml
View File

@@ -20,14 +20,14 @@
<groupId>asys.mcserver</groupId> <groupId>asys.mcserver</groupId>
<artifactId>process-impl</artifactId> <artifactId>process-impl</artifactId>
<version>0.2</version> <version>0.3</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>asys</groupId> <groupId>asys</groupId>
<artifactId>api</artifactId> <artifactId>api</artifactId>
<version>0.6</version> <version>0.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>

4
McProcessServer/src/main/java/asys/mcserver/Activator.java
View File

@@ -26,7 +26,7 @@ public class Activator implements BundleActivator, MinecraftServerFactory {
} }
@Override @Override
public MinecraftServer createServer(String name, File directory, String mainJar, String jvmArgs, String params) { public MinecraftServer createServer(String name, File directory, String mainJar, short port, String jvmArgs, String params) {
return new MinecraftProcessServer(name, directory, mainJar, jvmArgs, params); return new MinecraftProcessServer(name, directory, mainJar, port, jvmArgs, params);
} }
} }

4
McProcessServer/src/main/java/asys/mcserver/MinecraftProcessServer.java
View File

@@ -17,7 +17,7 @@ public class MinecraftProcessServer implements MinecraftServer {
private final String name; private final String name;
private final byte[] newLine = "\r\n".getBytes(); private final byte[] newLine = "\r\n".getBytes();
public MinecraftProcessServer(String name, File directory, String mainJar, String jvmArgs, String params) { public MinecraftProcessServer(String name, File directory, String mainJar, short port, String jvmArgs, String params) {
processBuilder = new ProcessBuilder(); processBuilder = new ProcessBuilder();
processBuilder.directory(directory); processBuilder.directory(directory);
List<String> commandLine = new Vector<>(); List<String> commandLine = new Vector<>();
@@ -28,6 +28,8 @@ public class MinecraftProcessServer implements MinecraftServer {
} }
commandLine.add("-jar"); commandLine.add("-jar");
commandLine.add(mainJar); commandLine.add(mainJar);
commandLine.add("-p");
commandLine.add(String.valueOf(port));
if ((params != null) && (!params.trim().isEmpty())) { if ((params != null) && (!params.trim().isEmpty())) {
commandLine.add(params); commandLine.add(params);
} }