From 3927427b5b5347b5eecaeaa56398ee2e148e7ce6 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 7 Oct 2013 10:23:04 -0400 Subject: [PATCH] Refactor all our repairable stuff into a special package. --- .../com/gmail/nossr50/commands/skills/RepairCommand.java | 2 +- .../gmail/nossr50/config/experience/ExperienceConfig.java | 2 +- .../com/gmail/nossr50/config/mods/CustomArmorConfig.java | 8 ++++---- .../com/gmail/nossr50/config/mods/CustomToolConfig.java | 8 ++++---- src/main/java/com/gmail/nossr50/mcMMO.java | 6 +++--- .../com/gmail/nossr50/skills/repair/RepairManager.java | 1 + .../gmail/nossr50/skills/repair/config/RepairConfig.java | 8 ++++---- .../nossr50/skills/repair/config/RepairConfigManager.java | 2 +- .../skills/repair/{ => repairables}/RepairItemType.java | 2 +- .../repair/{ => repairables}/RepairMaterialType.java | 2 +- .../skills/repair/{ => repairables}/Repairable.java | 3 ++- .../repair/{ => repairables}/RepairableFactory.java | 3 ++- .../repair/{ => repairables}/RepairableManager.java | 2 +- .../{ => repairables}/RepairableManagerFactory.java | 3 ++- .../skills/repair/{ => repairables}/SimpleRepairable.java | 3 ++- .../repair/{ => repairables}/SimpleRepairableManager.java | 3 ++- 16 files changed, 32 insertions(+), 26 deletions(-) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/RepairItemType.java (93%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/RepairMaterialType.java (97%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/Repairable.java (97%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/RepairableFactory.java (94%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/RepairableManager.java (95%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/RepairableManagerFactory.java (89%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/SimpleRepairable.java (97%) rename src/main/java/com/gmail/nossr50/skills/repair/{ => repairables}/SimpleRepairableManager.java (95%) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index c2f424866..963820ddb 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -8,7 +8,7 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.repair.ArcaneForging; import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.RepairManager; -import com.gmail.nossr50.skills.repair.Repairable; +import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.util.Permissions; public class RepairCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index c89145ba9..33ca3ebb5 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -9,7 +9,7 @@ import org.bukkit.entity.EntityType; import com.gmail.nossr50.config.AutoUpdateConfigLoader; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.skills.repair.RepairMaterialType; +import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType; import com.gmail.nossr50.util.StringUtils; public class ExperienceConfig extends AutoUpdateConfigLoader { diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java index 49e0473ca..c46d51fef 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java +++ b/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java @@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.skills.repair.Repair; -import com.gmail.nossr50.skills.repair.RepairItemType; -import com.gmail.nossr50.skills.repair.RepairMaterialType; -import com.gmail.nossr50.skills.repair.Repairable; -import com.gmail.nossr50.skills.repair.RepairableFactory; +import com.gmail.nossr50.skills.repair.repairables.RepairItemType; +import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType; +import com.gmail.nossr50.skills.repair.repairables.Repairable; +import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; public class CustomArmorConfig extends ConfigLoader { private static CustomArmorConfig instance; diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java index 75d53236e..0073fd6a1 100644 --- a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java +++ b/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java @@ -12,10 +12,10 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.datatypes.mods.CustomTool; import com.gmail.nossr50.skills.repair.Repair; -import com.gmail.nossr50.skills.repair.RepairItemType; -import com.gmail.nossr50.skills.repair.RepairMaterialType; -import com.gmail.nossr50.skills.repair.Repairable; -import com.gmail.nossr50.skills.repair.RepairableFactory; +import com.gmail.nossr50.skills.repair.repairables.RepairItemType; +import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType; +import com.gmail.nossr50.skills.repair.repairables.Repairable; +import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; public class CustomToolConfig extends ConfigLoader { private static CustomToolConfig instance; diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 9188118ef..830ce70ff 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -35,10 +35,10 @@ import com.gmail.nossr50.runnables.database.UserPurgeTask; import com.gmail.nossr50.runnables.party.PartyAutoKickTask; import com.gmail.nossr50.runnables.skills.BleedTimerTask; import com.gmail.nossr50.skills.child.ChildConfig; -import com.gmail.nossr50.skills.repair.Repairable; -import com.gmail.nossr50.skills.repair.RepairableManager; -import com.gmail.nossr50.skills.repair.RepairableManagerFactory; import com.gmail.nossr50.skills.repair.config.RepairConfigManager; +import com.gmail.nossr50.skills.repair.repairables.Repairable; +import com.gmail.nossr50.skills.repair.repairables.RepairableManager; +import com.gmail.nossr50.skills.repair.repairables.RepairableManagerFactory; import com.gmail.nossr50.util.ChimaeraWing; import com.gmail.nossr50.util.LogFilter; import com.gmail.nossr50.util.Misc; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index a509b1d3b..2b54224ab 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -21,6 +21,7 @@ import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillManager; import com.gmail.nossr50.skills.repair.ArcaneForging.Tier; +import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java index ccdd237ce..f278393f8 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java @@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.skills.repair.Repair; -import com.gmail.nossr50.skills.repair.RepairItemType; -import com.gmail.nossr50.skills.repair.RepairMaterialType; -import com.gmail.nossr50.skills.repair.Repairable; -import com.gmail.nossr50.skills.repair.RepairableFactory; +import com.gmail.nossr50.skills.repair.repairables.RepairItemType; +import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType; +import com.gmail.nossr50.skills.repair.repairables.Repairable; +import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; import com.gmail.nossr50.util.ItemUtils; public class RepairConfig extends ConfigLoader { diff --git a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java index 8033c071c..97b5f980d 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.regex.Pattern; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.skills.repair.Repairable; +import com.gmail.nossr50.skills.repair.repairables.Repairable; public class RepairConfigManager { private List repairables; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairItemType.java similarity index 93% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairItemType.java index 96c62a56a..cff61ebf3 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairItemType.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairMaterialType.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairMaterialType.java index f478b798d..950871846 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairMaterialType.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repairable.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/repair/Repairable.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java index 434b45631..c86535c87 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repairable.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java @@ -1,7 +1,8 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import org.bukkit.Material; + public interface Repairable { /** * Gets the type of this repairable item diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairableFactory.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java similarity index 94% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairableFactory.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java index b52738246..588b58bb7 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairableFactory.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java @@ -1,7 +1,8 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import org.bukkit.Material; + public class RepairableFactory { public static Repairable getRepairable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int minimumQuantity, short maximumDurability) { return getRepairable(itemMaterial, repairMaterial, repairMetadata, 0, minimumQuantity, maximumDurability, RepairItemType.OTHER, RepairMaterialType.OTHER, 1); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairableManager.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairableManager.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java index 912b33edc..be06e78a4 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairableManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import java.util.List; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairableManagerFactory.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManagerFactory.java similarity index 89% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairableManagerFactory.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManagerFactory.java index 32cdd47b9..274687d1f 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairableManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManagerFactory.java @@ -1,4 +1,5 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; + public class RepairableManagerFactory { public static RepairableManager getRepairManager() { diff --git a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairable.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairable.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java index f56b57d06..a74a7c6c1 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairable.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java @@ -1,7 +1,8 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import org.bukkit.Material; + public class SimpleRepairable implements Repairable { private final Material itemMaterial, repairMaterial; private final int minimumQuantity, minimumLevel; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairableManager.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java similarity index 95% rename from src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairableManager.java rename to src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java index 87ba61f3a..0711b7149 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairableManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills.repair; +package com.gmail.nossr50.skills.repair.repairables; import java.util.HashMap; import java.util.List; @@ -6,6 +6,7 @@ import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; + public class SimpleRepairableManager implements RepairableManager { private HashMap repairables;