diff --git a/.gitignore b/.gitignore index eff674339..1f2440b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,9 @@ zSotanna2 /.recommenders/index/http___download_eclipse_org_recommenders_models_mars_ /RemoteSystemsTempFiles /.recommenders/caches + +target/ + +# IntelliJ IDEA Files +*.iml +.idea/ \ No newline at end of file diff --git a/Patches/CraftBukkit-Patches/0177-Server-freezing-fix-fake-yaw-pitch.patch b/Patches/CraftBukkit-Patches/0177-Server-freezing-fix-fake-yaw-pitch.patch new file mode 100644 index 000000000..a7bd7eef1 --- /dev/null +++ b/Patches/CraftBukkit-Patches/0177-Server-freezing-fix-fake-yaw-pitch.patch @@ -0,0 +1,68 @@ +From 3b4526267e3bd53d9e70578ec1c7a8cd13038e73 Mon Sep 17 00:00:00 2001 +From: libraryaddict +Date: Fri, 27 Nov 2015 22:26:34 +1300 +Subject: [PATCH] Server freezing, fix fake yaw/pitch + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 7165579..4f366da 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -5,6 +5,7 @@ import java.util.List; + import java.util.Random; + import java.util.UUID; + import java.util.concurrent.Callable; ++import com.google.common.primitives.Doubles; + + // CraftBukkit start + import org.bukkit.Bukkit; +@@ -153,6 +154,12 @@ public abstract class Entity implements ICommandListener { + public void setFakeHead(boolean fakeHead) + { + _fakeHead = fakeHead; ++ ++ if (!isFakeHead()) ++ { ++ this.fakeYaw = yaw; ++ this.fakePitch = pitch; ++ } + } + + public boolean isSilent() +@@ -1024,9 +1031,18 @@ public abstract class Entity implements ICommandListener { + this.lastX = this.locX = d0; + this.lastY = this.locY = d1; + this.lastZ = this.locZ = d2; +- this.lastYaw = this.yaw = fakeYaw = f; +- this.lastPitch = this.pitch = fakePitch = f1; ++ this.lastYaw = this.yaw = f; ++ this.lastPitch = this.pitch = f1; ++ ++ if (!isFakeHead()) ++ { ++ this.fakeYaw = yaw; ++ this.fakePitch = pitch; ++ } + ++ if (!Doubles.isFinite(locX) || !Doubles.isFinite(locY) || !Doubles.isFinite(locZ)) ++ Thread.dumpStack(); ++ + if (this instanceof EntityLiving) + ((EntityLiving) this).aK = f; + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index 5edef3e..d3b1586 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -208,7 +208,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList + + public void a(PacketPlayInFlying packetplayinflying) { + PlayerConnectionUtils.ensureMainThread(packetplayinflying, this, this.player.u()); +- if (this.b(packetplayinflying)) { ++ if (this.b(packetplayinflying) || !Doubles.isFinite(player.locX) || !Doubles.isFinite(player.locY) || !Doubles.isFinite(player.locZ)) { + this.disconnect("Invalid move packet received"); + } else { + WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); +-- +1.9.5.msysgit.0 + diff --git a/Patches/CraftBukkit-Patches/0178-Sound-and-vehicle-fixes.patch b/Patches/CraftBukkit-Patches/0178-Sound-and-vehicle-fixes.patch new file mode 100644 index 000000000..db2d14f2d --- /dev/null +++ b/Patches/CraftBukkit-Patches/0178-Sound-and-vehicle-fixes.patch @@ -0,0 +1,47 @@ +From 2522a926e6cc670f4f10657ea5494b5ffe81eb37 Mon Sep 17 00:00:00 2001 +From: libraryaddict +Date: Tue, 12 Jan 2016 19:56:07 +1300 +Subject: [PATCH] Sound and vehicle fixes + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 4f366da..fc9cce0 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -1628,11 +1628,13 @@ public abstract class Entity implements ICommandListener { + EntityDismountEvent exitEvent1 = null; + if (this.vehicle != null) { + if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) ++ { + exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity); +- pluginManager.callEvent(exitEvent); ++ pluginManager.callEvent(exitEvent); + +- if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) { +- return; ++ if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) { ++ return; ++ } + } + + exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity); +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java +index 0cc8f9b..dd07600 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java +@@ -14,9 +14,9 @@ public class CraftSound { + set(AMBIENCE_RAIN, "ambient.weather.rain"); + set(AMBIENCE_THUNDER, "ambient.weather.thunder"); + // Damage +- set(HURT_FLESH, "game.neutral.hurt"); +- set(FALL_BIG, "game.neutral.hurt.fall.big"); +- set(FALL_SMALL, "game.neutral.hurt.fall.small"); ++ set(HURT_FLESH, "game.player.hurt"); ++ set(FALL_BIG, "game.player.hurt.fall.big"); ++ set(FALL_SMALL, "game.player.hurt.fall.small"); + // Dig Sounds + set(DIG_WOOL, "dig.cloth"); + set(DIG_GRASS, "dig.grass"); +-- +1.9.5.msysgit.0 + diff --git a/Plugins/.idea/.name b/Plugins/.idea/.name deleted file mode 100644 index 179eb2ecc..000000000 --- a/Plugins/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Mineplex \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml deleted file mode 100644 index dddcd68e4..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_test.xml b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_test.xml deleted file mode 100644 index 3febfc9cc..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/../Testing/Bungee/plugins - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml b/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml deleted file mode 100644 index cc62eda71..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Game_Clans_test.xml b/Plugins/.idea/artifacts/Mineplex_Game_Clans_test.xml deleted file mode 100644 index 99c131976..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Game_Clans_test.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - $PROJECT_DIR$/../Testing/Clans/plugins - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml deleted file mode 100644 index 8ac831c95..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_test.xml b/Plugins/.idea/artifacts/Mineplex_Hub_test.xml deleted file mode 100644 index 0527ee7d4..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Hub_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/../Testing/Hub/plugins - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_MapParser_jar.xml b/Plugins/.idea/artifacts/Mineplex_MapParser_jar.xml deleted file mode 100644 index 84ebf306c..000000000 --- a/Plugins/.idea/artifacts/Mineplex_MapParser_jar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_MapParser_test.xml b/Plugins/.idea/artifacts/Mineplex_MapParser_test.xml deleted file mode 100644 index ec67fdbc2..000000000 --- a/Plugins/.idea/artifacts/Mineplex_MapParser_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/../Testing/MapParser/plugins - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml b/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml deleted file mode 100644 index 6dad4b8f3..000000000 --- a/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Mineplex_Votifier_jar.xml b/Plugins/.idea/artifacts/Mineplex_Votifier_jar.xml deleted file mode 100644 index 372114469..000000000 --- a/Plugins/.idea/artifacts/Mineplex_Votifier_jar.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml deleted file mode 100644 index 79c3170ce..000000000 --- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - $PROJECT_DIR$/bin - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml deleted file mode 100644 index 8b3142e4c..000000000 --- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/../Testing/Arcade/plugins - - - - - \ No newline at end of file diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml deleted file mode 100644 index f750af4b9..000000000 --- a/Plugins/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml deleted file mode 100644 index ec08cea77..000000000 --- a/Plugins/.idea/compiler.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/dataSources.xml b/Plugins/.idea/dataSources.xml deleted file mode 100644 index b55f2b18c..000000000 --- a/Plugins/.idea/dataSources.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - mysql - true - com.mysql.jdbc.Driver - jdbc:mysql://db.mineplex.com:3306/Account - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/encodings.xml b/Plugins/.idea/encodings.xml deleted file mode 100644 index f75895965..000000000 --- a/Plugins/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/BungeeCord.xml b/Plugins/.idea/libraries/BungeeCord.xml deleted file mode 100644 index 0ac775186..000000000 --- a/Plugins/.idea/libraries/BungeeCord.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/NoCheatPlus.xml b/Plugins/.idea/libraries/NoCheatPlus.xml deleted file mode 100644 index 92bd59440..000000000 --- a/Plugins/.idea/libraries/NoCheatPlus.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/commons_codec.xml b/Plugins/.idea/libraries/commons_codec.xml deleted file mode 100644 index 0fad66459..000000000 --- a/Plugins/.idea/libraries/commons_codec.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/commons_dbcp2.xml b/Plugins/.idea/libraries/commons_dbcp2.xml deleted file mode 100644 index 2985dea2c..000000000 --- a/Plugins/.idea/libraries/commons_dbcp2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/commons_io.xml b/Plugins/.idea/libraries/commons_io.xml deleted file mode 100644 index fd63b1467..000000000 --- a/Plugins/.idea/libraries/commons_io.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/commons_logging.xml b/Plugins/.idea/libraries/commons_logging.xml deleted file mode 100644 index 15f402d2f..000000000 --- a/Plugins/.idea/libraries/commons_logging.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/commons_pool2.xml b/Plugins/.idea/libraries/commons_pool2.xml deleted file mode 100644 index 1f63d0077..000000000 --- a/Plugins/.idea/libraries/commons_pool2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/craftbukkit.xml b/Plugins/.idea/libraries/craftbukkit.xml deleted file mode 100644 index 757400be0..000000000 --- a/Plugins/.idea/libraries/craftbukkit.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/gson.xml b/Plugins/.idea/libraries/gson.xml deleted file mode 100644 index c235da675..000000000 --- a/Plugins/.idea/libraries/gson.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/httpclient.xml b/Plugins/.idea/libraries/httpclient.xml deleted file mode 100644 index 6fd5de945..000000000 --- a/Plugins/.idea/libraries/httpclient.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/httpcore.xml b/Plugins/.idea/libraries/httpcore.xml deleted file mode 100644 index 9ea23f380..000000000 --- a/Plugins/.idea/libraries/httpcore.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/jedis.xml b/Plugins/.idea/libraries/jedis.xml deleted file mode 100644 index c215cf0ed..000000000 --- a/Plugins/.idea/libraries/jedis.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/jooq.xml b/Plugins/.idea/libraries/jooq.xml deleted file mode 100644 index 77a1232b0..000000000 --- a/Plugins/.idea/libraries/jooq.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/jooq_codegen.xml b/Plugins/.idea/libraries/jooq_codegen.xml deleted file mode 100644 index 06b90a890..000000000 --- a/Plugins/.idea/libraries/jooq_codegen.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/libraries/mysql_connector.xml b/Plugins/.idea/libraries/mysql_connector.xml deleted file mode 100644 index 34f02f1ee..000000000 --- a/Plugins/.idea/libraries/mysql_connector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml deleted file mode 100644 index 0f016238b..000000000 --- a/Plugins/.idea/misc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml deleted file mode 100644 index 0d58dfad1..000000000 --- a/Plugins/.idea/modules.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/Arcade.xml b/Plugins/.idea/runConfigurations/Arcade.xml deleted file mode 100644 index f57362a28..000000000 --- a/Plugins/.idea/runConfigurations/Arcade.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/Bungee.xml b/Plugins/.idea/runConfigurations/Bungee.xml deleted file mode 100644 index 5c4651df7..000000000 --- a/Plugins/.idea/runConfigurations/Bungee.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/Clans.xml b/Plugins/.idea/runConfigurations/Clans.xml deleted file mode 100644 index 7ffd70d27..000000000 --- a/Plugins/.idea/runConfigurations/Clans.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/Database.xml b/Plugins/.idea/runConfigurations/Database.xml deleted file mode 100644 index 434e772ba..000000000 --- a/Plugins/.idea/runConfigurations/Database.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/Hub.xml b/Plugins/.idea/runConfigurations/Hub.xml deleted file mode 100644 index 031f03cce..000000000 --- a/Plugins/.idea/runConfigurations/Hub.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/runConfigurations/MapParser.xml b/Plugins/.idea/runConfigurations/MapParser.xml deleted file mode 100644 index 85f2a671e..000000000 --- a/Plugins/.idea/runConfigurations/MapParser.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Plugins/.idea/scopes/scope_settings.xml b/Plugins/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/Plugins/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/Plugins/.idea/uiDesigner.xml b/Plugins/.idea/uiDesigner.xml deleted file mode 100644 index 3b0002030..000000000 --- a/Plugins/.idea/uiDesigner.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/.idea/vcs.xml b/Plugins/.idea/vcs.xml deleted file mode 100644 index 21cbaa607..000000000 --- a/Plugins/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Plugins/BuildFiles/EnjinTranslator.xml b/Plugins/BuildFiles/EnjinTranslator.xml deleted file mode 100644 index 6cd7bf62d..000000000 --- a/Plugins/BuildFiles/EnjinTranslator.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml deleted file mode 100644 index 234d9f195..000000000 --- a/Plugins/BuildFiles/common.xml +++ /dev/null @@ -1,540 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Classpath.Dummy/Classpath.Dummy.iml b/Plugins/Classpath.Dummy/Classpath.Dummy.iml deleted file mode 100644 index 62272ae21..000000000 --- a/Plugins/Classpath.Dummy/Classpath.Dummy.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/JedisTest/JedisTest.iml b/Plugins/JedisTest/JedisTest.iml deleted file mode 100644 index c47b983ea..000000000 --- a/Plugins/JedisTest/JedisTest.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java b/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java deleted file mode 100644 index de4481d4b..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java +++ /dev/null @@ -1,93 +0,0 @@ -package ca.phinary.jedistest; - -import javax.swing.*; - -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; - -import ca.phinary.jedistest.gui.ChatFrame; -import ca.phinary.jedistest.model.JedisChat; - -public class Main -{ - public static void main(String[] args) - { - SwingUtilities.invokeLater(new Runnable() - { - @Override - public void run() - { - try - { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - catch (InstantiationException e) - { - e.printStackTrace(); - } - catch (IllegalAccessException e) - { - e.printStackTrace(); - } - catch (UnsupportedLookAndFeelException e) - { - e.printStackTrace(); - } - - ChatFrame chatFrame = new ChatFrame(); - final JedisChat jedisChat = new JedisChat(chatFrame, "phinaryTest", "10.33.53.16", 6379); - - chatFrame.addWindowListener(new WindowListener() - { - @Override - public void windowOpened(WindowEvent e) - { - - } - - @Override - public void windowClosing(WindowEvent e) - { - - } - - @Override - public void windowClosed(WindowEvent e) - { - jedisChat.close(); - } - - @Override - public void windowIconified(WindowEvent e) - { - - } - - @Override - public void windowDeiconified(WindowEvent e) - { - - } - - @Override - public void windowActivated(WindowEvent e) - { - - } - - @Override - public void windowDeactivated(WindowEvent e) - { - - } - }); - } - }); - - } - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java deleted file mode 100644 index adfee2df0..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java +++ /dev/null @@ -1,8 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Chat -{ - public void addListener(ChatListener chatListener); - - public void clearListeners(); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java deleted file mode 100644 index d650ac563..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface ChatListener -{ - public void onChat(String message); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java deleted file mode 100644 index fa899383f..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java +++ /dev/null @@ -1,6 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Console -{ - public void println(String line); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java deleted file mode 100644 index bf94b9e42..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java +++ /dev/null @@ -1,9 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Messenger -{ - public Chat getChat(); - - public Console getConsole(); - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java deleted file mode 100644 index 7ae888aa6..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java +++ /dev/null @@ -1,42 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; - -import java.awt.*; - -import ca.phinary.jedistest.api.Chat; -import ca.phinary.jedistest.api.Console; -import ca.phinary.jedistest.api.Messenger; - -public class ChatFrame extends JFrame implements Messenger -{ - private ConsolePane _console; - private ChatPane _chat; - - public ChatFrame() - { - setLayout(new BorderLayout()); - - _console = new ConsolePane(); - _chat = new ChatPane(this); - - add(_console, BorderLayout.CENTER); - add(_chat, BorderLayout.SOUTH); - - setTitle("Phinary's Redis Chat"); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - pack(); - setLocationRelativeTo(null); - setVisible(true); - } - - public Console getConsole() - { - return _console; - } - - public Chat getChat() - { - return _chat; - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java deleted file mode 100644 index 8234bff85..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java +++ /dev/null @@ -1,60 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; - -import ca.phinary.jedistest.api.Chat; -import ca.phinary.jedistest.api.ChatListener; - -public class ChatPane extends JPanel implements ActionListener, Chat -{ - private ArrayList _chatListeners; - - private JTextField _textField; - private JButton _sendButton; - - public ChatPane(JFrame frame) - { - _chatListeners = new ArrayList(); - - _textField = new JTextField(); - _sendButton = new JButton("Send"); - - setBorder(new EmptyBorder(5, 10, 5, 10)); - setLayout(new BorderLayout()); - - add(_textField, BorderLayout.CENTER); - add(_sendButton, BorderLayout.EAST); - - _sendButton.addActionListener(this); - frame.getRootPane().setDefaultButton(_sendButton); - } - - @Override - public void actionPerformed(ActionEvent e) - { - String text = _textField.getText(); - for (ChatListener listener : _chatListeners) - { - listener.onChat(text); - } - _textField.setText(""); - } - - @Override - public void addListener(ChatListener chatListener) - { - _chatListeners.add(chatListener); - } - - @Override - public void clearListeners() - { - _chatListeners.clear(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java deleted file mode 100644 index 2fb0293c3..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java +++ /dev/null @@ -1,33 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; -import javax.swing.border.TitledBorder; -import java.awt.*; - -import ca.phinary.jedistest.api.Console; - -public class ConsolePane extends JPanel implements Console -{ - private JScrollPane _scrollPane; - private JTextArea _textArea; - - public ConsolePane() - { - _textArea = new JTextArea(); - _textArea.setEditable(false); - _textArea.setPreferredSize(new Dimension(800, 400)); - _scrollPane = new JScrollPane(_textArea); - _scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - - setLayout(new BorderLayout()); - setBorder(new TitledBorder("Console")); - - add(_scrollPane, BorderLayout.CENTER); - } - - public synchronized void println(String line) - { - _textArea.append(line + "\n"); - } - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java deleted file mode 100644 index ff37cdf67..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java +++ /dev/null @@ -1,51 +0,0 @@ -package ca.phinary.jedistest.model; - -import ca.phinary.jedistest.api.Messenger; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; - -public class JedisChat -{ - private JedisPool _jedisPool; - private String _channel; - - private Messenger _messenger; - private JedisPublisher _publisher; - - public JedisChat(Messenger messenger, final String channel, String host, int port) - { - _jedisPool = new JedisPool(new JedisPoolConfig(), host, port); - _channel = channel; - _messenger = messenger; - - _publisher = new JedisPublisher(messenger.getConsole(), _jedisPool, channel); - _messenger.getChat().addListener(_publisher); - - startListen(); - } - - public void startListen() - { - _messenger.getConsole().println("Attempting to connect to redis server..."); - try - { - final Jedis jedis = _jedisPool.getResource(); - - _messenger.getConsole().println("Successfully connected!"); - - SubscribeWorker worker = new SubscribeWorker(_messenger.getConsole(), _jedisPool, _channel); - worker.execute(); - - } catch (Exception e) - { - _messenger.getConsole().println("Failed to connect to redis server!"); - } - } - - public void close() - { - System.out.println("close"); - _publisher.close(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java deleted file mode 100644 index 445c338f3..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java +++ /dev/null @@ -1,93 +0,0 @@ -package ca.phinary.jedistest.model; - -import javax.swing.*; -import java.net.InetAddress; -import java.util.List; - -import ca.phinary.jedistest.api.ChatListener; -import ca.phinary.jedistest.api.Console; -import redis.clients.jedis.JedisPool; - -public class JedisPublisher implements ChatListener -{ - private Console _console; - private JedisPool _jedisPool; - private String _channelName; - - public JedisPublisher(Console console, JedisPool jedisPool, String channelName) - { - _console = console; - _jedisPool = jedisPool; - _channelName = channelName; - - sendConnectMessage(); - } - - @Override - public void onChat(String message) - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - message(hostName + " > " + message); - } - - private void sendConnectMessage() - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - message(hostName + " has connected to the channel"); - } - - public void close() - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - - message(hostName + " has disconnected from the channel"); - } - - private void message(final String text) - { - new SwingWorker() - { - @Override - protected Void doInBackground() throws Exception - { - try - { - _jedisPool.getResource().publish(_channelName, text); - } - catch (Exception e) - { - publish("Failed to send message: " + e.getMessage()); - } - return null; - } - - @Override - protected void process(List chunks) - { - for (String s : chunks) - _console.println(s); - } - }.execute(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java deleted file mode 100644 index a1df8dedd..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java +++ /dev/null @@ -1,49 +0,0 @@ -package ca.phinary.jedistest.model; - -import redis.clients.jedis.JedisPubSub; - -public class JedisSubscriber extends JedisPubSub -{ - private SubscribeWorker _jedisWorker; - - public JedisSubscriber(SubscribeWorker jedisWorker) - { - _jedisWorker = jedisWorker; - } - - @Override - public void onMessage(String channel, String message) - { - _jedisWorker.onMessage(message); - } - - @Override - public void onPMessage(String s, String s1, String s2) - { - System.out.println("Pmessage:" + s + " " + s1 + " " + s2); - } - - @Override - public void onSubscribe(String s, int i) - { - System.out.println("Subcribe: s " + i); - } - - @Override - public void onUnsubscribe(String s, int i) - { - System.out.println("UnSubcribe: s " + i); - } - - @Override - public void onPUnsubscribe(String s, int i) - { - System.out.println("PUnSubcribe: s " + i); - } - - @Override - public void onPSubscribe(String s, int i) - { - System.out.println("Subcribe: s " + i); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java deleted file mode 100644 index 27b159657..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java +++ /dev/null @@ -1,56 +0,0 @@ -package ca.phinary.jedistest.model; - -import javax.swing.*; - -import java.util.List; - -import ca.phinary.jedistest.api.Console; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -public class SubscribeWorker extends SwingWorker -{ - private Console _console; - private JedisPool _jedisPool; - private JedisSubscriber _jedisSubscriber; - private String _channel; - - public SubscribeWorker(Console console, JedisPool jedisPool, String channel) - { - _console = console; - _jedisPool = jedisPool; - _jedisSubscriber = new JedisSubscriber(this); - _channel = channel; - } - - @Override - protected Void doInBackground() throws Exception - { - publish("Attempting to connect to channel: " + _channel); - try - { - Jedis j = _jedisPool.getResource(); - publish("Successfully connected to channel!"); - _jedisPool.getResource().subscribe(_jedisSubscriber, _channel); - } catch (Exception e) - { - publish("Connection to channel failed:" + e.getMessage()); - } - - return null; - } - - public void onMessage(String s) - { - publish(s); - } - - @Override - protected void process(List chunks) - { - for (String s : chunks) - { - _console.println(s); - } - } -} diff --git a/Plugins/Libraries/BungeeCord.jar b/Plugins/Libraries/BungeeCord.jar deleted file mode 100644 index 895238443..000000000 Binary files a/Plugins/Libraries/BungeeCord.jar and /dev/null differ diff --git a/Plugins/Libraries/NoCheatPlus.jar b/Plugins/Libraries/NoCheatPlus.jar deleted file mode 100644 index 8f367f996..000000000 Binary files a/Plugins/Libraries/NoCheatPlus.jar and /dev/null differ diff --git a/Plugins/Libraries/TerrainControl.jar b/Plugins/Libraries/TerrainControl.jar deleted file mode 100644 index e023e8be7..000000000 Binary files a/Plugins/Libraries/TerrainControl.jar and /dev/null differ diff --git a/Plugins/Libraries/Votifier.jar b/Plugins/Libraries/Votifier.jar deleted file mode 100644 index 9751f180a..000000000 Binary files a/Plugins/Libraries/Votifier.jar and /dev/null differ diff --git a/Plugins/Libraries/bcprov-jdk15on-147.jar b/Plugins/Libraries/bcprov-jdk15on-147.jar deleted file mode 100644 index 0b80922e6..000000000 Binary files a/Plugins/Libraries/bcprov-jdk15on-147.jar and /dev/null differ diff --git a/Plugins/Libraries/bukkit.jar b/Plugins/Libraries/bukkit.jar deleted file mode 100644 index 460e80d24..000000000 Binary files a/Plugins/Libraries/bukkit.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-cli-1.3.1.jar b/Plugins/Libraries/commons-cli-1.3.1.jar deleted file mode 100644 index c3e7a1f47..000000000 Binary files a/Plugins/Libraries/commons-cli-1.3.1.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-codec-1.6.jar b/Plugins/Libraries/commons-codec-1.6.jar deleted file mode 100644 index ee1bc49ac..000000000 Binary files a/Plugins/Libraries/commons-codec-1.6.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-dbcp2-2.0.1.jar b/Plugins/Libraries/commons-dbcp2-2.0.1.jar deleted file mode 100644 index 5e8d142dd..000000000 Binary files a/Plugins/Libraries/commons-dbcp2-2.0.1.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-io-2.4.jar b/Plugins/Libraries/commons-io-2.4.jar deleted file mode 100644 index 90035a4fe..000000000 Binary files a/Plugins/Libraries/commons-io-2.4.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-lang3-3.1.jar b/Plugins/Libraries/commons-lang3-3.1.jar deleted file mode 100644 index a85e539b1..000000000 Binary files a/Plugins/Libraries/commons-lang3-3.1.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-logging-1.1.1.jar b/Plugins/Libraries/commons-logging-1.1.1.jar deleted file mode 100644 index 1deef144c..000000000 Binary files a/Plugins/Libraries/commons-logging-1.1.1.jar and /dev/null differ diff --git a/Plugins/Libraries/commons-pool2-2.2.jar b/Plugins/Libraries/commons-pool2-2.2.jar deleted file mode 100644 index 6a3eb38ac..000000000 Binary files a/Plugins/Libraries/commons-pool2-2.2.jar and /dev/null differ diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index a585cf020..fcd6fc5b3 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ diff --git a/Plugins/Libraries/cxf-bundle-2.7.16.jar b/Plugins/Libraries/cxf-bundle-2.7.16.jar deleted file mode 100644 index 3c1182633..000000000 Binary files a/Plugins/Libraries/cxf-bundle-2.7.16.jar and /dev/null differ diff --git a/Plugins/Libraries/cxf-bundle-2.7.2.jar b/Plugins/Libraries/cxf-bundle-2.7.2.jar deleted file mode 100644 index e94b68339..000000000 Binary files a/Plugins/Libraries/cxf-bundle-2.7.2.jar and /dev/null differ diff --git a/Plugins/Libraries/cxf-rt-ws-policy-2.7.2.jar b/Plugins/Libraries/cxf-rt-ws-policy-2.7.2.jar deleted file mode 100644 index df3d2d646..000000000 Binary files a/Plugins/Libraries/cxf-rt-ws-policy-2.7.2.jar and /dev/null differ diff --git a/Plugins/Libraries/ebean-2.7.7.jar b/Plugins/Libraries/ebean-2.7.7.jar deleted file mode 100644 index 6232038f3..000000000 Binary files a/Plugins/Libraries/ebean-2.7.7.jar and /dev/null differ diff --git a/Plugins/Libraries/fluent-hc-4.2.jar b/Plugins/Libraries/fluent-hc-4.2.jar deleted file mode 100644 index 1f0e5d711..000000000 Binary files a/Plugins/Libraries/fluent-hc-4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/gson-2.2.1.jar b/Plugins/Libraries/gson-2.2.1.jar deleted file mode 100644 index 93ac6d70b..000000000 Binary files a/Plugins/Libraries/gson-2.2.1.jar and /dev/null differ diff --git a/Plugins/Libraries/guava-r07.jar b/Plugins/Libraries/guava-r07.jar deleted file mode 100644 index 9ff5f8905..000000000 Binary files a/Plugins/Libraries/guava-r07.jar and /dev/null differ diff --git a/Plugins/Libraries/httpclient-4.2.jar b/Plugins/Libraries/httpclient-4.2.jar deleted file mode 100644 index 9e0df5098..000000000 Binary files a/Plugins/Libraries/httpclient-4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/httpclient-cache-4.2.jar b/Plugins/Libraries/httpclient-cache-4.2.jar deleted file mode 100644 index a06f4bc66..000000000 Binary files a/Plugins/Libraries/httpclient-cache-4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/httpcore-4.2.jar b/Plugins/Libraries/httpcore-4.2.jar deleted file mode 100644 index 20214eabd..000000000 Binary files a/Plugins/Libraries/httpcore-4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/httpmime-4.2.jar b/Plugins/Libraries/httpmime-4.2.jar deleted file mode 100644 index 8cec2fc23..000000000 Binary files a/Plugins/Libraries/httpmime-4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/jackson-annotations-2.5.0.jar b/Plugins/Libraries/jackson-annotations-2.5.0.jar deleted file mode 100644 index 62521310a..000000000 Binary files a/Plugins/Libraries/jackson-annotations-2.5.0.jar and /dev/null differ diff --git a/Plugins/Libraries/jackson-core-2.5.1.jar b/Plugins/Libraries/jackson-core-2.5.1.jar deleted file mode 100644 index 8c9c4e0e4..000000000 Binary files a/Plugins/Libraries/jackson-core-2.5.1.jar and /dev/null differ diff --git a/Plugins/Libraries/jackson-databind-2.5.1.jar b/Plugins/Libraries/jackson-databind-2.5.1.jar deleted file mode 100644 index 9b82e3fa5..000000000 Binary files a/Plugins/Libraries/jackson-databind-2.5.1.jar and /dev/null differ diff --git a/Plugins/Libraries/jansi-1.3.jar b/Plugins/Libraries/jansi-1.3.jar deleted file mode 100644 index 680d5758e..000000000 Binary files a/Plugins/Libraries/jansi-1.3.jar and /dev/null differ diff --git a/Plugins/Libraries/javax.mail.jar b/Plugins/Libraries/javax.mail.jar deleted file mode 100644 index ca7eca7d9..000000000 Binary files a/Plugins/Libraries/javax.mail.jar and /dev/null differ diff --git a/Plugins/Libraries/jedis-2.4.2.jar b/Plugins/Libraries/jedis-2.4.2.jar deleted file mode 100644 index 21fdcabf7..000000000 Binary files a/Plugins/Libraries/jedis-2.4.2.jar and /dev/null differ diff --git a/Plugins/Libraries/jersey-apache-client-1.19.jar b/Plugins/Libraries/jersey-apache-client-1.19.jar deleted file mode 100644 index ac11e75f7..000000000 Binary files a/Plugins/Libraries/jersey-apache-client-1.19.jar and /dev/null differ diff --git a/Plugins/Libraries/jersey-bundle-1.17.jar b/Plugins/Libraries/jersey-bundle-1.17.jar deleted file mode 100644 index f25c713ce..000000000 Binary files a/Plugins/Libraries/jersey-bundle-1.17.jar and /dev/null differ diff --git a/Plugins/Libraries/jersey-multipart-1.19.jar b/Plugins/Libraries/jersey-multipart-1.19.jar deleted file mode 100644 index 75d77090a..000000000 Binary files a/Plugins/Libraries/jersey-multipart-1.19.jar and /dev/null differ diff --git a/Plugins/Libraries/jline-2.6.jar b/Plugins/Libraries/jline-2.6.jar deleted file mode 100644 index 0e32654ff..000000000 Binary files a/Plugins/Libraries/jline-2.6.jar and /dev/null differ diff --git a/Plugins/Libraries/jooq-3.5.2-javadoc.jar b/Plugins/Libraries/jooq-3.5.2-javadoc.jar deleted file mode 100644 index 5ac17c5ae..000000000 Binary files a/Plugins/Libraries/jooq-3.5.2-javadoc.jar and /dev/null differ diff --git a/Plugins/Libraries/jooq-3.5.2-sources.jar b/Plugins/Libraries/jooq-3.5.2-sources.jar deleted file mode 100644 index e3248a62a..000000000 Binary files a/Plugins/Libraries/jooq-3.5.2-sources.jar and /dev/null differ diff --git a/Plugins/Libraries/jooq-3.5.2.jar b/Plugins/Libraries/jooq-3.5.2.jar deleted file mode 100644 index d5b87d85b..000000000 Binary files a/Plugins/Libraries/jooq-3.5.2.jar and /dev/null differ diff --git a/Plugins/Libraries/jooq-codegen-3.5.2.jar b/Plugins/Libraries/jooq-codegen-3.5.2.jar deleted file mode 100644 index 9d6c2f5ff..000000000 Binary files a/Plugins/Libraries/jooq-codegen-3.5.2.jar and /dev/null differ diff --git a/Plugins/Libraries/jooq-meta-3.5.2.jar b/Plugins/Libraries/jooq-meta-3.5.2.jar deleted file mode 100644 index 0ca368194..000000000 Binary files a/Plugins/Libraries/jooq-meta-3.5.2.jar and /dev/null differ diff --git a/Plugins/Libraries/jopt-simple-3.2.jar b/Plugins/Libraries/jopt-simple-3.2.jar deleted file mode 100644 index 563736216..000000000 Binary files a/Plugins/Libraries/jopt-simple-3.2.jar and /dev/null differ diff --git a/Plugins/Libraries/mysql-connector-java-5.1.32-bin.jar b/Plugins/Libraries/mysql-connector-java-5.1.32-bin.jar deleted file mode 100644 index 822b714e5..000000000 Binary files a/Plugins/Libraries/mysql-connector-java-5.1.32-bin.jar and /dev/null differ diff --git a/Plugins/Libraries/mysql.zip b/Plugins/Libraries/mysql.zip deleted file mode 100644 index 13f3b4c2a..000000000 Binary files a/Plugins/Libraries/mysql.zip and /dev/null differ diff --git a/Plugins/Libraries/org-apache-commons-lang.jar b/Plugins/Libraries/org-apache-commons-lang.jar deleted file mode 100644 index 5d0113f3a..000000000 Binary files a/Plugins/Libraries/org-apache-commons-lang.jar and /dev/null differ diff --git a/Plugins/Libraries/slf4j-api-1.7.10.jar b/Plugins/Libraries/slf4j-api-1.7.10.jar deleted file mode 100644 index ac7da374a..000000000 Binary files a/Plugins/Libraries/slf4j-api-1.7.10.jar and /dev/null differ diff --git a/Plugins/Libraries/snakeyaml-1.10.jar b/Plugins/Libraries/snakeyaml-1.10.jar deleted file mode 100644 index 75a4e7d43..000000000 Binary files a/Plugins/Libraries/snakeyaml-1.10.jar and /dev/null differ diff --git a/Plugins/Libraries/wss4j-1.6.9.jar b/Plugins/Libraries/wss4j-1.6.9.jar deleted file mode 100644 index 89b8febe1..000000000 Binary files a/Plugins/Libraries/wss4j-1.6.9.jar and /dev/null differ diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.classpath b/Plugins/Mineplex.Bungee.Mineplexer/.classpath deleted file mode 100644 index c06b6c559..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.externalToolBuilders/Mineplexer2.launch b/Plugins/Mineplex.Bungee.Mineplexer/.externalToolBuilders/Mineplexer2.launch deleted file mode 100644 index bab52abb3..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.externalToolBuilders/Mineplexer2.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.project b/Plugins/Mineplex.Bungee.Mineplexer/.project deleted file mode 100644 index 414ef170a..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.Bungee.Mineplexer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/Mineplexer2.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml b/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml deleted file mode 100644 index a1a0bd8bf..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Bungee.Mineplexer/pom.xml b/Plugins/Mineplex.Bungee.Mineplexer/pom.xml new file mode 100644 index 000000000..4b46f2b44 --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + Mineplexer + mineplex-bungee-mineplexer + + + + ${project.groupId} + mineplex-cache + ${project.version} + + + ${project.groupId} + mineplex-serverdata + ${project.version} + + + commons-codec + commons-codec + + + net.md-5 + bungeecord-proxy + + + diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerJoinHandler.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerJoinHandler.java index 8e56dab88..36c4f37c8 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerJoinHandler.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerJoinHandler.java @@ -1,5 +1,6 @@ package mineplex.bungee.playerTracker; +import java.util.UUID; import mineplex.serverdata.commands.CommandCallback; import mineplex.serverdata.commands.PlayerJoinCommand; import mineplex.serverdata.commands.ServerCommand; @@ -21,7 +22,7 @@ public class PlayerJoinHandler implements CommandCallback { PlayerJoinCommand joinCommand = (PlayerJoinCommand)command; - _playerTracker.kickPlayerIfOnline(joinCommand.getUuid()); + _playerTracker.kickPlayerIfOnline(UUID.fromString(joinCommand.getUuid())); } } } diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java index 8d0a2cf99..a7b2d004e 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java @@ -2,6 +2,7 @@ package mineplex.bungee.playerTracker; import java.io.File; import java.util.HashSet; +import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -27,7 +28,7 @@ public class PlayerTracker implements Listener, Runnable // Repository storing player status' across network. private DataRepository _repository; - private HashSet _onlineUUIDs = new HashSet(); + private Set _onlineUUIDs = new HashSet<>(); private Plugin _plugin; @@ -76,32 +77,32 @@ public class PlayerTracker implements Listener, Runnable @EventHandler public void playerConnect(final PostLoginEvent event) { - _onlineUUIDs.add(event.getPlayer().getUniqueId().toString()); + _onlineUUIDs.add(event.getPlayer().getUniqueId()); } @Override public void run() { - HashSet onlineUUIDs = new HashSet(); + Set onlineUUIDs = new HashSet<>(); for (ProxiedPlayer player : _plugin.getProxy().getPlayers()) { - onlineUUIDs.add(player.getUniqueId().toString()); + onlineUUIDs.add(player.getUniqueId()); } _onlineUUIDs = onlineUUIDs; } - public boolean isPlayerOnline(String uuid) + public boolean isPlayerOnline(UUID uuid) { return _onlineUUIDs.contains(uuid); } - public void kickPlayerIfOnline(String uuid) + public void kickPlayerIfOnline(UUID uuid) { if (_onlineUUIDs.contains(uuid)) { - ProxiedPlayer player = _plugin.getProxy().getPlayer(UUID.fromString(uuid)); + ProxiedPlayer player = _plugin.getProxy().getPlayer(uuid); if (player != null) player.disconnect("You have logged in from another location."); diff --git a/Plugins/Mineplex.BungeeRotator/.classpath b/Plugins/Mineplex.BungeeRotator/.classpath deleted file mode 100644 index e952c3e6a..000000000 --- a/Plugins/Mineplex.BungeeRotator/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.BungeeRotator/.externalToolBuilders/BungeeRotator.launch b/Plugins/Mineplex.BungeeRotator/.externalToolBuilders/BungeeRotator.launch deleted file mode 100644 index 894d3947c..000000000 --- a/Plugins/Mineplex.BungeeRotator/.externalToolBuilders/BungeeRotator.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.BungeeRotator/.project b/Plugins/Mineplex.BungeeRotator/.project deleted file mode 100644 index 6378b1f50..000000000 --- a/Plugins/Mineplex.BungeeRotator/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.BungeeRotator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/BungeeRotator.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.BungeeRotator/pom.xml b/Plugins/Mineplex.BungeeRotator/pom.xml new file mode 100644 index 000000000..7fff9dd5a --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + + com.mineplex + mineplex-app + dev-SNAPSHOT + ../app.xml + + + BungeeRotator + mineplex-bungeerotator + + + + ${project.groupId} + mineplex-serverdata + ${project.version} + + + org.apache.cxf + cxf-bundle + + + org.apache.ws.security + wss4j + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + mineplex.bungee.BungeeRotator + + + + + + + diff --git a/Plugins/Mineplex.Cache/.classpath b/Plugins/Mineplex.Cache/.classpath deleted file mode 100644 index e5ed569d5..000000000 --- a/Plugins/Mineplex.Cache/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Plugins/Mineplex.Cache/.project b/Plugins/Mineplex.Cache/.project deleted file mode 100644 index 5321c2157..000000000 --- a/Plugins/Mineplex.Cache/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Cache - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Cache/Mineplex.Cache.iml b/Plugins/Mineplex.Cache/Mineplex.Cache.iml deleted file mode 100644 index 54892e832..000000000 --- a/Plugins/Mineplex.Cache/Mineplex.Cache.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Cache/pom.xml b/Plugins/Mineplex.Cache/pom.xml new file mode 100644 index 000000000..5a9cafabd --- /dev/null +++ b/Plugins/Mineplex.Cache/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-cache + + + + ${project.groupId} + mineplex-serverdata + ${project.version} + + + diff --git a/Plugins/Mineplex.ChestConverter/.classpath b/Plugins/Mineplex.ChestConverter/.classpath deleted file mode 100644 index 49e473eb4..000000000 --- a/Plugins/Mineplex.ChestConverter/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/Chest.launch b/Plugins/Mineplex.ChestConverter/.externalToolBuilders/Chest.launch deleted file mode 100644 index ecc42cfd7..000000000 --- a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/Chest.launch +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/New_Builder.launch b/Plugins/Mineplex.ChestConverter/.externalToolBuilders/New_Builder.launch deleted file mode 100644 index 0c6e0f696..000000000 --- a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/New_Builder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/ServerMonitor.launch b/Plugins/Mineplex.ChestConverter/.externalToolBuilders/ServerMonitor.launch deleted file mode 100644 index d07871b9a..000000000 --- a/Plugins/Mineplex.ChestConverter/.externalToolBuilders/ServerMonitor.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ChestConverter/.project b/Plugins/Mineplex.ChestConverter/.project deleted file mode 100644 index d1d373e2c..000000000 --- a/Plugins/Mineplex.ChestConverter/.project +++ /dev/null @@ -1,37 +0,0 @@ - - - Mineplex.ChestConverter - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/ServerMonitor.launch - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/Chest.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/Plugins/Mineplex.ChestConverter/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Plugins/Mineplex.ChestConverter/Mineplex.ServerMonitor.iml b/Plugins/Mineplex.ChestConverter/Mineplex.ServerMonitor.iml deleted file mode 100644 index 53e69d8e1..000000000 --- a/Plugins/Mineplex.ChestConverter/Mineplex.ServerMonitor.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core.Common/.classpath b/Plugins/Mineplex.Core.Common/.classpath deleted file mode 100644 index a028ce814..000000000 --- a/Plugins/Mineplex.Core.Common/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Plugins/Mineplex.Core.Common/.project b/Plugins/Mineplex.Core.Common/.project deleted file mode 100644 index 801869e42..000000000 --- a/Plugins/Mineplex.Core.Common/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Core.Common - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml b/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml deleted file mode 100644 index b59695f8a..000000000 --- a/Plugins/Mineplex.Core.Common/Mineplex.Core.Common.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/ascii.png b/Plugins/Mineplex.Core.Common/ascii.png similarity index 100% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/ascii.png rename to Plugins/Mineplex.Core.Common/ascii.png diff --git a/Plugins/Mineplex.Core.Common/pom.xml b/Plugins/Mineplex.Core.Common/pom.xml new file mode 100644 index 000000000..c2512a855 --- /dev/null +++ b/Plugins/Mineplex.Core.Common/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-core-common + + + + com.mineplex + spigot + + + + + + + + + ascii.png + + + + + diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java index 360a418c2..fe42fdf3c 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java @@ -24,7 +24,7 @@ public class UtilText { try { - InputStream inputStream = CurrencyType.class.getResourceAsStream("ascii.png"); + InputStream inputStream = CurrencyType.class.getResourceAsStream("/ascii.png"); BufferedImage image = ImageIO.read(inputStream); char[] text = new char[] diff --git a/Plugins/Mineplex.Core/.classpath b/Plugins/Mineplex.Core/.classpath deleted file mode 100644 index e223d6129..000000000 --- a/Plugins/Mineplex.Core/.classpath +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch b/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch deleted file mode 100644 index 881f2f585..000000000 --- a/Plugins/Mineplex.Core/.externalToolBuilders/asdf.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core/.project b/Plugins/Mineplex.Core/.project deleted file mode 100644 index 83838c414..000000000 --- a/Plugins/Mineplex.Core/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.Core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/asdf.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a698e5967..000000000 --- a/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Core/Mineplex.Core.iml b/Plugins/Mineplex.Core/Mineplex.Core.iml deleted file mode 100644 index c6de528e3..000000000 --- a/Plugins/Mineplex.Core/Mineplex.Core.iml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Core/pom.xml b/Plugins/Mineplex.Core/pom.xml new file mode 100644 index 000000000..2a88ca1ca --- /dev/null +++ b/Plugins/Mineplex.Core/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-core + + + + ${project.groupId} + mineplex-cache + ${project.version} + + + ${project.groupId} + mineplex-core-common + ${project.version} + + + ${project.groupId} + mineplex-database + ${project.version} + + + ${project.groupId} + mineplex-serverdata + ${project.version} + + + fr.neatmonster + nocheatplus + + + org.apache.commons + commons-dbcp2 + + + org.apache.httpcomponents + httpclient + + + + + + + + + version.properties + + true + + + + diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index af619626b..6dd6d2c29 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -69,8 +69,8 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook PacketPlayOutEntityMetadata.class, PacketPlayOutSpawnEntity.class, PacketPlayOutSpawnEntityLiving.class, PacketPlayOutNamedEntitySpawn.class, PacketPlayInUseEntity.class, PacketPlayOutAttachEntity.class); - NCPHookManager.addHook(CheckType.MOVING_SURVIVALFLY, this); - NCPHookManager.addHook(CheckType.MOVING_PASSABLE, this); +// NCPHookManager.addHook(CheckType.MOVING_SURVIVALFLY, this); +// NCPHookManager.addHook(CheckType.MOVING_PASSABLE, this); NCPHookManager.addHook(CheckType.ALL, this); } @@ -80,7 +80,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook _entityMap.remove(event.getPlayer().getName()); _entityNameMap.remove(event.getPlayer().getName()); _entityRiding.remove(event.getPlayer().getName()); - _loggedIn.remove(event.getPlayer()); + _loggedIn.remove(event.getPlayer().getName()); } @EventHandler(priority = EventPriority.LOW) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index d92f4e5b7..1f2dc672d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -213,6 +213,11 @@ public class CoreClientManager extends MiniPlugin _clientsConnecting.decrementAndGet(); } } + + public void loadAccountIdFromUUID(UUID uuid, Callback callback) + { + _repository.getAccountId(uuid, callback); + } public void loadClientByName(final String playerName, final Runnable runnable) { @@ -466,6 +471,13 @@ public class CoreClientManager extends MiniPlugin if (event.getReason().contains("You logged in from another location")) { _duplicateLoginGlitchPreventionList.add(event.getPlayer().getName()); + Bukkit.getScheduler().runTask(_plugin, new Runnable() { + public void run() { + if(!_clientList.containsKey(event.getPlayer().getName())) return; + Player p = _clientList.get(event.getPlayer().getName()).GetPlayer(); + p.kickPlayer("You're already logged in."); + } + }); } } @@ -473,7 +485,7 @@ public class CoreClientManager extends MiniPlugin public void Quit(PlayerQuitEvent event) { // When an account is logged in to this server and the same account name logs in - // Then it Fires events in this order (original, new for accounts) + // Then it Fires events in this order (original, new for acco unts) // AsyncPreLogin -> new // PlayerLogin -> new // PlayerKick -> old diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java index d11b9a081..658c984ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java @@ -41,6 +41,7 @@ public class AccountRepository extends RepositoryBase private static String UPDATE_ACCOUNT_NULL_RANK = "UPDATE accounts SET rank=?, donorRank=?, rankPerm=?, rankExpire=? WHERE uuid = ? AND rank IS NULL;"; private static String SELECT_ACCOUNT_UUID_BY_NAME = "SELECT uuid FROM accounts WHERE name = ? ORDER BY lastLogin DESC;"; + private static String SELECT_ACCOUNT_ID_BY_UUID = "SELECT id FROM accounts WHERE accounts.uuid = ? LIMIT 1"; private String _webAddress; @@ -160,6 +161,15 @@ public class AccountRepository extends RepositoryBase return accountId; } + + public void getAccountId(UUID uuid, Callback callback) + { + executeQuery(SELECT_ACCOUNT_ID_BY_UUID, resultSet -> { + int accountId = -1; + while (resultSet.next()) accountId = resultSet.getInt(1); + callback.run(accountId); + }, new ColumnVarChar("uuid", 100, uuid.toString())); + } public String GetClient(String name, UUID uuid, String ipAddress) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java index 9394628ae..3afb1ae7e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java @@ -108,7 +108,7 @@ public class CosmeticManager extends MiniPlugin if (event.getPlayer().isOnline()) { event.getPlayer().getInventory().remove(Material.CHEST); - event.getPlayer().getInventory().setItem(_interfaceSlot, ItemStackFactory.Instance.CreateStack(Material.CHEST, (byte)0, 1, ChatColor.RESET + C.cGreen + "Inventory Menu")); + event.getPlayer().getInventory().setItem(_interfaceSlot, ItemStackFactory.Instance.CreateStack(Material.CHEST, (byte)0, 1, ChatColor.RESET + C.cGreen + "Cosmetic Menu")); event.getPlayer().updateInventory(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java index 76077f8f6..3954e1edc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java @@ -160,12 +160,12 @@ public class Menu extends ShopPageBase if (enabled.containsKey(type)) addGlow(deathSlot); type = GadgetType.Item; - lore = getLore(ownedCount.get(type), maxCount.get(type), "All sorts of zaney contraptions to use on your friends and foes.", "Usable in Lobbies", enabled.get(type)); + lore = getLore(ownedCount.get(type), maxCount.get(type), "All sorts of zany contraptions to use on your friends and foes.", "Usable in Lobbies", enabled.get(type)); addButton(gadgetSlot, new ShopItem(Material.MELON_BLOCK, "Gadgets", lore, 1, false), new OpenGadgets(this, enabled.get(type))); if (enabled.containsKey(type)) addGlow(gadgetSlot); type = GadgetType.Morph; - lore = getLore(ownedCount.get(type), maxCount.get(type), "Ever want to be a tiger? Well, you can’t be a tiger! That’s silly! But you can be many other things!", "Usable in Lobbies", enabled.get(type)); + lore = getLore(ownedCount.get(type), maxCount.get(type), "Have you ever wanted to be a tiger? Well, you can't be a tiger! That's silly! But you can be many other things!", "Usable in Lobbies", enabled.get(type)); addButton(morphSlot, new ShopItem(Material.LEATHER, "Morphs", lore, 1, false), new OpenMorphs(this, enabled.get(type))); if (enabled.containsKey(type)) addGlow(morphSlot); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java index 4e796c47e..114b700ce 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java @@ -193,7 +193,7 @@ public class PetPage extends ShopPageBase } else if (getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.WITHER) { - addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Coins", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this)); + addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Shards", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this)); } slot++; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java index b23603f69..91a071484 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java @@ -18,7 +18,7 @@ import mineplex.core.account.event.ClientWebResponseEvent; import mineplex.core.common.CurrencyType; import mineplex.core.common.util.Callback; import mineplex.core.common.util.NautHashMap; -import mineplex.core.donation.command.CoinCommand; +import mineplex.core.donation.command.ShardCommand; import mineplex.core.donation.command.GemCommand; import mineplex.core.donation.command.GoldCommand; import mineplex.core.donation.command.SetGoldCommand; @@ -48,7 +48,7 @@ public class DonationManager extends MiniDbClientPlugin { // TODO: Re-add commands? Where are command implementations, seen as missing at the moment. addCommand(new GemCommand(this)); - addCommand(new CoinCommand(this)); + addCommand(new ShardCommand(this)); addCommand(new GoldCommand(this)); addCommand(new SetGoldCommand(this)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/ShardCommand.java similarity index 67% rename from Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java rename to Plugins/Mineplex.Core/src/mineplex/core/donation/command/ShardCommand.java index 4886bb8e2..c65df1a4a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/ShardCommand.java @@ -10,11 +10,11 @@ import mineplex.core.donation.DonationManager; import org.bukkit.entity.Player; -public class CoinCommand extends CommandBase +public class ShardCommand extends CommandBase { - public CoinCommand(DonationManager plugin) + public ShardCommand(DonationManager plugin) { - super(plugin, Rank.ADMIN, "coin"); + super(plugin, Rank.ADMIN, "coin", "shard", "shards"); } @Override @@ -22,7 +22,7 @@ public class CoinCommand extends CommandBase { if (args.length < 2) { - UtilPlayer.message(caller, F.main("Coin", "Missing Args: " + F.elem("/coin "))); + UtilPlayer.message(caller, F.main("Shards", "Missing Args: " + F.elem("/shard "))); return; } @@ -42,7 +42,7 @@ public class CoinCommand extends CommandBase rewardCoins(caller, null, targetName, client.getAccountId(), coinsString); else { - UtilPlayer.message(caller, F.main("Coin", "Could not find player " + F.name(targetName))); + UtilPlayer.message(caller, F.main("Shards", "Could not find player " + F.name(targetName))); } } }); @@ -62,7 +62,7 @@ public class CoinCommand extends CommandBase } catch (Exception e) { - UtilPlayer.message(caller, F.main("Coin", "Invalid Coins Amount")); + UtilPlayer.message(caller, F.main("Shards", "Invalid Shards Amount")); } } @@ -74,16 +74,16 @@ public class CoinCommand extends CommandBase { if (completed) { - UtilPlayer.message(caller, F.main("Coin", "You gave " + F.elem(coins + " Coins") + " to " + F.name(targetName) + ".")); + UtilPlayer.message(caller, F.main("Shards", "You gave " + F.elem(coins + " Treasure Shards") + " to " + F.name(targetName) + ".")); if (target != null) { - UtilPlayer.message(target, F.main("Coin", F.name(caller.getName()) + " gave you " + F.elem(coins + " Coins") + ".")); + UtilPlayer.message(target, F.main("Shards", F.name(caller.getName()) + " gave you " + F.elem(coins + " Treasure Shards") + ".")); } } else { - UtilPlayer.message(caller, F.main("Coin", "There was an error giving " + F.elem(coins + "Coins") + " to " + F.name(targetName) + ".")); + UtilPlayer.message(caller, F.main("Shards", "There was an error giving " + F.elem(coins + "Treasure Shards") + " to " + F.name(targetName) + ".")); } } }, caller.getName(), targetName, accountId, coins); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java index 88d7db15c..7f2f27f1d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java @@ -131,7 +131,7 @@ public class FriendsGUI implements Listener ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0)); builder.setTitle(C.cWhite + C.Bold + friend.Name); -// builder.setPlayerHead(friend.Name); + builder.setPlayerHead(friend.Name); builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline")); @@ -276,7 +276,7 @@ public class FriendsGUI implements Listener ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0)); builder.setTitle(C.cWhite + C.Bold + friend.Name); -// builder.setPlayerHead(friend.Name); + builder.setPlayerHead(friend.Name); builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline")); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java index ec6b33ba6..d528c4a7c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java @@ -20,7 +20,7 @@ public class ArrowTrailCandyCane extends ArrowEffectGadget public ArrowTrailCandyCane(GadgetManager manager) { super(manager, "Candy Cane Arrows", - UtilText.splitLineToArray(C.cGray + "The real reason no one visits the North Pole? Santa’s Elves are deadly shots.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "The real reason no one visits the North Pole? Santa's Elves are deadly shots.", LineFormat.LORE), -3, Material.INK_SACK, (byte)1); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java index 171860cd5..3a7c910b5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java @@ -18,7 +18,7 @@ public class ArrowTrailFrostLord extends ArrowEffectGadget public ArrowTrailFrostLord(GadgetManager manager) { super(manager, "Arrows of the Frost Lord", - UtilText.splitLineToArray(C.cGray + "The Frost Lord’s arrows bring a blast of winter in the wind of their passing.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "The Frost Lord's arrows bring a blast of winter in the wind of their passing.", LineFormat.LORE), -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java index a6ccbda55..58bb91a1b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java @@ -19,7 +19,7 @@ public class DeathCandyCane extends DeathEffectGadget public DeathCandyCane(GadgetManager manager) { super(manager, "Candy Cane Remains", - UtilText.splitLineToArray(C.cGray + "The biggest enemy of the Holidays, is January.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "The biggest enemy of the Holidays is January.", LineFormat.LORE), -3, Material.INK_SACK, (byte)1); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java index 7897272a8..c83e00ed4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java @@ -15,7 +15,7 @@ public class HatCoal extends HatGadget public HatCoal(GadgetManager manager) { super(manager, "Lump of Coal Hat", - UtilText.splitLineToArray(C.cGray + "When life gives you coal, make a wierd cube hat out it!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "When life gives you coal, make a weird cube hat out it!", LineFormat.LORE), -1, new ItemStack(Material.COAL_BLOCK)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatGrinch.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatGrinch.java index 9ef68b04a..747d969d0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatGrinch.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatGrinch.java @@ -13,7 +13,7 @@ public class HatGrinch extends HatGadget public HatGrinch(GadgetManager manager) { super(manager, "The Grinch", - UtilText.splitLineToArray(C.cGray + "Great! Now where’s the Roast Beast?!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Great! Now where's the Roast Beast?!", LineFormat.LORE), -3, SkinData.THE_GRINCH.getSkull(), "The Grinch Hat"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java index e92b2b398..12ccc8db2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java @@ -13,7 +13,7 @@ public class HatPresent extends HatGadget public HatPresent(GadgetManager manager) { super(manager, "Present", - UtilText.splitLineToArray(C.cGray + "WHAT IN THE PRESENT? Oh, it's just you...", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "WHAT'S IN THE PRESENT? Oh, it's just you...", LineFormat.LORE), -3, SkinData.PRESENT.getSkull()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatRudolph.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatRudolph.java index 1dfd9fa5c..574508d1e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatRudolph.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatRudolph.java @@ -13,7 +13,7 @@ public class HatRudolph extends HatGadget public HatRudolph(GadgetManager manager) { super(manager, "Rudolph", - UtilText.splitLineToArray(C.cGray + "WHAT IN THE PRESENT? Oh, it's just you...", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "HEY YOU! Wanna lead Santa's sleigh team?", LineFormat.LORE), -3, SkinData.RUDOLPH.getSkull()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java index 72af832fd..9a8096e9b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java @@ -130,6 +130,20 @@ public class ItemBatGun extends ItemGadget } } } + + public boolean isThrownBat(Bat bat) + { + for (ArrayList batArray : _bats.values()) + { + for (Bat thrownBat : batArray) + { + if (bat.equals(thrownBat)) + return true; + } + } + + return false; + } public void Clear(Player player) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java index d0039cd87..1f9f69217 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java @@ -38,7 +38,7 @@ public class ItemCoinBomb extends ItemGadget public ItemCoinBomb(GadgetManager manager) { super(manager, "Treasure Party Bomb", - UtilText.splitLineToArray(C.cWhite + "It's party time! You'll be everyones favourite player when you use one of these!", LineFormat.LORE), + UtilText.splitLineToArray(C.cWhite + "It's party time! You'll be everyone's favourite player when you use one of these!", LineFormat.LORE), -1, Material.PRISMARINE, (byte)0, 30000, new Ammo("Treasure Party Bomb", "1 Coin Party Bomb", Material.PRISMARINE, (byte)0, new String[] { C.cWhite + "1 Treasure Party Bomb" }, 2000, 1)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java index c8ced1f05..bb4a64339 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java @@ -22,7 +22,7 @@ public class ItemDuelingSword extends ItemGadget }, -3, Material.GOLD_SWORD, (byte)0, - 1000, new Ammo("Dueling Sword", "10 Swords", Material.WOOD_SWORD, (byte)0, new String[] { C.cWhite + "10 Swords to duel with" }, 1000, 10)); + 1000, new Ammo("Dueling Sword", "10 Swords", Material.WOOD_SWORD, (byte)0, new String[] { C.cWhite + "10 Swords to duel with" }, 1000, 10), true); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java index 92da2218c..c3ea07224 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java @@ -32,7 +32,7 @@ public class ItemPartyPopper extends ItemGadget implements IThrown public ItemPartyPopper(GadgetManager manager) { super(manager, "Party Popper", - UtilText.splitLineToArray(C.cWhite + "Celebrate by blasting confetti into peoples eyes!", LineFormat.LORE), + UtilText.splitLineToArray(C.cWhite + "Celebrate by blasting confetti into peoples' eyes!", LineFormat.LORE), 1, Material.GOLDEN_CARROT, (byte) 0, 1000, new Ammo("Party Popper", "1 Party Popper", Material.GOLDEN_CARROT, (byte) 0, new String[] { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java index 55f67dc0d..50d789985 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java @@ -59,7 +59,7 @@ public class MorphBunny extends MorphGadget "#" + C.cWhite + "Charge Crouch to use Super Jump", "#" + C.cWhite + "Left Click to use Hide Easter Egg", C.blankLine, - "#" + C.cRed +C.Bold + "WARNING: " + ChatColor.RESET + "Hide Easter Egg uses 500 Coins" , + "#" + C.cRed +C.Bold + "WARNING: " + ChatColor.RESET + "Hide Easter Egg uses 500 Shards" , }, LineFormat.LORE), -5, Material.MONSTER_EGG, (byte)98); @@ -154,7 +154,7 @@ public class MorphBunny extends MorphGadget if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Coins) < 500) { - UtilPlayer.message(player, F.main("Gadget", "You do not have enough Coins.")); + UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; } @@ -183,7 +183,7 @@ public class MorphBunny extends MorphGadget ChatColor.RESET + C.Bold + " hid an " + C.cYellow + C.Bold + "Easter Egg" + ChatColor.RESET + C.Bold + " worth " + - C.cYellow + C.Bold + "450 Coins"); + C.cYellow + C.Bold + "450 Shards"); for (Player other : UtilServer.getPlayers()) other.playSound(other.getLocation(), Sound.CAT_HIT, 1.5f, 1.5f); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java index 7a8430173..7e539bf90 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java @@ -29,7 +29,7 @@ public class MorphSlime extends MorphGadget { super(manager, "Big Larry Morph", UtilText.splitLinesToArray(new String[] { - C.cGray + "Have you ever looked at Big Larry and thought, \'I really want to be that guy!\'? Well, today is your lucky day!", + C.cGray + "Have you ever looked at Big Larry and thought, \'I really want to be that guy\'!? Well, today is your lucky day!", C.blankLine, "#" + C.cWhite + "Left Click to use Bounce", C.blankLine, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java index 13fe0ee14..68091b674 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java @@ -46,7 +46,7 @@ public class MorphTitan extends MorphGadget { super(manager, "Elder Guardian Morph", UtilText.splitLinesToArray(new String[] { - C.cGray + "From the depths of the sea, the Elder Guardian posseses powers more amazing than any seen before!", + C.cGray + "From the depths of the sea, the Elder Guardian possesses powers more amazing than any seen before!", C.blankLine, "#" + C.cWhite + "Left-Click to use Guardians Laser", }, LineFormat.LORE), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java index d36ca5021..2d9c8c8c7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java @@ -29,7 +29,7 @@ public class ParticleCandyCane extends ParticleGadget public ParticleCandyCane(GadgetManager manager) { super(manager, "Crushed Candy Cane", - UtilText.splitLineToArray(C.cGray + "There’s no such thing as too much Christmas Candy. Don’t listen to your dentist.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "There's no such thing as too much Christmas Candy. Don't listen to your dentist.", LineFormat.LORE), -3, Material.INK_SACK, (byte)1); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java index 230705505..43319483c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java @@ -22,7 +22,7 @@ public class ParticleEnchant extends ParticleGadget public ParticleEnchant(GadgetManager manager) { super(manager, "Enchanted", - UtilText.splitLineToArray(C.cGray + "The wisdom of the universe suddenly find you extremely attractive, and wants to \'enchant\' you.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "The wisdom of the universe suddenly finds you extremely attractive, and wants to \'enchant\' you.", LineFormat.LORE), -2, Material.BOOK, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java index 035615c59..aaaa4d79c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java @@ -28,7 +28,7 @@ public class ParticleFrostLord extends ParticleGadget public ParticleFrostLord(GadgetManager manager) { super(manager, "Wind of the Frost Lord", - UtilText.splitLineToArray(C.cGray + "He’s not passing wind okay? HE HAS A CONDITION!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "He's not passing wind, okay? HE HAS A CONDITION!", LineFormat.LORE), -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java index a9bd2739d..68304788a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java @@ -24,7 +24,7 @@ public class ParticleGreen extends ParticleGadget public ParticleGreen(GadgetManager manager) { super(manager, "Green Ring", - UtilText.splitLineToArray(C.cGray + "With these sparkles, you can sparkle while sparkle with CaptainSparklez!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "With these sparkles, you can sparkle while sparkling with CaptainSparklez!", LineFormat.LORE), -2, Material.EMERALD, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java index a9336927b..9e33bdc52 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java @@ -24,7 +24,7 @@ public class ParticleHelix extends ParticleGadget public ParticleHelix(GadgetManager manager) { super(manager, "Blood Helix", - UtilText.splitLineToArray(C.cGray + "Blood magic is very dangerous... but also very cool!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Blood magic is very dangerous...but also very cool!", LineFormat.LORE), -2, Material.REDSTONE, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java index b0d7bdae6..9dfa14563 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java @@ -27,6 +27,7 @@ import mineplex.core.recharge.Recharge; public abstract class ItemGadget extends Gadget { + private boolean _preserveStaticItem; private Ammo _ammo; protected long _recharge; @@ -40,6 +41,14 @@ public abstract class ItemGadget extends Gadget Free = true; } + public ItemGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, + long recharge, Ammo ammo, boolean preserveStaticItem) + { + this(manager, name, desc, cost, mat, data, recharge, ammo); + + _preserveStaticItem = preserveStaticItem; + } + @Override public void EnableCustom(Player player) { @@ -81,9 +90,12 @@ public abstract class ItemGadget extends Gadget @EventHandler public void orderThatChest(PlayerDropItemEvent event) - { + { if (IsActive(event.getPlayer()) && event.getItemDrop().getItemStack().getType() == GetDisplayMaterial()) { + if (_preserveStaticItem) + return; + final Player player = event.getPlayer(); Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() @@ -172,4 +184,4 @@ public abstract class ItemGadget extends Gadget } public abstract void ActivateCustom(Player player); -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java index a10dd5e73..4d3431275 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java @@ -23,6 +23,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; import mineplex.cache.player.PlayerCache; +import mineplex.cache.player.PlayerInfo; import mineplex.core.MiniDbClientPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.Callback; @@ -138,17 +139,28 @@ public class InventoryManager extends MiniDbClientPlugin { public void run() { - try + PlayerInfo playerInfo = PlayerCache.getInstance().getPlayer(uuid); + if (playerInfo != null) { - addItemToInventoryForOffline(callback, PlayerCache.getInstance().getPlayer(uuid).getAccountId(), item, count); + addItemToInventoryForOffline(callback, playerInfo.getAccountId(), item, count); } - catch (Exception e) + else { - e.printStackTrace(); - - System.out.println("-----DEBUG-----"); - System.out.println("PlayerCache Instance: " + (PlayerCache.getInstance() == null)); - System.out.println("PlayerCache Player Object: " + (PlayerCache.getInstance().getPlayer(uuid) == null)); + ClientManager.loadAccountIdFromUUID(uuid, new Callback() + { + @Override + public void run(Integer id) + { + if (id > 0) + { + addItemToInventoryForOffline(callback, id, item, count); + } + else + { + runSync(() -> callback.run(false)); + } + } + }); } } }); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java index ce6804e86..94e726ad8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java @@ -55,19 +55,27 @@ public class GiveItemCommand extends CommandBase } else { - Plugin.getClientManager().loadClientByName(playerName, new Runnable() + Plugin.runAsync(new Runnable() { + @Override public void run() { UUID uuid = Plugin.getClientManager().loadUUIDFromDB(playerName); - + if (uuid != null) { Plugin.addItemToInventoryForOffline(new Callback() { public void run (Boolean success) { - UtilPlayer.message(caller, F.main("Item", "You gave " + F.elem(amount + " " + itemName) + " to offline player " + F.name(playerName))); + if (success) + { + UtilPlayer.message(caller, F.main("Item", "You gave " + F.elem(amount + " " + itemName) + " to offline player " + F.name(playerName))); + } + else + { + UtilPlayer.message(caller, F.main("Item", "An error occured while trying to give item to " + F.name(playerName) + "!")); + } } }, uuid, item.Name, amount); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/map/ascii.png b/Plugins/Mineplex.Core/src/mineplex/core/map/ascii.png deleted file mode 100644 index 587966dc3..000000000 Binary files a/Plugins/Mineplex.Core/src/mineplex/core/map/ascii.png and /dev/null differ diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java index 64e56f971..da0c765bc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java @@ -32,7 +32,7 @@ public class MountBabyReindeer extends HorseMount public MountBabyReindeer(MountManager manager) { super(manager, "Baby Reindeer", - UtilText.splitLineToArray(C.cGray + "One of Santas baby reindeers. He's still learning how to fly...", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "One of Santa's baby reindeers. He's still learning how to fly...", LineFormat.LORE), Material.GOLDEN_CARROT, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java index d6a48c63d..f2aa31571 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java @@ -2,6 +2,20 @@ package mineplex.core.punish; import java.util.HashMap; +import org.bukkit.Bukkit; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.SignChangeEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.plugin.java.JavaPlugin; + +import com.google.gson.Gson; + import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.account.event.ClientWebResponseEvent; @@ -20,18 +34,6 @@ import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.serverdata.commands.ServerCommandManager; -import org.bukkit.Bukkit; -import org.bukkit.Sound; -import com.google.gson.Gson; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.plugin.java.JavaPlugin; - public class Punish extends MiniPlugin { private HashMap _punishClients; @@ -110,6 +112,18 @@ public class Punish extends MiniPlugin } } + @EventHandler(priority = EventPriority.LOWEST) + public void PunishSignEvent(SignChangeEvent event) + { + PunishClient client = GetClient(event.getPlayer().getName()); + + if (client != null && client.IsMuted()) + { + event.getPlayer().sendMessage(F.main(getName(), "Shh, you're muted because " + client.GetPunishment(PunishmentSentence.Mute).GetReason() + " by " + client.GetPunishment(PunishmentSentence.Mute).GetAdmin() + " for " + C.cGreen + UtilTime.convertString(client.GetPunishment(PunishmentSentence.Mute).GetRemaining(), 1, TimeUnit.FIT) + ".")); + event.setCancelled(true); + } + } + @EventHandler public void banRefresh(UpdateEvent event) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java index 4b11a5e29..5df3e3a33 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java @@ -4,7 +4,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; +import java.util.Properties; +import mineplex.core.updater.command.BuildVersionCommand; +import mineplex.core.updater.command.RestartServerCommand; import org.apache.commons.codec.digest.DigestUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -34,28 +37,33 @@ public class FileUpdater extends MiniPlugin private boolean _needUpdate; private boolean _enabled = true; + + private Properties _buildProperties; public FileUpdater(JavaPlugin plugin, Portal portal, String serverName, Region region) { super("File Updater", plugin); - + _portal = portal; _serverName = serverName; _region = region; - + GetPluginMd5s(); - + if (new File("IgnoreUpdates.dat").exists()) _enabled = false; - + // Register the server command type for future use ServerCommandManager.getInstance().registerCommandType("RestartCommand", RestartCommand.class, new RestartHandler(plugin, _serverName, _region)); + + loadBuildProperties(); } - + @Override public void addCommands() { addCommand(new RestartServerCommand(this)); + addCommand(new BuildVersionCommand(this)); } @EventHandler @@ -224,6 +232,25 @@ public class FileUpdater extends MiniPlugin } } + private void loadBuildProperties() + { + _buildProperties = new Properties(); + + try + { + _buildProperties.load(this.getClass().getResourceAsStream("/version.properties")); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + public Properties getBuildProperties() + { + return _buildProperties; + } + public Region getRegion() { return _region; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java new file mode 100644 index 000000000..0e5e2b10f --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java @@ -0,0 +1,33 @@ +package mineplex.core.updater.command; + +import java.util.Properties; + +import org.bukkit.entity.Player; + +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.common.util.C; +import mineplex.core.updater.FileUpdater; + +public class BuildVersionCommand extends CommandBase +{ + public BuildVersionCommand(FileUpdater plugin) + { + super(plugin, Rank.MODERATOR, "bversion"); + } + + @Override + public void Execute(Player caller, String[] args) + { + Properties buildProperties = Plugin.getBuildProperties(); + + String git = buildProperties.getProperty("build.git", "Unknown"); + String date = buildProperties.getProperty("build.date", "Unknown"); + String user = buildProperties.getProperty("build.user", "Unknown"); + + caller.sendMessage(C.cRedB + "Build Version;"); + caller.sendMessage(" " + C.cGold + "Date " + C.cWhite + date); + caller.sendMessage(" " + C.cGold + "User " + C.cWhite + user); + caller.sendMessage(" " + C.cGold + "Git " + C.cWhite + git); + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java similarity index 93% rename from Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java rename to Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java index 1067506b0..544ae231e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java @@ -1,4 +1,4 @@ -package mineplex.core.updater; +package mineplex.core.updater.command; import org.bukkit.entity.Player; @@ -9,6 +9,7 @@ import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.portal.Portal; +import mineplex.core.updater.FileUpdater; import mineplex.serverdata.commands.RestartCommand; public class RestartServerCommand extends CommandBase diff --git a/Plugins/Mineplex.Core/version.properties b/Plugins/Mineplex.Core/version.properties new file mode 100644 index 000000000..6678e7153 --- /dev/null +++ b/Plugins/Mineplex.Core/version.properties @@ -0,0 +1,3 @@ +build.git=${describe} +build.date=${timestamp} +build.user=${user.name} \ No newline at end of file diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath deleted file mode 100644 index 3cc5b666a..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.externalToolBuilders/DDoSProtectionSwitcher.launch b/Plugins/Mineplex.DDoSProtectionSwitcher/.externalToolBuilders/DDoSProtectionSwitcher.launch deleted file mode 100644 index ae42dca77..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.externalToolBuilders/DDoSProtectionSwitcher.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.project b/Plugins/Mineplex.DDoSProtectionSwitcher/.project deleted file mode 100644 index 487269c99..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.DDoSProtectionSwitcher - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/DDoSProtectionSwitcher.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/pom.xml b/Plugins/Mineplex.DDoSProtectionSwitcher/pom.xml new file mode 100644 index 000000000..2eadc0add --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + + com.mineplex + mineplex-app + dev-SNAPSHOT + ../app.xml + + + DDoSProtectionSwitcher + mineplex-ddosprotectionswitcher + + + + com.google.code.gson + gson + + + javax.mail + mail + + + org.apache.httpcomponents + httpclient + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + mineplex.ddos.DDoSProtectionSwitcher + + + + + + + diff --git a/Plugins/Mineplex.Database/.classpath b/Plugins/Mineplex.Database/.classpath deleted file mode 100644 index cc5554790..000000000 --- a/Plugins/Mineplex.Database/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Plugins/Mineplex.Database/.project b/Plugins/Mineplex.Database/.project deleted file mode 100644 index 202b668eb..000000000 --- a/Plugins/Mineplex.Database/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Database - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Database/Mineplex.Database.iml b/Plugins/Mineplex.Database/Mineplex.Database.iml deleted file mode 100644 index fa0ef0ae0..000000000 --- a/Plugins/Mineplex.Database/Mineplex.Database.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Database/pom.xml b/Plugins/Mineplex.Database/pom.xml new file mode 100644 index 000000000..f00a8d581 --- /dev/null +++ b/Plugins/Mineplex.Database/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-database + + + + org.jooq + jooq-codegen + + + diff --git a/Plugins/Mineplex.EnjinTranslator/.classpath b/Plugins/Mineplex.EnjinTranslator/.classpath deleted file mode 100644 index 224f11ab1..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/EnjinTranslator.launch b/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/EnjinTranslator.launch deleted file mode 100644 index 30d5b0d95..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/EnjinTranslator.launch +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/Translator.launch b/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/Translator.launch deleted file mode 100644 index 12d9261c3..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.externalToolBuilders/Translator.launch +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.EnjinTranslator/.project b/Plugins/Mineplex.EnjinTranslator/.project deleted file mode 100644 index b8d031388..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - EnjinTranslator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/Translator.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.EnjinTranslator/EnjinTranslator.iml b/Plugins/Mineplex.EnjinTranslator/EnjinTranslator.iml deleted file mode 100644 index 950a6d03a..000000000 --- a/Plugins/Mineplex.EnjinTranslator/EnjinTranslator.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.EnjinTranslator/pom.xml b/Plugins/Mineplex.EnjinTranslator/pom.xml new file mode 100644 index 000000000..bb8ce5969 --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + EnjinTranslator + mineplex-enjintranslator + + + + ${project.groupId} + mineplex-core + ${project.version} + + + diff --git a/Plugins/Mineplex.Game.Clans.Core/.classpath b/Plugins/Mineplex.Game.Clans.Core/.classpath deleted file mode 100644 index c6a118cbe..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Game.Clans.Core/.project b/Plugins/Mineplex.Game.Clans.Core/.project deleted file mode 100644 index fb0cce853..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Game.Clans.Core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml b/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml deleted file mode 100644 index d33a27278..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans.Core/pom.xml b/Plugins/Mineplex.Game.Clans.Core/pom.xml new file mode 100644 index 000000000..8a51dd13a --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-game-clans-core + + + + ${project.groupId} + mineplex-core + ${project.version} + + + diff --git a/Plugins/Mineplex.Game.Clans/.classpath b/Plugins/Mineplex.Game.Clans/.classpath deleted file mode 100644 index 4caf6a583..000000000 --- a/Plugins/Mineplex.Game.Clans/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Game.Clans/.externalToolBuilders/ClansBuilder.launch b/Plugins/Mineplex.Game.Clans/.externalToolBuilders/ClansBuilder.launch deleted file mode 100644 index 32132a71e..000000000 --- a/Plugins/Mineplex.Game.Clans/.externalToolBuilders/ClansBuilder.launch +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Game.Clans/.project b/Plugins/Mineplex.Game.Clans/.project deleted file mode 100644 index d9fd96609..000000000 --- a/Plugins/Mineplex.Game.Clans/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.Game.Clans - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/ClansBuilder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 3a2153707..000000000 --- a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml b/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml deleted file mode 100644 index c5914c65c..000000000 --- a/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/pom.xml b/Plugins/Mineplex.Game.Clans/pom.xml new file mode 100644 index 000000000..73a6d5ad9 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + Clans + mineplex-game-clans + + + + ${project.groupId} + mineplex-game-clans-core + ${project.version} + + + ${project.groupId} + mineplex-minecraft-game-classcombat + ${project.version} + + + diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java index 59055ea02..7e84a14af 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java @@ -136,7 +136,7 @@ public class ObserverManager extends MiniPlugin if (_observerMap.containsKey(event.getPlayer())) { restore(event.getPlayer(), _observerMap.get(event.getPlayer())); - _observerMap.remove(_plugin); + _observerMap.remove(event.getPlayer()); } } diff --git a/Plugins/Mineplex.Hub/.classpath b/Plugins/Mineplex.Hub/.classpath deleted file mode 100644 index 92e1e93d4..000000000 --- a/Plugins/Mineplex.Hub/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Hub/.externalToolBuilders/Hub Builder.launch b/Plugins/Mineplex.Hub/.externalToolBuilders/Hub Builder.launch deleted file mode 100644 index 25bfb413a..000000000 --- a/Plugins/Mineplex.Hub/.externalToolBuilders/Hub Builder.launch +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Hub/.project b/Plugins/Mineplex.Hub/.project deleted file mode 100644 index 3230745dd..000000000 --- a/Plugins/Mineplex.Hub/.project +++ /dev/null @@ -1,26 +0,0 @@ - - - Mineplex.Hub - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - - - LaunchConfigHandle - <project>/.externalToolBuilders/Hub Builder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Hub/Mineplex.Hub.iml b/Plugins/Mineplex.Hub/Mineplex.Hub.iml deleted file mode 100644 index 474bfecac..000000000 --- a/Plugins/Mineplex.Hub/Mineplex.Hub.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Hub/pom.xml b/Plugins/Mineplex.Hub/pom.xml new file mode 100644 index 000000000..feb5a3f6e --- /dev/null +++ b/Plugins/Mineplex.Hub/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + Hub + mineplex-hub + + + + ${project.groupId} + mineplex-game-clans-core + ${project.version} + + + ${project.groupId} + mineplex-minecraft-game-classcombat + ${project.version} + + + diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 163b65500..9c33ad164 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -250,7 +250,7 @@ public class HubManager extends MiniClientPlugin _playerCountManager = new PlayerCountManager(plugin); _customDataManager = new CustomDataManager(plugin, clientManager); - + _songs = new ArrayList(); _punishManager = punish; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java index 0fa87552c..9c52e18a3 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java @@ -7,6 +7,8 @@ import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventoryCrafting; +import org.bukkit.entity.Bat; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.Horse; @@ -16,6 +18,8 @@ import org.bukkit.entity.Wither; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerInteractAtEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; import mineplex.core.MiniPlugin; @@ -28,8 +32,10 @@ import mineplex.core.common.util.UtilEvent.ActionType; import mineplex.core.common.util.UtilGear; import mineplex.core.common.util.UtilPlayer; import mineplex.core.event.StackerEvent; +import mineplex.core.gadget.gadgets.item.ItemBatGun; import mineplex.core.gadget.gadgets.morph.MorphBlock; import mineplex.core.gadget.types.GadgetType; +import mineplex.core.pet.PetManager; import mineplex.core.projectile.IThrown; import mineplex.core.projectile.ProjectileManager; import mineplex.core.projectile.ProjectileUser; @@ -94,7 +100,9 @@ public class StackerManager extends MiniPlugin implements IThrown //Parkour Disable if (Manager.GetParkour().InsideParkour(stacker.getLocation())) { - UtilPlayer.message(stacker, F.main("Parkour", "You cannot Stack/Throw near Parkour Challenges.")); + if (!stackee.isCustomNameVisible()) + UtilPlayer.message(stacker, F.main("Parkour", "You cannot Stack/Throw near Parkour Challenges.")); + return; } @@ -120,30 +128,68 @@ public class StackerManager extends MiniPlugin implements IThrown if (stackee instanceof Player) { + Player stackeePlayer = (Player) stackee; + if (!Manager.hasPlayerStackingEnabled(stacker)) { UtilPlayer.message(stacker, F.main("Stacker", "You have player stacking disabled.")); return; } - if (!Manager.hasPlayerStackingEnabled(((Player)stackee))) + if (!Manager.hasPlayerStackingEnabled((stackeePlayer))) { UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " has player stacking disabled.")); return; } - if (Manager.GetTreasure().isOpening((Player) stackee)) + if (Manager.GetTreasure().isOpening(stackeePlayer)) { UtilPlayer.message(stacker, F.main("Stacker", F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is opening a chest!"))); return; } - } + + Inventory top = stackeePlayer.getOpenInventory().getTopInventory(); + + if (!(top instanceof CraftInventoryCrafting) && hasItems(top)) + { + String message = F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " cannot be stacked right now."); + + if (top.getHolder() != null) + { + if (top.getHolder().equals(stackeePlayer)) + { + UtilPlayer.message(stacker, message); + return; + } + } + + UtilPlayer.message(stacker, message); + return; + } + } if (stackee instanceof LivingEntity) { - if (Manager.getPetManager().getPets().contains(stackee) || stackee instanceof Wither || stackee instanceof EnderDragon || ((LivingEntity)stackee).isCustomNameVisible()) + ItemBatGun batGun = (ItemBatGun) Manager.GetGadget().getGadget(ItemBatGun.class); + + if (stackee instanceof Bat) { - UtilPlayer.message(stacker, F.main("Stacker", "You cannot stack this entity.")); + Bat bat = (Bat) stackee; + + if (batGun.isThrownBat(bat)) + return; + } + + PetManager petManager = Manager.getPetManager(); + LivingEntity livingStackee = (LivingEntity) stackee; + boolean cannotStack = petManager.getPets().contains(stackee) || stackee instanceof Wither || stackee instanceof EnderDragon; + + if (cannotStack || livingStackee.isCustomNameVisible()) + { + // Prevent from showing this message when players right-click on game npc's. + if (cannotStack) + UtilPlayer.message(stacker, F.main("Stacker", "You cannot stack this entity.")); + return; } } @@ -163,8 +209,8 @@ public class StackerManager extends MiniPlugin implements IThrown top.setPassenger(stackee); - UtilPlayer.message(stacker, F.main("Stacker", "You stacked " + F.name(UtilEnt.getName(stackee) + "."))); - UtilPlayer.message(stackee, F.main("Stacker", "You were stacked by " + F.name(stacker.getName() + "."))); + UtilPlayer.message(stacker, F.main("Stacker", "You stacked " + F.name(UtilEnt.getName(stackee)) + ".")); + UtilPlayer.message(stackee, F.main("Stacker", "You were stacked by " + F.name(stacker.getName()) + ".")); UtilPlayer.message(stackee, F.main("Stacker", "Push " + F.skill("Crouch") + " to escape!")); //Portal Delay @@ -224,8 +270,8 @@ public class StackerManager extends MiniPlugin implements IThrown return; } - UtilPlayer.message(thrower, F.main("Stacker", "You threw " + F.name(UtilEnt.getName(throwee)))); - UtilPlayer.message(throwee, F.main("Stacker", "You were thrown by " + F.name(thrower.getName()))); + UtilPlayer.message(thrower, F.main("Stacker", "You threw " + F.name(UtilEnt.getName(throwee)) + ".")); + UtilPlayer.message(throwee, F.main("Stacker", "You were thrown by " + F.name(thrower.getName()) + ".")); System.out.println("Stacker throw."); @@ -274,6 +320,17 @@ public class StackerManager extends MiniPlugin implements IThrown //Portal Delay Manager.SetPortalDelay(target); } + + private boolean hasItems(Inventory inventory) + { + for (ItemStack item : inventory.getContents()) + { + if (item != null) + return true; + } + + return false; + } @Override public void Idle(ProjectileUser data) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 59b019540..a70d04559 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -295,17 +295,7 @@ public class ServerManager extends MiniPlugin return timeLeft; } - - public void removeServer(String serverName) - { - for (String key : _serverKeyInfoMap.keySet()) - { - _serverKeyInfoMap.get(key).remove(serverName); - } - - _serverInfoMap.remove(serverName); - } - + public void addServerGroup(ServerGroup serverGroup) { _serverKeyInfoMap.put(serverGroup.getPrefix(), new HashSet()); diff --git a/Plugins/Mineplex.MapParser/.classpath b/Plugins/Mineplex.MapParser/.classpath deleted file mode 100644 index 972ce62be..000000000 --- a/Plugins/Mineplex.MapParser/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Plugins/Mineplex.MapParser/.externalToolBuilders/MapParser Builder.launch b/Plugins/Mineplex.MapParser/.externalToolBuilders/MapParser Builder.launch deleted file mode 100644 index 2c1f162ea..000000000 --- a/Plugins/Mineplex.MapParser/.externalToolBuilders/MapParser Builder.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.MapParser/.project b/Plugins/Mineplex.MapParser/.project deleted file mode 100644 index 03de90b0d..000000000 --- a/Plugins/Mineplex.MapParser/.project +++ /dev/null @@ -1,26 +0,0 @@ - - - Mineplex.MapParser - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - - - LaunchConfigHandle - <project>/.externalToolBuilders/MapParser Builder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml b/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml deleted file mode 100644 index 86ec89ce9..000000000 --- a/Plugins/Mineplex.MapParser/Mineplex.MapParser.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.MapParser/pom.xml b/Plugins/Mineplex.MapParser/pom.xml new file mode 100644 index 000000000..65a7236aa --- /dev/null +++ b/Plugins/Mineplex.MapParser/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + MapParser + mineplex-mapparser + + + + ${project.groupId} + mineplex-core-common + ${project.version} + + + diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath deleted file mode 100644 index f7ec39e88..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.externalToolBuilders/ClassCombat.launch b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.externalToolBuilders/ClassCombat.launch deleted file mode 100644 index 79a45c65c..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.externalToolBuilders/ClassCombat.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project deleted file mode 100644 index 21323ed3c..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.Minecraft.Game.ClassCombat - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/ClassCombat.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml b/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml deleted file mode 100644 index b3324f1c3..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/pom.xml b/Plugins/Mineplex.Minecraft.Game.ClassCombat/pom.xml new file mode 100644 index 000000000..01c80f78b --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-minecraft-game-classcombat + + + + ${project.groupId} + mineplex-minecraft-game-core + ${project.version} + + + diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.classpath b/Plugins/Mineplex.Minecraft.Game.Core/.classpath deleted file mode 100644 index 0c60eb1ca..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.project b/Plugins/Mineplex.Minecraft.Game.Core/.project deleted file mode 100644 index 0e7e5acdb..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Minecraft.Game.Core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml b/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml deleted file mode 100644 index 6882d9ec9..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/pom.xml b/Plugins/Mineplex.Minecraft.Game.Core/pom.xml new file mode 100644 index 000000000..e8440a3f0 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-minecraft-game-core + + + + ${project.groupId} + mineplex-core + ${project.version} + + + diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/conditions/Burning.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/conditions/Burning.java index ed772a92a..73c868066 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/conditions/Burning.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/conditions/Burning.java @@ -20,7 +20,6 @@ public class Burning extends Condition @Override public void Add() { - } @Override @@ -32,9 +31,9 @@ public class Burning extends Condition @Override public void OnConditionAdd() { - if (_ent.getFireTicks() > 0) + if (_ent.getFireTicks() > 0 && IsAdd()) _ent.setFireTicks(_ent.getFireTicks() + _ticksTotal); - else + else if (_ent.getFireTicks() < _ticksTotal) _ent.setFireTicks(_ticksTotal); } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java index 8d3d35d16..d5c6f0bf4 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java @@ -37,10 +37,10 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.player.PlayerVelocityEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; @@ -122,6 +122,15 @@ public class DamageManager extends MiniPlugin event.setCancelled(true); } + @EventHandler + public void onEntityCombust(EntityCombustByEntityEvent event) + { + if (!(event.getCombuster() instanceof Player || event.getCombuster() instanceof Arrow)) + return; + + event.setCancelled(true); + } + @EventHandler(priority = EventPriority.HIGHEST) public void removeDemArrowsCrazyMan(EntityDamageEvent event) { @@ -307,12 +316,18 @@ public class DamageManager extends MiniPlugin else if (e.equals(Enchantment.ARROW_DAMAGE) || e.equals(Enchantment.DAMAGE_ALL)) event.AddMod("Enchant", "Ench Damage", 0.5 * (double)enchants.get(e), true); - else if (e.equals(Enchantment.ARROW_FIRE) || e.equals(Enchantment.FIRE_ASPECT)) + else if (e.equals(Enchantment.FIRE_ASPECT)) if (_conditionManager != null) _conditionManager.Factory().Ignite("Ench Fire", event.GetDamageeEntity(), damager, - 1 * (double)enchants.get(e), false, false); + 4 * (double)enchants.get(e), false, false); } } + + if (event.GetProjectile() instanceof Arrow && event.GetProjectile().getFireTicks() > 0) + { + if (_conditionManager != null) + _conditionManager.Factory().Ignite("Arrow Fire", event.GetDamageeEntity(), damager, 5, false, false); + } } @EventHandler(priority = EventPriority.MONITOR) diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java index d5c86a91f..fed9d16ff 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java @@ -356,12 +356,10 @@ public class CustomExplosion extends Explosion if (_fallingBlockExplosion) { - Collection blocks = event.GetBlocks(); + List blocks = new ArrayList<>(event.GetBlocks()); if (blocks.size() > _maxFallingBlocks) { - blocks = new ArrayList(blocks); - Collections.shuffle((ArrayList) blocks); int toRemove = blocks.size() - _maxFallingBlocks; diff --git a/Plugins/Mineplex.Queue.Core/.project b/Plugins/Mineplex.Queue.Core/.project deleted file mode 100644 index 669fb734b..000000000 --- a/Plugins/Mineplex.Queue.Core/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.Queue.Core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Queuer/.classpath b/Plugins/Mineplex.Queuer/.classpath deleted file mode 100644 index 945e9a997..000000000 --- a/Plugins/Mineplex.Queuer/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Queuer/.externalToolBuilders/New_Builder.launch b/Plugins/Mineplex.Queuer/.externalToolBuilders/New_Builder.launch deleted file mode 100644 index 0c6e0f696..000000000 --- a/Plugins/Mineplex.Queuer/.externalToolBuilders/New_Builder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Queuer/.externalToolBuilders/Queuer.launch b/Plugins/Mineplex.Queuer/.externalToolBuilders/Queuer.launch deleted file mode 100644 index 7fe0fe5da..000000000 --- a/Plugins/Mineplex.Queuer/.externalToolBuilders/Queuer.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Queuer/.gitignore b/Plugins/Mineplex.Queuer/.gitignore deleted file mode 100644 index 167fb2c02..000000000 --- a/Plugins/Mineplex.Queuer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin -/bin diff --git a/Plugins/Mineplex.Queuer/.project b/Plugins/Mineplex.Queuer/.project deleted file mode 100644 index e799bd1fc..000000000 --- a/Plugins/Mineplex.Queuer/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.Queuer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/Queuer.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Plugins/Mineplex.Queuer/Mineplex.Queuer.iml b/Plugins/Mineplex.Queuer/Mineplex.Queuer.iml deleted file mode 100644 index c68cf7cf9..000000000 --- a/Plugins/Mineplex.Queuer/Mineplex.Queuer.iml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ReportServer/pom.xml b/Plugins/Mineplex.ReportServer/pom.xml new file mode 100644 index 000000000..b7e313ba5 --- /dev/null +++ b/Plugins/Mineplex.ReportServer/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-serverdata + + + + com.google.code.gson + gson + + + redis.clients + jedis + + + diff --git a/Plugins/Mineplex.ServerData/.classpath b/Plugins/Mineplex.ServerData/.classpath deleted file mode 100644 index b90da709c..000000000 --- a/Plugins/Mineplex.ServerData/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/.externalToolBuilders/New_Builder.launch b/Plugins/Mineplex.ServerData/.externalToolBuilders/New_Builder.launch deleted file mode 100644 index 0c6e0f696..000000000 --- a/Plugins/Mineplex.ServerData/.externalToolBuilders/New_Builder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/.externalToolBuilders/ServerData.launch b/Plugins/Mineplex.ServerData/.externalToolBuilders/ServerData.launch deleted file mode 100644 index b9ea00f1f..000000000 --- a/Plugins/Mineplex.ServerData/.externalToolBuilders/ServerData.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/.project b/Plugins/Mineplex.ServerData/.project deleted file mode 100644 index 87c600cb6..000000000 --- a/Plugins/Mineplex.ServerData/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.ServerData - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/ServerData.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.ServerData/Mineplex.ServerData.iml b/Plugins/Mineplex.ServerData/Mineplex.ServerData.iml deleted file mode 100644 index d65267f31..000000000 --- a/Plugins/Mineplex.ServerData/Mineplex.ServerData.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/build.xml b/Plugins/Mineplex.ServerData/build.xml deleted file mode 100644 index 411a60854..000000000 --- a/Plugins/Mineplex.ServerData/build.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/pom.xml b/Plugins/Mineplex.ServerData/pom.xml new file mode 100644 index 000000000..b7e313ba5 --- /dev/null +++ b/Plugins/Mineplex.ServerData/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + + + mineplex-serverdata + + + + com.google.code.gson + gson + + + redis.clients + jedis + + + diff --git a/Plugins/Mineplex.ServerMonitor/.classpath b/Plugins/Mineplex.ServerMonitor/.classpath deleted file mode 100644 index 49e473eb4..000000000 --- a/Plugins/Mineplex.ServerMonitor/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/New_Builder.launch b/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/New_Builder.launch deleted file mode 100644 index 0c6e0f696..000000000 --- a/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/New_Builder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/ServerMonitor.launch b/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/ServerMonitor.launch deleted file mode 100644 index 0c6e0f696..000000000 --- a/Plugins/Mineplex.ServerMonitor/.externalToolBuilders/ServerMonitor.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerMonitor/.project b/Plugins/Mineplex.ServerMonitor/.project deleted file mode 100644 index 77e4dc132..000000000 --- a/Plugins/Mineplex.ServerMonitor/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.ServerMonitor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/ServerMonitor.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml b/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml deleted file mode 100644 index 53e69d8e1..000000000 --- a/Plugins/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerMonitor/pom.xml b/Plugins/Mineplex.ServerMonitor/pom.xml new file mode 100644 index 000000000..d9dc9bf60 --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + + com.mineplex + mineplex-app + dev-SNAPSHOT + ../app.xml + + + ServerMonitor + mineplex-servermonitor + + + + ${project.groupId} + mineplex-core-common + ${project.version} + + + ${project.groupId} + mineplex-serverdata + ${project.version} + + + org.apache.httpcomponents + httpclient + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + mineplex.servermonitor.ServerMonitor + + + + + + + diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java index cb57dc313..2bb711a58 100644 --- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java +++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java @@ -206,7 +206,7 @@ public class ServerMonitor if (groupStatus.getServerType().equalsIgnoreCase("Player")) { _repository.removeServerGroup(groupStatus); - _serverGroupMap.remove(groupStatus); + _serverGroupMap.remove(groupStatus.getName()); groupStatusIterator.remove(); System.out.println("Removed MPS : " + groupStatus.getName()); @@ -449,7 +449,7 @@ public class ServerMonitor if (serverGroup != null && serverGroup.getHost() != null && !serverGroup.getHost().isEmpty() && serverGroup.getServerCount() <= 1) { _repository.removeServerGroup(serverGroup); - _serverGroupMap.remove(serverGroup); + _serverGroupMap.remove(serverGroup.getName()); _serverGroups.remove(serverGroup); System.out.println("Removed ServerGroup : " + serverGroup.getName()); } diff --git a/Plugins/Mineplex.ServerProcesses/.project b/Plugins/Mineplex.ServerProcesses/.project deleted file mode 100644 index 66b31cde0..000000000 --- a/Plugins/Mineplex.ServerProcesses/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Mineplex.ServerProcesses - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.StaffServer/.classpath b/Plugins/Mineplex.StaffServer/.classpath deleted file mode 100644 index 52e5e02bf..000000000 --- a/Plugins/Mineplex.StaffServer/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.StaffServer/.externalToolBuilders/StaffBuilder.launch b/Plugins/Mineplex.StaffServer/.externalToolBuilders/StaffBuilder.launch deleted file mode 100644 index 6eb51c35e..000000000 --- a/Plugins/Mineplex.StaffServer/.externalToolBuilders/StaffBuilder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.StaffServer/.project b/Plugins/Mineplex.StaffServer/.project deleted file mode 100644 index 055073ad3..000000000 --- a/Plugins/Mineplex.StaffServer/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Mineplex.StaffServer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/StaffBuilder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Mineplex.StaffServer/pom.xml b/Plugins/Mineplex.StaffServer/pom.xml new file mode 100644 index 000000000..1b4ffcbef --- /dev/null +++ b/Plugins/Mineplex.StaffServer/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + StaffServer + mineplex-staffserver + + + + ${project.groupId} + mineplex-core + ${project.version} + + + diff --git a/Plugins/Mineplex.Votifier/Mineplex.Votifier.iml b/Plugins/Mineplex.Votifier/Mineplex.Votifier.iml deleted file mode 100644 index c5e840788..000000000 --- a/Plugins/Mineplex.Votifier/Mineplex.Votifier.iml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Mineplex.Votifier/pom.xml b/Plugins/Mineplex.Votifier/pom.xml new file mode 100644 index 000000000..0d3e1464c --- /dev/null +++ b/Plugins/Mineplex.Votifier/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + MineplexVotifier + mineplex-votifier + + + + ${project.groupId} + mineplex-core + ${project.version} + + + com.vexsoftware + votifier + + + diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath deleted file mode 100644 index 315ba497a..000000000 --- a/Plugins/Nautilus.Game.Arcade/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.Arcade/.externalToolBuilders/Arcade Builder.launch b/Plugins/Nautilus.Game.Arcade/.externalToolBuilders/Arcade Builder.launch deleted file mode 100644 index 2507dff2a..000000000 --- a/Plugins/Nautilus.Game.Arcade/.externalToolBuilders/Arcade Builder.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.Arcade/.project b/Plugins/Nautilus.Game.Arcade/.project deleted file mode 100644 index 3f89e9760..000000000 --- a/Plugins/Nautilus.Game.Arcade/.project +++ /dev/null @@ -1,26 +0,0 @@ - - - Nautilus.Game.Arcade - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - - - LaunchConfigHandle - <project>/.externalToolBuilders/Arcade Builder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index fe89f28bc..000000000 --- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -formatter_settings_version=12 diff --git a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml b/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml deleted file mode 100644 index 471754299..000000000 --- a/Plugins/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.Arcade/pom.xml b/Plugins/Nautilus.Game.Arcade/pom.xml new file mode 100644 index 000000000..6c69780d2 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + com.mineplex + mineplex-plugin + dev-SNAPSHOT + ../plugin.xml + + + Arcade + nautilus-game-arcade + + + + ${project.groupId} + mineplex-minecraft-game-classcombat + ${project.version} + + + diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java index bbcf02a2e..191364b9b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java @@ -2,41 +2,10 @@ package nautilus.game.arcade.game.games.build; import java.util.AbstractMap; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Map.Entry; - -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.NautHashMap; -import mineplex.core.common.util.UtilAction; -import mineplex.core.common.util.UtilAlg; -import mineplex.core.common.util.UtilEvent; -import mineplex.core.common.util.UtilEvent.ActionType; -import mineplex.core.common.util.UtilGear; -import mineplex.core.common.util.UtilInv; -import mineplex.core.common.util.UtilMath; -import mineplex.core.common.util.UtilParticle; -import mineplex.core.common.util.UtilParticle.ParticleType; -import mineplex.core.common.util.UtilParticle.ViewDist; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; -import mineplex.core.common.util.UtilTextBottom; -import mineplex.core.common.util.UtilTextMiddle; -import mineplex.core.common.util.UtilTime; -import mineplex.core.explosion.ExplosionEvent; -import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.recharge.Recharge; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; -import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import nautilus.game.arcade.ArcadeManager; -import nautilus.game.arcade.GameType; -import nautilus.game.arcade.events.GameStateChangeEvent; -import nautilus.game.arcade.events.PlayerPrepareTeleportEvent; -import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.games.build.gui.MobShop; -import nautilus.game.arcade.game.games.build.gui.OptionsShop; -import nautilus.game.arcade.game.games.build.kits.KitBuilder; -import nautilus.game.arcade.kit.Kit; +import java.util.UUID; import org.bukkit.ChatColor; import org.bukkit.Effect; @@ -100,6 +69,40 @@ import org.bukkit.event.vehicle.VehicleCreateEvent; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.inventory.ItemStack; +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.NautHashMap; +import mineplex.core.common.util.UtilAction; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilEvent; +import mineplex.core.common.util.UtilEvent.ActionType; +import mineplex.core.common.util.UtilGear; +import mineplex.core.common.util.UtilInv; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilParticle.ParticleType; +import mineplex.core.common.util.UtilParticle.ViewDist; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextBottom; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.common.util.UtilTime; +import mineplex.core.explosion.ExplosionEvent; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.recharge.Recharge; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.GameType; +import nautilus.game.arcade.events.GameStateChangeEvent; +import nautilus.game.arcade.events.PlayerPrepareTeleportEvent; +import nautilus.game.arcade.game.SoloGame; +import nautilus.game.arcade.game.games.build.gui.MobShop; +import nautilus.game.arcade.game.games.build.gui.OptionsShop; +import nautilus.game.arcade.game.games.build.kits.KitBuilder; +import nautilus.game.arcade.kit.Kit; + public class Build extends SoloGame { private NautHashMap _data = new NautHashMap(); @@ -142,6 +145,8 @@ public class Build extends SoloGame private ChatColor _hintColor = ChatColor.YELLOW; private ChatColor _firstHintColor = ChatColor.YELLOW; + private UUID _winnerUUID = null; + public Build(ArcadeManager manager) { super(manager, GameType.Build, @@ -538,7 +543,10 @@ public class Build extends SoloGame //Gems if (places.size() >= 1) + { + _winnerUUID = places.get(0).getUniqueId(); AddGems(places.get(0), 20, "1st Place", false, false); + } if (places.size() >= 2) AddGems(places.get(1), 15, "2nd Place", false, false); @@ -1542,4 +1550,14 @@ public class Build extends SoloGame } } } + + @Override + public List getWinners() + { + Player player = UtilPlayer.searchExact(_winnerUUID); + if (player == null) + return null; + + return Arrays.asList(player); + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part.java index ea8e171cc..80c3a276e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part.java @@ -223,7 +223,7 @@ public abstract class Part implements Listener Host.GetSleigh().AddPresent(present.getBlock().getLocation()); - Host.SantaSay("Well done " + event.getPlayer().getName() + "! You collected a present!", null); + Host.SantaSay("Well done, " + event.getPlayer().getName() + "! You collected a present!", null); } public void SetObjectiveText(String text, double percent) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java index 2dceaca60..b91aa0d13 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java @@ -143,7 +143,7 @@ public class Part5 extends Part _a = true; _dialogueDelay = System.currentTimeMillis(); - Host.SantaSay("WHAT IS THIS?! Who's castle is this?!", ChristmasAudio.BANTER_A); + Host.SantaSay("WHAT IS THIS?! Whose castle is this?!", ChristmasAudio.BANTER_A); } else if (_a && !_b && UtilTime.elapsed(_dialogueDelay, _delayTime)) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java index b4c4832cf..91d05aef2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java @@ -122,7 +122,7 @@ public class Minion "Purpose", "Symptom", "Sticks", "Measure", "Slimes", "Greece", "Spooky", "Coffee", "Aliens", "Cities", "Bikini", "Mortal", "Serena", "Future", "Bottle", "Helmet", "Crunch", "Afraid", "Threat", "Static", "Happy", "Knife", "Scary", "Lapis", "Skirt", "Waves", "Calem", "Clock", "Taste", "Lucas", - "Anger", "Spork", "Maike", "Candy", "Shirt", "Tides", "Ocean", "Crawl", "Smell", "React", + "Anger", "Spork", "Make", "Candy", "Shirt", "Tides", "Ocean", "Crawl", "Smell", "React", "Dolls", "Roses", "Trips", "Flute", "Pants", "Brick", "Three", "Ethan", "Uncle", "Lunch", "Legos", "Tulip", "Beach", "Wipes", "Heels", "Straw", "Seven", "Hands", "Queen", "Books", "Couch", "Grass", "Clans", "Frame", "Nails", "Cream", "Eight", "Belly", "Crown", "Polls", diff --git a/Plugins/Nautilus.Game.MineKart/.classpath b/Plugins/Nautilus.Game.MineKart/.classpath deleted file mode 100644 index 7d34fcad1..000000000 --- a/Plugins/Nautilus.Game.MineKart/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.MineKart/.externalToolBuilders/MineKart Builder.launch b/Plugins/Nautilus.Game.MineKart/.externalToolBuilders/MineKart Builder.launch deleted file mode 100644 index 21979608a..000000000 --- a/Plugins/Nautilus.Game.MineKart/.externalToolBuilders/MineKart Builder.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.MineKart/.project b/Plugins/Nautilus.Game.MineKart/.project deleted file mode 100644 index 50f9fe4d1..000000000 --- a/Plugins/Nautilus.Game.MineKart/.project +++ /dev/null @@ -1,26 +0,0 @@ - - - Nautilus.Game.MineKart - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - - - LaunchConfigHandle - <project>/.externalToolBuilders/MineKart Builder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Nautilus.Game.MineKart/.settings/org.eclipse.jdt.core.prefs b/Plugins/Nautilus.Game.MineKart/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/Plugins/Nautilus.Game.MineKart/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Plugins/Nautilus.Game.PvP/.classpath b/Plugins/Nautilus.Game.PvP/.classpath deleted file mode 100644 index f2ec6207b..000000000 --- a/Plugins/Nautilus.Game.PvP/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.PvP/.externalToolBuilders/Nautilus.Game.PvP.launch b/Plugins/Nautilus.Game.PvP/.externalToolBuilders/Nautilus.Game.PvP.launch deleted file mode 100644 index dcb9a797b..000000000 --- a/Plugins/Nautilus.Game.PvP/.externalToolBuilders/Nautilus.Game.PvP.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.PvP/.externalToolBuilders/PvP Builder.launch b/Plugins/Nautilus.Game.PvP/.externalToolBuilders/PvP Builder.launch deleted file mode 100644 index dcb9a797b..000000000 --- a/Plugins/Nautilus.Game.PvP/.externalToolBuilders/PvP Builder.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.PvP/.project b/Plugins/Nautilus.Game.PvP/.project deleted file mode 100644 index b6a75da4c..000000000 --- a/Plugins/Nautilus.Game.PvP/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - Nautilus.Game.PvP - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/PvP Builder.launch - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.core.resources.prefs b/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.jdt.core.prefs b/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/Plugins/Nautilus.Game.PvP/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml b/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml deleted file mode 100644 index 0a2adb96d..000000000 --- a/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugins/Nautilus.Game.PvP/PvP.xml b/Plugins/Nautilus.Game.PvP/PvP.xml deleted file mode 100644 index e129fb89e..000000000 --- a/Plugins/Nautilus.Game.PvP/PvP.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/app.xml b/Plugins/app.xml new file mode 100644 index 000000000..aa91bc8fc --- /dev/null +++ b/Plugins/app.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + pom.xml + + + mineplex-app + pom + + + + + org.apache.maven.plugins + maven-jar-plugin + + ../out + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + + + com.mineplex:spigot + + + + + + + diff --git a/Plugins/plugin.xml b/Plugins/plugin.xml new file mode 100644 index 000000000..30937a766 --- /dev/null +++ b/Plugins/plugin.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + + com.mineplex + mineplex-parent + dev-SNAPSHOT + pom.xml + + + mineplex-plugin + pom + + + + + + + plugin.yml + + + + + + org.apache.maven.plugins + maven-jar-plugin + + ../out + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + + + commons-codec:commons-codec + com.google.code.gson:gson + com.mineplex:spigot + + + + + + + diff --git a/Plugins/pom.xml b/Plugins/pom.xml new file mode 100644 index 000000000..f17e2b4ff --- /dev/null +++ b/Plugins/pom.xml @@ -0,0 +1,181 @@ + + + 4.0.0 + + com.mineplex + mineplex-parent + dev-SNAPSHOT + pom + + + 1.8 + 1.8 + UTF-8 + ${maven.build.timestamp} + yyyy-MM-dd HH:mm + + + + Mineplex.Bungee.Mineplexer + Mineplex.BungeeRotator + Mineplex.Cache + Mineplex.Core + Mineplex.Core.Common + Mineplex.Database + Mineplex.DDoSProtectionSwitcher + Mineplex.EnjinTranslator + Mineplex.Game.Clans + Mineplex.Game.Clans.Core + Mineplex.Hub + Mineplex.MapParser + Mineplex.Minecraft.Game.ClassCombat + Mineplex.Minecraft.Game.Core + Mineplex.ServerData + Mineplex.ServerMonitor + Mineplex.StaffServer + Mineplex.Votifier + Nautilus.Game.Arcade + + + + + mineplex + http://mineplex:sZhnBKND9c@dev.mineplex.com:8081/nexus/content/groups/public/ + + + + + + + commons-codec + commons-codec + 1.6 + compile + + + com.google.code.gson + gson + 2.2.1 + compile + + + com.vexsoftware + votifier + 1.9 + provided + + + fr.neatmonster + nocheatplus + 3.12.1-SNAPSHOT + provided + + + javax.mail + mail + 1.4.7 + compile + + + net.md-5 + bungeecord-proxy + 1.8-SNAPSHOT + provided + + + org.apache.commons + commons-dbcp2 + 2.0.1 + compile + + + org.apache.cxf + cxf-bundle + 2.7.2 + compile + + + org.apache.httpcomponents + httpclient + 4.2 + compile + + + org.apache.ws.security + wss4j + 1.6.9 + compile + + + org.jooq + jooq-codegen + 3.5.2 + compile + + + com.mineplex + spigot + 1.8.8-R0.1-SNAPSHOT + compile + + + redis.clients + jedis + 2.7.2 + compile + + + + + + ${project.name} + ${project.basedir}/src + + + net.md-5 + scriptus + 0.3.1 + + + initialize + + describe + + + + + git:${project.name}:%s:${maven.build.timestamp} + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${describe} + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.2 + + false + + + + + +