From 599bbe73b4d202bb07310c8ee76d063f894d16c2 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 11:53:51 -0500 Subject: [PATCH 1/6] More major refactoring. My OCD is better now. --- .../java/com/gmail/nossr50/api/AbilityAPI.java | 2 +- .../com/gmail/nossr50/api/ExperienceAPI.java | 4 ++-- .../com/gmail/nossr50/api/SpoutToolsAPI.java | 2 +- .../chunkmeta/ChunkManager.java | 2 +- .../chunkmeta/ChunkManagerFactory.java | 2 +- .../chunkmeta/ChunkStore.java | 4 ++-- .../chunkmeta/ChunkStoreFactory.java | 2 +- .../chunkmeta/HashChunkManager.java | 4 ++-- .../chunkmeta/NullChunkManager.java | 2 +- .../chunkmeta/PrimitiveChunkStore.java | 4 ++-- .../conversion}/BlockStoreConversionMain.java | 2 +- .../BlockStoreConversionXDirectory.java | 2 +- .../BlockStoreConversionZDirectory.java | 14 +++++++------- .../old}/ChunkletManager.java | 2 +- .../old}/ChunkletManagerFactory.java | 2 +- .../old}/ChunkletStore.java | 2 +- .../old}/ChunkletStoreFactory.java | 2 +- .../old}/HashChunkletManager.java | 2 +- .../old}/NullChunkletManager.java | 2 +- .../old}/PrimitiveChunkletStore.java | 2 +- .../old}/PrimitiveExChunkletStore.java | 2 +- .../gmail/nossr50/commands/CommandHelper.java | 4 ++-- .../commands/general/AddlevelsCommand.java | 4 ++-- .../nossr50/commands/general/AddxpCommand.java | 4 ++-- .../nossr50/commands/general/InspectCommand.java | 2 +- .../nossr50/commands/general/MmoeditCommand.java | 4 ++-- .../commands/general/SkillResetCommand.java | 2 +- .../gmail/nossr50/commands/mc/McrankCommand.java | 4 ++-- .../gmail/nossr50/commands/mc/MctopCommand.java | 4 ++-- .../com/gmail/nossr50/database/Database.java | 4 ++-- .../database/commands/MmoupdateCommand.java | 2 +- .../runnables/SQLConversionTask.java | 2 +- .../{ => database}/runnables/SQLReconnect.java | 2 +- .../{ => database}/runnables/UserPurgeTask.java | 2 +- .../com/gmail/nossr50/datatypes/McMMOPlayer.java | 2 +- .../gmail/nossr50/datatypes/PlayerProfile.java | 6 +++--- .../experience/McMMOPlayerExperienceEvent.java | 2 +- .../experience/McMMOPlayerLevelUpEvent.java | 2 +- .../experience/McMMOPlayerXpGainEvent.java | 2 +- .../events/skills/McMMOPlayerDisarmEvent.java | 2 +- .../skills/McMMOPlayerRepairCheckEvent.java | 2 +- .../events/skills/McMMOPlayerSkillEvent.java | 2 +- .../gmail/nossr50/listeners/BlockListener.java | 8 ++++---- .../gmail/nossr50/listeners/EntityListener.java | 6 +++--- .../gmail/nossr50/listeners/PlayerListener.java | 6 +++--- .../gmail/nossr50/listeners/WorldListener.java | 2 +- src/main/java/com/gmail/nossr50/mcMMO.java | 10 +++++----- .../com/gmail/nossr50/party/ShareHandler.java | 4 ++-- .../com/gmail/nossr50/runnables/McRankAsync.java | 4 ++-- .../com/gmail/nossr50/skills/SkillCommand.java | 4 +++- .../skills/{Page.java => SkillGuide.java} | 16 +++++++++------- .../com/gmail/nossr50/skills/SkillManager.java | 1 + .../skills/acrobatics/AcrobaticsCommand.java | 2 +- .../skills/acrobatics/AcrobaticsManager.java | 2 +- .../skills/acrobatics/DodgeEventHandler.java | 4 ++-- .../skills/acrobatics/RollEventHandler.java | 4 ++-- .../nossr50/skills/archery/ArcheryCommand.java | 2 +- .../nossr50/skills/archery/ArcheryManager.java | 4 ++-- .../gmail/nossr50/skills/axes/AxeManager.java | 2 +- .../gmail/nossr50/skills/axes/AxesCommand.java | 2 +- .../skills/axes/SkullSplitterEventHandler.java | 6 +++--- .../nossr50/skills/excavation/Excavation.java | 4 ++-- .../skills/excavation/ExcavationCommand.java | 2 +- .../gmail/nossr50/skills/fishing/Fishing.java | 4 ++-- .../nossr50/skills/fishing/FishingCommand.java | 2 +- .../gmail/nossr50/skills/fishing/ShakeMob.java | 4 ++-- .../herbalism}/GreenThumbTimer.java | 6 +++--- .../nossr50/skills/herbalism/Herbalism.java | 7 +++---- .../skills/herbalism/HerbalismCommand.java | 2 +- .../com/gmail/nossr50/skills/mining/Mining.java | 4 ++-- .../nossr50/skills/mining/MiningCommand.java | 2 +- .../nossr50/skills/mining/MiningManager.java | 2 +- .../mining/RemoteDetonationEventHandler.java | 4 ++-- .../skills/mining/SuperBreakerEventHandler.java | 2 +- .../com/gmail/nossr50/skills/repair/Repair.java | 4 ++-- .../nossr50/skills/repair/RepairCommand.java | 2 +- .../com/gmail/nossr50/skills/repair/Salvage.java | 2 +- .../skills/repair/SimpleRepairManager.java | 2 +- .../{ => skills}/runnables/BleedTimer.java | 10 +++++----- .../nossr50/{ => skills}/runnables/GainXp.java | 6 +++--- .../{ => skills}/runnables/SkillMonitor.java | 8 ++++---- .../skills/smelting/FluxMiningEventHandler.java | 2 +- .../smelting/SmeltResourceEventHandler.java | 4 ++-- .../nossr50/skills/smelting/SmeltingCommand.java | 2 +- .../nossr50/skills/smelting/SmeltingManager.java | 2 +- .../nossr50/skills/swords/BleedEventHandler.java | 2 +- .../skills/swords/CounterAttackEventHandler.java | 4 ++-- .../swords/SerratedStrikesEventHandler.java | 8 ++++---- .../nossr50/skills/swords/SwordsCommand.java | 2 +- .../nossr50/skills/swords/SwordsManager.java | 2 +- .../nossr50/skills/taming/GoreEventHandler.java | 2 +- .../nossr50/skills/taming/TamingCommand.java | 2 +- .../nossr50/skills/taming/TamingManager.java | 4 ++-- .../skills/unarmed/IronGripEventHandler.java | 2 +- .../nossr50/skills/unarmed/UnarmedCommand.java | 2 +- .../nossr50/skills/unarmed/UnarmedManager.java | 2 +- .../skills/{ => utilities}/AbilityType.java | 2 +- .../{Combat.java => utilities/CombatTools.java} | 10 +++++----- .../skills/{ => utilities}/SkillTools.java | 2 +- .../skills/{ => utilities}/SkillType.java | 2 +- .../nossr50/skills/{ => utilities}/ToolType.java | 2 +- .../nossr50/skills/woodcutting/TreeFeller.java | 8 ++++---- .../nossr50/skills/woodcutting/Woodcutting.java | 4 ++-- .../skills/woodcutting/WoodcuttingCommand.java | 2 +- .../java/com/gmail/nossr50/spout/SpoutTools.java | 4 ++-- .../nossr50/spout/commands/XplockCommand.java | 4 ++-- .../com/gmail/nossr50/spout/huds/SpoutHud.java | 2 +- .../com/gmail/nossr50/spout/popups/XpBar.java | 2 +- .../com/gmail/nossr50/util/ChimaeraWing.java | 2 +- .../java/com/gmail/nossr50/util/Hardcore.java | 2 +- .../java/com/gmail/nossr50/util/Leaderboard.java | 2 +- src/main/java/com/gmail/nossr50/util/Motd.java | 2 +- .../java/com/gmail/nossr50/util/Permissions.java | 2 +- .../old}/PrimitiveExChunkletStoreTest.java | 4 +++- 114 files changed, 198 insertions(+), 192 deletions(-) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/ChunkManager.java (99%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/ChunkManagerFactory.java (86%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/ChunkStore.java (95%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/ChunkStoreFactory.java (83%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/HashChunkManager.java (99%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/NullChunkManager.java (97%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore}/chunkmeta/PrimitiveChunkStore.java (98%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{runnables/blockstoreconversion => blockstore/conversion}/BlockStoreConversionMain.java (97%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{runnables/blockstoreconversion => blockstore/conversion}/BlockStoreConversionXDirectory.java (97%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{runnables/blockstoreconversion => blockstore/conversion}/BlockStoreConversionZDirectory.java (93%) mode change 100755 => 100644 rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/ChunkletManager.java (99%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/ChunkletManagerFactory.java (89%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/ChunkletStore.java (97%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/ChunkletStoreFactory.java (83%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/HashChunkletManager.java (99%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/NullChunkletManager.java (97%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/PrimitiveChunkletStore.java (96%) rename src/main/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/PrimitiveExChunkletStore.java (99%) rename src/main/java/com/gmail/nossr50/{ => database}/runnables/SQLConversionTask.java (97%) rename src/main/java/com/gmail/nossr50/{ => database}/runnables/SQLReconnect.java (89%) rename src/main/java/com/gmail/nossr50/{ => database}/runnables/UserPurgeTask.java (87%) rename src/main/java/com/gmail/nossr50/skills/{Page.java => SkillGuide.java} (83%) rename src/main/java/com/gmail/nossr50/{runnables => skills/herbalism}/GreenThumbTimer.java (92%) rename src/main/java/com/gmail/nossr50/{ => skills}/runnables/BleedTimer.java (94%) rename src/main/java/com/gmail/nossr50/{ => skills}/runnables/GainXp.java (85%) rename src/main/java/com/gmail/nossr50/{ => skills}/runnables/SkillMonitor.java (83%) rename src/main/java/com/gmail/nossr50/skills/{ => utilities}/AbilityType.java (96%) rename src/main/java/com/gmail/nossr50/skills/{Combat.java => utilities/CombatTools.java} (99%) rename src/main/java/com/gmail/nossr50/skills/{ => utilities}/SkillTools.java (97%) rename src/main/java/com/gmail/nossr50/skills/{ => utilities}/SkillType.java (96%) rename src/main/java/com/gmail/nossr50/skills/{ => utilities}/ToolType.java (94%) rename src/test/java/com/gmail/nossr50/{util/blockmeta => blockstore/old}/PrimitiveExChunkletStoreTest.java (89%) diff --git a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java index 552121bdf..742bc5bb6 100644 --- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java +++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.api; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.AbilityType; +import com.gmail.nossr50.skills.utilities.AbilityType; import com.gmail.nossr50.util.Users; public final class AbilityAPI { diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index 807c0b105..9de6ca527 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -2,8 +2,8 @@ package com.gmail.nossr50.api; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Users; public final class ExperienceAPI { diff --git a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java index 2bc505d97..732c6c383 100644 --- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java +++ b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java @@ -5,7 +5,7 @@ import java.util.List; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.skills.ToolType; +import com.gmail.nossr50.skills.utilities.ToolType; public final class SpoutToolsAPI { public static final List spoutSwords = new ArrayList(); diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java index 9fee57617..7155f3feb --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java index efb3847ed..c3d26fb56 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import com.gmail.nossr50.config.HiddenConfig; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java index 69ed58485..147376700 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java @@ -1,10 +1,10 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import java.io.Serializable; import java.util.List; import java.util.UUID; -import com.gmail.nossr50.util.blockmeta.ChunkletStore; +import com.gmail.nossr50.blockstore.old.ChunkletStore; /** * A ChunkStore should be responsible for a 16x16xWorldHeight area of data diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java old mode 100755 new mode 100644 similarity index 83% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java index 2ca5d5032..0c661090a --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import org.bukkit.World; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java index 1b20512fd..e95e426f9 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import java.io.File; import java.io.IOException; @@ -18,7 +18,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.getspout.spoutapi.chunkstore.mcMMOSimpleRegionFile; -import com.gmail.nossr50.runnables.blockstoreconversion.BlockStoreConversionZDirectory; +import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionZDirectory; public class HashChunkManager implements ChunkManager { private HashMap> regionFiles = new HashMap>(); diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java index e3e3b776e..b5a0a1039 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java rename to src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java index fe1f7d173..1e9065db8 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta.chunkmeta; +package com.gmail.nossr50.blockstore.chunkmeta; import java.io.IOException; import java.io.ObjectInputStream; @@ -10,7 +10,7 @@ import java.util.UUID; import org.bukkit.World; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.blockmeta.ChunkletStore; +import com.gmail.nossr50.blockstore.old.ChunkletStore; public class PrimitiveChunkStore implements ChunkStore { private static final long serialVersionUID = -1L; diff --git a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionMain.java b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionMain.java rename to src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java index d8c82efc6..eb1225e71 --- a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionMain.java +++ b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables.blockstoreconversion; +package com.gmail.nossr50.blockstore.conversion; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionXDirectory.java b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionXDirectory.java rename to src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java index dfe1cf06a..91b2c089b --- a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionXDirectory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables.blockstoreconversion; +package com.gmail.nossr50.blockstore.conversion; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionZDirectory.java b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionZDirectory.java rename to src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java index 12f281745..9a62f35ff --- a/src/main/java/com/gmail/nossr50/runnables/blockstoreconversion/BlockStoreConversionZDirectory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java @@ -1,16 +1,16 @@ -package com.gmail.nossr50.runnables.blockstoreconversion; +package com.gmail.nossr50.blockstore.conversion; import java.io.File; import org.bukkit.scheduler.BukkitScheduler; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.blockmeta.ChunkletStore; -import com.gmail.nossr50.util.blockmeta.HashChunkletManager; -import com.gmail.nossr50.util.blockmeta.PrimitiveChunkletStore; -import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore; -import com.gmail.nossr50.util.blockmeta.chunkmeta.HashChunkManager; -import com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore; +import com.gmail.nossr50.blockstore.chunkmeta.HashChunkManager; +import com.gmail.nossr50.blockstore.chunkmeta.PrimitiveChunkStore; +import com.gmail.nossr50.blockstore.old.ChunkletStore; +import com.gmail.nossr50.blockstore.old.HashChunkletManager; +import com.gmail.nossr50.blockstore.old.PrimitiveChunkletStore; +import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore; public class BlockStoreConversionZDirectory implements Runnable { public int taskID, cx, cz, x, y, z, y2, xPos, zPos, cxPos, czPos; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java rename to src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java index 7a1d2b7cf..1f441354e 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java similarity index 89% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java rename to src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java index 39f8732d3..1ad7ec50a 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import com.gmail.nossr50.config.HiddenConfig; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java similarity index 97% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java rename to src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java index 5514df13c..ce42c171e 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import java.io.Serializable; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java similarity index 83% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java rename to src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java index 1fb4a315a..825b70bb5 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; public class ChunkletStoreFactory { protected static ChunkletStore getChunkletStore() { diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java b/src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java rename to src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java index c97af7c02..0aea915f6 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import java.io.EOFException; import java.io.File; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java b/src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java similarity index 97% rename from src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java rename to src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java index 89bd46967..e4e92e894 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java b/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java similarity index 96% rename from src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java rename to src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java index 64a149049..bf668fd1e 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; public class PrimitiveChunkletStore implements ChunkletStore { private static final long serialVersionUID = -3453078050608607478L; diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java b/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java similarity index 99% rename from src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java rename to src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java index 6644fdd9a..2fffccde2 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import java.io.Externalizable; import java.io.IOException; diff --git a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java index 4beda0511..7c2c00265 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java @@ -5,8 +5,8 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java index 4233ba953..17b10632b 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java @@ -10,8 +10,8 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index 9507dca5b..17ad26a80 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -10,8 +10,8 @@ import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.McMMOPlayer; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java index e3c5f6855..e0237cb6c 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java @@ -9,7 +9,7 @@ import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.McMMOPlayer; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java index 9d6f3621d..6d3e25b3d 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java @@ -9,8 +9,8 @@ import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.McMMOPlayer; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java b/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java index bc191fec3..c1f2f5c6f 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Users; public class SkillResetCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java index 276e7d8dc..f67c384bd 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java @@ -10,8 +10,8 @@ import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.runnables.McRankAsync; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Leaderboard; public class McrankCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java index 2b19d5de9..a44045b5a 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java @@ -11,8 +11,8 @@ import org.bukkit.command.CommandSender; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.database.Database; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Leaderboard; import com.gmail.nossr50.util.Misc; diff --git a/src/main/java/com/gmail/nossr50/database/Database.java b/src/main/java/com/gmail/nossr50/database/Database.java index 9bb7de207..2b59245d9 100644 --- a/src/main/java/com/gmail/nossr50/database/Database.java +++ b/src/main/java/com/gmail/nossr50/database/Database.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; +import com.gmail.nossr50.database.runnables.SQLReconnect; import com.gmail.nossr50.datatypes.McMMOPlayer; -import com.gmail.nossr50.runnables.SQLReconnect; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.spout.SpoutTools; import com.gmail.nossr50.spout.huds.SpoutHud; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java index 492956431..aa64d1355 100644 --- a/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java +++ b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.Config; +import com.gmail.nossr50.database.runnables.SQLConversionTask; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.runnables.SQLConversionTask; import com.gmail.nossr50.util.Users; public class MmoupdateCommand implements CommandExecutor { diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java b/src/main/java/com/gmail/nossr50/database/runnables/SQLConversionTask.java similarity index 97% rename from src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java rename to src/main/java/com/gmail/nossr50/database/runnables/SQLConversionTask.java index 1798918c6..0de52b221 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java +++ b/src/main/java/com/gmail/nossr50/database/runnables/SQLConversionTask.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.database.runnables; import java.io.BufferedReader; import java.io.FileReader; diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java b/src/main/java/com/gmail/nossr50/database/runnables/SQLReconnect.java similarity index 89% rename from src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java rename to src/main/java/com/gmail/nossr50/database/runnables/SQLReconnect.java index df7d6e959..37a289284 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java +++ b/src/main/java/com/gmail/nossr50/database/runnables/SQLReconnect.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.database.runnables; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java b/src/main/java/com/gmail/nossr50/database/runnables/UserPurgeTask.java similarity index 87% rename from src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java rename to src/main/java/com/gmail/nossr50/database/runnables/UserPurgeTask.java index fb4755a75..cd6e6d87c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java +++ b/src/main/java/com/gmail/nossr50/database/runnables/UserPurgeTask.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.database.runnables; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.database.Database; diff --git a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java index e0281eb06..4cd2cea11 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java @@ -11,7 +11,7 @@ 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.skills.utilities.SkillType; import com.gmail.nossr50.spout.huds.SpoutHud; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java index 9f87aea55..460f43189 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -14,9 +14,9 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.database.Database; import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.skills.AbilityType; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.ToolType; +import com.gmail.nossr50.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillType; +import com.gmail.nossr50.skills.utilities.ToolType; import com.gmail.nossr50.spout.SpoutConfig; import com.gmail.nossr50.spout.huds.HudType; import com.gmail.nossr50.spout.huds.SpoutHud; diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java index 9b177b2bd..a79ac6b29 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; /** * Generic event for mcMMO experience events. diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java index 4e1a1937d..52afd8452 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.events.experience; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; /** * Called when a user levels up in a skill diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java index 77e29e070..82fc3d4ec 100644 --- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java +++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.events.experience; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; /** * Called when a player gains XP in a skill diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerDisarmEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerDisarmEvent.java index d754e02ff..dcaccbb63 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerDisarmEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerDisarmEvent.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.events.skills; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable { private boolean cancelled; diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java index fc8a66d5f..d6eb70be7 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; /** * Called just before a player repairs an object with mcMMO. diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java index 0c4f6d7c4..3690480c5 100644 --- a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java +++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; /** * Generic event for mcMMO skill handling. diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 7b43996b0..3eab41471 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -27,10 +27,6 @@ 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.runnables.StickyPistonTracker; -import com.gmail.nossr50.skills.AbilityType; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; -import com.gmail.nossr50.skills.ToolType; import com.gmail.nossr50.skills.excavation.Excavation; import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.skills.mining.Mining; @@ -38,6 +34,10 @@ import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Salvage; import com.gmail.nossr50.skills.smelting.SmeltingManager; +import com.gmail.nossr50.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; +import com.gmail.nossr50.skills.utilities.ToolType; import com.gmail.nossr50.skills.woodcutting.Woodcutting; import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.ItemChecks; diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index dc043d03a..bffc2dd64 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -31,15 +31,15 @@ import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.runnables.BleedTimer; -import com.gmail.nossr50.skills.Combat; import com.gmail.nossr50.skills.acrobatics.Acrobatics; import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager; import com.gmail.nossr50.skills.archery.Archery; import com.gmail.nossr50.skills.fishing.Fishing; import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.skills.mining.MiningManager; +import com.gmail.nossr50.skills.runnables.BleedTimer; import com.gmail.nossr50.skills.taming.TamingManager; +import com.gmail.nossr50.skills.utilities.CombatTools; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; @@ -121,7 +121,7 @@ public class EntityListener implements Listener { LivingEntity livingDefender = (LivingEntity) defender; if (!Misc.isInvincible(livingDefender, event)) { - Combat.combatChecks(event, attacker, livingDefender); + CombatTools.combatChecks(event, attacker, livingDefender); } } } diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index cb9fa2ac9..d5e4c8fa7 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -24,16 +24,16 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.Party; -import com.gmail.nossr50.runnables.BleedTimer; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; import com.gmail.nossr50.skills.fishing.Fishing; import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.skills.mining.BlastMining; import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.skills.repair.Repair; import com.gmail.nossr50.skills.repair.Salvage; +import com.gmail.nossr50.skills.runnables.BleedTimer; import com.gmail.nossr50.skills.taming.TamingManager; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.ChatManager; import com.gmail.nossr50.util.ChimaeraWing; diff --git a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java index 89d58ac56..cae3d1fab 100644 --- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java @@ -20,7 +20,7 @@ import org.bukkit.event.world.WorldInitEvent; import org.bukkit.event.world.WorldUnloadEvent; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.blockstoreconversion.BlockStoreConversionMain; +import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionMain; public class WorldListener implements Listener { private ArrayList converters = new ArrayList(); diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 5c4d17ed4..2da82446e 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -16,6 +16,8 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; +import com.gmail.nossr50.blockstore.chunkmeta.ChunkManager; +import com.gmail.nossr50.blockstore.chunkmeta.ChunkManagerFactory; import com.gmail.nossr50.commands.general.AddlevelsCommand; import com.gmail.nossr50.commands.general.AddxpCommand; import com.gmail.nossr50.commands.general.InspectCommand; @@ -38,6 +40,7 @@ import com.gmail.nossr50.database.Database; import com.gmail.nossr50.database.commands.McpurgeCommand; import com.gmail.nossr50.database.commands.McremoveCommand; import com.gmail.nossr50.database.commands.MmoupdateCommand; +import com.gmail.nossr50.database.runnables.UserPurgeTask; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.listeners.BlockListener; import com.gmail.nossr50.listeners.EntityListener; @@ -54,11 +57,8 @@ import com.gmail.nossr50.party.commands.ACommand; import com.gmail.nossr50.party.commands.PCommand; import com.gmail.nossr50.party.commands.PartyCommand; import com.gmail.nossr50.party.commands.PtpCommand; -import com.gmail.nossr50.runnables.BleedTimer; import com.gmail.nossr50.runnables.MobStoreCleaner; import com.gmail.nossr50.runnables.SaveTimer; -import com.gmail.nossr50.runnables.SkillMonitor; -import com.gmail.nossr50.runnables.UserPurgeTask; import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand; import com.gmail.nossr50.skills.archery.ArcheryCommand; import com.gmail.nossr50.skills.axes.AxesCommand; @@ -71,6 +71,8 @@ import com.gmail.nossr50.skills.repair.RepairManager; import com.gmail.nossr50.skills.repair.RepairManagerFactory; import com.gmail.nossr50.skills.repair.Repairable; import com.gmail.nossr50.skills.repair.config.RepairConfigManager; +import com.gmail.nossr50.skills.runnables.BleedTimer; +import com.gmail.nossr50.skills.runnables.SkillMonitor; import com.gmail.nossr50.skills.smelting.SmeltingCommand; import com.gmail.nossr50.skills.swords.SwordsCommand; import com.gmail.nossr50.skills.taming.TamingCommand; @@ -85,8 +87,6 @@ import com.gmail.nossr50.util.Leaderboard; import com.gmail.nossr50.util.Metrics; import com.gmail.nossr50.util.Metrics.Graph; import com.gmail.nossr50.util.Users; -import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager; -import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory; public class mcMMO extends JavaPlugin { private final PlayerListener playerListener = new PlayerListener(this); diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java index a20506680..1222b9221 100644 --- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java +++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java @@ -5,8 +5,8 @@ import java.util.List; import org.bukkit.entity.Player; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.skills.SkillTools; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Users; public class ShareHandler { diff --git a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java index d5ecb284d..40780d825 100644 --- a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java +++ b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java @@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender; import com.gmail.nossr50.database.Database; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; public class McRankAsync implements Runnable { private final String playerName; diff --git a/src/main/java/com/gmail/nossr50/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/skills/SkillCommand.java index 049446107..267a2d7b8 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillCommand.java @@ -10,6 +10,8 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; @@ -78,7 +80,7 @@ public abstract class SkillCommand implements CommandExecutor { statsDisplay(); - Page.grabGuidePageForSkill(skill, player, args); + SkillGuide.grabGuidePageForSkill(skill, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/skills/Page.java b/src/main/java/com/gmail/nossr50/skills/SkillGuide.java similarity index 83% rename from src/main/java/com/gmail/nossr50/skills/Page.java rename to src/main/java/com/gmail/nossr50/skills/SkillGuide.java index c2734cbdf..9a94503a7 100644 --- a/src/main/java/com/gmail/nossr50/skills/Page.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillGuide.java @@ -5,10 +5,12 @@ import java.util.ArrayList; import org.bukkit.entity.Player; import com.gmail.nossr50.locale.LocaleLoader; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; -public final class Page { - private Page() {} +public final class SkillGuide { + private SkillGuide() {} public static int getTotalPageNumber(String address) { String[] addressSplit = LocaleLoader.getString(address).split("\n"); @@ -61,12 +63,12 @@ public final class Page { if (args.length >= 1 && args[0].equals("?")) { String address = "Guides." + capitalized; - int totalPages = Page.getTotalPageNumber(address); + int totalPages = SkillGuide.getTotalPageNumber(address); if (args.length == 1) { - Page.clearChat(player); + SkillGuide.clearChat(player); - for (String target : Page.grabPageContents(localized, address, 1)) { + for (String target : SkillGuide.grabPageContents(localized, address, 1)) { player.sendMessage(target); } } @@ -76,9 +78,9 @@ public final class Page { } if (Misc.getInt(args[1]) <= totalPages) { - Page.clearChat(player); + SkillGuide.clearChat(player); - for (String target : Page.grabPageContents(localized, address, Misc.getInt(args[1]))) { + for (String target : SkillGuide.grabPageContents(localized, address, Misc.getInt(args[1]))) { player.sendMessage(target); } } diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/src/main/java/com/gmail/nossr50/skills/SkillManager.java index 2e7f3853e..0def68e44 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.skills; import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.PlayerProfile; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsCommand.java index d95f3e4f8..cf743a292 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.acrobatics; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class AcrobaticsCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index f2b5dbba7..bacc7f2f0 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; public class AcrobaticsManager extends SkillManager { diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java index d032e5726..0ba90b08e 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java @@ -4,8 +4,8 @@ import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; public class DodgeEventHandler extends AcrobaticsEventHandler { diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java index f01e713c8..998e7f782 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.acrobatics; import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryCommand.java index c390ef66f..a38b0bd55 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.archery; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class ArcheryCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java index 2ab939c7c..2df716734 100644 --- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java +++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillTools; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java b/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java index dd67300ba..a3afeb739 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; public class AxeManager extends SkillManager { diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxesCommand.java b/src/main/java/com/gmail/nossr50/skills/axes/AxesCommand.java index 8de08c103..6afe14040 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.axes; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class AxesCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/axes/SkullSplitterEventHandler.java b/src/main/java/com/gmail/nossr50/skills/axes/SkullSplitterEventHandler.java index fb5589be5..d4f8ef05f 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/SkullSplitterEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/SkullSplitterEventHandler.java @@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.axes; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.Combat; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.CombatTools; +import com.gmail.nossr50.skills.utilities.SkillType; public class SkullSplitterEventHandler { private Player player; @@ -18,6 +18,6 @@ public class SkullSplitterEventHandler { } protected void applyAbilityEffects() { - Combat.applyAbilityAoE(player, target, damage / Axes.skullSplitterModifier, SkillType.AXES); + CombatTools.applyAbilityAoE(player, target, damage / Axes.skullSplitterModifier, SkillType.AXES); } } 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 ef15b2997..4bef2cda9 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java @@ -17,8 +17,8 @@ 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.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationCommand.java index 0e60b35cd..e236c63d9 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.excavation; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class ExcavationCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java index f0d30e67d..b25b3cbe3 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java @@ -17,8 +17,8 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.TreasuresConfig; import com.gmail.nossr50.datatypes.treasure.FishingTreasure; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingCommand.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingCommand.java index de26e62ae..eca1defb5 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.fishing; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class FishingCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java b/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java index c89743f8e..765af8746 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java @@ -15,8 +15,8 @@ import org.bukkit.material.Wool; import org.bukkit.potion.Potion; import org.bukkit.potion.PotionType; -import com.gmail.nossr50.skills.Combat; import com.gmail.nossr50.skills.fishing.Fishing.Tier; +import com.gmail.nossr50.skills.utilities.CombatTools; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; @@ -92,7 +92,7 @@ public final class ShakeMob { } Misc.dropItem(mob.getLocation(), drop); - Combat.dealDamage(mob, 1); // We may want to base the damage on the entity max health + CombatTools.dealDamage(mob, 1); // We may want to base the damage on the entity max health } /** diff --git a/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java b/src/main/java/com/gmail/nossr50/skills/herbalism/GreenThumbTimer.java similarity index 92% rename from src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java rename to src/main/java/com/gmail/nossr50/skills/herbalism/GreenThumbTimer.java index 178c72acc..fa2ca97ff 100644 --- a/src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/GreenThumbTimer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.skills.herbalism; import org.bukkit.CropState; import org.bukkit.Material; @@ -6,8 +6,8 @@ import org.bukkit.block.Block; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.AbilityType; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillType; public class GreenThumbTimer implements Runnable { private Block block; 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 61deac37b..b19843bdc 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java @@ -23,10 +23,9 @@ 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.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java index f6bc36898..085876997 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.herbalism; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class HerbalismCommand extends SkillCommand { 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 8b5dcf5df..747a4159c 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java @@ -14,8 +14,8 @@ import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; 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.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; public class Mining { diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java index 02539a039..bfebfc859 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.mining; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java index 427500f02..d78042f47 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -10,7 +10,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java b/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java index a994ebb3f..31a88b725 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java @@ -11,8 +11,8 @@ import org.bukkit.event.player.PlayerInteractEvent; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.AbilityType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillTools; import com.gmail.nossr50.util.Misc; public class RemoteDetonationEventHandler { 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 7a9c716f8..38840cec1 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java @@ -9,7 +9,7 @@ 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.skills.utilities.SkillTools; import com.gmail.nossr50.util.Misc; public class SuperBreakerEventHandler { diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 05d3b8363..87cac9716 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -16,8 +16,8 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java index b28ae2580..567f78964 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java @@ -5,7 +5,7 @@ import org.bukkit.Material; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class RepairCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java index d4d771894..5f3d34850 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java @@ -13,7 +13,7 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java index 84a4d333b..07d95d7c7 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.PlayerInventory; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java b/src/main/java/com/gmail/nossr50/skills/runnables/BleedTimer.java similarity index 94% rename from src/main/java/com/gmail/nossr50/runnables/BleedTimer.java rename to src/main/java/com/gmail/nossr50/skills/runnables/BleedTimer.java index 3b2c9068f..b3108c83c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java +++ b/src/main/java/com/gmail/nossr50/skills/runnables/BleedTimer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.skills.runnables; import java.util.ArrayList; import java.util.HashMap; @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.Combat; +import com.gmail.nossr50.skills.utilities.CombatTools; public class BleedTimer implements Runnable { private final static int MAX_BLEED_TICKS = 10; @@ -47,7 +47,7 @@ public class BleedTimer implements Runnable { //Never kill with Bleeding if (player.getHealth() - 1 > 0) { - Combat.dealDamage(player, 1); + CombatTools.dealDamage(player, 1); } entry.setValue(entry.getValue() - 1); @@ -58,7 +58,7 @@ public class BleedTimer implements Runnable { } // Bleed monsters/animals else { - Combat.dealDamage(entity, 2); + CombatTools.dealDamage(entity, 2); entry.setValue(entry.getValue() - 1); } } @@ -87,7 +87,7 @@ public class BleedTimer implements Runnable { */ public static void bleedOut(LivingEntity entity) { if (bleedList.containsKey(entity)) { - Combat.dealDamage(entity, bleedList.get(entity) * 2); + CombatTools.dealDamage(entity, bleedList.get(entity) * 2); bleedList.remove(entity); } } diff --git a/src/main/java/com/gmail/nossr50/runnables/GainXp.java b/src/main/java/com/gmail/nossr50/skills/runnables/GainXp.java similarity index 85% rename from src/main/java/com/gmail/nossr50/runnables/GainXp.java rename to src/main/java/com/gmail/nossr50/skills/runnables/GainXp.java index 14ba53012..e4795f16f 100644 --- a/src/main/java/com/gmail/nossr50/runnables/GainXp.java +++ b/src/main/java/com/gmail/nossr50/skills/runnables/GainXp.java @@ -1,11 +1,11 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.skills.runnables; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; public class GainXp implements Runnable { private Player player; diff --git a/src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java b/src/main/java/com/gmail/nossr50/skills/runnables/SkillMonitor.java similarity index 83% rename from src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java rename to src/main/java/com/gmail/nossr50/skills/runnables/SkillMonitor.java index 4f9d443f1..6e082c652 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java +++ b/src/main/java/com/gmail/nossr50/skills/runnables/SkillMonitor.java @@ -1,12 +1,12 @@ -package com.gmail.nossr50.runnables; +package com.gmail.nossr50.skills.runnables; import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.AbilityType; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.AbilityType; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Users; public class SkillMonitor implements Runnable { diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java b/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java index e6a915fec..0881be2ed 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java @@ -8,8 +8,8 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; import com.gmail.nossr50.skills.mining.Mining; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java index 69328f901..4162e7380 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java index 66851e2e4..f91d75eaa 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.smelting; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class SmeltingCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java index 18c6de590..a12c12ec1 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java @@ -7,7 +7,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent; import org.bukkit.event.inventory.FurnaceSmeltEvent; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java b/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java index e5b6d1189..133a23454 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java @@ -4,7 +4,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.runnables.BleedTimer; +import com.gmail.nossr50.skills.runnables.BleedTimer; import com.gmail.nossr50.util.Misc; public class BleedEventHandler { diff --git a/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java b/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java index 3926d5c19..c7fd7226b 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java @@ -4,7 +4,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.Combat; +import com.gmail.nossr50.skills.utilities.CombatTools; import com.gmail.nossr50.util.Misc; public class CounterAttackEventHandler { @@ -27,7 +27,7 @@ public class CounterAttackEventHandler { } protected void dealDamage() { - Combat.dealDamage(attacker, damage / Swords.counterAttackModifier); + CombatTools.dealDamage(attacker, damage / Swords.counterAttackModifier); } protected void sendAbilityMessages() { diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java b/src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java index a7982310e..15bd23b99 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java @@ -3,9 +3,9 @@ package com.gmail.nossr50.skills.swords; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import com.gmail.nossr50.runnables.BleedTimer; -import com.gmail.nossr50.skills.Combat; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.runnables.BleedTimer; +import com.gmail.nossr50.skills.utilities.CombatTools; +import com.gmail.nossr50.skills.utilities.SkillType; public class SerratedStrikesEventHandler { private Player player; @@ -19,7 +19,7 @@ public class SerratedStrikesEventHandler { } protected void applyAbilityEffects() { - Combat.applyAbilityAoE(player, target, damage / Swords.serratedStrikesModifier, SkillType.SWORDS); + CombatTools.applyAbilityAoE(player, target, damage / Swords.serratedStrikesModifier, SkillType.SWORDS); BleedTimer.add(target, Swords.serratedStrikesBleedTicks); } } diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsCommand.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsCommand.java index 7060498c5..adf6cb78d 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.swords; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class SwordsCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java index feb011efe..cbaf876bd 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -4,7 +4,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; public class SwordsManager extends SkillManager { diff --git a/src/main/java/com/gmail/nossr50/skills/taming/GoreEventHandler.java b/src/main/java/com/gmail/nossr50/skills/taming/GoreEventHandler.java index 948709539..713156d69 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/GoreEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/GoreEventHandler.java @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.runnables.BleedTimer; +import com.gmail.nossr50.skills.runnables.BleedTimer; import com.gmail.nossr50.util.Misc; public class GoreEventHandler { diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingCommand.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingCommand.java index c4fcd2b9a..5e86eba06 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingCommand.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.taming; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class TamingCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index bbdebd048..dbf835491 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -12,8 +12,8 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java b/src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java index 74c8dea41..49e1898e9 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.unarmed; import org.bukkit.entity.Player; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedCommand.java index 12bc6f310..b9c58322c 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedCommand.java @@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.unarmed; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class UnarmedCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index 003c766e3..85bd560d3 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import com.gmail.nossr50.skills.SkillManager; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/skills/AbilityType.java b/src/main/java/com/gmail/nossr50/skills/utilities/AbilityType.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/AbilityType.java rename to src/main/java/com/gmail/nossr50/skills/utilities/AbilityType.java index 16268db02..06bb2af6e 100644 --- a/src/main/java/com/gmail/nossr50/skills/AbilityType.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/AbilityType.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.utilities; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/com/gmail/nossr50/skills/Combat.java b/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java similarity index 99% rename from src/main/java/com/gmail/nossr50/skills/Combat.java rename to src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java index 2886b579d..74e6938f2 100644 --- a/src/main/java/com/gmail/nossr50/skills/Combat.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.utilities; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -26,14 +26,14 @@ import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.runnables.BleedTimer; -import com.gmail.nossr50.runnables.GainXp; import com.gmail.nossr50.skills.acrobatics.Acrobatics; import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager; import com.gmail.nossr50.skills.archery.Archery; import com.gmail.nossr50.skills.archery.ArcheryManager; import com.gmail.nossr50.skills.axes.AxeManager; import com.gmail.nossr50.skills.axes.Axes; +import com.gmail.nossr50.skills.runnables.BleedTimer; +import com.gmail.nossr50.skills.runnables.GainXp; import com.gmail.nossr50.skills.swords.Swords; import com.gmail.nossr50.skills.swords.SwordsManager; import com.gmail.nossr50.skills.taming.Taming; @@ -45,10 +45,10 @@ import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; -public final class Combat { +public final class CombatTools { private static Config configInstance = Config.getInstance(); - private Combat() {} + private CombatTools() {} /** * Apply combat modifiers and process and XP gain. diff --git a/src/main/java/com/gmail/nossr50/skills/SkillTools.java b/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/SkillTools.java rename to src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java index d07262411..b1aa554de 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillTools.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.utilities; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/com/gmail/nossr50/skills/SkillType.java b/src/main/java/com/gmail/nossr50/skills/utilities/SkillType.java similarity index 96% rename from src/main/java/com/gmail/nossr50/skills/SkillType.java rename to src/main/java/com/gmail/nossr50/skills/utilities/SkillType.java index c879b5ad6..f329b4cb3 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillType.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/SkillType.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.utilities; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/skills/ToolType.java b/src/main/java/com/gmail/nossr50/skills/utilities/ToolType.java similarity index 94% rename from src/main/java/com/gmail/nossr50/skills/ToolType.java rename to src/main/java/com/gmail/nossr50/skills/utilities/ToolType.java index aba0dd224..a11e82159 100644 --- a/src/main/java/com/gmail/nossr50/skills/ToolType.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/ToolType.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.skills; +package com.gmail.nossr50.skills.utilities; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; 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 6ce89924f..aa2d33b18 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java @@ -15,9 +15,9 @@ import com.gmail.nossr50.mcMMO; 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.utilities.CombatTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.skills.woodcutting.Woodcutting.ExperienceGainMethod; import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.Misc; @@ -54,7 +54,7 @@ public final class TreeFeller { int health = player.getHealth(); if (health > 1) { - Combat.dealDamage(player, Misc.getRandom().nextInt(health - 1)); + CombatTools.dealDamage(player, Misc.getRandom().nextInt(health - 1)); } return; 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 5e05ee0b7..6beef0f99 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java @@ -15,8 +15,8 @@ import com.gmail.nossr50.config.Config; 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.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingCommand.java index 92acd7df1..8bdde6d04 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingCommand.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.SkillCommand; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Permissions; public class WoodcuttingCommand extends SkillCommand { diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutTools.java b/src/main/java/com/gmail/nossr50/spout/SpoutTools.java index 9d34775d7..fbe7243a8 100644 --- a/src/main/java/com/gmail/nossr50/spout/SpoutTools.java +++ b/src/main/java/com/gmail/nossr50/spout/SpoutTools.java @@ -23,8 +23,8 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Users; diff --git a/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java b/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java index 1f4f4c5a9..cc75f4acb 100644 --- a/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java +++ b/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java @@ -10,8 +10,8 @@ import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.spout.SpoutConfig; import com.gmail.nossr50.spout.huds.SpoutHud; import com.gmail.nossr50.util.Misc; diff --git a/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java b/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java index 395dea1c6..a69219985 100644 --- a/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java +++ b/src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java @@ -6,7 +6,7 @@ import org.getspout.spoutapi.SpoutManager; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.McMMOPlayer; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.spout.SpoutConfig; import com.gmail.nossr50.spout.popups.Menu; import com.gmail.nossr50.spout.popups.XpBar; diff --git a/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java b/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java index b986a9b7a..da0bfbb78 100644 --- a/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java +++ b/src/main/java/com/gmail/nossr50/spout/popups/XpBar.java @@ -10,7 +10,7 @@ import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.spout.SpoutConfig; import com.gmail.nossr50.spout.huds.HudType; import com.gmail.nossr50.util.Misc; diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index 24f099414..90f2f5373 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillTools; +import com.gmail.nossr50.skills.utilities.SkillTools; public final class ChimaeraWing { private ChimaeraWing() {} diff --git a/src/main/java/com/gmail/nossr50/util/Hardcore.java b/src/main/java/com/gmail/nossr50/util/Hardcore.java index 0d114d7d5..6ef80b115 100644 --- a/src/main/java/com/gmail/nossr50/util/Hardcore.java +++ b/src/main/java/com/gmail/nossr50/util/Hardcore.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; public final class Hardcore { public static double statLossPercentage = Config.getInstance().getHardcoreDeathStatPenaltyPercentage(); diff --git a/src/main/java/com/gmail/nossr50/util/Leaderboard.java b/src/main/java/com/gmail/nossr50/util/Leaderboard.java index d4bc5afea..52ecb8e04 100644 --- a/src/main/java/com/gmail/nossr50/util/Leaderboard.java +++ b/src/main/java/com/gmail/nossr50/util/Leaderboard.java @@ -10,7 +10,7 @@ import java.util.List; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.PlayerStat; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; public final class Leaderboard { private static HashMap> playerStatHash = new HashMap>(); diff --git a/src/main/java/com/gmail/nossr50/util/Motd.java b/src/main/java/com/gmail/nossr50/util/Motd.java index 9e23d91b2..40f39867d 100644 --- a/src/main/java/com/gmail/nossr50/util/Motd.java +++ b/src/main/java/com/gmail/nossr50/util/Motd.java @@ -5,7 +5,7 @@ import org.bukkit.plugin.PluginDescriptionFile; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; public final class Motd { private static final String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix"); diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java index 05bec60f1..27e340d25 100644 --- a/src/main/java/com/gmail/nossr50/util/Permissions.java +++ b/src/main/java/com/gmail/nossr50/util/Permissions.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.gmail.nossr50.skills.SkillType; +import com.gmail.nossr50.skills.utilities.SkillType; public final class Permissions { private Permissions() {} diff --git a/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java b/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java similarity index 89% rename from src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java rename to src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java index 512a7a253..eb8b8487b 100644 --- a/src/test/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStoreTest.java +++ b/src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java @@ -1,10 +1,12 @@ -package com.gmail.nossr50.util.blockmeta; +package com.gmail.nossr50.blockstore.old; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; +import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore; + public class PrimitiveExChunkletStoreTest { byte addresses[][] = new byte[16][16]; From bfe8403d75f8ff0b7937438c96f53dc2c7482fe2 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 12:22:14 -0500 Subject: [PATCH 2/6] Minor cleanup. --- .../blockstore/chunkmeta/PrimitiveChunkStore.java | 14 +------------- .../java/com/gmail/nossr50/database/Database.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java index 1e9065db8..bf4110db1 100644 --- a/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java +++ b/src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java @@ -25,22 +25,12 @@ public class PrimitiveChunkStore implements ChunkStore { private List spawnedMobs = new ArrayList(); transient private int worldHeight; - transient private int xBitShifts; - transient private int zBitShifts; - transient private boolean conversionNeeded; - public PrimitiveChunkStore(World world, int cx, int cz) { this.cx = cx; this.cz = cz; this.worldUid = world.getUID(); - - this.worldHeight = world != null ? world.getMaxHeight() : 128; - this.xBitShifts = 11; - this.zBitShifts = 7; - + this.worldHeight = world.getMaxHeight(); this.store = new boolean[16][16][this.worldHeight]; - - conversionNeeded = false; } @Override @@ -207,8 +197,6 @@ public class PrimitiveChunkStore implements ChunkStore { World world = mcMMO.p.getServer().getWorld(this.worldUid); this.worldHeight = world.getMaxHeight(); - this.xBitShifts = 11; - this.zBitShifts = 7; store = (boolean[][][]) in.readObject(); diff --git a/src/main/java/com/gmail/nossr50/database/Database.java b/src/main/java/com/gmail/nossr50/database/Database.java index 2b59245d9..a44c76b39 100644 --- a/src/main/java/com/gmail/nossr50/database/Database.java +++ b/src/main/java/com/gmail/nossr50/database/Database.java @@ -179,7 +179,7 @@ public final class Database { break; case INDEX: - if(read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13) { + if (read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13) { mcMMO.p.getLogger().info("Indexing tables, this may take a while on larger databases"); write("ALTER TABLE `" + tablePrefix + "skills` ADD INDEX `idx_taming` (`taming`) USING BTREE, " + "ADD INDEX `idx_mining` (`mining`) USING BTREE, " @@ -478,24 +478,26 @@ public final class Database { for (SkillType skillType: SkillType.values()) { if (skillType.isChildSkill()) continue; String sql; - if(skillType != SkillType.ALL) { + if (skillType != SkillType.ALL) { sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " > (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')"; - } else { + } + else { sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')"; } PreparedStatement statement = connection.prepareStatement(sql); resultSet = statement.executeQuery(); resultSet.next(); int rank = resultSet.getInt("rank"); - if(skillType != SkillType.ALL) { + if (skillType != SkillType.ALL) { sql = "SELECT user, " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " = (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user"; - } else { + } + else { sql = "SELECT user, taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing = (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user"; } statement = connection.prepareStatement(sql); resultSet = statement.executeQuery(); while (resultSet.next()) { - if(resultSet.getString("user").equalsIgnoreCase(playerName)) { + if (resultSet.getString("user").equalsIgnoreCase(playerName)) { skills.put(skillType.name(), rank + resultSet.getRow()); break; } From 8eee0cb0b072c75b9ea67ac2259da4cd9f804726 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 12:25:31 -0500 Subject: [PATCH 3/6] Use display name for chat events. --- src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index d5e4c8fa7..2be42975f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -342,11 +342,11 @@ public class PlayerListener implements Listener { return; } - ChatManager.handlePartyChat(plugin, party, player.getName(), event.getMessage()); + ChatManager.handlePartyChat(plugin, party, player.getDisplayName(), event.getMessage()); event.setCancelled(true); } else if (profile.getAdminChatMode()) { - ChatManager.handleAdminChat(plugin, player.getName(), event.getMessage()); + ChatManager.handleAdminChat(plugin, player.getDisplayName(), event.getMessage()); event.setCancelled(true); } } From 1c0cafc6c80c54bcc48e14fc5cf919e151eff892 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 12:30:45 -0500 Subject: [PATCH 4/6] Fixed the guide usage string showing up every time /skillname was called --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/skills/SkillGuide.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 57bb14c62..fc320ce18 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -20,6 +20,7 @@ Version 1.4.00-dev + Added XP bonus for Archery based on distance from shooter to target + Added ability to config Hylian Luck drops through treasures.yml + Added party XP sharing + = Fixed the guide usage string showing up every time /skillname was called = Fixed Spout not being able to precache our resources properly, and therefore making our XP bars fail = Fixed Spout config files loading / generating when they shouldn't have = Fixed mod config files loading / generating when they shouldn't have diff --git a/src/main/java/com/gmail/nossr50/skills/SkillGuide.java b/src/main/java/com/gmail/nossr50/skills/SkillGuide.java index 9a94503a7..61ab35c9b 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillGuide.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillGuide.java @@ -89,7 +89,9 @@ public final class SkillGuide { } } } - else { + + // We have to specify this, else we get the usage string every time we call /skillname... + else if (args.length != 0) { player.sendMessage(LocaleLoader.getString("Guides.Usage", new Object[] {localized.toLowerCase()} )); } } From 5e6b1fe362c6af2eb55218d56bce4317d8a307fd Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Wed, 30 Jan 2013 18:35:46 +0100 Subject: [PATCH 5/6] BeastLore can now display Offline Owner names --- Changelog.txt | 2 ++ .../nossr50/skills/taming/BeastLoreEventHandler.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index fc320ce18..e28da13b3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -53,6 +53,8 @@ Version 1.4.00-dev ! Changed McMMOChatEvent to contain the plugin that the event originated from. ! Changed Excavation to have individual XP values for each block type, rather than a base XP value. ! Changed the way party teleportation works. When using /ptp, the target player needs to confirm the teleport before it takes place. (Configurable) + ! Changed BeastLore: Now also displays offline player names + - Removed Party "master/apprentice" system. Replaced with the new party XP share feature. Version 1.3.14 + Added new Hylian Luck skill to Herbalism. diff --git a/src/main/java/com/gmail/nossr50/skills/taming/BeastLoreEventHandler.java b/src/main/java/com/gmail/nossr50/skills/taming/BeastLoreEventHandler.java index 0efd8de0a..7caad64b4 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/BeastLoreEventHandler.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/BeastLoreEventHandler.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.skills.taming; +import org.bukkit.OfflinePlayer; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -36,7 +37,7 @@ public class BeastLoreEventHandler { * Get the name of a tameable animal's owner. * * @param beast The animal whose owner's name to get - * @return the name of the animal's owner, or "Offline Master" if the owner is offline + * @return the name of the animal's owner */ private String getOwnerName() { AnimalTamer tamer = beast.getOwner(); @@ -44,7 +45,10 @@ public class BeastLoreEventHandler { if (tamer instanceof Player) { return ((Player) tamer).getName(); } + else if (tamer instanceof OfflinePlayer) { + return ((OfflinePlayer)tamer).getName(); + } - return "Offline Master"; + return "Unknown Master"; } } From 3f6bd7894d87f6090049bbd7063fbf9f97f5e0e3 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 30 Jan 2013 13:24:56 -0500 Subject: [PATCH 6/6] Added vanilla XP boost for Fishing - includes permissions, config options, etc --- Changelog.txt | 1 + .../gmail/nossr50/config/AdvancedConfig.java | 7 +++ .../nossr50/listeners/PlayerListener.java | 4 +- .../gmail/nossr50/skills/fishing/Fishing.java | 47 +++++++++++++++++-- .../com/gmail/nossr50/util/Permissions.java | 4 ++ src/main/resources/advanced.yml | 8 ++++ src/main/resources/plugin.yml | 5 +- 7 files changed, 69 insertions(+), 7 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index e28da13b3..6cc4b1af7 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -20,6 +20,7 @@ Version 1.4.00-dev + Added XP bonus for Archery based on distance from shooter to target + Added ability to config Hylian Luck drops through treasures.yml + Added party XP sharing + + Added vanilla XP boost for Fishing - includes permissions, config options, etc = Fixed the guide usage string showing up every time /skillname was called = Fixed Spout not being able to precache our resources properly, and therefore making our XP bars fail = Fixed Spout config files loading / generating when they shouldn't have diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 7021b39f3..ef0213e60 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -89,6 +89,13 @@ public class AdvancedConfig extends ConfigLoader { public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); } public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); } + /* Vanilla XP Boost */ + public int getFishingVanillaXPModifierRank1() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_1", 1); } + public int getFishingVanillaXPModifierRank2() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_2", 2); } + public int getFishingVanillaXPModifierRank3() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_3", 3); } + public int getFishingVanillaXPModifierRank4() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_4", 4); } + public int getFishingVanillaXPModifierRank5() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_5", 5); } + /* HERBALISM */ public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Farmer_Diet_RankChange", 200); } diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 2be42975f..9ad9fc2b7 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -92,7 +92,9 @@ public class PlayerListener implements Listener { switch (event.getState()) { case CAUGHT_FISH: Fishing.beginFishing(player, skillLevel, event); - break; + Fishing.awardAdditionalVanillaXP(skillLevel, event); + break; + case CAUGHT_ENTITY: if (skillLevel >= AdvancedConfig.getInstance().getShakeUnlockLevel() && Permissions.shakeMob(player)) { //TODO: Unsafe cast? diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java index b25b3cbe3..80269a9ae 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java @@ -29,11 +29,26 @@ public final class Fishing { // The order of the values is extremely important, Fishing.getLootTier() and ShakeMob.getShakeChance() depend on it to work properly protected enum Tier { - FIVE(5) {@Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier5();} @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank5();}}, - FOUR(4) {@Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier4();} @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank4();}}, - THREE(3) {@Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier3();} @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank3();}}, - TWO(2) {@Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier2();} @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank2();}}, - ONE(1) {@Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier1();} @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank1();}}; + FIVE(5) { + @Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier5();} + @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank5();} + @Override public int getVanillaXPBoostModifier() {return ADVANCED_CONFIG.getFishingVanillaXPModifierRank5();}}, + FOUR(4) { + @Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier4();} + @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank4();} + @Override public int getVanillaXPBoostModifier() {return ADVANCED_CONFIG.getFishingVanillaXPModifierRank4();}}, + THREE(3) { + @Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier3();} + @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank3();} + @Override public int getVanillaXPBoostModifier() {return ADVANCED_CONFIG.getFishingVanillaXPModifierRank3();}}, + TWO(2) { + @Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier2();} + @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank2();} + @Override public int getVanillaXPBoostModifier() {return ADVANCED_CONFIG.getFishingVanillaXPModifierRank2();}}, + ONE(1) { + @Override public int getLevel() {return ADVANCED_CONFIG.getFishingTierLevelsTier1();} + @Override public int getShakeChance() {return ADVANCED_CONFIG.getShakeChanceRank1();} + @Override public int getVanillaXPBoostModifier() {return ADVANCED_CONFIG.getFishingVanillaXPModifierRank1();}}; int numerical; @@ -47,6 +62,7 @@ public final class Fishing { abstract protected int getLevel(); abstract protected int getShakeChance(); + abstract protected int getVanillaXPBoostModifier(); } // TODO: Get rid of that @@ -115,6 +131,11 @@ public final class Fishing { SkillTools.xpProcessing(player, Users.getProfile(player), SkillType.FISHING, Config.getInstance().getFishingBaseXP() + xp); } + public static void awardAdditionalVanillaXP(int skillLevel, PlayerFishEvent event) { + int xp = event.getExpToDrop(); + event.setExpToDrop(xp * getVanillaXPMultiplier(skillLevel)); + } + /** * Checks for treasure * @@ -233,4 +254,20 @@ public final class Fishing { return 0; } + + /** + * Gets the Shake Mob probability for a given skill level + * + * @param skillLevel Fishing skill level + * @return Shake Mob probability + */ + public static int getVanillaXPMultiplier(int skillLevel) { + for (Tier tier : Tier.values()) { + if (skillLevel >= tier.getLevel()) { + return tier.getVanillaXPBoostModifier(); + } + } + + return 0; + } } diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/src/main/java/com/gmail/nossr50/util/Permissions.java index 27e340d25..4e5f3e79b 100644 --- a/src/main/java/com/gmail/nossr50/util/Permissions.java +++ b/src/main/java/com/gmail/nossr50/util/Permissions.java @@ -235,6 +235,10 @@ public final class Permissions { return hasPermission(player, "mcmmo.ability.fishing.fishermansdiet"); } + public static boolean fishingVanillaXPBoost(Player player) { + return hasPermission(player, "mcmmo.ability.fishing.vanillaxpboost"); + } + /* * MCMMO.ABILITY.MINING.* */ diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 16a50a214..276622d1f 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -106,6 +106,14 @@ Skills: Rank_4: 60 Rank_5: 75 + #VanillaXPBoost: Vanilla XP gained from fishing is mutliplied by these values. + VanillaXPBoost: + Rank_1: 1 + Rank_2: 2 + Rank_3: 3 + Rank_4: 4 + Rank_5: 5 + # Tiers Tier_Levels: Tier1: 0 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d51b21f4f..64d7ea139 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -12,7 +12,7 @@ description: > experience. author: nossr50 -authors: [NuclearW, GJ, Glitchfinder, TfT_02, toothplck1] +authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, toothplck1] website: http://dev.bukkit.org/server-mods/mcmmo/ main: com.gmail.nossr50.mcMMO @@ -412,6 +412,7 @@ permissions: mcmmo.ability.fishing.treasures: true mcmmo.ability.fishing.magic: true mcmmo.ability.fishing.fishermansdiet: true + mcmmo.ability.fishing.vanillaxpboost: true mcmmo.ability.fishing.shakemob: description: Allows access to the Shake Mob ability mcmmo.ability.fishing.treasures: @@ -420,6 +421,8 @@ permissions: description: Allows enchanted drops from Fishing mcmmo.ability.fishing.fishermansdiet: description: Allows access to the Fishermans's Diet ability + mcmmo.ability.fishing.vanillaxpboost: + description: Allows vanilla XP boost from Fishing mcmmo.ability.mining.*: description: Allows access to all Mining abilities children: