From bf8e3d5a088b86f657134e5b1bd34930d00bd6fd Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 22 Mar 2019 13:29:51 -0700 Subject: [PATCH] Removing unecessary interfaces --- pom.xml | 6 ++-- .../gmail/nossr50/config/ConfigManager.java | 2 -- .../repair/repairables/RepairableManager.java | 32 +++++++++++++------ .../repairables/SimpleRepairableManager.java | 20 +++++------- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index c1663a51a..7c9998ca5 100755 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ sponge - https://repo.spongepowered.org/maven + https://repo.spongepowered.org/maven/ flow @@ -188,12 +188,12 @@ org.spongepowered configurate-yaml - 3.6 + 3.7-SNAPSHOT org.spongepowered configurate-hocon - 3.6 + 3.7-SNAPSHOT org.apache.maven.scm diff --git a/src/main/java/com/gmail/nossr50/config/ConfigManager.java b/src/main/java/com/gmail/nossr50/config/ConfigManager.java index d92de184a..26db88fa0 100644 --- a/src/main/java/com/gmail/nossr50/config/ConfigManager.java +++ b/src/main/java/com/gmail/nossr50/config/ConfigManager.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.config.collectionconfigs.RepairConfig; import com.gmail.nossr50.config.collectionconfigs.SalvageConfig; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.hocon.CustomEnumValueSerializer; @@ -47,7 +46,6 @@ import com.gmail.nossr50.config.treasure.HerbalismTreasureConfig; import com.gmail.nossr50.datatypes.party.PartyFeature; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.skills.repair.repairables.SimpleRepairable; import com.gmail.nossr50.skills.repair.repairables.SimpleRepairableManager; import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java index 82cac0145..6cdf45bbb 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java @@ -1,3 +1,4 @@ +/* package com.gmail.nossr50.skills.repair.repairables; import com.gmail.nossr50.config.Unload; @@ -7,44 +8,55 @@ import org.bukkit.inventory.ItemStack; import java.util.List; public interface RepairableManager extends Unload { - /** + */ +/** * Register a repairable with the RepairManager * * @param repairable Repairable to register - */ + *//* + public void registerRepairable(Repairable repairable); - /** + */ +/** * Register a list of repairables with the RepairManager * * @param repairables List to register - */ + *//* + public void registerRepairables(List repairables); - /** + */ +/** * Checks if an item is repairable * * @param type Material to check if repairable * * @return true if repairable, false if not - */ + *//* + public boolean isRepairable(Material type); - /** + */ +/** * Checks if an item is repairable * * @param itemStack Item to check if repairable * * @return true if repairable, false if not - */ + *//* + public boolean isRepairable(ItemStack itemStack); - /** + */ +/** * Gets the repairable with this type * * @param type Material of the repairable to look for * * @return the repairable, can be null - */ + *//* + public Repairable getRepairable(Material type); } +*/ diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java index daf8a57b9..4883bed5c 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java @@ -1,48 +1,44 @@ package com.gmail.nossr50.skills.repair.repairables; +import com.gmail.nossr50.config.Unload; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.List; -public class SimpleRepairableManager implements RepairableManager { - private HashMap repairables; +public class SimpleRepairableManager implements Unload { + private HashMap repairables; @Override public void unload() { repairables.clear(); } - public SimpleRepairableManager(List repairablesCollection) { - this.repairables = new HashMap(repairablesCollection.size()); + public SimpleRepairableManager(List repairablesCollection) { + this.repairables = new HashMap(repairablesCollection.size()); registerRepairables(repairablesCollection); } - @Override - public void registerRepairable(Repairable repairable) { + public void registerRepairable(SimpleRepairable repairable) { Material item = repairable.getItemMaterial(); repairables.put(item, repairable); } - @Override - public void registerRepairables(List repairables) { - for (Repairable repairable : repairables) { + public void registerRepairables(List repairables) { + for (SimpleRepairable repairable : repairables) { registerRepairable(repairable); } } - @Override public boolean isRepairable(Material type) { return repairables.containsKey(type); } - @Override public boolean isRepairable(ItemStack itemStack) { return isRepairable(itemStack.getType()); } - @Override public Repairable getRepairable(Material type) { return repairables.get(type); }