Browse Source

Refactor to match existing conventions

GJ 11 years ago
parent
commit
8e040ae8d9

+ 2 - 2
src/main/java/com/gmail/nossr50/config/potion/PotionConfig.java → src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.potion;
+package com.gmail.nossr50.config.skills.alchemy;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,7 +13,7 @@ import org.bukkit.potion.PotionEffectType;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.AlchemyPotion;
+import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 
 public class PotionConfig extends ConfigLoader {
     private static PotionConfig instance;

+ 1 - 1
src/main/java/com/gmail/nossr50/config/repair/RepairConfig.java → src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java

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

+ 1 - 1
src/main/java/com/gmail/nossr50/config/repair/RepairConfigManager.java → src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.repair;
+package com.gmail.nossr50.config.skills.repair;
 
 import java.io.File;
 import java.util.ArrayList;

+ 1 - 1
src/main/java/com/gmail/nossr50/datatypes/AlchemyPotion.java → src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes;
+package com.gmail.nossr50.datatypes.skills.alchemy;
 
 import java.util.List;
 import java.util.Map;

+ 2 - 2
src/main/java/com/gmail/nossr50/mcMMO.java

@@ -19,8 +19,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.potion.PotionConfig;
-import com.gmail.nossr50.config.repair.RepairConfigManager;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
+import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.database.DatabaseManagerFactory;

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.config.potion.PotionConfig;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -18,8 +18,8 @@ import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.potion.PotionConfig;
-import com.gmail.nossr50.datatypes.AlchemyPotion;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
+import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask;