stuff

2025-04-10 14:26:45 +00:00 · 2017-12-28 17:02:41 -06:00 · 2017-12-28 17:02:41 -06:00 · c23ee0dc86
commit c23ee0dc86
parent 96cce8478e
15 changed files with 4 additions and 105 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,4 +12,4 @@ mar.log.lck
 plugins/*.jar
 save.json
 Server/Server.iml
-target/server-1.2a.jar
+target/*
--- a/Server/pom.xml
+++ b/Server/pom.xml
@ -13,10 +13,10 @@
    <build>
        <resources>
            <resource>
-                <directory>../</directory>
+                <directory>/</directory>
                <filtering>true</filtering>
                <includes>
-                    <include>**/*.properties</include>
+                    <include>../config.properties</include>
                </includes>
            </resource>
        </resources>
--- a/pom.xml
+++ b/pom.xml
@ -13,7 +13,7 @@
    <build>
        <resources>
            <resource>
-                <directory>../</directory>
+                <directory>/src/main/java/resources</directory>
                <filtering>true</filtering>
                <includes>
                    <include>**/*.properties</include>
--- a/target/plugins/plugin-biomassBlob-1.2a.jar
+++ b/target/plugins/plugin-biomassBlob-1.2a.jar
--- a/target/plugins/plugin-cubot-1.2a.jar
+++ b/target/plugins/plugin-cubot-1.2a.jar
--- a/target/plugins/plugin-misc-hw-1.2a.jar
+++ b/target/plugins/plugin-misc-hw-1.2a.jar
--- a/target/plugins/plugin-npc-1.2a.jar
+++ b/target/plugins/plugin-npc-1.2a.jar
--- a/target/server-1.2a.jar
+++ b/target/server-1.2a.jar
--- a/target/server-1.2a/META-INF/MANIFEST.MF
+++ b/target/server-1.2a/META-INF/MANIFEST.MF
@ -1,7 +0,0 @@
-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
-
--- 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
@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Dec 28 16:28:27 CST 2017
-version=1.2a
-groupId=net.simon987.server
-artifactId=server
--- 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
@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-    <modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>net.simon987.server</groupId>
-		<artifactId>server_root</artifactId>
-		<version>1.2a</version>
-    </parent>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>../</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <version>3.6.2</version>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <outputDirectory>../target</outputDirectory>
-                    <archive>
-                        <manifest>
-                            <mainClass>net.simon987.server.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <groupId>net.simon987.server</groupId>
-    <artifactId>server</artifactId>
-    <version>1.2a</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.java-websocket</groupId>
-            <artifactId>Java-WebSocket</artifactId>
-            <version>1.3.6</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.42</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
--- a/Cubot/src/main/resources/plugin.properties
+++ b/Cubot/src/main/resources/plugin.properties
@ -1,3 +0,0 @@
-classpath=net.simon987.cubotplugin.CubotPlugin
-name=Cubot Plugin
-version=1.0
--- a/HW/src/main/resources/plugin.properties
+++ b/HW/src/main/resources/plugin.properties
@ -1,3 +0,0 @@
-classpath=net.simon987.mischwplugin.MiscHWPlugin
-name=Misc HW Plugin
-version=1.0
--- a/target/server-1.2a/Plugin
+++ b/target/server-1.2a/Plugin
@ -1,3 +0,0 @@
-classpath=net.simon987.npcplugin.NpcPlugin
-name=NPC Plugin
-version=1.0
--- a/Plant/src/main/resources/plugin.properties
+++ b/Plant/src/main/resources/plugin.properties
@ -1,3 +0,0 @@
-classpath=net.simon987.biomassplugin.BiomassPlugin
-name=Biomass Plugin
-version=1.0