From 132036bd17a419cdcd97d2fd2b74599db231dc89 Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 11 Jan 2017 16:10:06 -0500 Subject: [PATCH] Move Constants to common --- .../src/mineplex/core/common}/Constants.java | 2 +- .../src/mineplex/core/common/util/UtilServer.java | 3 ++- .../src/mineplex/enjinTranslator/EnjinTranslator.java | 2 +- Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java | 2 +- Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- .../src/mineplex/staffServer/StaffServer.java | 2 +- .../Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java | 2 +- .../src/mineplex/mavericks/review/Hub.java | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Core.Common/src/mineplex/core/common}/Constants.java (84%) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/Constants.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java similarity index 84% rename from Plugins/Mineplex.Core/src/mineplex/core/Constants.java rename to Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java index 749e45968..050927e52 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/Constants.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java @@ -1,4 +1,4 @@ -package mineplex.core; +package mineplex.core.common; public class Constants { diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java index 92b7ba9af..722b7f174 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java @@ -2,6 +2,7 @@ package mineplex.core.common.util; import com.google.common.collect.Lists; +import mineplex.core.common.Constants; import mineplex.core.common.events.PlayerRecieveBroadcastEvent; import mineplex.serverdata.Region; @@ -209,7 +210,7 @@ public class UtilServer public static String getWebServerURL() { - return getPlugin().getConfig().getString("webServer"); + return getPlugin().getConfig().getString(Constants.WEB_CONFIG_KEY); } public static BukkitTask runAsync(Runnable runnable) diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java index 0f4a6950c..60451cab7 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java @@ -1,6 +1,6 @@ package mineplex.enjinTranslator; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.account.CoreClientManager; import mineplex.core.command.CommandCenter; import mineplex.core.donation.DonationManager; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index e4379a1aa..e34fc40b2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -10,7 +10,7 @@ import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.plugin.java.JavaPlugin; import org.spigotmc.SpigotConfig; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.CustomTagFix; import mineplex.core.FoodDupeFix; import mineplex.core.TimingsFix; diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java index c4ed11a41..41e7321b8 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java @@ -4,7 +4,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.CustomTagFix; import mineplex.core.PacketsInteractionFix; import mineplex.core.account.CoreClientManager; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index b6d772184..eaaff57d0 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -5,7 +5,7 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.CustomTagFix; import mineplex.core.PacketsInteractionFix; import mineplex.core.account.CoreClientManager; diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index 2661aa5d3..1cb6ac7b3 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -2,7 +2,7 @@ package mineplex.staffServer; import com.mojang.authlib.GameProfile; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; import mineplex.core.chat.Chat; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 0e63fe59e..152a6b8d1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.spigotmc.SpigotConfig; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.CustomTagFix; import mineplex.core.FoodDupeFix; import mineplex.core.PacketsInteractionFix; diff --git a/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java b/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java index c8817ee8a..e510bd169 100644 --- a/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java +++ b/Plugins/mavericks-review-hub/src/mineplex/mavericks/review/Hub.java @@ -3,7 +3,7 @@ package mineplex.mavericks.review; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.Constants; +import mineplex.core.common.Constants; import mineplex.core.CustomTagFix; import mineplex.core.FoodDupeFix; import mineplex.core.PacketsInteractionFix;