Browse Source

WG refactor

nossr50 6 years ago
parent
commit
6be1319927

+ 2 - 2
src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.WorldGuardManager;
-import com.gmail.nossr50.WorldGuardUtils;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
+import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.datatypes.party.Party;

+ 2 - 2
src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.WorldGuardManager;
-import com.gmail.nossr50.WorldGuardUtils;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
+import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.WorldBlacklist;

+ 2 - 2
src/main/java/com/gmail/nossr50/listeners/InventoryListener.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.WorldGuardManager;
-import com.gmail.nossr50.WorldGuardUtils;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
+import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

+ 2 - 2
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.WorldGuardManager;
-import com.gmail.nossr50.WorldGuardUtils;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
+import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
 import com.gmail.nossr50.chat.PartyChatManager;

+ 2 - 2
src/main/java/com/gmail/nossr50/listeners/SelfListener.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.WorldGuardManager;
-import com.gmail.nossr50.WorldGuardUtils;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
+import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;

+ 1 - 0
src/main/java/com/gmail/nossr50/mcMMO.java

@@ -43,6 +43,7 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.upgrade.UpgradeManager;
+import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.google.common.base.Charsets;
 import net.shatteredlands.shatt.backup.ZipLibrary;
 import org.bstats.bukkit.Metrics;

+ 1 - 1
src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.worldguard;
 
 import com.sk89q.worldguard.protection.flags.StateFlag;
 

+ 1 - 1
src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.worldguard;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;

+ 1 - 1
src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.worldguard;
 
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import org.bukkit.plugin.Plugin;

+ 7 - 0
src/main/resources/locale/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#3E176B",
+        "titleBar.activeBackground": "#562195",
+        "titleBar.activeForeground": "#FBF9FE"
+    }
+}