Custom mod support refactoring.

src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java

@@ -6,13 +6,13 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.datatypes.CustomTool;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.spout.huds.SpoutHud;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 
 public class McMMOPlayer {

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -34,9 +34,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.config.TreasuresConfig;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
-import com.gmail.nossr50.config.mods.CustomToolsConfig;
 import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.database.commands.McpurgeCommand;
 import com.gmail.nossr50.database.commands.McremoveCommand;
@@ -49,6 +46,9 @@ import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.listeners.WorldListener;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.config.CustomArmorConfig;
+import com.gmail.nossr50.mods.config.CustomBlocksConfig;
+import com.gmail.nossr50.mods.config.CustomToolsConfig;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.party.commands.ACommand;
 import com.gmail.nossr50.party.commands.PCommand;

src/main/java/com/gmail/nossr50/util/ModChecks.java → src/main/java/com/gmail/nossr50/mods/ModChecks.java

@@ -1,16 +1,16 @@
-package com.gmail.nossr50.util;
+package com.gmail.nossr50.mods;
 
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
-import com.gmail.nossr50.config.mods.CustomToolsConfig;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-import com.gmail.nossr50.datatypes.mods.CustomItem;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.mods.config.CustomArmorConfig;
+import com.gmail.nossr50.mods.config.CustomBlocksConfig;
+import com.gmail.nossr50.mods.config.CustomToolsConfig;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
+import com.gmail.nossr50.mods.datatypes.CustomItem;
+import com.gmail.nossr50.mods.datatypes.CustomTool;
 
 public final class ModChecks {
     private static Config configInstance = Config.getInstance();

src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java → src/main/java/com/gmail/nossr50/mods/config/CustomArmorConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.mods;
+package com.gmail.nossr50.mods.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,7 +8,7 @@ import java.util.Set;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomItem;
+import com.gmail.nossr50.mods.datatypes.CustomItem;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 

src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java → src/main/java/com/gmail/nossr50/mods/config/CustomBlocksConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.mods;
+package com.gmail.nossr50.mods.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
 
 public class CustomBlocksConfig extends ConfigLoader {
     private static CustomBlocksConfig instance;

src/main/java/com/gmail/nossr50/config/mods/CustomToolsConfig.java → src/main/java/com/gmail/nossr50/mods/config/CustomToolsConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.mods;
+package com.gmail.nossr50.mods.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,7 +8,7 @@ import java.util.Set;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.mods.datatypes.CustomTool;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 

src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java → src/main/java/com/gmail/nossr50/mods/datatypes/CustomBlock.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.mods;
+package com.gmail.nossr50.mods.datatypes;
 
 import org.bukkit.inventory.ItemStack;
 

src/main/java/com/gmail/nossr50/datatypes/mods/CustomItem.java → src/main/java/com/gmail/nossr50/mods/datatypes/CustomItem.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.mods;
+package com.gmail.nossr50.mods.datatypes;
 
 public class CustomItem {
     protected int itemID;

src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java → src/main/java/com/gmail/nossr50/mods/datatypes/CustomTool.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.mods;
+package com.gmail.nossr50.mods.datatypes;
 
 public class CustomTool extends CustomItem {
     private double xpMultiplier;

src/main/java/com/gmail/nossr50/party/ShareHandler.java

@@ -16,11 +16,11 @@ public class ShareHandler {
     public static double partyShareRange = Config.getInstance().getPartyShareRange();
     public static double partyShareBonus = Config.getInstance().getPartyShareBonus();
 
-    protected enum PartyShareType {
-        NO_SHARE,
-        RANDOM,
-        EQUAL,
-    };
+//    protected enum PartyShareType {
+//        NO_SHARE,
+//        RANDOM,
+//        EQUAL,
+//    };
 
     public static double checkXpSharing(int oldExp, Player player, Party party) {
         int newExp = oldExp;

src/main/java/com/gmail/nossr50/skills/SkillTools.java

@@ -14,11 +14,11 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.spout.SpoutConfig;
 import com.gmail.nossr50.spout.SpoutTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 

src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java

@@ -16,10 +16,10 @@ import com.gmail.nossr50.config.TreasuresConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 

src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java

@@ -19,15 +19,15 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.TreasuresConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.datatypes.treasure.HylianTreasure;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
 import com.gmail.nossr50.runnables.GreenThumbTimer;
 import com.gmail.nossr50.skills.AbilityType;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 

src/main/java/com/gmail/nossr50/skills/mining/Mining.java

@@ -12,11 +12,11 @@ import org.bukkit.material.MaterialData;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 
 public class Mining {
     private static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();

src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java

@@ -8,9 +8,9 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 
 public class SuperBreakerEventHandler {
     private MiningManager manager;

src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java

@@ -12,15 +12,15 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
 import com.gmail.nossr50.skills.Combat;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.skills.woodcutting.Woodcutting.ExperienceGainMethod;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Users;
 
 public final class TreeFeller {

src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java

@@ -12,12 +12,12 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.datatypes.CustomBlock;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.SkillTools;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 

src/main/java/com/gmail/nossr50/util/BlockChecks.java

@@ -9,7 +9,8 @@ import org.bukkit.material.MaterialData;
 import org.bukkit.material.CocoaPlant.CocoaPlantSize;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.mods.config.CustomBlocksConfig;
 
 public final class BlockChecks {
     private static Config configInstance = Config.getInstance();

src/main/java/com/gmail/nossr50/util/ItemChecks.java

@@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.SpoutToolsAPI;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomToolsConfig;
+import com.gmail.nossr50.mods.config.CustomArmorConfig;
+import com.gmail.nossr50.mods.config.CustomToolsConfig;
 
 public class ItemChecks {
     private static Config configInstance = Config.getInstance();

src/main/java/com/gmail/nossr50/util/Misc.java

@@ -23,6 +23,7 @@ import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.events.items.McMMOItemSpawnEvent;
+import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.party.PartyManager;
 
 public final class Misc {