From 29cac77e794ed84d3953941c18e670c3db8661e7 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 22 Nov 2017 17:05:50 -0500 Subject: [PATCH] Changed maven artifactID names --- Plugin Cubot/pom.xml | 4 ++-- .../{ => src/main/resources}/plugin.properties | 0 .../src/net/simon987/cubotplugin/CubotAction.java | 10 ---------- Plugin Misc HW/pom.xml | 4 ++-- .../{ => src/main/resources}/plugin.properties | 0 Plugin NPC/pom.xml | 4 ++-- .../main/java/net/simon987/npcplugin/NpcPlugin.java | 2 +- Plugin Plant/pom.xml | 4 ++-- .../{ => src/main/resources}/plugin.properties | 0 Server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 20 deletions(-) rename Plugin Cubot/{ => src/main/resources}/plugin.properties (100%) delete mode 100644 Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java rename Plugin Misc HW/{ => src/main/resources}/plugin.properties (100%) rename Plugin Plant/{ => src/main/resources}/plugin.properties (100%) diff --git a/Plugin Cubot/pom.xml b/Plugin Cubot/pom.xml index 0596f2a..ad14040 100644 --- a/Plugin Cubot/pom.xml +++ b/Plugin Cubot/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.simon987.plugincubot - Plugin Cubot + plugin-cubot 1.2a @@ -24,7 +24,7 @@ net.simon987.server - Server + server 1.2a diff --git a/Plugin Cubot/plugin.properties b/Plugin Cubot/src/main/resources/plugin.properties similarity index 100% rename from Plugin Cubot/plugin.properties rename to Plugin Cubot/src/main/resources/plugin.properties diff --git a/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java b/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java deleted file mode 100644 index 98b60fb..0000000 --- a/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.simon987.cubotplugin; - -public enum CubotAction { - IDLE, - DIGGING, - WALKING, - WITHDRAWING, - DEPOSITING - -} diff --git a/Plugin Misc HW/pom.xml b/Plugin Misc HW/pom.xml index b120ce5..ff78dff 100644 --- a/Plugin Misc HW/pom.xml +++ b/Plugin Misc HW/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.simon987.pluginmischw - Plugin Misc HW + plugin-misc-hw 1.2a @@ -24,7 +24,7 @@ net.simon987.server - Server + server 1.2a diff --git a/Plugin Misc HW/plugin.properties b/Plugin Misc HW/src/main/resources/plugin.properties similarity index 100% rename from Plugin Misc HW/plugin.properties rename to Plugin Misc HW/src/main/resources/plugin.properties diff --git a/Plugin NPC/pom.xml b/Plugin NPC/pom.xml index 857ea6f..c97766a 100644 --- a/Plugin NPC/pom.xml +++ b/Plugin NPC/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.simon987.pluginnpc - Plugin NPC + plugin-npc 1.2a @@ -29,7 +29,7 @@ net.simon987.server - Server + server 1.2a diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java index 801d24b..c3c94fb 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java +++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java @@ -20,7 +20,7 @@ public class NpcPlugin extends ServerPlugin implements GameObjectDeserializer { @Override public GameObject deserializeObject(JSONObject object) { - ; + int objType = (int) (long) object.get("type"); if (objType == HarvesterNPC.ID) { diff --git a/Plugin Plant/pom.xml b/Plugin Plant/pom.xml index cae6177..9570125 100644 --- a/Plugin Plant/pom.xml +++ b/Plugin Plant/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.simon987.pluginplant - Plugin Plant + plugin-plant 1.2a @@ -29,7 +29,7 @@ net.simon987.server - Server + server 1.2a diff --git a/Plugin Plant/plugin.properties b/Plugin Plant/src/main/resources/plugin.properties similarity index 100% rename from Plugin Plant/plugin.properties rename to Plugin Plant/src/main/resources/plugin.properties diff --git a/Server/pom.xml b/Server/pom.xml index 5698a08..e6d70d0 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.simon987.server - Server + server 1.2a