EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Refactor all our repairable stuff into a special package.

Browse Source
This commit is contained in:
GJ 2013-10-07 10:23:04 -04:00
parent 4aef4c63fc
commit 3927427b5b
16 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
View File

@ -8,7 +8,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.repair.ArcaneForging; import com.gmail.nossr50.skills.repair.ArcaneForging;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairManager; 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; import com.gmail.nossr50.util.Permissions;
public class RepairCommand extends SkillCommand { public class RepairCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
View File

@ -9,7 +9,7 @@ import org.bukkit.entity.EntityType;
import com.gmail.nossr50.config.AutoUpdateConfigLoader; import com.gmail.nossr50.config.AutoUpdateConfigLoader;
import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.experience.FormulaType;
import com.gmail.nossr50.datatypes.skills.SkillType; 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; import com.gmail.nossr50.util.StringUtils;
public class ExperienceConfig extends AutoUpdateConfigLoader { public class ExperienceConfig extends AutoUpdateConfigLoader {

8
src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
View File

@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairItemType; import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
import com.gmail.nossr50.skills.repair.RepairMaterialType; import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
import com.gmail.nossr50.skills.repair.Repairable; import com.gmail.nossr50.skills.repair.repairables.Repairable;
import com.gmail.nossr50.skills.repair.RepairableFactory; import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
public class CustomArmorConfig extends ConfigLoader { public class CustomArmorConfig extends ConfigLoader {
private static CustomArmorConfig instance; private static CustomArmorConfig instance;

8
src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
View File

@ -12,10 +12,10 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.datatypes.mods.CustomTool; import com.gmail.nossr50.datatypes.mods.CustomTool;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairItemType; import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
import com.gmail.nossr50.skills.repair.RepairMaterialType; import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
import com.gmail.nossr50.skills.repair.Repairable; import com.gmail.nossr50.skills.repair.repairables.Repairable;
import com.gmail.nossr50.skills.repair.RepairableFactory; import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
public class CustomToolConfig extends ConfigLoader { public class CustomToolConfig extends ConfigLoader {
private static CustomToolConfig instance; private static CustomToolConfig instance;

6
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -35,10 +35,10 @@ import com.gmail.nossr50.runnables.database.UserPurgeTask;
import com.gmail.nossr50.runnables.party.PartyAutoKickTask; import com.gmail.nossr50.runnables.party.PartyAutoKickTask;
import com.gmail.nossr50.runnables.skills.BleedTimerTask; import com.gmail.nossr50.runnables.skills.BleedTimerTask;
import com.gmail.nossr50.skills.child.ChildConfig; 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.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.ChimaeraWing;
import com.gmail.nossr50.util.LogFilter; import com.gmail.nossr50.util.LogFilter;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;

1
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -21,6 +21,7 @@ import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillManager; import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.repair.ArcaneForging.Tier; 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.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.StringUtils;

8
src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java
View File

@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.RepairItemType; import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
import com.gmail.nossr50.skills.repair.RepairMaterialType; import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
import com.gmail.nossr50.skills.repair.Repairable; import com.gmail.nossr50.skills.repair.repairables.Repairable;
import com.gmail.nossr50.skills.repair.RepairableFactory; import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.util.ItemUtils;
public class RepairConfig extends ConfigLoader { public class RepairConfig extends ConfigLoader {

2
src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.repair.Repairable; import com.gmail.nossr50.skills.repair.repairables.Repairable;
public class RepairConfigManager { public class RepairConfigManager {
private List<Repairable> repairables; private List<Repairable> repairables;

2
src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairItemType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairMaterialType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

3
src/main/java/com/gmail/nossr50/skills/repair/Repairable.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java
View File

@ -1,7 +1,8 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import org.bukkit.Material; import org.bukkit.Material;
public interface Repairable { public interface Repairable {
/** /**
* Gets the type of this repairable item * Gets the type of this repairable item

3
src/main/java/com/gmail/nossr50/skills/repair/RepairableFactory.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java
View File

@ -1,7 +1,8 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import org.bukkit.Material; import org.bukkit.Material;
public class RepairableFactory { public class RepairableFactory {
public static Repairable getRepairable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int minimumQuantity, short maximumDurability) { 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); return getRepairable(itemMaterial, repairMaterial, repairMetadata, 0, minimumQuantity, maximumDurability, RepairItemType.OTHER, RepairMaterialType.OTHER, 1);

2
src/main/java/com/gmail/nossr50/skills/repair/RepairableManager.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import java.util.List; import java.util.List;

3
src/main/java/com/gmail/nossr50/skills/repair/RepairableManagerFactory.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManagerFactory.java
View File

@ -1,4 +1,5 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
public class RepairableManagerFactory { public class RepairableManagerFactory {
public static RepairableManager getRepairManager() { public static RepairableManager getRepairManager() {

3
src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairable.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
View File

@ -1,7 +1,8 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import org.bukkit.Material; import org.bukkit.Material;
public class SimpleRepairable implements Repairable { public class SimpleRepairable implements Repairable {
private final Material itemMaterial, repairMaterial; private final Material itemMaterial, repairMaterial;
private final int minimumQuantity, minimumLevel; private final int minimumQuantity, minimumLevel;

3
src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairableManager.java → src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.repair; package com.gmail.nossr50.skills.repair.repairables;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -6,6 +6,7 @@ import java.util.List;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class SimpleRepairableManager implements RepairableManager { public class SimpleRepairableManager implements RepairableManager {
private HashMap<Material, Repairable> repairables; private HashMap<Material, Repairable> repairables;