diff --git a/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml b/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml index 348adee4..602d03d7 100644 --- a/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml +++ b/Plugins[Modified]/Mineplex.Core.Common.Base/pom.xml @@ -21,6 +21,7 @@ com.mineplex spigot + provided diff --git a/Plugins[Modified]/Mineplex.Core.Common/pom.xml b/Plugins[Modified]/Mineplex.Core.Common/pom.xml index ad90346d..d67b7fca 100644 --- a/Plugins[Modified]/Mineplex.Core.Common/pom.xml +++ b/Plugins[Modified]/Mineplex.Core.Common/pom.xml @@ -40,7 +40,7 @@ ascii.png - ../ + ./ true diff --git a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index 4ee684cd..1b8c243e 100644 --- a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -828,7 +828,8 @@ public class GadgetManager extends MiniPlugin addGadget(new WinEffectRiseOfTheElderGuardian(this)); addGadget(new WinEffectLavaTrap(this)); addGadget(new WinEffectHalloween(this)); - addGadget(new WinEffectWinterWarfare(this)); + //TODO: Win effect missing schematic + //addGadget(new WinEffectWinterWarfare(this)); addGadget(new WinEffectLoveIsABattlefield(this)); addGadget(new WinEffectTornado(this)); addGadget(new WinEffectEarthquake(this)); @@ -980,6 +981,9 @@ public class GadgetManager extends MiniPlugin } }; + //TODO: Cosmetic: MOBA + /* + new GameCosmeticType(this, GameDisplay.MOBA) { @Override @@ -1013,6 +1017,8 @@ public class GadgetManager extends MiniPlugin } }; + */ + for (GadgetType gadgetType : GadgetType.values()) { _gadgets.putIfAbsent(gadgetType, new ArrayList<>()); diff --git a/Plugins[Modified]/Mineplex.Hub/pom.xml b/Plugins[Modified]/Mineplex.Hub/pom.xml index 6e2950ee..c82bc6f2 100644 --- a/Plugins[Modified]/Mineplex.Hub/pom.xml +++ b/Plugins[Modified]/Mineplex.Hub/pom.xml @@ -26,5 +26,11 @@ mineplex-minecraft-game-classcombat ${project.version} + + com.mineplex + spigot + 1.0 + provided + diff --git a/Plugins[Modified]/Mineplex.MapParser/pom.xml b/Plugins[Modified]/Mineplex.MapParser/pom.xml index 1fd1baad..6a85b7c2 100644 --- a/Plugins[Modified]/Mineplex.MapParser/pom.xml +++ b/Plugins[Modified]/Mineplex.MapParser/pom.xml @@ -23,5 +23,11 @@ mineplex-core-common-base ${project.version} + + com.mineplex + spigot + 1.0 + provided + diff --git a/server_configs/Arcade/api-config.dat b/server_configs/Arcade/api-config.dat new file mode 100644 index 00000000..19898f83 --- /dev/null +++ b/server_configs/Arcade/api-config.dat @@ -0,0 +1,3 @@ +AMPLIFIERS: + ip: 127.0.0.1 + port: 1000 \ No newline at end of file diff --git a/server_configs/Arcade/database-config.dat b/server_configs/Arcade/database-config.dat new file mode 100644 index 00000000..6e270d17 --- /dev/null +++ b/server_configs/Arcade/database-config.dat @@ -0,0 +1,2 @@ +ACCOUNT localhost root root +PLAYER_STATS localhost root root \ No newline at end of file diff --git a/server_configs/Arcade/plugins/Arcade/config.yml b/server_configs/Arcade/plugins/Arcade/config.yml new file mode 100644 index 00000000..3c7e181a --- /dev/null +++ b/server_configs/Arcade/plugins/Arcade/config.yml @@ -0,0 +1,8 @@ +webServer: http://127.0.0.1:1000/ +serverstatus: + name: Arcade-1 + us: true + group: Arcade + connectionurl: 127.0.0.1:3306 + username: root + password: root diff --git a/server_configs/Arcade/redis-config.dat b/server_configs/Arcade/redis-config.dat new file mode 100644 index 00000000..3784039f --- /dev/null +++ b/server_configs/Arcade/redis-config.dat @@ -0,0 +1,4 @@ +127.0.0.1 6379 MASTER DefaultConnection +127.0.0.1 6379 SLAVE DefaultConnection +127.0.0.1 6379 MASTER ServerStatus +127.0.0.1 6379 SLAVE ServerStatus \ No newline at end of file