diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91faeca --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ + +plugins/Plugin NPC.jar +plugins/Plugin Misc HW.jar +plugins/Plant.jar +plugins/Cubot.jar +.idea/* +mar.log +mar.log.lck +*.iml +*.class +*/target/* +plugins/*.jar +save.json +Server/Server.iml diff --git a/Plugin Cubot/pom.xml b/Plugin Cubot/pom.xml index ad14040..3357177 100644 --- a/Plugin Cubot/pom.xml +++ b/Plugin Cubot/pom.xml @@ -3,23 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + + net.simon987.server + server_root + 1.2a + + net.simon987.plugincubot plugin-cubot 1.2a - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - diff --git a/Plugin Misc HW/pom.xml b/Plugin Misc HW/pom.xml index ff78dff..9e1408f 100644 --- a/Plugin Misc HW/pom.xml +++ b/Plugin Misc HW/pom.xml @@ -4,23 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + net.simon987.server + server_root + 1.2a + + net.simon987.pluginmischw plugin-misc-hw 1.2a - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - net.simon987.server diff --git a/Plugin NPC/pom.xml b/Plugin NPC/pom.xml index c97766a..9377393 100644 --- a/Plugin NPC/pom.xml +++ b/Plugin NPC/pom.xml @@ -3,22 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + net.simon987.server + server_root + 1.2a + net.simon987.pluginnpc plugin-npc 1.2a - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + diff --git a/Plugin Plant/pom.xml b/Plugin Plant/pom.xml index 226322a..2486b7f 100644 --- a/Plugin Plant/pom.xml +++ b/Plugin Plant/pom.xml @@ -4,21 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + net.simon987.server + server_root + 1.2a + + net.simon987.pluginplant plugin-biomassBlob 1.2a - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + diff --git a/Server/Server.iml b/Server/Server.iml index ebc0539..4f5ac60 100644 --- a/Server/Server.iml +++ b/Server/Server.iml @@ -4,13 +4,12 @@ - - - + + - + diff --git a/Server/pom.xml b/Server/pom.xml index e6d70d0..03a5739 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -3,14 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - net.simon987.server - server - 1.2a + + + net.simon987.server + server_root + 1.2a + + 3.6.2 org.apache.maven.plugins maven-compiler-plugin @@ -18,9 +21,20 @@ 1.8 + + org.apache.maven.plugins + maven-jar-plugin + + ../target + + + net.simon987.server + server + 1.2a + org.java-websocket diff --git a/plugins/Plant.jar b/plugins/Plant.jar deleted file mode 100644 index 7c885cb..0000000 Binary files a/plugins/Plant.jar and /dev/null differ diff --git a/plugins/Plugin Misc HW.jar b/plugins/Plugin Misc HW.jar deleted file mode 100644 index 111b3c6..0000000 Binary files a/plugins/Plugin Misc HW.jar and /dev/null differ diff --git a/plugins/Plugin NPC.jar b/plugins/Plugin NPC.jar deleted file mode 100644 index d3be2a9..0000000 Binary files a/plugins/Plugin NPC.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0ff00c0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + net.simon987.server + server_root + 1.2a + pom + + + + + + 3.6.2 + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + 3.6.2 + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + + ../target/plugins + + + + + + + Server + Plugin Plant + Plugin NPC + Plugin Misc HW + Plugin Cubot + + + + + UTF-8 + + + \ No newline at end of file diff --git a/target/plugins/plugin-biomassBlob-1.2a.jar b/target/plugins/plugin-biomassBlob-1.2a.jar new file mode 100644 index 0000000..82bb871 Binary files /dev/null and b/target/plugins/plugin-biomassBlob-1.2a.jar differ diff --git a/plugins/Cubot.jar b/target/plugins/plugin-cubot-1.2a.jar similarity index 70% rename from plugins/Cubot.jar rename to target/plugins/plugin-cubot-1.2a.jar index 6865b39..78a95bb 100644 Binary files a/plugins/Cubot.jar and b/target/plugins/plugin-cubot-1.2a.jar differ diff --git a/target/plugins/plugin-misc-hw-1.2a.jar b/target/plugins/plugin-misc-hw-1.2a.jar new file mode 100644 index 0000000..9c5410a Binary files /dev/null and b/target/plugins/plugin-misc-hw-1.2a.jar differ diff --git a/target/plugins/plugin-npc-1.2a.jar b/target/plugins/plugin-npc-1.2a.jar new file mode 100644 index 0000000..c7a28e8 Binary files /dev/null and b/target/plugins/plugin-npc-1.2a.jar differ diff --git a/target/server-1.2a.jar b/target/server-1.2a.jar new file mode 100644 index 0000000..b8eca2b Binary files /dev/null and b/target/server-1.2a.jar differ