diff --git a/.gitignore b/.gitignore index 91faeca..3730c79 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ mar.log.lck plugins/*.jar save.json Server/Server.iml +target/server-1.2a.jar diff --git a/Server/pom.xml b/Server/pom.xml index 03a5739..4883186 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -11,6 +11,15 @@ + + + ../ + true + + **/*.properties + + + 3.6.2 @@ -26,6 +35,11 @@ maven-jar-plugin ../target + + + net.simon987.server.Main + + diff --git a/pom.xml b/pom.xml index 0ff00c0..ec845b1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,15 @@ + + + ../ + true + + **/*.properties + + + 3.6.2 @@ -35,6 +44,12 @@ maven-jar-plugin ../target/plugins + + + false + net.simon987.server.Main + + diff --git a/target/plugins/plugin-biomassBlob-1.2a.jar b/target/plugins/plugin-biomassBlob-1.2a.jar index a5486be..aa5b237 100644 Binary files a/target/plugins/plugin-biomassBlob-1.2a.jar and b/target/plugins/plugin-biomassBlob-1.2a.jar differ diff --git a/target/plugins/plugin-cubot-1.2a.jar b/target/plugins/plugin-cubot-1.2a.jar index de09684..08a7477 100644 Binary files a/target/plugins/plugin-cubot-1.2a.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 index a85e7ba..e8a724d 100644 Binary files a/target/plugins/plugin-misc-hw-1.2a.jar 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 index c5e62cb..a10eeac 100644 Binary files a/target/plugins/plugin-npc-1.2a.jar and b/target/plugins/plugin-npc-1.2a.jar differ diff --git a/target/server-1.2a.jar b/target/server-1.2a.jar index 8a4a432..914ca13 100644 Binary files a/target/server-1.2a.jar and b/target/server-1.2a.jar differ diff --git a/target/server-1.2a/META-INF/MANIFEST.MF b/target/server-1.2a/META-INF/MANIFEST.MF new file mode 100644 index 0000000..745ccf7 --- /dev/null +++ b/target/server-1.2a/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Built-By: jacob.swehla +Created-By: Apache Maven 3.5.0 +Build-Jdk: 1.8.0_121 +Main-Class: net.simon987.server.Main + diff --git a/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.properties b/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.properties new file mode 100644 index 0000000..b5b936b --- /dev/null +++ b/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Thu Dec 28 16:28:27 CST 2017 +version=1.2a +groupId=net.simon987.server +artifactId=server diff --git a/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.xml b/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.xml new file mode 100644 index 0000000..4883186 --- /dev/null +++ b/target/server-1.2a/META-INF/maven/net.simon987.server/server/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + + net.simon987.server + server_root + 1.2a + + + + + + ../ + true + + **/*.properties + + + + + + 3.6.2 + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + + ../target + + + net.simon987.server.Main + + + + + + + + net.simon987.server + server + 1.2a + + + + org.java-websocket + Java-WebSocket + 1.3.6 + + + junit + junit + 4.12 + test + + + mysql + mysql-connector-java + 5.1.42 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + + \ No newline at end of file diff --git a/target/server-1.2a/Plugin Cubot/src/main/resources/plugin.properties b/target/server-1.2a/Plugin Cubot/src/main/resources/plugin.properties new file mode 100644 index 0000000..5460a2b --- /dev/null +++ b/target/server-1.2a/Plugin Cubot/src/main/resources/plugin.properties @@ -0,0 +1,3 @@ +classpath=net.simon987.cubotplugin.CubotPlugin +name=Cubot Plugin +version=1.0 \ No newline at end of file diff --git a/target/server-1.2a/Plugin Misc HW/src/main/resources/plugin.properties b/target/server-1.2a/Plugin Misc HW/src/main/resources/plugin.properties new file mode 100644 index 0000000..38fc991 --- /dev/null +++ b/target/server-1.2a/Plugin Misc HW/src/main/resources/plugin.properties @@ -0,0 +1,3 @@ +classpath=net.simon987.mischwplugin.MiscHWPlugin +name=Misc HW Plugin +version=1.0 \ No newline at end of file diff --git a/target/server-1.2a/Plugin NPC/plugin.properties b/target/server-1.2a/Plugin NPC/plugin.properties new file mode 100644 index 0000000..d2e105b --- /dev/null +++ b/target/server-1.2a/Plugin NPC/plugin.properties @@ -0,0 +1,3 @@ +classpath=net.simon987.npcplugin.NpcPlugin +name=NPC Plugin +version=1.0 \ No newline at end of file diff --git a/target/server-1.2a/Plugin Plant/src/main/resources/plugin.properties b/target/server-1.2a/Plugin Plant/src/main/resources/plugin.properties new file mode 100644 index 0000000..067c471 --- /dev/null +++ b/target/server-1.2a/Plugin Plant/src/main/resources/plugin.properties @@ -0,0 +1,3 @@ +classpath=net.simon987.biomassplugin.BiomassPlugin +name=Biomass Plugin +version=1.0 \ No newline at end of file