From fe407489290a7718454e18f9c8d790cfcdc2a84c Mon Sep 17 00:00:00 2001 From: Gabriel Harris-Rouquette Date: Thu, 7 Feb 2019 16:09:35 -0800 Subject: [PATCH] Migrate gradle scripts to have multiple modules and source sets. Using Kotlin-DSL for enhanced script debugging. Signed-off-by: Gabriel Harris-Rouquette --- .gitignore | 309 +++++++++++++++--- build.gradle.kts | 33 ++ bukkit/build.gradle.kts | 40 +++ .../com/gmail/nossr50/api/AbilityAPI.java | 0 .../java/com/gmail/nossr50/api/ChatAPI.java | 0 .../com/gmail/nossr50/api/ExperienceAPI.java | 0 .../java/com/gmail/nossr50/api/PartyAPI.java | 0 .../java/com/gmail/nossr50/api/SkillAPI.java | 0 .../InvalidFormulaTypeException.java | 0 .../exceptions/InvalidPlayerException.java | 0 .../api/exceptions/InvalidSkillException.java | 0 .../InvalidXPGainReasonException.java | 0 .../McMMOPlayerNotFoundException.java | 0 .../gmail/nossr50/chat/AdminChatManager.java | 0 .../com/gmail/nossr50/chat/ChatManager.java | 0 .../nossr50/chat/ChatManagerFactory.java | 0 .../gmail/nossr50/chat/PartyChatManager.java | 0 .../gmail/nossr50/commands/MHDCommand.java | 0 .../nossr50/commands/McImportCommand.java | 0 .../nossr50/commands/McabilityCommand.java | 0 .../nossr50/commands/McconvertCommand.java | 0 .../gmail/nossr50/commands/McgodCommand.java | 0 .../gmail/nossr50/commands/McmmoCommand.java | 0 .../nossr50/commands/McnotifyCommand.java | 0 .../nossr50/commands/McrefreshCommand.java | 0 .../nossr50/commands/McscoreboardCommand.java | 0 .../gmail/nossr50/commands/ToggleCommand.java | 0 .../gmail/nossr50/commands/XprateCommand.java | 0 .../commands/chat/AdminChatCommand.java | 0 .../nossr50/commands/chat/ChatCommand.java | 0 .../nossr50/commands/chat/McChatSpy.java | 0 .../commands/chat/PartyChatCommand.java | 0 .../database/ConvertDatabaseCommand.java | 0 .../commands/database/McpurgeCommand.java | 0 .../commands/database/McremoveCommand.java | 0 .../commands/database/MmoshowdbCommand.java | 0 .../commands/experience/AddlevelsCommand.java | 0 .../commands/experience/AddxpCommand.java | 0 .../experience/ConvertExperienceCommand.java | 0 .../experience/ExperienceCommand.java | 0 .../commands/experience/MmoeditCommand.java | 0 .../experience/SkillresetCommand.java | 0 .../commands/hardcore/HardcoreCommand.java | 0 .../hardcore/HardcoreModeCommand.java | 0 .../commands/hardcore/VampirismCommand.java | 0 .../commands/party/PartyAcceptCommand.java | 0 .../party/PartyChangeOwnerCommand.java | 0 .../party/PartyChangePasswordCommand.java | 0 .../nossr50/commands/party/PartyCommand.java | 0 .../commands/party/PartyCreateCommand.java | 0 .../commands/party/PartyDisbandCommand.java | 0 .../commands/party/PartyHelpCommand.java | 0 .../commands/party/PartyInfoCommand.java | 0 .../commands/party/PartyInviteCommand.java | 0 .../commands/party/PartyItemShareCommand.java | 0 .../commands/party/PartyJoinCommand.java | 0 .../commands/party/PartyKickCommand.java | 0 .../commands/party/PartyLockCommand.java | 0 .../commands/party/PartyQuitCommand.java | 0 .../commands/party/PartyRenameCommand.java | 0 .../commands/party/PartySubcommandType.java | 0 .../commands/party/PartyXpShareCommand.java | 0 .../alliance/PartyAllianceAcceptCommand.java | 0 .../party/alliance/PartyAllianceCommand.java | 0 .../alliance/PartyAllianceDisbandCommand.java | 0 .../alliance/PartyAllianceInviteCommand.java | 0 .../party/teleport/PtpAcceptAnyCommand.java | 0 .../party/teleport/PtpAcceptCommand.java | 0 .../commands/party/teleport/PtpCommand.java | 0 .../party/teleport/PtpToggleCommand.java | 0 .../commands/player/InspectCommand.java | 0 .../commands/player/MccooldownCommand.java | 0 .../commands/player/McrankCommand.java | 0 .../commands/player/McstatsCommand.java | 0 .../nossr50/commands/player/MctopCommand.java | 0 .../nossr50/commands/server/Mcmmoupgrade.java | 0 .../commands/skills/AcrobaticsCommand.java | 0 .../commands/skills/AlchemyCommand.java | 0 .../nossr50/commands/skills/AprilCommand.java | 0 .../commands/skills/ArcheryCommand.java | 0 .../nossr50/commands/skills/AxesCommand.java | 0 .../commands/skills/ExcavationCommand.java | 0 .../commands/skills/FishingCommand.java | 0 .../commands/skills/HerbalismCommand.java | 0 .../commands/skills/MiningCommand.java | 0 .../commands/skills/MmoInfoCommand.java | 0 .../commands/skills/RepairCommand.java | 0 .../commands/skills/SalvageCommand.java | 0 .../nossr50/commands/skills/SkillCommand.java | 0 .../commands/skills/SkillGuideCommand.java | 0 .../commands/skills/SmeltingCommand.java | 0 .../commands/skills/SwordsCommand.java | 0 .../commands/skills/TamingCommand.java | 0 .../commands/skills/UnarmedCommand.java | 0 .../commands/skills/WoodcuttingCommand.java | 0 .../gmail/nossr50/config/AdvancedConfig.java | 0 .../config/AutoUpdateConfigLoader.java | 0 .../java/com/gmail/nossr50/config/Config.java | 0 .../gmail/nossr50/config/ConfigLoader.java | 0 .../nossr50/config/CoreSkillsConfig.java | 0 .../gmail/nossr50/config/HiddenConfig.java | 0 .../com/gmail/nossr50/config/RankConfig.java | 0 .../com/gmail/nossr50/config/SoundConfig.java | 0 .../gmail/nossr50/config/WorldBlacklist.java | 0 .../config/experience/ExperienceConfig.java | 0 .../config/mods/ArmorConfigManager.java | 0 .../config/mods/BlockConfigManager.java | 0 .../config/mods/CustomArmorConfig.java | 0 .../config/mods/CustomBlockConfig.java | 0 .../config/mods/CustomEntityConfig.java | 0 .../nossr50/config/mods/CustomToolConfig.java | 0 .../config/mods/EntityConfigManager.java | 0 .../config/mods/ToolConfigManager.java | 0 .../config/party/ItemWeightConfig.java | 0 .../config/skills/alchemy/PotionConfig.java | 0 .../config/skills/repair/RepairConfig.java | 0 .../skills/repair/RepairConfigManager.java | 0 .../config/skills/salvage/SalvageConfig.java | 0 .../skills/salvage/SalvageConfigManager.java | 0 .../config/treasure/TreasureConfig.java | 0 .../nossr50/database/DatabaseManager.java | 0 .../database/DatabaseManagerFactory.java | 0 .../database/FlatfileDatabaseManager.java | 0 .../nossr50/database/SQLDatabaseManager.java | 0 .../nossr50/datatypes/LimitedSizeList.java | 0 .../nossr50/datatypes/MobHealthbarType.java | 0 .../nossr50/datatypes/chat/ChatMode.java | 0 .../datatypes/database/DatabaseType.java | 0 .../datatypes/database/PlayerStat.java | 0 .../datatypes/database/UpgradeType.java | 0 .../datatypes/experience/FormulaType.java | 0 .../datatypes/experience/SkillXpGain.java | 0 .../datatypes/experience/XPGainReason.java | 0 .../datatypes/experience/XPGainSource.java | 0 .../interactions/NotificationType.java | 0 .../datatypes/json/CustomBaseComponent.java | 0 .../nossr50/datatypes/json/McMMOUrl.java | 0 .../nossr50/datatypes/json/McMMOWebLinks.java | 0 .../gmail/nossr50/datatypes/meta/OldName.java | 0 .../nossr50/datatypes/mods/CustomBlock.java | 0 .../nossr50/datatypes/mods/CustomEntity.java | 0 .../nossr50/datatypes/mods/CustomTool.java | 0 .../datatypes/party/ItemShareType.java | 0 .../gmail/nossr50/datatypes/party/Party.java | 0 .../nossr50/datatypes/party/PartyFeature.java | 0 .../nossr50/datatypes/party/PartyLeader.java | 0 .../datatypes/party/PartyTeleportRecord.java | 0 .../nossr50/datatypes/party/ShareMode.java | 0 .../nossr50/datatypes/player/McMMOPlayer.java | 0 .../datatypes/player/PlayerProfile.java | 0 .../datatypes/player/UniqueDataType.java | 0 .../nossr50/datatypes/skills/ItemType.java | 0 .../datatypes/skills/MaterialType.java | 0 .../datatypes/skills/ModConfigType.java | 0 .../datatypes/skills/PrimarySkillType.java | 0 .../datatypes/skills/SubSkillFlags.java | 0 .../datatypes/skills/SubSkillType.java | 0 .../datatypes/skills/SuperAbilityType.java | 0 .../nossr50/datatypes/skills/ToolType.java | 0 .../skills/alchemy/AlchemyPotion.java | 0 .../datatypes/skills/alchemy/PotionStage.java | 0 .../skills/interfaces/ChildSkill.java | 0 .../skills/interfaces/CoreSkill.java | 0 .../skills/interfaces/Localized.java | 0 .../datatypes/skills/interfaces/Skill.java | 0 .../datatypes/skills/interfaces/Toolable.java | 0 .../skills/progression/Progression.java | 0 .../skills/subskills/AbstractSubSkill.java | 0 .../acrobatics/AcrobaticsSubSkill.java | 0 .../skills/subskills/acrobatics/Roll.java | 0 .../subskills/interfaces/InteractType.java | 0 .../subskills/interfaces/Interaction.java | 0 .../skills/subskills/interfaces/Rank.java | 0 .../skills/subskills/interfaces/SubSkill.java | 0 .../interfaces/SubSkillProperties.java | 0 .../treasure/EnchantmentTreasure.java | 0 .../treasure/ExcavationTreasure.java | 0 .../datatypes/treasure/FishingTreasure.java | 0 .../datatypes/treasure/HylianTreasure.java | 0 .../nossr50/datatypes/treasure/Rarity.java | 0 .../datatypes/treasure/ShakeTreasure.java | 0 .../nossr50/datatypes/treasure/Treasure.java | 0 .../events/chat/McMMOAdminChatEvent.java | 0 .../nossr50/events/chat/McMMOChatEvent.java | 0 .../events/chat/McMMOPartyChatEvent.java | 0 .../McMMOPlayerExperienceEvent.java | 0 .../McMMOPlayerLevelChangeEvent.java | 0 .../experience/McMMOPlayerLevelDownEvent.java | 0 .../experience/McMMOPlayerLevelUpEvent.java | 0 .../experience/McMMOPlayerXpGainEvent.java | 0 .../events/fake/FakeBlockBreakEvent.java | 0 .../events/fake/FakeBlockDamageEvent.java | 0 .../nossr50/events/fake/FakeBrewEvent.java | 0 .../fake/FakeEntityDamageByEntityEvent.java | 0 .../events/fake/FakeEntityDamageEvent.java | 0 .../events/fake/FakeEntityTameEvent.java | 0 .../events/fake/FakePlayerAnimationEvent.java | 0 .../events/fake/FakePlayerFishEvent.java | 0 .../McMMOPlayerDeathPenaltyEvent.java | 0 .../McMMOPlayerPreDeathPenaltyEvent.java | 0 .../hardcore/McMMOPlayerStatLossEvent.java | 0 .../hardcore/McMMOPlayerVampirismEvent.java | 0 .../events/items/McMMOItemSpawnEvent.java | 0 .../party/McMMOPartyAllianceChangeEvent.java | 0 .../events/party/McMMOPartyChangeEvent.java | 0 .../events/party/McMMOPartyLevelUpEvent.java | 0 .../events/party/McMMOPartyTeleportEvent.java | 0 .../events/party/McMMOPartyXpGainEvent.java | 0 .../scoreboard/McMMOScoreboardEvent.java | 0 .../McMMOScoreboardMakeboardEvent.java | 0 .../McMMOScoreboardObjectiveEvent.java | 0 .../McMMOScoreboardRevertEvent.java | 0 .../scoreboard/ScoreboardEventReason.java | 0 .../ScoreboardObjectiveEventReason.java | 0 .../skills/McMMOPlayerNotificationEvent.java | 0 .../events/skills/McMMOPlayerSkillEvent.java | 0 .../McMMOPlayerAbilityActivateEvent.java | 0 .../McMMOPlayerAbilityDeactivateEvent.java | 0 .../abilities/McMMOPlayerAbilityEvent.java | 0 .../skills/alchemy/McMMOPlayerBrewEvent.java | 0 .../alchemy/McMMOPlayerCatalysisEvent.java | 0 .../fishing/McMMOPlayerFishingEvent.java | 0 .../McMMOPlayerFishingTreasureEvent.java | 0 .../fishing/McMMOPlayerMagicHunterEvent.java | 0 .../skills/fishing/McMMOPlayerShakeEvent.java | 0 .../repair/McMMOPlayerRepairCheckEvent.java | 0 .../salvage/McMMOPlayerSalvageCheckEvent.java | 0 .../secondaryabilities/SubSkillEvent.java | 0 .../SubSkillRandomCheckEvent.java | 0 .../unarmed/McMMOPlayerDisarmEvent.java | 0 .../nossr50/listeners/BlockListener.java | 0 .../nossr50/listeners/EntityListener.java | 0 .../nossr50/listeners/InteractionManager.java | 0 .../nossr50/listeners/InventoryListener.java | 0 .../nossr50/listeners/PlayerListener.java | 0 .../gmail/nossr50/listeners/SelfListener.java | 0 .../nossr50/listeners/WorldListener.java | 0 .../gmail/nossr50/locale/LocaleLoader.java | 0 .../main/java/com/gmail/nossr50/mcMMO.java | 0 .../com/gmail/nossr50/party/PartyManager.java | 0 .../com/gmail/nossr50/party/ShareHandler.java | 0 .../nossr50/runnables/CheckDateTask.java | 0 .../MobHealthDisplayUpdaterTask.java | 0 .../nossr50/runnables/PistonTrackerTask.java | 0 .../nossr50/runnables/SaveTimerTask.java | 0 .../runnables/StickyPistonTrackerTask.java | 0 .../runnables/backups/CleanBackupsTask.java | 0 .../commands/McScoreboardKeepTask.java | 0 .../commands/McrankCommandAsyncTask.java | 0 .../commands/McrankCommandDisplayTask.java | 0 .../commands/MctopCommandAsyncTask.java | 0 .../commands/MctopCommandDisplayTask.java | 0 .../database/DatabaseConversionTask.java | 0 .../database/FormulaConversionTask.java | 0 .../database/UUIDUpdateAsyncTask.java | 0 .../runnables/database/UserPurgeTask.java | 0 .../runnables/items/ChimaeraWingWarmup.java | 0 .../runnables/items/TeleportationWarmup.java | 0 .../runnables/party/PartyAutoKickTask.java | 0 .../runnables/party/PartyChatTask.java | 0 .../player/ClearRegisteredXPGainTask.java | 0 .../player/PlayerProfileLoadingTask.java | 0 .../player/PlayerProfileSaveTask.java | 0 .../player/PlayerUpdateInventoryTask.java | 0 .../player/PowerLevelUpdatingTask.java | 0 .../runnables/skills/AbilityCooldownTask.java | 0 .../runnables/skills/AbilityDisableTask.java | 0 .../skills/AlchemyBrewCheckTask.java | 0 .../runnables/skills/AlchemyBrewTask.java | 0 .../nossr50/runnables/skills/AprilTask.java | 0 .../runnables/skills/AwardCombatXpTask.java | 0 .../runnables/skills/BleedContainer.java | 0 .../runnables/skills/BleedTimerTask.java | 0 .../skills/ExperienceBarHideTask.java | 0 .../skills/HerbalismBlockUpdaterTask.java | 0 .../skills/SkillUnlockNotificationTask.java | 0 .../runnables/skills/ToolLowerTask.java | 0 .../gmail/nossr50/skills/SkillManager.java | 0 .../nossr50/skills/acrobatics/Acrobatics.java | 0 .../skills/acrobatics/AcrobaticsManager.java | 0 .../gmail/nossr50/skills/alchemy/Alchemy.java | 0 .../skills/alchemy/AlchemyManager.java | 0 .../skills/alchemy/AlchemyPotionBrewer.java | 0 .../gmail/nossr50/skills/archery/Archery.java | 0 .../skills/archery/ArcheryManager.java | 0 .../nossr50/skills/archery/TrackedEntity.java | 0 .../com/gmail/nossr50/skills/axes/Axes.java | 0 .../nossr50/skills/axes/AxesManager.java | 0 .../nossr50/skills/child/ChildConfig.java | 0 .../nossr50/skills/child/FamilyTree.java | 0 .../nossr50/skills/excavation/Excavation.java | 0 .../skills/excavation/ExcavationManager.java | 0 .../gmail/nossr50/skills/fishing/Fishing.java | 0 .../skills/fishing/FishingManager.java | 0 .../nossr50/skills/herbalism/Herbalism.java | 0 .../skills/herbalism/HerbalismManager.java | 0 .../nossr50/skills/mining/BlastMining.java | 0 .../gmail/nossr50/skills/mining/Mining.java | 0 .../nossr50/skills/mining/MiningManager.java | 0 .../nossr50/skills/repair/ArcaneForging.java | 0 .../gmail/nossr50/skills/repair/Repair.java | 0 .../nossr50/skills/repair/RepairManager.java | 0 .../skills/repair/repairables/Repairable.java | 0 .../repair/repairables/RepairableFactory.java | 0 .../repair/repairables/RepairableManager.java | 0 .../repair/repairables/SimpleRepairable.java | 0 .../repairables/SimpleRepairableManager.java | 0 .../gmail/nossr50/skills/salvage/Salvage.java | 0 .../skills/salvage/SalvageManager.java | 0 .../salvage/salvageables/Salvageable.java | 0 .../salvageables/SalvageableFactory.java | 0 .../salvageables/SalvageableManager.java | 0 .../salvageables/SimpleSalvageable.java | 0 .../SimpleSalvageableManager.java | 0 .../nossr50/skills/smelting/Smelting.java | 0 .../skills/smelting/SmeltingManager.java | 0 .../gmail/nossr50/skills/swords/Swords.java | 0 .../nossr50/skills/swords/SwordsManager.java | 0 .../gmail/nossr50/skills/taming/Taming.java | 0 .../nossr50/skills/taming/TamingManager.java | 0 .../skills/taming/TrackedTamingEntity.java | 0 .../gmail/nossr50/skills/unarmed/Unarmed.java | 0 .../skills/unarmed/UnarmedManager.java | 0 .../skills/woodcutting/Woodcutting.java | 0 .../woodcutting/WoodcuttingManager.java | 0 .../com/gmail/nossr50/util/BlockUtils.java | 0 .../com/gmail/nossr50/util/ChimaeraWing.java | 0 .../gmail/nossr50/util/EnchantmentUtils.java | 0 .../com/gmail/nossr50/util/EventUtils.java | 0 .../gmail/nossr50/util/HardcoreManager.java | 0 .../gmail/nossr50/util/HolidayManager.java | 0 .../com/gmail/nossr50/util/ItemUtils.java | 0 .../com/gmail/nossr50/util/LogFilter.java | 0 .../com/gmail/nossr50/util/MaterialUtils.java | 0 .../java/com/gmail/nossr50/util/Misc.java | 0 .../gmail/nossr50/util/MobHealthbarUtils.java | 0 .../com/gmail/nossr50/util/ModManager.java | 0 .../java/com/gmail/nossr50/util/Motd.java | 0 .../com/gmail/nossr50/util/Permissions.java | 0 .../com/gmail/nossr50/util/StringUtils.java | 0 .../nossr50/util/TextComponentFactory.java | 0 .../nossr50/util/adapter/BiomeAdapter.java | 0 .../util/blockmeta/ChunkletManager.java | 0 .../blockmeta/ChunkletManagerFactory.java | 0 .../nossr50/util/blockmeta/ChunkletStore.java | 0 .../util/blockmeta/ChunkletStoreFactory.java | 0 .../util/blockmeta/HashChunkletManager.java | 0 .../util/blockmeta/NullChunkletManager.java | 0 .../blockmeta/PrimitiveChunkletStore.java | 0 .../blockmeta/PrimitiveExChunkletStore.java | 0 .../blockmeta/chunkmeta/ChunkManager.java | 0 .../chunkmeta/ChunkManagerFactory.java | 0 .../util/blockmeta/chunkmeta/ChunkStore.java | 0 .../chunkmeta/ChunkStoreFactory.java | 0 .../blockmeta/chunkmeta/HashChunkManager.java | 0 .../chunkmeta/McMMOSimpleChunkBuffer.java | 0 .../chunkmeta/McMMOSimpleRegionFile.java | 0 .../blockmeta/chunkmeta/NullChunkManager.java | 0 .../chunkmeta/PrimitiveChunkStore.java | 0 .../conversion/BlockStoreConversionMain.java | 0 .../BlockStoreConversionXDirectory.java | 0 .../BlockStoreConversionZDirectory.java | 0 .../commands/CommandRegistrationManager.java | 0 .../nossr50/util/commands/CommandUtils.java | 0 .../util/experience/ExperienceBarManager.java | 0 .../util/experience/ExperienceBarWrapper.java | 0 .../util/experience/FormulaManager.java | 0 .../util/player/NotificationManager.java | 0 .../nossr50/util/player/UserManager.java | 0 .../random/InvalidActivationException.java | 0 .../util/random/InvalidStaticChance.java | 0 .../util/random/RandomChanceExecution.java | 0 .../util/random/RandomChanceSkill.java | 0 .../util/random/RandomChanceSkillStatic.java | 0 .../util/random/RandomChanceStatic.java | 0 .../nossr50/util/random/RandomChanceUtil.java | 0 .../util/scoreboards/ObjectiveType.java | 0 .../util/scoreboards/ScoreboardManager.java | 0 .../util/scoreboards/ScoreboardWrapper.java | 0 .../nossr50/util/skills/CombatUtils.java | 0 .../util/skills/ParticleEffectUtils.java | 0 .../gmail/nossr50/util/skills/PerksUtils.java | 0 .../gmail/nossr50/util/skills/RankUtils.java | 0 .../util/skills/SkillActivationType.java | 0 .../gmail/nossr50/util/skills/SkillUtils.java | 0 .../nossr50/util/sounds/SoundManager.java | 0 .../gmail/nossr50/util/sounds/SoundType.java | 0 .../nossr50/util/upgrade/UpgradeManager.java | 0 .../gmail/nossr50/util/uuid/UUIDFetcher.java | 0 .../nossr50/worldguard/WorldGuardFlags.java | 0 .../nossr50/worldguard/WorldGuardManager.java | 0 .../nossr50/worldguard/WorldGuardUtils.java | 0 .../shatt/backup/ZipLibrary.java | 0 .../java/mcMMO/PotionConfigGenerator.java | 0 .../src/main/resources/.jenkins | 0 .../src/main/resources}/META-INF/MANIFEST.MF | 0 .../src/main/resources/advanced.yml | 0 .../src/main/resources/child.yml | 0 .../src/main/resources/config.yml | 0 .../src/main/resources/coreskills.yml | 0 .../src/main/resources/experience.yml | 0 .../src/main/resources/hidden.yml | 0 .../src/main/resources/itemweights.yml | 0 .../resources/locale/locale_cs_CZ.properties | 0 .../resources/locale/locale_cy.properties | 0 .../resources/locale/locale_da.properties | 0 .../resources/locale/locale_de.properties | 0 .../resources/locale/locale_en_US.properties | 0 .../resources/locale/locale_es.properties | 0 .../resources/locale/locale_fi.properties | 0 .../resources/locale/locale_fr.properties | 0 .../resources/locale/locale_hu_HU.properties | 0 .../resources/locale/locale_it.properties | 0 .../resources/locale/locale_ja_JP.properties | Bin .../resources/locale/locale_ko.properties | 0 .../resources/locale/locale_nl.properties | 0 .../resources/locale/locale_pl.properties | 0 .../resources/locale/locale_pt_BR.properties | 0 .../resources/locale/locale_ru.properties | 0 .../resources/locale/locale_sv.properties | 0 .../resources/locale/locale_th_TH.properties | 0 .../resources/locale/locale_zh_CN.properties | 0 .../resources/locale/locale_zh_TW.properties | 0 .../src/main/resources/mods/armor.default.yml | 0 .../main/resources/mods/blocks.default.yml | 0 .../main/resources/mods/entities.default.yml | 0 .../src/main/resources/mods/tools.default.yml | 0 .../src/main/resources/plugin.yml | 0 .../src/main/resources/potions.yml | 0 .../src/main/resources/repair.vanilla.yml | 0 .../src/main/resources/salvage.vanilla.yml | 0 .../src/main/resources/skillranks.yml | 0 .../src/main/resources/sounds.yml | 0 .../src/main/resources/treasures.yml | 0 .../src/main/resources/upgrades.yml | 0 .../com/gmail/nossr50/InternalHandler.java | 5 + core/build.gradle.kts | 15 + .../java/com/gmail/nossr50/McmmoCore.java | 5 + gradle.properties | 2 + .../wrapper/gradle-wrapper.properties | 3 +- mcMMO-core/gradlew => gradlew | 0 mcMMO-core/gradlew.bat => gradlew.bat | 0 .../.gradle/4.10/fileChanges/last-build.bin | Bin 1 -> 0 bytes mcMMO-core/.gradle/4.10/gc.properties | 0 .../buildOutputCleanup/cache.properties | 2 - mcMMO-core/.gradle/vcs-1/gc.properties | 0 mcMMO-core/build.gradle | 44 --- mcMMO-core/settings.gradle | 2 - settings.gradle.kts | 10 + sponge/build.gradle.kts | 30 ++ .../java/com/gmail/nossr50/SpongePlugin.java | 22 ++ 451 files changed, 425 insertions(+), 97 deletions(-) create mode 100644 build.gradle.kts create mode 100644 bukkit/build.gradle.kts rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/AbilityAPI.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/ChatAPI.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/PartyAPI.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/SkillAPI.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/chat/ChatManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/MHDCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McImportCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McgodCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/XprateCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/Config.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/ConfigLoader.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/HiddenConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/RankConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/SoundConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/database/DatabaseManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/Party.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/BlockListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/EntityListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/SelfListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/listeners/WorldListener.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/mcMMO.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/party/PartyManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/party/ShareHandler.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/SkillManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/archery/Archery.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/axes/Axes.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/mining/Mining.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/Repair.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/swords/Swords.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/taming/Taming.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/BlockUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/EventUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/HardcoreManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/HolidayManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/ItemUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/LogFilter.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/MaterialUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/Misc.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/ModManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/Motd.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/Permissions.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/StringUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/player/UserManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java (100%) rename {mcMMO-core => bukkit}/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java (100%) rename {mcMMO-core => bukkit}/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java (100%) rename {mcMMO-core => bukkit}/src/main/java/util/java/mcMMO/PotionConfigGenerator.java (100%) rename {mcMMO-core => bukkit}/src/main/resources/.jenkins (100%) rename {mcMMO-core/src/main/java => bukkit/src/main/resources}/META-INF/MANIFEST.MF (100%) rename {mcMMO-core => bukkit}/src/main/resources/advanced.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/child.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/config.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/coreskills.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/experience.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/hidden.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/itemweights.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_cs_CZ.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_cy.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_da.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_de.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_en_US.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_es.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_fi.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_fr.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_hu_HU.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_it.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_ja_JP.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_ko.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_nl.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_pl.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_pt_BR.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_ru.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_sv.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_th_TH.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_zh_CN.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/locale/locale_zh_TW.properties (100%) rename {mcMMO-core => bukkit}/src/main/resources/mods/armor.default.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/mods/blocks.default.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/mods/entities.default.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/mods/tools.default.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/plugin.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/potions.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/repair.vanilla.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/salvage.vanilla.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/skillranks.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/sounds.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/treasures.yml (100%) rename {mcMMO-core => bukkit}/src/main/resources/upgrades.yml (100%) create mode 100644 bukkit/src/nms/java/com/gmail/nossr50/InternalHandler.java create mode 100644 core/build.gradle.kts create mode 100644 core/src/main/java/com/gmail/nossr50/McmmoCore.java create mode 100644 gradle.properties rename {mcMMO-core/gradle => gradle}/wrapper/gradle-wrapper.properties (80%) rename mcMMO-core/gradlew => gradlew (100%) rename mcMMO-core/gradlew.bat => gradlew.bat (100%) delete mode 100644 mcMMO-core/.gradle/4.10/fileChanges/last-build.bin delete mode 100644 mcMMO-core/.gradle/4.10/gc.properties delete mode 100644 mcMMO-core/.gradle/buildOutputCleanup/cache.properties delete mode 100644 mcMMO-core/.gradle/vcs-1/gc.properties delete mode 100644 mcMMO-core/build.gradle delete mode 100644 mcMMO-core/settings.gradle create mode 100644 settings.gradle.kts create mode 100644 sponge/build.gradle.kts create mode 100644 sponge/src/main/java/com/gmail/nossr50/SpongePlugin.java diff --git a/.gitignore b/.gitignore index e400cfa43..514664f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,57 +1,272 @@ -# Eclipse stuff -/.classpath -/.project -/.settings -/dependency-reduced-pom.xml +# Created by .ignore support plugin (hsz.mobi) +### Gradle template +.gradle +/build/ -#vs code -/.vscode +# Ignore Gradle GUI config +gradle-app.setting -# Maven Depends -/lib +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar -# gradle -*.bin -*.lock -bin -/.gradle -/mcMMO-core/.gradle -/mcMMO-core/gradle +# Cache of project +.gradletasknamecache -# netbeans -/nbproject +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties +### Java template +# Compiled class file +*.class -# we use maven! -/build.xml +# Log file +*.log -# maven -/target +# BlueJ files +*.ctxt -# vim -.*.sw[a-p] +# Mobile Tools for Java (J2ME) +.mtj.tmp/ -# various other potential build files -/build -/bin -/dist -/manifest.mf - -/world - -# Mac filesystem dust -*.DS_Store - -# intellij -*.iml -*.ipr -*.iws -.idea/ - -# Project Stuff -/src/main/resources/mcMMO - -# Other Libraries +# Package Files # *.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests +### Windows template +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk +### Maven template +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar +### Kotlin template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +### Linux template +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* +### Eclipse template + +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet +### VisualStudioCode template +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ +### macOS template +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk -# Atlassian Stuff -/atlassian-ide-plugin.xml diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..688ad4cc1 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,33 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + } + +} + +group = properties["pluginGroup"]!! +version = properties["pluginVersion"]!! + +plugins { + `java-library` + java +} + +allprojects { + + apply(plugin="java-library") + + repositories { + mavenCentral() + // World Edit + maven("https://maven.sk89q.com/repo") + // bStats + maven("https://repo.codemc.org/repository/maven-public") + } + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + +} diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts new file mode 100644 index 000000000..3e95fadf3 --- /dev/null +++ b/bukkit/build.gradle.kts @@ -0,0 +1,40 @@ +repositories { + + // Spigot & Bukkit + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + maven("https://oss.sonatype.org/content/repositories/snapshots") + + mavenLocal() // For nms variants + +} +plugins { + java +} +dependencies { + implementation("org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT") // Spigot API + implementation("com.sk89q.worldguard", "worldguard-core", "7.0.0-SNAPSHOT") // WorldGuard + implementation("com.sk89q.worldguard", "worldguard-legacy", "7.0.0-SNAPSHOT") // NEEDED + + implementation("org.bstats", "bstats-bukkit", "1.4") // Bukkit bstats + + implementation("org.apache.tomcat", "tomcat-jdbc", "7.0.52") // tomcat JDBC + implementation("org.apache.tomcat", "tomcat-juli", "7.0.52") // tomcat juli + implementation("junit", "junit", "4.12") + +} +java { + sourceSets { + create("nms") + } + +} + +val jar by tasks.getting(Jar::class) { + manifest { + attributes(mapOf( + "Implementation-Title" to project.name, + "Implementation-Version" to project.version, + "Main-Class" to "com.gmail.nossr50.mcMMO" // Main plugin class for bukkit + )) + } +} \ No newline at end of file diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java b/bukkit/src/main/java/com/gmail/nossr50/api/AbilityAPI.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java rename to bukkit/src/main/java/com/gmail/nossr50/api/AbilityAPI.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java b/bukkit/src/main/java/com/gmail/nossr50/api/ChatAPI.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java rename to bukkit/src/main/java/com/gmail/nossr50/api/ChatAPI.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/bukkit/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java rename to bukkit/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java b/bukkit/src/main/java/com/gmail/nossr50/api/PartyAPI.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java rename to bukkit/src/main/java/com/gmail/nossr50/api/PartyAPI.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java b/bukkit/src/main/java/com/gmail/nossr50/api/SkillAPI.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java rename to bukkit/src/main/java/com/gmail/nossr50/api/SkillAPI.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java b/bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java rename to bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java b/bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java rename to bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java b/bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java rename to bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java b/bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java rename to bukkit/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java b/bukkit/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java rename to bukkit/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java b/bukkit/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java rename to bukkit/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/bukkit/src/main/java/com/gmail/nossr50/chat/ChatManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java rename to bukkit/src/main/java/com/gmail/nossr50/chat/ChatManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java b/bukkit/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java b/bukkit/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java rename to bukkit/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McImportCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McImportCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McgodCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McgodCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java b/bukkit/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java rename to bukkit/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java b/bukkit/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java rename to bukkit/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/Config.java b/bukkit/src/main/java/com/gmail/nossr50/config/Config.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/Config.java rename to bukkit/src/main/java/com/gmail/nossr50/config/Config.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/ConfigLoader.java b/bukkit/src/main/java/com/gmail/nossr50/config/ConfigLoader.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/ConfigLoader.java rename to bukkit/src/main/java/com/gmail/nossr50/config/ConfigLoader.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/HiddenConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/HiddenConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/HiddenConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/HiddenConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/RankConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/RankConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/RankConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/RankConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/SoundConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/SoundConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/SoundConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/SoundConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java b/bukkit/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java rename to bukkit/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java b/bukkit/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java rename to bukkit/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/bukkit/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManager.java b/bukkit/src/main/java/com/gmail/nossr50/database/DatabaseManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManager.java rename to bukkit/src/main/java/com/gmail/nossr50/database/DatabaseManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java b/bukkit/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/bukkit/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java rename to bukkit/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/bukkit/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java rename to bukkit/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/Party.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/Party.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/Party.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/Party.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java b/bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java rename to bukkit/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java b/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java rename to bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java b/bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java rename to bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/BlockListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/EntityListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/SelfListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/listeners/WorldListener.java rename to bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/bukkit/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java rename to bukkit/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/mcMMO.java b/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/mcMMO.java rename to bukkit/src/main/java/com/gmail/nossr50/mcMMO.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/party/PartyManager.java b/bukkit/src/main/java/com/gmail/nossr50/party/PartyManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/party/PartyManager.java rename to bukkit/src/main/java/com/gmail/nossr50/party/PartyManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/bukkit/src/main/java/com/gmail/nossr50/party/ShareHandler.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/party/ShareHandler.java rename to bukkit/src/main/java/com/gmail/nossr50/party/ShareHandler.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java b/bukkit/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java rename to bukkit/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/SkillManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/SkillManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/SkillManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java b/bukkit/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java b/bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java b/bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/bukkit/src/main/java/com/gmail/nossr50/skills/archery/Archery.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/Archery.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/archery/Archery.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java b/bukkit/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/Axes.java b/bukkit/src/main/java/com/gmail/nossr50/skills/axes/Axes.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/Axes.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/axes/Axes.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/bukkit/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java b/bukkit/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/bukkit/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java b/bukkit/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java b/bukkit/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java b/bukkit/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/bukkit/src/main/java/com/gmail/nossr50/skills/mining/Mining.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/Mining.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/mining/Mining.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/Repair.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/Repair.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/Repair.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java b/bukkit/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/Swords.java b/bukkit/src/main/java/com/gmail/nossr50/skills/swords/Swords.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/Swords.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/swords/Swords.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/Taming.java b/bukkit/src/main/java/com/gmail/nossr50/skills/taming/Taming.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/Taming.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/taming/Taming.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java b/bukkit/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java b/bukkit/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/bukkit/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java b/bukkit/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java rename to bukkit/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/BlockUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/BlockUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/BlockUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/bukkit/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java rename to bukkit/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/EventUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/EventUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/EventUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/EventUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/HardcoreManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/HardcoreManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/HardcoreManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/HolidayManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/HolidayManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/HolidayManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/ItemUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/ItemUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/ItemUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/LogFilter.java b/bukkit/src/main/java/com/gmail/nossr50/util/LogFilter.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/LogFilter.java rename to bukkit/src/main/java/com/gmail/nossr50/util/LogFilter.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/MaterialUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/MaterialUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/MaterialUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/MaterialUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/Misc.java b/bukkit/src/main/java/com/gmail/nossr50/util/Misc.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/Misc.java rename to bukkit/src/main/java/com/gmail/nossr50/util/Misc.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/ModManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/ModManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/ModManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/ModManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/Motd.java b/bukkit/src/main/java/com/gmail/nossr50/util/Motd.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/Motd.java rename to bukkit/src/main/java/com/gmail/nossr50/util/Motd.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/Permissions.java b/bukkit/src/main/java/com/gmail/nossr50/util/Permissions.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/Permissions.java rename to bukkit/src/main/java/com/gmail/nossr50/util/Permissions.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/StringUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/StringUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/StringUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/StringUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java b/bukkit/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java b/bukkit/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java rename to bukkit/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java b/bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java rename to bukkit/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/bukkit/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java rename to bukkit/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/player/UserManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/player/UserManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/player/UserManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java b/bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java rename to bukkit/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java b/bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java rename to bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java b/bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java rename to bukkit/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/bukkit/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java b/bukkit/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java rename to bukkit/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java b/bukkit/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java rename to bukkit/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java b/bukkit/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java rename to bukkit/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java b/bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java rename to bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java b/bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java rename to bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java b/bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java similarity index 100% rename from mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java rename to bukkit/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java diff --git a/mcMMO-core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/bukkit/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java similarity index 100% rename from mcMMO-core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java rename to bukkit/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java diff --git a/mcMMO-core/src/main/java/util/java/mcMMO/PotionConfigGenerator.java b/bukkit/src/main/java/util/java/mcMMO/PotionConfigGenerator.java similarity index 100% rename from mcMMO-core/src/main/java/util/java/mcMMO/PotionConfigGenerator.java rename to bukkit/src/main/java/util/java/mcMMO/PotionConfigGenerator.java diff --git a/mcMMO-core/src/main/resources/.jenkins b/bukkit/src/main/resources/.jenkins similarity index 100% rename from mcMMO-core/src/main/resources/.jenkins rename to bukkit/src/main/resources/.jenkins diff --git a/mcMMO-core/src/main/java/META-INF/MANIFEST.MF b/bukkit/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from mcMMO-core/src/main/java/META-INF/MANIFEST.MF rename to bukkit/src/main/resources/META-INF/MANIFEST.MF diff --git a/mcMMO-core/src/main/resources/advanced.yml b/bukkit/src/main/resources/advanced.yml similarity index 100% rename from mcMMO-core/src/main/resources/advanced.yml rename to bukkit/src/main/resources/advanced.yml diff --git a/mcMMO-core/src/main/resources/child.yml b/bukkit/src/main/resources/child.yml similarity index 100% rename from mcMMO-core/src/main/resources/child.yml rename to bukkit/src/main/resources/child.yml diff --git a/mcMMO-core/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml similarity index 100% rename from mcMMO-core/src/main/resources/config.yml rename to bukkit/src/main/resources/config.yml diff --git a/mcMMO-core/src/main/resources/coreskills.yml b/bukkit/src/main/resources/coreskills.yml similarity index 100% rename from mcMMO-core/src/main/resources/coreskills.yml rename to bukkit/src/main/resources/coreskills.yml diff --git a/mcMMO-core/src/main/resources/experience.yml b/bukkit/src/main/resources/experience.yml similarity index 100% rename from mcMMO-core/src/main/resources/experience.yml rename to bukkit/src/main/resources/experience.yml diff --git a/mcMMO-core/src/main/resources/hidden.yml b/bukkit/src/main/resources/hidden.yml similarity index 100% rename from mcMMO-core/src/main/resources/hidden.yml rename to bukkit/src/main/resources/hidden.yml diff --git a/mcMMO-core/src/main/resources/itemweights.yml b/bukkit/src/main/resources/itemweights.yml similarity index 100% rename from mcMMO-core/src/main/resources/itemweights.yml rename to bukkit/src/main/resources/itemweights.yml diff --git a/mcMMO-core/src/main/resources/locale/locale_cs_CZ.properties b/bukkit/src/main/resources/locale/locale_cs_CZ.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_cs_CZ.properties rename to bukkit/src/main/resources/locale/locale_cs_CZ.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_cy.properties b/bukkit/src/main/resources/locale/locale_cy.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_cy.properties rename to bukkit/src/main/resources/locale/locale_cy.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_da.properties b/bukkit/src/main/resources/locale/locale_da.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_da.properties rename to bukkit/src/main/resources/locale/locale_da.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_de.properties b/bukkit/src/main/resources/locale/locale_de.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_de.properties rename to bukkit/src/main/resources/locale/locale_de.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_en_US.properties b/bukkit/src/main/resources/locale/locale_en_US.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_en_US.properties rename to bukkit/src/main/resources/locale/locale_en_US.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_es.properties b/bukkit/src/main/resources/locale/locale_es.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_es.properties rename to bukkit/src/main/resources/locale/locale_es.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_fi.properties b/bukkit/src/main/resources/locale/locale_fi.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_fi.properties rename to bukkit/src/main/resources/locale/locale_fi.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_fr.properties b/bukkit/src/main/resources/locale/locale_fr.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_fr.properties rename to bukkit/src/main/resources/locale/locale_fr.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_hu_HU.properties b/bukkit/src/main/resources/locale/locale_hu_HU.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_hu_HU.properties rename to bukkit/src/main/resources/locale/locale_hu_HU.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_it.properties b/bukkit/src/main/resources/locale/locale_it.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_it.properties rename to bukkit/src/main/resources/locale/locale_it.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_ja_JP.properties b/bukkit/src/main/resources/locale/locale_ja_JP.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_ja_JP.properties rename to bukkit/src/main/resources/locale/locale_ja_JP.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_ko.properties b/bukkit/src/main/resources/locale/locale_ko.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_ko.properties rename to bukkit/src/main/resources/locale/locale_ko.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_nl.properties b/bukkit/src/main/resources/locale/locale_nl.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_nl.properties rename to bukkit/src/main/resources/locale/locale_nl.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_pl.properties b/bukkit/src/main/resources/locale/locale_pl.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_pl.properties rename to bukkit/src/main/resources/locale/locale_pl.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_pt_BR.properties b/bukkit/src/main/resources/locale/locale_pt_BR.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_pt_BR.properties rename to bukkit/src/main/resources/locale/locale_pt_BR.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_ru.properties b/bukkit/src/main/resources/locale/locale_ru.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_ru.properties rename to bukkit/src/main/resources/locale/locale_ru.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_sv.properties b/bukkit/src/main/resources/locale/locale_sv.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_sv.properties rename to bukkit/src/main/resources/locale/locale_sv.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_th_TH.properties b/bukkit/src/main/resources/locale/locale_th_TH.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_th_TH.properties rename to bukkit/src/main/resources/locale/locale_th_TH.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_zh_CN.properties b/bukkit/src/main/resources/locale/locale_zh_CN.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_zh_CN.properties rename to bukkit/src/main/resources/locale/locale_zh_CN.properties diff --git a/mcMMO-core/src/main/resources/locale/locale_zh_TW.properties b/bukkit/src/main/resources/locale/locale_zh_TW.properties similarity index 100% rename from mcMMO-core/src/main/resources/locale/locale_zh_TW.properties rename to bukkit/src/main/resources/locale/locale_zh_TW.properties diff --git a/mcMMO-core/src/main/resources/mods/armor.default.yml b/bukkit/src/main/resources/mods/armor.default.yml similarity index 100% rename from mcMMO-core/src/main/resources/mods/armor.default.yml rename to bukkit/src/main/resources/mods/armor.default.yml diff --git a/mcMMO-core/src/main/resources/mods/blocks.default.yml b/bukkit/src/main/resources/mods/blocks.default.yml similarity index 100% rename from mcMMO-core/src/main/resources/mods/blocks.default.yml rename to bukkit/src/main/resources/mods/blocks.default.yml diff --git a/mcMMO-core/src/main/resources/mods/entities.default.yml b/bukkit/src/main/resources/mods/entities.default.yml similarity index 100% rename from mcMMO-core/src/main/resources/mods/entities.default.yml rename to bukkit/src/main/resources/mods/entities.default.yml diff --git a/mcMMO-core/src/main/resources/mods/tools.default.yml b/bukkit/src/main/resources/mods/tools.default.yml similarity index 100% rename from mcMMO-core/src/main/resources/mods/tools.default.yml rename to bukkit/src/main/resources/mods/tools.default.yml diff --git a/mcMMO-core/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml similarity index 100% rename from mcMMO-core/src/main/resources/plugin.yml rename to bukkit/src/main/resources/plugin.yml diff --git a/mcMMO-core/src/main/resources/potions.yml b/bukkit/src/main/resources/potions.yml similarity index 100% rename from mcMMO-core/src/main/resources/potions.yml rename to bukkit/src/main/resources/potions.yml diff --git a/mcMMO-core/src/main/resources/repair.vanilla.yml b/bukkit/src/main/resources/repair.vanilla.yml similarity index 100% rename from mcMMO-core/src/main/resources/repair.vanilla.yml rename to bukkit/src/main/resources/repair.vanilla.yml diff --git a/mcMMO-core/src/main/resources/salvage.vanilla.yml b/bukkit/src/main/resources/salvage.vanilla.yml similarity index 100% rename from mcMMO-core/src/main/resources/salvage.vanilla.yml rename to bukkit/src/main/resources/salvage.vanilla.yml diff --git a/mcMMO-core/src/main/resources/skillranks.yml b/bukkit/src/main/resources/skillranks.yml similarity index 100% rename from mcMMO-core/src/main/resources/skillranks.yml rename to bukkit/src/main/resources/skillranks.yml diff --git a/mcMMO-core/src/main/resources/sounds.yml b/bukkit/src/main/resources/sounds.yml similarity index 100% rename from mcMMO-core/src/main/resources/sounds.yml rename to bukkit/src/main/resources/sounds.yml diff --git a/mcMMO-core/src/main/resources/treasures.yml b/bukkit/src/main/resources/treasures.yml similarity index 100% rename from mcMMO-core/src/main/resources/treasures.yml rename to bukkit/src/main/resources/treasures.yml diff --git a/mcMMO-core/src/main/resources/upgrades.yml b/bukkit/src/main/resources/upgrades.yml similarity index 100% rename from mcMMO-core/src/main/resources/upgrades.yml rename to bukkit/src/main/resources/upgrades.yml diff --git a/bukkit/src/nms/java/com/gmail/nossr50/InternalHandler.java b/bukkit/src/nms/java/com/gmail/nossr50/InternalHandler.java new file mode 100644 index 000000000..cd8fa177f --- /dev/null +++ b/bukkit/src/nms/java/com/gmail/nossr50/InternalHandler.java @@ -0,0 +1,5 @@ +package com.gmail.nossr50; + +public class InternalHandler { + +} diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 000000000..74f816191 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,15 @@ + +plugins { + java +} +dependencies { + implementation("junit", "junit", "4.12") +} +val jar by tasks.getting(Jar::class) { + manifest { + attributes(mapOf( + "Implementation-Title" to project.name, + "Implementation-Version" to project.version + )) + } +} \ No newline at end of file diff --git a/core/src/main/java/com/gmail/nossr50/McmmoCore.java b/core/src/main/java/com/gmail/nossr50/McmmoCore.java new file mode 100644 index 000000000..f84cfb30a --- /dev/null +++ b/core/src/main/java/com/gmail/nossr50/McmmoCore.java @@ -0,0 +1,5 @@ +package com.gmail.nossr50; + +public class McmmoCore { + +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..758ba6c65 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +pluginGroup="com.gmail.nossr50" +pluginVersion="2.2.0-SNAPSHOT" diff --git a/mcMMO-core/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 80% rename from mcMMO-core/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties index d85420f18..7dc503f14 100644 --- a/mcMMO-core/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Feb 06 17:16:30 PST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/mcMMO-core/gradlew b/gradlew similarity index 100% rename from mcMMO-core/gradlew rename to gradlew diff --git a/mcMMO-core/gradlew.bat b/gradlew.bat similarity index 100% rename from mcMMO-core/gradlew.bat rename to gradlew.bat diff --git a/mcMMO-core/.gradle/4.10/fileChanges/last-build.bin b/mcMMO-core/.gradle/4.10/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/mcMMO-core/.gradle/4.10/gc.properties b/mcMMO-core/.gradle/4.10/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/mcMMO-core/.gradle/buildOutputCleanup/cache.properties b/mcMMO-core/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 024d45a53..000000000 --- a/mcMMO-core/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Feb 06 17:16:15 PST 2019 -gradle.version=4.10 diff --git a/mcMMO-core/.gradle/vcs-1/gc.properties b/mcMMO-core/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/mcMMO-core/build.gradle b/mcMMO-core/build.gradle deleted file mode 100644 index 8c4c0ac45..000000000 --- a/mcMMO-core/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - id 'java' -} - -group 'com.com.gmail.com.gmail.nossr50.mcmmo' -version '2.2.0-SNAPSHOT' - -sourceCompatibility = 1.8 -compileJava.options.encoding = 'UTF-8' - -repositories { - - mavenCentral() - - // Spigot & Bukkit - maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } - maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' } - - // World Edit - maven { url = "http://maven.sk89q.com/repo/" } - - // Tomcat - - // bStats - maven { url = "https://repo.codemc.org/repository/maven-public" } - - mavenLocal() // -- needed for craftbukkit / spigot - -} - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' // Spigot API - - compileOnly 'com.sk89q.worldguard:worldguard-core:7.0.0-SNAPSHOT' // World Guard - compileOnly 'com.sk89q.worldguard:worldguard-legacy:7.0.0-SNAPSHOT' // World Guard Legacy (NEEDED) - - compileOnly 'org.bstats:bstats:1.4' // bStats - - compileOnly 'org.apache.tomcat:tomcat-jdbc:7.0.52' // tomcat JDBC - compileOnly 'org.apache.tomcat:tomcat-juli:7.0.52' // tomcat juli - - testCompile group: 'junit', name: 'junit', version: '4.12' -} - diff --git a/mcMMO-core/settings.gradle b/mcMMO-core/settings.gradle deleted file mode 100644 index 07184bc3d..000000000 --- a/mcMMO-core/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'mcMMO' - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..5a88e8183 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user guide at https://docs.gradle.org/4.9/userguide/multi_project_builds.html + */ +rootProject.name = "mcMMO" +include("core", "bukkit", "sponge") diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts new file mode 100644 index 000000000..3667ebaba --- /dev/null +++ b/sponge/build.gradle.kts @@ -0,0 +1,30 @@ +buildscript { + repositories { + maven("https://repo.spongepowered.org/maven") + } +} + +plugins { + java + id("org.spongepowered.plugin") version "0.9.0" +} +dependencies { + compile("org.spongepowered", "spongeapi", "7.1.0") // SpongeAPI + + implementation("org.bstats", "bstats-sponge", "1.4") // Sponge bstats +} + +description = "mcMMO for Sponge" + +val compileJava by tasks.getting(JavaCompile::class) { + options.encoding = "UTF-8" +} + +val jar by tasks.getting(Jar::class) { + manifest { + attributes(mapOf( + "Implementation-Title" to project.name, + "Implementation-Version" to project.version + )) + } +} \ No newline at end of file diff --git a/sponge/src/main/java/com/gmail/nossr50/SpongePlugin.java b/sponge/src/main/java/com/gmail/nossr50/SpongePlugin.java new file mode 100644 index 000000000..5960aeecb --- /dev/null +++ b/sponge/src/main/java/com/gmail/nossr50/SpongePlugin.java @@ -0,0 +1,22 @@ +package com.gmail.nossr50; + +import org.spongepowered.api.event.Listener; +import org.spongepowered.api.event.game.state.GamePreInitializationEvent; +import org.spongepowered.api.plugin.Plugin; + +@Plugin( + id = "mcmmo", + authors = {"nossr50", "gabizou", "bloodmage"}, + version = "2.2.0-SNAPSHOT", + name = "mcMMO", + url = "https://www.mcmmo.org/" +) +public class SpongePlugin { + + + @Listener + public void onGamePreInit(GamePreInitializationEvent event) { + + } + +}