From 852872f55c8efb566ad6c2741f2602ecb582e03d Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 11:35:33 -0500 Subject: [PATCH] Custom mod support refactoring. --- .../com/gmail/nossr50/datatypes/McMMOPlayer.java | 4 ++-- src/main/java/com/gmail/nossr50/mcMMO.java | 6 +++--- .../gmail/nossr50/{util => mods}/ModChecks.java | 14 +++++++------- .../mods => mods/config}/CustomArmorConfig.java | 4 ++-- .../mods => mods/config}/CustomBlocksConfig.java | 4 ++-- .../mods => mods/config}/CustomToolsConfig.java | 4 ++-- .../mods => mods/datatypes}/CustomBlock.java | 2 +- .../mods => mods/datatypes}/CustomItem.java | 2 +- .../mods => mods/datatypes}/CustomTool.java | 2 +- .../java/com/gmail/nossr50/party/ShareHandler.java | 10 +++++----- .../java/com/gmail/nossr50/skills/SkillTools.java | 2 +- .../nossr50/skills/excavation/Excavation.java | 2 +- .../gmail/nossr50/skills/herbalism/Herbalism.java | 4 ++-- .../com/gmail/nossr50/skills/mining/Mining.java | 4 ++-- .../skills/mining/SuperBreakerEventHandler.java | 2 +- .../nossr50/skills/woodcutting/TreeFeller.java | 4 ++-- .../nossr50/skills/woodcutting/Woodcutting.java | 4 ++-- .../java/com/gmail/nossr50/util/BlockChecks.java | 3 ++- .../java/com/gmail/nossr50/util/ItemChecks.java | 4 ++-- src/main/java/com/gmail/nossr50/util/Misc.java | 1 + 20 files changed, 42 insertions(+), 40 deletions(-) rename src/main/java/com/gmail/nossr50/{util => mods}/ModChecks.java (91%) rename src/main/java/com/gmail/nossr50/{config/mods => mods/config}/CustomArmorConfig.java (94%) rename src/main/java/com/gmail/nossr50/{config/mods => mods/config}/CustomBlocksConfig.java (95%) rename src/main/java/com/gmail/nossr50/{config/mods => mods/config}/CustomToolsConfig.java (95%) rename src/main/java/com/gmail/nossr50/{datatypes/mods => mods/datatypes}/CustomBlock.java (93%) rename src/main/java/com/gmail/nossr50/{datatypes/mods => mods/datatypes}/CustomItem.java (88%) rename src/main/java/com/gmail/nossr50/{datatypes/mods => mods/datatypes}/CustomTool.java (91%) diff --git a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java index 750b7efb1..e0281eb06 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 12d1441cc..5c4d17ed4 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/util/ModChecks.java b/src/main/java/com/gmail/nossr50/mods/ModChecks.java similarity index 91% rename from src/main/java/com/gmail/nossr50/util/ModChecks.java rename to src/main/java/com/gmail/nossr50/mods/ModChecks.java index 74d88be28..d0bcc7059 100644 --- a/src/main/java/com/gmail/nossr50/util/ModChecks.java +++ b/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(); diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java b/src/main/java/com/gmail/nossr50/mods/config/CustomArmorConfig.java similarity index 94% rename from src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java rename to src/main/java/com/gmail/nossr50/mods/config/CustomArmorConfig.java index e5ddb9058..8f0a67055 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java b/src/main/java/com/gmail/nossr50/mods/config/CustomBlocksConfig.java similarity index 95% rename from src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java rename to src/main/java/com/gmail/nossr50/mods/config/CustomBlocksConfig.java index af40425b7..5d7568f16 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomToolsConfig.java b/src/main/java/com/gmail/nossr50/mods/config/CustomToolsConfig.java similarity index 95% rename from src/main/java/com/gmail/nossr50/config/mods/CustomToolsConfig.java rename to src/main/java/com/gmail/nossr50/mods/config/CustomToolsConfig.java index 460ab5a52..e5c970b57 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomToolsConfig.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java b/src/main/java/com/gmail/nossr50/mods/datatypes/CustomBlock.java similarity index 93% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java rename to src/main/java/com/gmail/nossr50/mods/datatypes/CustomBlock.java index 4f225e3c9..269bf2bac 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomItem.java b/src/main/java/com/gmail/nossr50/mods/datatypes/CustomItem.java similarity index 88% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomItem.java rename to src/main/java/com/gmail/nossr50/mods/datatypes/CustomItem.java index 19a4663a2..ae040aadb 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomItem.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java b/src/main/java/com/gmail/nossr50/mods/datatypes/CustomTool.java similarity index 91% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java rename to src/main/java/com/gmail/nossr50/mods/datatypes/CustomTool.java index f2d98b157..3485863f1 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java index 2cfd969ac..a20506680 100644 --- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/SkillTools.java b/src/main/java/com/gmail/nossr50/skills/SkillTools.java index 58d68453a..d07262411 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillTools.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java index 7263104d0..ef15b2997 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java index c0ee28298..61deac37b 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java index c66d50d5b..8b5dcf5df 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java +++ b/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(); diff --git a/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java b/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java index b58f40d21..7a9c716f8 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java index af43f17a8..6ce89924f 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java index 9cd0fcdad..5e05ee0b7 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/util/BlockChecks.java b/src/main/java/com/gmail/nossr50/util/BlockChecks.java index a7a32daf1..54f764f77 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockChecks.java +++ b/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(); diff --git a/src/main/java/com/gmail/nossr50/util/ItemChecks.java b/src/main/java/com/gmail/nossr50/util/ItemChecks.java index 010741c95..e08939f54 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemChecks.java +++ b/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(); diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index 27536088c..14737c608 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/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 {