From 9e01a075428c1093f360e4954327272653d0c490 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 30 Sep 2019 14:34:38 -0700 Subject: [PATCH] Removing the hocon package --- .../gmail/nossr50/config/ConfigManager.java | 93 +++++++++---------- .../nossr50/config/{hocon => }/General.java | 2 +- .../nossr50/config/{hocon => }/HOCONUtil.java | 2 +- .../{hocon => }/SerializedConfigLoader.java | 3 +- .../nossr50/config/SkillConfigFactory.java | 1 - .../config/{hocon => }/admin/ConfigAdmin.java | 2 +- .../admin/ConfigAdminNotifications.java | 2 +- .../antiexploit/ConfigExploitPrevention.java | 2 +- .../ConfigSectionExploitAcrobatics.java | 2 +- .../ConfigSectionExploitFishing.java | 2 +- .../ConfigSectionExploitHerbalism.java | 2 +- .../ConfigSectionExploitMining.java | 2 +- .../ConfigSectionExploitRepair.java | 2 +- .../ConfigSectionExploitSalvage.java | 2 +- .../ConfigSectionExploitSkills.java | 2 +- .../ConfigSectionExploitTaming.java | 2 +- .../antiexploit/ConfigSectionGeneral.java | 2 +- .../backup/ConfigAutomatedBackups.java | 2 +- .../{hocon => }/commands/ConfigCommands.java | 2 +- .../commands/ConfigCommandsAdminChat.java | 2 +- .../commands/ConfigCommandsInspect.java | 2 +- .../commands/ConfigCommandsMisc.java | 2 +- .../commands/ConfigCommandsSkills.java | 2 +- .../{hocon => }/database/ConfigDatabase.java | 2 +- .../database/ConfigDatabaseFlatFile.java | 2 +- .../database/ConfigSectionCleaning.java | 2 +- .../database/ConfigSectionDatabase.java | 2 +- .../ConfigSectionDatabaseGeneral.java | 2 +- .../database/ConfigSectionMaxConnections.java | 2 +- .../database/ConfigSectionMaxPoolSize.java | 2 +- .../database/ConfigSectionMySQL.java | 2 +- .../database/ConfigSectionUser.java | 2 +- .../database/UserConfigSectionServer.java | 2 +- .../donation/ConfigAuthorAdvertisements.java | 2 +- .../config/{hocon => }/event/ConfigEvent.java | 2 +- .../event/ConfigEventExperienceRate.java | 2 +- .../experience/ConfigExperience.java | 2 +- .../ConfigExperienceAcrobatics.java | 2 +- .../experience/ConfigExperienceAlchemy.java | 2 +- .../experience/ConfigExperienceArchery.java | 2 +- .../experience/ConfigExperienceCombat.java | 2 +- .../ConfigExperienceCustomBoosts.java | 2 +- .../ConfigExperienceExcavation.java | 2 +- .../experience/ConfigExperienceFishing.java | 2 +- .../experience/ConfigExperienceHerbalism.java | 2 +- .../experience/ConfigExperienceMining.java | 2 +- .../experience/ConfigExperienceRepair.java | 2 +- .../ConfigExperienceSkillMultiplier.java | 2 +- .../experience/ConfigExperienceSkills.java | 2 +- .../experience/ConfigExperienceSmelting.java | 2 +- .../experience/ConfigExperienceTaming.java | 2 +- .../ConfigExperienceWoodcutting.java | 2 +- .../{hocon => }/hardcore/ConfigHardcore.java | 2 +- .../hardcore/ConfigHardcoreDeathPenalty.java | 2 +- .../{hocon => }/hardcore/ConfigVampirism.java | 2 +- .../config/{hocon => }/items/ConfigItems.java | 2 +- .../items/ConfigItemsChimaeraWing.java | 2 +- .../items/ConfigItemsConsumables.java | 2 +- .../{hocon => }/language/ConfigLanguage.java | 2 +- .../{hocon => }/metrics/ConfigMetrics.java | 2 +- .../config/{hocon => }/mobs/ConfigMobs.java | 2 +- .../{hocon => }/mobs/ConfigSectionCombat.java | 2 +- .../mobs/ConfigSectionHealthBars.java | 2 +- .../config/{hocon => }/motd/ConfigMOTD.java | 2 +- .../ConfigNotificationGeneral.java | 2 +- .../notifications/ConfigNotifications.java | 2 +- .../ConfigPlayerNotifications.java | 2 +- .../PlayerNotificationSettings.java | 2 +- .../particles/ConfigParticles.java | 2 +- .../config/{hocon => }/party/ConfigParty.java | 2 +- .../party/ConfigSectionPartyChat.java | 2 +- .../party/ConfigSectionPartyCleanup.java | 2 +- .../party/ConfigSectionPartyCombat.java | 2 +- .../party/ConfigSectionPartyCommands.java | 2 +- .../ConfigSectionPartyExperienceSharing.java | 2 +- .../party/ConfigSectionPartyGeneral.java | 2 +- .../party/ConfigSectionPartyItemShare.java | 2 +- .../ConfigSectionPartyItemShareSettings.java | 2 +- .../party/ConfigSectionPartyItemWeights.java | 2 +- .../party/ConfigSectionPartyLevel.java | 2 +- .../party/ConfigSectionPartyLimit.java | 2 +- .../ConfigSectionPartyTeleportCommand.java | 2 +- .../party/ConfigSectionPartyXP.java | 2 +- .../party/ConfigSectionPartyXPFormula.java | 2 +- .../party/data/ConfigPartyData.java | 2 +- .../party/data/ConfigPartyDataStore.java | 2 +- .../party/data/ConfigPartyMemberData.java | 2 +- .../playerleveling/ConfigExperienceBars.java | 2 +- .../ConfigExperienceFormula.java | 2 +- .../ConfigExperienceFormulaExponential.java | 2 +- .../ConfigExperienceFormulaLinear.java | 2 +- .../ConfigLevelEarlyGameBoost.java | 2 +- .../playerleveling/ConfigLeveling.java | 2 +- .../ConfigLevelingDiminishedReturns.java | 2 +- .../ConfigSectionLevelCaps.java | 2 +- .../ConfigSectionLevelScaling.java | 2 +- .../ConfigSectionLevelingGeneral.java | 2 +- .../ConfigSectionSkillLevelCap.java | 2 +- .../ConfigSectionSkillLevelCaps.java | 2 +- .../IncorrectFormulaException.java | 2 +- .../scoreboard/ConfigScoreboard.java | 2 +- .../ConfigSectionCooldownBoard.java | 2 +- .../scoreboard/ConfigSectionGeneral.java | 2 +- .../scoreboard/ConfigSectionInspectBoard.java | 2 +- .../scoreboard/ConfigSectionRankBoard.java | 2 +- .../ConfigSectionScoreboardTypes.java | 2 +- .../scoreboard/ConfigSectionSkillBoard.java | 2 +- .../scoreboard/ConfigSectionStatsBoard.java | 2 +- .../scoreboard/ConfigSectionTopBoard.java | 2 +- .../CustomEnumValueSerializer.java | 4 +- ...CustomEnumValueSerializerPartyFeature.java | 4 +- .../CustomItemTargetSerializer.java | 2 +- .../serializers/CustomXPPerkSerializer.java | 2 +- .../serializers/DamagePropertySerializer.java | 2 +- .../serializers/ItemStackSerializer.java | 2 +- .../serializers/ItemWildcardSerializer.java | 2 +- .../serializers/MaterialSerializer.java | 2 +- .../serializers/MaxBonusLevelSerializer.java | 2 +- .../MinecraftMaterialWrapperSerializer.java | 4 +- .../PlayerNotificationSerializer.java | 4 +- .../serializers/RawNBTSerializer.java | 2 +- .../RepairTransactionSerializer.java | 2 +- .../serializers/RepairableSerializer.java | 2 +- .../serializers/SalvageableSerializer.java | 2 +- .../serializers/SerializerUtil.java | 2 +- .../serializers/SetSerializer.java | 2 +- .../SimpleRepairCostSerializer.java | 2 +- .../SkillRankPropertySerializer.java | 4 +- .../serializers/SoundSettingSerializer.java | 4 +- .../serializers/TamingSummonSerializer.java | 2 +- .../{hocon => }/skills/ConfigMaxChance.java | 2 +- .../{hocon => }/skills/ConfigMaxLevel.java | 2 +- .../skills/acrobatics/ConfigAcrobatics.java | 6 +- .../acrobatics/ConfigAcrobaticsSubSkills.java | 6 +- .../skills/acrobatics/dodge/ConfigDodge.java | 2 +- .../skills/acrobatics/roll/ConfigRoll.java | 2 +- .../skills/alchemy/ConfigAlchemy.java | 2 +- .../skills/archery/ConfigArchery.java | 2 +- .../archery/ConfigArcheryArrowRetrieval.java | 2 +- .../skills/archery/ConfigArcheryDaze.java | 2 +- .../archery/ConfigArcheryLimitBreak.java | 2 +- .../archery/ConfigArcherySkillShot.java | 2 +- .../archery/ConfigArcherySubSkills.java | 2 +- .../{hocon => }/skills/axes/ConfigAxes.java | 2 +- .../skills/axes/ConfigAxesAxeMastery.java | 2 +- .../axes/ConfigAxesCriticalStrikes.java | 2 +- .../skills/axes/ConfigAxesGreaterImpact.java | 2 +- .../skills/axes/ConfigAxesImpact.java | 2 +- .../skills/axes/ConfigAxesLimitBreak.java | 2 +- .../skills/axes/ConfigAxesSkullSplitter.java | 2 +- .../skills/axes/ConfigAxesSubSkills.java | 2 +- .../coreskills/ConfigCoreSkillCombatMap.java | 2 +- .../skills/coreskills/ConfigCoreSkills.java | 2 +- .../ConfigCoreSkillsAcrobatics.java | 2 +- .../ConfigCoreSkillsCombatToggles.java | 2 +- .../ConfigNameRegisterDefaults.java | 2 +- .../MinecraftMaterialWrapper.java | 2 +- .../skills/excavation/ConfigExcavation.java | 2 +- .../skills/fishing/ConfigFishing.java | 2 +- .../skills/fishing/ConfigFishingGeneral.java | 2 +- .../fishing/ConfigFishingInnerPeace.java | 2 +- .../fishing/ConfigFishingSubskills.java | 2 +- .../skills/herbalism/ConfigHerbalism.java | 2 +- .../herbalism/ConfigHerbalismDoubleDrops.java | 2 +- .../herbalism/ConfigHerbalismGreenThumb.java | 2 +- .../herbalism/ConfigHerbalismHylianLuck.java | 2 +- .../herbalism/ConfigHerbalismShroomThumb.java | 2 +- .../herbalism/ConfigHerbalismSubSkills.java | 2 +- .../skills/mining/ConfigMining.java | 2 +- .../mining/ConfigMiningBlastMining.java | 2 +- .../mining/ConfigMiningDoubleDrops.java | 2 +- .../skills/mining/ConfigMiningSubskills.java | 2 +- .../{hocon => }/skills/ranks/ConfigRanks.java | 2 +- .../skills/ranks/ConfigRanksAcrobatics.java | 2 +- .../skills/ranks/ConfigRanksAlchemy.java | 2 +- .../skills/ranks/ConfigRanksArchery.java | 2 +- .../skills/ranks/ConfigRanksAxes.java | 2 +- .../skills/ranks/ConfigRanksExcavation.java | 2 +- .../skills/ranks/ConfigRanksFishing.java | 2 +- .../skills/ranks/ConfigRanksHerbalism.java | 2 +- .../skills/ranks/ConfigRanksMining.java | 2 +- .../skills/ranks/ConfigRanksRepair.java | 2 +- .../skills/ranks/ConfigRanksSalvage.java | 2 +- .../skills/ranks/ConfigRanksSmelting.java | 2 +- .../skills/ranks/ConfigRanksSwords.java | 2 +- .../skills/ranks/ConfigRanksTaming.java | 2 +- .../skills/ranks/ConfigRanksUnarmed.java | 2 +- .../skills/ranks/ConfigRanksWoodcutting.java | 2 +- .../skills/ranks/SkillRankProperty.java | 2 +- .../skills/repair/ConfigRepair.java | 8 +- .../repair/ConfigRepairArcaneForging.java | 2 +- .../repair/ConfigRepairSuperRepair.java | 2 +- .../repair/general/ConfigRepairGeneral.java | 2 +- .../ConfigRepairRepairMastery.java | 2 +- .../subskills/ConfigRepairSubSkills.java | 8 +- .../skills/salvage/ConfigArcaneSalvage.java | 2 +- .../skills/salvage/ConfigSalvage.java | 4 +- .../salvage/general/ConfigSalvageGeneral.java | 2 +- .../skills/smelting/ConfigSmelting.java | 2 +- .../smelting/ConfigSmeltingSecondSmelt.java | 2 +- .../smelting/ConfigSmeltingSubSkills.java | 2 +- .../skills/swords/ConfigSwords.java | 2 +- .../swords/ConfigSwordsCounterAttack.java | 2 +- .../skills/swords/ConfigSwordsLimitBreak.java | 2 +- .../skills/swords/ConfigSwordsRupture.java | 2 +- .../swords/ConfigSwordsSerratedStrikes.java | 2 +- .../skills/swords/ConfigSwordsSubSkills.java | 2 +- .../skills/taming/ConfigTaming.java | 2 +- .../taming/ConfigTamingCallOfTheWild.java | 2 +- .../ConfigTamingEnvironmentallyAware.java | 2 +- .../taming/ConfigTamingFastFoodService.java | 2 +- .../skills/taming/ConfigTamingGore.java | 2 +- .../skills/taming/ConfigTamingPummel.java | 2 +- .../taming/ConfigTamingSharpenedClaws.java | 2 +- .../skills/taming/ConfigTamingShockProof.java | 2 +- .../skills/taming/ConfigTamingSubSkills.java | 2 +- .../skills/taming/ConfigTamingThickFur.java | 2 +- .../skills/unarmed/ConfigUnarmed.java | 2 +- .../skills/unarmed/ConfigUnarmedDisarm.java | 2 +- .../unarmed/ConfigUnarmedLimitBreak.java | 2 +- .../unarmed/ConfigUnarmedSubSkills.java | 2 +- .../skills/woodcutting/ConfigWoodcutting.java | 2 +- .../woodcutting/ConfigWoodcuttingHarvest.java | 2 +- .../ConfigWoodcuttingSubskills.java | 2 +- .../config/{hocon => }/sound/ConfigSound.java | 2 +- .../{hocon => }/sound/SoundSetting.java | 2 +- .../ConfigSectionSuperAbilityCooldowns.java | 2 +- .../ConfigSectionSuperAbilityLimits.java | 2 +- .../ConfigSectionSuperAbilityMaxLength.java | 2 +- .../ConfigSectionTreeFeller.java | 2 +- .../superabilities/ConfigSuperAbilities.java | 2 +- .../worldblacklist/ConfigWorldBlacklist.java | 2 +- .../datatypes/skills/SubSkillType.java | 2 +- .../ExperienceConfig.java | 0 .../skills/McMMOPlayerNotificationEvent.java | 2 +- .../main/java/com/gmail/nossr50/mcMMO.java | 12 +-- .../blockmeta/PrimitiveExChunkletStore.java | 2 +- .../util/player/NotificationManager.java | 2 +- .../gmail/nossr50/util/skills/RankTools.java | 2 +- .../nossr50/util/sounds/SoundManager.java | 2 +- 240 files changed, 305 insertions(+), 308 deletions(-) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/General.java (75%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/HOCONUtil.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/SerializedConfigLoader.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/admin/ConfigAdmin.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/admin/ConfigAdminNotifications.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigExploitPrevention.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitAcrobatics.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitFishing.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitHerbalism.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitMining.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitRepair.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitSalvage.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitSkills.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionExploitTaming.java (89%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/antiexploit/ConfigSectionGeneral.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/backup/ConfigAutomatedBackups.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/commands/ConfigCommands.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/commands/ConfigCommandsAdminChat.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/commands/ConfigCommandsInspect.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/commands/ConfigCommandsMisc.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/commands/ConfigCommandsSkills.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigDatabase.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigDatabaseFlatFile.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionCleaning.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionDatabase.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionDatabaseGeneral.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionMaxConnections.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionMaxPoolSize.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionMySQL.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/ConfigSectionUser.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/database/UserConfigSectionServer.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/donation/ConfigAuthorAdvertisements.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/event/ConfigEvent.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/event/ConfigEventExperienceRate.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperience.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceAcrobatics.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceAlchemy.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceArchery.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceCombat.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceCustomBoosts.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceExcavation.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceFishing.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceHerbalism.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceMining.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceRepair.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceSkillMultiplier.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceSkills.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceSmelting.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceTaming.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/experience/ConfigExperienceWoodcutting.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/hardcore/ConfigHardcore.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/hardcore/ConfigHardcoreDeathPenalty.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/hardcore/ConfigVampirism.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/items/ConfigItems.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/items/ConfigItemsChimaeraWing.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/items/ConfigItemsConsumables.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/language/ConfigLanguage.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/metrics/ConfigMetrics.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/mobs/ConfigMobs.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/mobs/ConfigSectionCombat.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/mobs/ConfigSectionHealthBars.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/motd/ConfigMOTD.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/notifications/ConfigNotificationGeneral.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/notifications/ConfigNotifications.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/notifications/ConfigPlayerNotifications.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/notifications/PlayerNotificationSettings.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/particles/ConfigParticles.java (72%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigParty.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyChat.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyCleanup.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyCombat.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyCommands.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyExperienceSharing.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyGeneral.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyItemShare.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyItemShareSettings.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyItemWeights.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyLevel.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyLimit.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyTeleportCommand.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyXP.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/ConfigSectionPartyXPFormula.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/data/ConfigPartyData.java (86%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/data/ConfigPartyDataStore.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/party/data/ConfigPartyMemberData.java (72%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigExperienceBars.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigExperienceFormula.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigExperienceFormulaExponential.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigExperienceFormulaLinear.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigLevelEarlyGameBoost.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigLeveling.java (99%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigLevelingDiminishedReturns.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigSectionLevelCaps.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigSectionLevelScaling.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigSectionLevelingGeneral.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigSectionSkillLevelCap.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/ConfigSectionSkillLevelCaps.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/playerleveling/IncorrectFormulaException.java (83%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigScoreboard.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionCooldownBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionGeneral.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionInspectBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionRankBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionScoreboardTypes.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionSkillBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionStatsBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/scoreboard/ConfigSectionTopBoard.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/CustomEnumValueSerializer.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/CustomEnumValueSerializerPartyFeature.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/CustomItemTargetSerializer.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/CustomXPPerkSerializer.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/DamagePropertySerializer.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/ItemStackSerializer.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/ItemWildcardSerializer.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/MaterialSerializer.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/MaxBonusLevelSerializer.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/MinecraftMaterialWrapperSerializer.java (89%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/PlayerNotificationSerializer.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/RawNBTSerializer.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/RepairTransactionSerializer.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/RepairableSerializer.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SalvageableSerializer.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SerializerUtil.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SetSerializer.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SimpleRepairCostSerializer.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SkillRankPropertySerializer.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/SoundSettingSerializer.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/serializers/TamingSummonSerializer.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ConfigMaxChance.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ConfigMaxLevel.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/acrobatics/ConfigAcrobatics.java (80%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/acrobatics/ConfigAcrobaticsSubSkills.java (79%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/acrobatics/dodge/ConfigDodge.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/acrobatics/roll/ConfigRoll.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/alchemy/ConfigAlchemy.java (69%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArchery.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArcheryArrowRetrieval.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArcheryDaze.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArcheryLimitBreak.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArcherySkillShot.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/archery/ConfigArcherySubSkills.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxes.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesAxeMastery.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesCriticalStrikes.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesGreaterImpact.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesImpact.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesLimitBreak.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesSkullSplitter.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/axes/ConfigAxesSubSkills.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/coreskills/ConfigCoreSkillCombatMap.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/coreskills/ConfigCoreSkills.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/coreskills/ConfigCoreSkillsAcrobatics.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/coreskills/ConfigCoreSkillsCombatToggles.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/exampleconfigs/ConfigNameRegisterDefaults.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/exampleconfigs/MinecraftMaterialWrapper.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/excavation/ConfigExcavation.java (69%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/fishing/ConfigFishing.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/fishing/ConfigFishingGeneral.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/fishing/ConfigFishingInnerPeace.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/fishing/ConfigFishingSubskills.java (87%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalism.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalismDoubleDrops.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalismGreenThumb.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalismHylianLuck.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalismShroomThumb.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/herbalism/ConfigHerbalismSubSkills.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/mining/ConfigMining.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/mining/ConfigMiningBlastMining.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/mining/ConfigMiningDoubleDrops.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/mining/ConfigMiningSubskills.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanks.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksAcrobatics.java (87%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksAlchemy.java (71%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksArchery.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksAxes.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksExcavation.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksFishing.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksHerbalism.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksMining.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksRepair.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksSalvage.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksSmelting.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksSwords.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksTaming.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksUnarmed.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/ConfigRanksWoodcutting.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/ranks/SkillRankProperty.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/ConfigRepair.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/ConfigRepairArcaneForging.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/ConfigRepairSuperRepair.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/general/ConfigRepairGeneral.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/repairmastery/ConfigRepairRepairMastery.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/repair/subskills/ConfigRepairSubSkills.java (76%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/salvage/ConfigArcaneSalvage.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/salvage/ConfigSalvage.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/salvage/general/ConfigSalvageGeneral.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/smelting/ConfigSmelting.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/smelting/ConfigSmeltingSecondSmelt.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/smelting/ConfigSmeltingSubSkills.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwords.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwordsCounterAttack.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwordsLimitBreak.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwordsRupture.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwordsSerratedStrikes.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/swords/ConfigSwordsSubSkills.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTaming.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingCallOfTheWild.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingEnvironmentallyAware.java (73%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingFastFoodService.java (72%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingGore.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingPummel.java (71%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingSharpenedClaws.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingShockProof.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingSubSkills.java (97%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/taming/ConfigTamingThickFur.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/unarmed/ConfigUnarmed.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/unarmed/ConfigUnarmedDisarm.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/unarmed/ConfigUnarmedLimitBreak.java (90%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/unarmed/ConfigUnarmedSubSkills.java (92%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/woodcutting/ConfigWoodcutting.java (89%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/woodcutting/ConfigWoodcuttingHarvest.java (93%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/skills/woodcutting/ConfigWoodcuttingSubskills.java (87%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/sound/ConfigSound.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/sound/SoundSetting.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/superabilities/ConfigSectionSuperAbilityCooldowns.java (96%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/superabilities/ConfigSectionSuperAbilityLimits.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/superabilities/ConfigSectionSuperAbilityMaxLength.java (95%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/superabilities/ConfigSectionTreeFeller.java (91%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/superabilities/ConfigSuperAbilities.java (98%) rename mcmmo-core/src/main/java/com/gmail/nossr50/config/{hocon => }/worldblacklist/ConfigWorldBlacklist.java (94%) rename mcmmo-core/src/main/java/com/gmail/nossr50/{config/experience => dumpster}/ExperienceConfig.java (100%) diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/ConfigManager.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/ConfigManager.java index c6a065b00..8446ef64d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/ConfigManager.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/ConfigManager.java @@ -1,52 +1,51 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.config.hocon.SerializedConfigLoader; -import com.gmail.nossr50.config.hocon.admin.ConfigAdmin; -import com.gmail.nossr50.config.hocon.antiexploit.ConfigExploitPrevention; -import com.gmail.nossr50.config.hocon.backup.ConfigAutomatedBackups; -import com.gmail.nossr50.config.hocon.commands.ConfigCommands; -import com.gmail.nossr50.config.hocon.database.ConfigDatabase; -import com.gmail.nossr50.config.hocon.donation.ConfigAuthorAdvertisements; -import com.gmail.nossr50.config.hocon.event.ConfigEvent; -import com.gmail.nossr50.config.hocon.experience.ConfigExperience; -import com.gmail.nossr50.config.hocon.hardcore.ConfigHardcore; -import com.gmail.nossr50.config.hocon.items.ConfigItems; -import com.gmail.nossr50.config.hocon.language.ConfigLanguage; -import com.gmail.nossr50.config.hocon.metrics.ConfigMetrics; -import com.gmail.nossr50.config.hocon.mobs.ConfigMobs; -import com.gmail.nossr50.config.hocon.motd.ConfigMOTD; -import com.gmail.nossr50.config.hocon.notifications.ConfigNotifications; -import com.gmail.nossr50.config.hocon.notifications.PlayerNotificationSettings; -import com.gmail.nossr50.config.hocon.particles.ConfigParticles; -import com.gmail.nossr50.config.hocon.party.ConfigParty; -import com.gmail.nossr50.config.hocon.party.data.ConfigPartyData; -import com.gmail.nossr50.config.hocon.playerleveling.ConfigLeveling; -import com.gmail.nossr50.config.hocon.scoreboard.ConfigScoreboard; -import com.gmail.nossr50.config.hocon.serializers.*; -import com.gmail.nossr50.config.hocon.skills.acrobatics.ConfigAcrobatics; -import com.gmail.nossr50.config.hocon.skills.alchemy.ConfigAlchemy; -import com.gmail.nossr50.config.hocon.skills.archery.ConfigArchery; -import com.gmail.nossr50.config.hocon.skills.axes.ConfigAxes; -import com.gmail.nossr50.config.hocon.skills.coreskills.ConfigCoreSkills; -import com.gmail.nossr50.config.hocon.skills.exampleconfigs.ConfigNameRegisterDefaults; -import com.gmail.nossr50.config.hocon.skills.exampleconfigs.MinecraftMaterialWrapper; -import com.gmail.nossr50.config.hocon.skills.excavation.ConfigExcavation; -import com.gmail.nossr50.config.hocon.skills.fishing.ConfigFishing; -import com.gmail.nossr50.config.hocon.skills.herbalism.ConfigHerbalism; -import com.gmail.nossr50.config.hocon.skills.mining.ConfigMining; -import com.gmail.nossr50.config.hocon.skills.ranks.ConfigRanks; -import com.gmail.nossr50.config.hocon.skills.ranks.SkillRankProperty; -import com.gmail.nossr50.config.hocon.skills.repair.ConfigRepair; -import com.gmail.nossr50.config.hocon.skills.salvage.ConfigSalvage; -import com.gmail.nossr50.config.hocon.skills.smelting.ConfigSmelting; -import com.gmail.nossr50.config.hocon.skills.swords.ConfigSwords; -import com.gmail.nossr50.config.hocon.skills.taming.ConfigTaming; -import com.gmail.nossr50.config.hocon.skills.unarmed.ConfigUnarmed; -import com.gmail.nossr50.config.hocon.skills.woodcutting.ConfigWoodcutting; -import com.gmail.nossr50.config.hocon.sound.ConfigSound; -import com.gmail.nossr50.config.hocon.sound.SoundSetting; -import com.gmail.nossr50.config.hocon.superabilities.ConfigSuperAbilities; -import com.gmail.nossr50.config.hocon.worldblacklist.ConfigWorldBlacklist; +import com.gmail.nossr50.config.admin.ConfigAdmin; +import com.gmail.nossr50.config.antiexploit.ConfigExploitPrevention; +import com.gmail.nossr50.config.backup.ConfigAutomatedBackups; +import com.gmail.nossr50.config.commands.ConfigCommands; +import com.gmail.nossr50.config.database.ConfigDatabase; +import com.gmail.nossr50.config.donation.ConfigAuthorAdvertisements; +import com.gmail.nossr50.config.event.ConfigEvent; +import com.gmail.nossr50.config.experience.ConfigExperience; +import com.gmail.nossr50.config.hardcore.ConfigHardcore; +import com.gmail.nossr50.config.items.ConfigItems; +import com.gmail.nossr50.config.language.ConfigLanguage; +import com.gmail.nossr50.config.metrics.ConfigMetrics; +import com.gmail.nossr50.config.mobs.ConfigMobs; +import com.gmail.nossr50.config.motd.ConfigMOTD; +import com.gmail.nossr50.config.notifications.ConfigNotifications; +import com.gmail.nossr50.config.notifications.PlayerNotificationSettings; +import com.gmail.nossr50.config.particles.ConfigParticles; +import com.gmail.nossr50.config.party.ConfigParty; +import com.gmail.nossr50.config.party.data.ConfigPartyData; +import com.gmail.nossr50.config.playerleveling.ConfigLeveling; +import com.gmail.nossr50.config.scoreboard.ConfigScoreboard; +import com.gmail.nossr50.config.serializers.*; +import com.gmail.nossr50.config.skills.acrobatics.ConfigAcrobatics; +import com.gmail.nossr50.config.skills.alchemy.ConfigAlchemy; +import com.gmail.nossr50.config.skills.archery.ConfigArchery; +import com.gmail.nossr50.config.skills.axes.ConfigAxes; +import com.gmail.nossr50.config.skills.coreskills.ConfigCoreSkills; +import com.gmail.nossr50.config.skills.exampleconfigs.ConfigNameRegisterDefaults; +import com.gmail.nossr50.config.skills.exampleconfigs.MinecraftMaterialWrapper; +import com.gmail.nossr50.config.skills.excavation.ConfigExcavation; +import com.gmail.nossr50.config.skills.fishing.ConfigFishing; +import com.gmail.nossr50.config.skills.herbalism.ConfigHerbalism; +import com.gmail.nossr50.config.skills.mining.ConfigMining; +import com.gmail.nossr50.config.skills.ranks.ConfigRanks; +import com.gmail.nossr50.config.skills.ranks.SkillRankProperty; +import com.gmail.nossr50.config.skills.repair.ConfigRepair; +import com.gmail.nossr50.config.skills.salvage.ConfigSalvage; +import com.gmail.nossr50.config.skills.smelting.ConfigSmelting; +import com.gmail.nossr50.config.skills.swords.ConfigSwords; +import com.gmail.nossr50.config.skills.taming.ConfigTaming; +import com.gmail.nossr50.config.skills.unarmed.ConfigUnarmed; +import com.gmail.nossr50.config.skills.woodcutting.ConfigWoodcutting; +import com.gmail.nossr50.config.sound.ConfigSound; +import com.gmail.nossr50.config.sound.SoundSetting; +import com.gmail.nossr50.config.superabilities.ConfigSuperAbilities; +import com.gmail.nossr50.config.worldblacklist.ConfigWorldBlacklist; import com.gmail.nossr50.datatypes.experience.CustomXPPerk; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.items.ItemMatch; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/General.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/General.java similarity index 75% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/General.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/General.java index 7125d260f..29cacef0d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/General.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/General.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/HOCONUtil.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/HOCONUtil.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/HOCONUtil.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/HOCONUtil.java index 0a3160c9c..4c24710e1 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/HOCONUtil.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/HOCONUtil.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config; import com.gmail.nossr50.util.StringUtils; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/SerializedConfigLoader.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/SerializedConfigLoader.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/SerializedConfigLoader.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/SerializedConfigLoader.java index 8e21e633d..221af37c7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/SerializedConfigLoader.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/SerializedConfigLoader.java @@ -1,6 +1,5 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config; -import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.mcMMO; import ninja.leaping.configurate.ConfigurationOptions; import ninja.leaping.configurate.ValueType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/SkillConfigFactory.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/SkillConfigFactory.java index 56b54b0bd..50eed1303 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/SkillConfigFactory.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/SkillConfigFactory.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.config.hocon.SerializedConfigLoader; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.StringUtils; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdmin.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdmin.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdmin.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdmin.java index 1bec371c8..89a988fcd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdmin.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdmin.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.admin; +package com.gmail.nossr50.config.admin; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdminNotifications.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdminNotifications.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdminNotifications.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdminNotifications.java index a45de56f5..1ffcdd548 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/admin/ConfigAdminNotifications.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/admin/ConfigAdminNotifications.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.admin; +package com.gmail.nossr50.config.admin; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigExploitPrevention.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigExploitPrevention.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigExploitPrevention.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigExploitPrevention.java index 9404b8e15..46934961c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigExploitPrevention.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigExploitPrevention.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitAcrobatics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitAcrobatics.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitAcrobatics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitAcrobatics.java index f98a6e66f..df99d1c78 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitAcrobatics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitAcrobatics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitFishing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitFishing.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitFishing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitFishing.java index 53a82a69d..dc9a2e28e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitFishing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitFishing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitHerbalism.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitHerbalism.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitHerbalism.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitHerbalism.java index 3351ad13d..209178cdb 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitHerbalism.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitHerbalism.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitMining.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitMining.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitMining.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitMining.java index bcd6b679a..8da316edd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitMining.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitMining.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitRepair.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitRepair.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitRepair.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitRepair.java index 1b34d856a..241e6bf95 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitRepair.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitRepair.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSalvage.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSalvage.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSalvage.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSalvage.java index 8f65d19a2..b2a5f647d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSalvage.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSalvage.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSkills.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSkills.java index 3a12c4cfc..fb114b1f9 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitTaming.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitTaming.java similarity index 89% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitTaming.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitTaming.java index c2d403391..c40efd0dc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitTaming.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionExploitTaming.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionGeneral.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionGeneral.java index 83347f9fc..ecdcaeb19 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/antiexploit/ConfigSectionGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.antiexploit; +package com.gmail.nossr50.config.antiexploit; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/backup/ConfigAutomatedBackups.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/backup/ConfigAutomatedBackups.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/backup/ConfigAutomatedBackups.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/backup/ConfigAutomatedBackups.java index 48a41b25f..b37226cde 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/backup/ConfigAutomatedBackups.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/backup/ConfigAutomatedBackups.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.backup; +package com.gmail.nossr50.config.backup; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommands.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommands.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommands.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommands.java index 12b8ad320..6459872c7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommands.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommands.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.commands; +package com.gmail.nossr50.config.commands; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsAdminChat.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsAdminChat.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsAdminChat.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsAdminChat.java index f0aabd7c8..b28f2b413 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsAdminChat.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsAdminChat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.commands; +package com.gmail.nossr50.config.commands; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsInspect.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsInspect.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsInspect.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsInspect.java index 8b2409675..0cf0857cc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsInspect.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsInspect.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.commands; +package com.gmail.nossr50.config.commands; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsMisc.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsMisc.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsMisc.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsMisc.java index d6f4e5605..8a0dfd123 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsMisc.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsMisc.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.commands; +package com.gmail.nossr50.config.commands; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsSkills.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsSkills.java index 3cee2768d..179452fe4 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/commands/ConfigCommandsSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/commands/ConfigCommandsSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.commands; +package com.gmail.nossr50.config.commands; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabase.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabase.java index bfc0ed189..cd9751d36 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabase.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabaseFlatFile.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabaseFlatFile.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabaseFlatFile.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabaseFlatFile.java index 6598006db..f3e1e084d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabaseFlatFile.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigDatabaseFlatFile.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionCleaning.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionCleaning.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionCleaning.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionCleaning.java index 517dfe66e..3a1de5c73 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionCleaning.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionCleaning.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabase.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabase.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabase.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabase.java index c5af2c051..251426bb1 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabase.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabase.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabaseGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabaseGeneral.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabaseGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabaseGeneral.java index 64c80f1e8..b7d252fc2 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionDatabaseGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionDatabaseGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxConnections.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxConnections.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxConnections.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxConnections.java index 3dbe441ea..04beca377 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxConnections.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxConnections.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxPoolSize.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxPoolSize.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxPoolSize.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxPoolSize.java index 9696d7b2b..e86718d22 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMaxPoolSize.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMaxPoolSize.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMySQL.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMySQL.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMySQL.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMySQL.java index 9c2212392..6a4f6ee0d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionMySQL.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionMySQL.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import com.gmail.nossr50.datatypes.database.PoolIdentifier; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionUser.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionUser.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionUser.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionUser.java index de22adfcf..fb0765e35 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigSectionUser.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/ConfigSectionUser.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/UserConfigSectionServer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/UserConfigSectionServer.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/UserConfigSectionServer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/database/UserConfigSectionServer.java index a45fb842d..17cecaa00 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/database/UserConfigSectionServer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/database/UserConfigSectionServer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.database; +package com.gmail.nossr50.config.database; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/donation/ConfigAuthorAdvertisements.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/donation/ConfigAuthorAdvertisements.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/donation/ConfigAuthorAdvertisements.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/donation/ConfigAuthorAdvertisements.java index c73d3424a..485d2f01e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/donation/ConfigAuthorAdvertisements.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/donation/ConfigAuthorAdvertisements.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.donation; +package com.gmail.nossr50.config.donation; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEvent.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEvent.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEvent.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEvent.java index 21009921c..0b014dd44 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEvent.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.event; +package com.gmail.nossr50.config.event; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEventExperienceRate.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEventExperienceRate.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEventExperienceRate.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEventExperienceRate.java index bf15e75b3..919023edc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/event/ConfigEventExperienceRate.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/event/ConfigEventExperienceRate.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.event; +package com.gmail.nossr50.config.event; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperience.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperience.java index 4d5a8b410..f0c45ba16 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperience.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.experience.CustomXPPerk; import com.gmail.nossr50.datatypes.experience.SpecialXPKey; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAcrobatics.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAcrobatics.java index c102a7ca3..a3edf6f8d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAcrobatics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAlchemy.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAlchemy.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAlchemy.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAlchemy.java index 0b94ef93a..819a62b00 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAlchemy.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceAlchemy.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceArchery.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceArchery.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceArchery.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceArchery.java index 2eb351381..57e3008d1 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceArchery.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceArchery.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCombat.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCombat.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCombat.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCombat.java index 8111c1e62..6a7d4be0f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCombat.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCombat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.experience.SpecialXPKey; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCustomBoosts.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCustomBoosts.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCustomBoosts.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCustomBoosts.java index 9496cdfb7..110b5d01b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCustomBoosts.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceCustomBoosts.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.experience.CustomXPPerk; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceExcavation.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceExcavation.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceExcavation.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceExcavation.java index 799e397fb..22619ead3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceExcavation.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceExcavation.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceFishing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceFishing.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceFishing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceFishing.java index e88ae702a..4f2695ecf 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceFishing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceFishing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceHerbalism.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceHerbalism.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceHerbalism.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceHerbalism.java index 4b79fa8d7..118e10254 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceHerbalism.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceHerbalism.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceMining.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceMining.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceMining.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceMining.java index dfc95e6c4..f5d703838 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceMining.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceMining.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceRepair.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceRepair.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceRepair.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceRepair.java index d230a8830..cd81960b5 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceRepair.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceRepair.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkillMultiplier.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkillMultiplier.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkillMultiplier.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkillMultiplier.java index 904b08c02..bc6c8f2a3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkillMultiplier.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkillMultiplier.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkills.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkills.java index 22e2c9332..514e638cd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import com.gmail.nossr50.datatypes.experience.SpecialXPKey; import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSmelting.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSmelting.java index 28f3b287a..5d179b388 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceSmelting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceTaming.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceTaming.java index 0c3437e42..cceff778f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceTaming.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceWoodcutting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceWoodcutting.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceWoodcutting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceWoodcutting.java index c93d55ea7..f96b89812 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceWoodcutting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ConfigExperienceWoodcutting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.experience; +package com.gmail.nossr50.config.experience; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcore.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcore.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcore.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcore.java index 7c69900cf..19c21c683 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcore.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.hardcore; +package com.gmail.nossr50.config.hardcore; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcoreDeathPenalty.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcoreDeathPenalty.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcoreDeathPenalty.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcoreDeathPenalty.java index e6898fa34..5bc02d814 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcoreDeathPenalty.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigHardcoreDeathPenalty.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.hardcore; +package com.gmail.nossr50.config.hardcore; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigVampirism.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigVampirism.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigVampirism.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigVampirism.java index 329bc0686..fe216831c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigVampirism.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/hardcore/ConfigVampirism.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.hardcore; +package com.gmail.nossr50.config.hardcore; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItems.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItems.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItems.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItems.java index e63318031..ca7bf9f30 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItems.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItems.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.items; +package com.gmail.nossr50.config.items; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsChimaeraWing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsChimaeraWing.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsChimaeraWing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsChimaeraWing.java index 1275de25b..f80f628f8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsChimaeraWing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsChimaeraWing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.items; +package com.gmail.nossr50.config.items; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsConsumables.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsConsumables.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsConsumables.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsConsumables.java index 3148f5ba3..cd0f2d40d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItemsConsumables.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/items/ConfigItemsConsumables.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.items; +package com.gmail.nossr50.config.items; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/language/ConfigLanguage.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/language/ConfigLanguage.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/language/ConfigLanguage.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/language/ConfigLanguage.java index 791eb7c2c..340d433f3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/language/ConfigLanguage.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/language/ConfigLanguage.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.language; +package com.gmail.nossr50.config.language; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/metrics/ConfigMetrics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/metrics/ConfigMetrics.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/metrics/ConfigMetrics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/metrics/ConfigMetrics.java index 2ba414640..ec75e583a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/metrics/ConfigMetrics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/metrics/ConfigMetrics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.metrics; +package com.gmail.nossr50.config.metrics; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigMobs.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigMobs.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigMobs.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigMobs.java index c6e4a2597..b54e37a5d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigMobs.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigMobs.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.mobs; +package com.gmail.nossr50.config.mobs; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionCombat.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionCombat.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionCombat.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionCombat.java index 970efd811..a87d20998 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionCombat.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionCombat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.mobs; +package com.gmail.nossr50.config.mobs; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionHealthBars.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionHealthBars.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionHealthBars.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionHealthBars.java index 9a4fdb576..616fe979b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/mobs/ConfigSectionHealthBars.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/mobs/ConfigSectionHealthBars.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.mobs; +package com.gmail.nossr50.config.mobs; import com.gmail.nossr50.datatypes.MobHealthbarType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/motd/ConfigMOTD.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/motd/ConfigMOTD.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/motd/ConfigMOTD.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/motd/ConfigMOTD.java index 2b0741cd7..1cdf08b40 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/motd/ConfigMOTD.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/motd/ConfigMOTD.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.motd; +package com.gmail.nossr50.config.motd; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotificationGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotificationGeneral.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotificationGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotificationGeneral.java index dd44ba64e..50cfa5e2c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotificationGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotificationGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.notifications; +package com.gmail.nossr50.config.notifications; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotifications.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotifications.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotifications.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotifications.java index 6404a9528..0cf516f68 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigNotifications.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigNotifications.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.notifications; +package com.gmail.nossr50.config.notifications; import com.gmail.nossr50.datatypes.interactions.NotificationType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigPlayerNotifications.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigPlayerNotifications.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigPlayerNotifications.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigPlayerNotifications.java index 103c844a9..919c7db89 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/ConfigPlayerNotifications.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/ConfigPlayerNotifications.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.notifications; +package com.gmail.nossr50.config.notifications; import com.gmail.nossr50.datatypes.interactions.NotificationType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/PlayerNotificationSettings.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/PlayerNotificationSettings.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/PlayerNotificationSettings.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/PlayerNotificationSettings.java index 02d1522d2..bfe4240f2 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/notifications/PlayerNotificationSettings.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/notifications/PlayerNotificationSettings.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.notifications; +package com.gmail.nossr50.config.notifications; public class PlayerNotificationSettings { diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/particles/ConfigParticles.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/particles/ConfigParticles.java similarity index 72% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/particles/ConfigParticles.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/particles/ConfigParticles.java index 544edca4d..63a9bb17e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/particles/ConfigParticles.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/particles/ConfigParticles.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.particles; +package com.gmail.nossr50.config.particles; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigParty.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigParty.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigParty.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigParty.java index 94a7acfc9..956f73933 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigParty.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigParty.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyChat.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyChat.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyChat.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyChat.java index 68d9bda73..ca8fe471f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyChat.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyChat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCleanup.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCleanup.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCleanup.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCleanup.java index 4c0de4e83..ff15a748f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCleanup.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCleanup.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCombat.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCombat.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCombat.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCombat.java index 68e67e7b5..9a55f21dc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCombat.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCombat.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCommands.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCommands.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCommands.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCommands.java index 506325a44..542cb88a3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyCommands.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyCommands.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyExperienceSharing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyExperienceSharing.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyExperienceSharing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyExperienceSharing.java index 6778d1050..54bad4cf3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyExperienceSharing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyExperienceSharing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyGeneral.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyGeneral.java index ffb0a974d..c7b8a19c9 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShare.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShare.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShare.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShare.java index 7d0828d6a..b96c21405 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShare.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShare.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShareSettings.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShareSettings.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShareSettings.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShareSettings.java index 4d17ca68b..1d08c8a9a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemShareSettings.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemShareSettings.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import com.gmail.nossr50.datatypes.party.ShareMode; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemWeights.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemWeights.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemWeights.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemWeights.java index 7667326d5..e46e8b2aa 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyItemWeights.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyItemWeights.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLevel.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLevel.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLevel.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLevel.java index d9b85c805..393efa299 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLevel.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLevel.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import com.gmail.nossr50.datatypes.party.PartyFeature; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLimit.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLimit.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLimit.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLimit.java index 2b8b43111..4b8059e67 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyLimit.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyLimit.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyTeleportCommand.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyTeleportCommand.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyTeleportCommand.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyTeleportCommand.java index 0d52f4192..b572f8312 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyTeleportCommand.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyTeleportCommand.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXP.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXP.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXP.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXP.java index 7fc9516e4..c854242cf 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXP.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXP.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXPFormula.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXPFormula.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXPFormula.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXPFormula.java index 0ec4b5aa0..f14ddcaab 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/ConfigSectionPartyXPFormula.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/ConfigSectionPartyXPFormula.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party; +package com.gmail.nossr50.config.party; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyData.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyData.java similarity index 86% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyData.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyData.java index a3367dcd6..865cda3d1 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyData.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyData.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party.data; +package com.gmail.nossr50.config.party.data; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyDataStore.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyDataStore.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyDataStore.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyDataStore.java index 333cef934..0423ea920 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyDataStore.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyDataStore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party.data; +package com.gmail.nossr50.config.party.data; import com.gmail.nossr50.datatypes.party.ShareMode; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyMemberData.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyMemberData.java similarity index 72% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyMemberData.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyMemberData.java index 81fd80054..a94531db6 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/party/data/ConfigPartyMemberData.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/party/data/ConfigPartyMemberData.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.party.data; +package com.gmail.nossr50.config.party.data; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceBars.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceBars.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceBars.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceBars.java index a7bd7580c..ff9b30b14 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceBars.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceBars.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormula.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormula.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormula.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormula.java index 7f9555678..597685d2c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormula.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormula.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaExponential.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaExponential.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaExponential.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaExponential.java index fa96823c3..8039e3ad8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaExponential.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaExponential.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaLinear.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaLinear.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaLinear.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaLinear.java index bfcaa0120..57044fe12 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigExperienceFormulaLinear.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigExperienceFormulaLinear.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelEarlyGameBoost.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelEarlyGameBoost.java index 83b2f75b1..593f41aeb 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelEarlyGameBoost.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLeveling.java similarity index 99% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLeveling.java index 07633fc92..e98f6034c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLeveling.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelingDiminishedReturns.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelingDiminishedReturns.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelingDiminishedReturns.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelingDiminishedReturns.java index 4215a8cda..4d1fd1b36 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelingDiminishedReturns.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigLevelingDiminishedReturns.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelCaps.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelCaps.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelCaps.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelCaps.java index 9915e99b3..2d857e20d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelCaps.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelCaps.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelScaling.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelScaling.java index 718067a61..224c5d406 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelScaling.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelingGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelingGeneral.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelingGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelingGeneral.java index 52d0d5db7..a5a8fe53f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelingGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionLevelingGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCap.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCap.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCap.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCap.java index 6d587b278..f1aff0f56 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCap.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCap.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCaps.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCaps.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCaps.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCaps.java index 341338439..56a8682ca 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionSkillLevelCaps.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/ConfigSectionSkillLevelCaps.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/IncorrectFormulaException.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/IncorrectFormulaException.java similarity index 83% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/IncorrectFormulaException.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/IncorrectFormulaException.java index f56a4af90..2ad8f3cae 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/IncorrectFormulaException.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/playerleveling/IncorrectFormulaException.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.playerleveling; +package com.gmail.nossr50.config.playerleveling; import com.gmail.nossr50.datatypes.experience.FormulaType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigScoreboard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigScoreboard.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigScoreboard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigScoreboard.java index 2a68fda6d..bbfc467b4 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigScoreboard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigScoreboard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import com.gmail.nossr50.util.scoreboards.SidebarType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionCooldownBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionCooldownBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionCooldownBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionCooldownBoard.java index 4d9377051..5c4022838 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionCooldownBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionCooldownBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionGeneral.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionGeneral.java index 69211f052..41e7f81dd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionInspectBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionInspectBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionInspectBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionInspectBoard.java index 62c4b821b..f0b1e1392 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionInspectBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionInspectBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionRankBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionRankBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionRankBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionRankBoard.java index ff93c7701..751dc8d80 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionRankBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionRankBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionScoreboardTypes.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionScoreboardTypes.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionScoreboardTypes.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionScoreboardTypes.java index c03b898e8..e52bd46f8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionScoreboardTypes.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionScoreboardTypes.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionSkillBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionSkillBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionSkillBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionSkillBoard.java index a6f183fa4..2556552fd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionSkillBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionSkillBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionStatsBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionStatsBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionStatsBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionStatsBoard.java index 7cc9194fb..ecfc940d7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionStatsBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionStatsBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionTopBoard.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionTopBoard.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionTopBoard.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionTopBoard.java index 6b3567d61..d2d2386f6 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/scoreboard/ConfigSectionTopBoard.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/scoreboard/ConfigSectionTopBoard.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.scoreboard; +package com.gmail.nossr50.config.scoreboard; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializer.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializer.java index 13c2c1851..5ec2722bc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializer.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.HOCONUtil; +import com.gmail.nossr50.config.HOCONUtil; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializerPartyFeature.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializerPartyFeature.java index 46e3a2820..38d3415ec 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomEnumValueSerializerPartyFeature.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.HOCONUtil; +import com.gmail.nossr50.config.HOCONUtil; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomItemTargetSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomItemTargetSerializer.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomItemTargetSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomItemTargetSerializer.java index 7e059756e..16f3d153d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomItemTargetSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomItemTargetSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.items.ItemMatch; import com.gmail.nossr50.datatypes.items.ItemMatchProperty; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomXPPerkSerializer.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomXPPerkSerializer.java index dcddb9995..1403f591b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/CustomXPPerkSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.api.exceptions.InvalidSkillException; import com.gmail.nossr50.datatypes.experience.CustomXPPerk; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/DamagePropertySerializer.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/DamagePropertySerializer.java index de4404826..53dd73b99 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/DamagePropertySerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.skills.properties.AbstractDamageProperty; import com.gmail.nossr50.datatypes.skills.properties.DamageProperty; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemStackSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemStackSerializer.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemStackSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemStackSerializer.java index dd592656f..259dc5366 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemStackSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemStackSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.items.BukkitMMOItem; import com.gmail.nossr50.datatypes.items.MMOItem; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemWildcardSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemWildcardSerializer.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemWildcardSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemWildcardSerializer.java index f785795f0..8a50cd8c8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/ItemWildcardSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/ItemWildcardSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.items.ItemMatch; import com.gmail.nossr50.datatypes.items.ItemWildcards; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaterialSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaterialSerializer.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaterialSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaterialSerializer.java index 571c9bca4..82941bfe6 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaterialSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaterialSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaxBonusLevelSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaxBonusLevelSerializer.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaxBonusLevelSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaxBonusLevelSerializer.java index 0322ce0ed..5345d65fb 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MaxBonusLevelSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MaxBonusLevelSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MinecraftMaterialWrapperSerializer.java similarity index 89% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MinecraftMaterialWrapperSerializer.java index 1cade8c21..abf95bbbc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/MinecraftMaterialWrapperSerializer.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.skills.exampleconfigs.MinecraftMaterialWrapper; +import com.gmail.nossr50.config.skills.exampleconfigs.MinecraftMaterialWrapper; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/PlayerNotificationSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/PlayerNotificationSerializer.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/PlayerNotificationSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/PlayerNotificationSerializer.java index db6aaba6f..69ff7487e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/PlayerNotificationSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/PlayerNotificationSerializer.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.notifications.PlayerNotificationSettings; +import com.gmail.nossr50.config.notifications.PlayerNotificationSettings; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RawNBTSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RawNBTSerializer.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RawNBTSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RawNBTSerializer.java index ce5495163..1f94e1540 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RawNBTSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RawNBTSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.util.nbt.RawNBT; import com.google.common.reflect.TypeToken; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairTransactionSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairTransactionSerializer.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairTransactionSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairTransactionSerializer.java index 8eaaaf34a..3a5c16984 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairTransactionSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairTransactionSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.skills.repair.RepairTransaction; import com.google.common.reflect.TypeToken; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairableSerializer.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairableSerializer.java index 1e3c1a372..a72932b2d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/RepairableSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.items.ItemMatch; import com.gmail.nossr50.datatypes.permissions.PermissionWrapper; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SalvageableSerializer.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SalvageableSerializer.java index bf4eb237d..9f84ca176 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SalvageableSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import com.google.common.reflect.TypeToken; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SerializerUtil.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SerializerUtil.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SerializerUtil.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SerializerUtil.java index 481880d5c..5cbb579d7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SerializerUtil.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SerializerUtil.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.commented.CommentedConfigurationNode; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SetSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SetSerializer.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SetSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SetSerializer.java index 35cc9e4f3..f4b79e905 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SetSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SetSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SimpleRepairCostSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SimpleRepairCostSerializer.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SimpleRepairCostSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SimpleRepairCostSerializer.java index 0671cc001..902eab9f2 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SimpleRepairCostSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SimpleRepairCostSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.items.ItemMatch; import com.gmail.nossr50.skills.repair.SimpleRepairCost; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SkillRankPropertySerializer.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SkillRankPropertySerializer.java index 933984043..df55e4fa8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SkillRankPropertySerializer.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.skills.ranks.SkillRankProperty; +import com.gmail.nossr50.config.skills.ranks.SkillRankProperty; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SoundSettingSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SoundSettingSerializer.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SoundSettingSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SoundSettingSerializer.java index edb8e92b4..a51e2a61d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/SoundSettingSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/SoundSettingSerializer.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; -import com.gmail.nossr50.config.hocon.sound.SoundSetting; +import com.gmail.nossr50.config.sound.SoundSetting; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.ValueType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/TamingSummonSerializer.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/TamingSummonSerializer.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/TamingSummonSerializer.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/TamingSummonSerializer.java index c97e35a8c..8d7fe2217 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/serializers/TamingSummonSerializer.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/serializers/TamingSummonSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.serializers; +package com.gmail.nossr50.config.serializers; import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType; import com.gmail.nossr50.datatypes.skills.subskills.taming.TamingSummon; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxChance.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxChance.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxChance.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxChance.java index 9790605ee..f583bfc52 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxChance.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxChance.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills; +package com.gmail.nossr50.config.skills; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxLevel.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxLevel.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxLevel.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxLevel.java index b65e6d66f..55170d36f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigMaxLevel.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ConfigMaxLevel.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills; +package com.gmail.nossr50.config.skills; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobatics.java similarity index 80% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobatics.java index 23163b469..e2687627e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobatics.java @@ -1,8 +1,8 @@ -package com.gmail.nossr50.config.hocon.skills.acrobatics; +package com.gmail.nossr50.config.skills.acrobatics; import com.gmail.nossr50.config.ConfigConstants; -import com.gmail.nossr50.config.hocon.skills.acrobatics.dodge.ConfigDodge; -import com.gmail.nossr50.config.hocon.skills.acrobatics.roll.ConfigRoll; +import com.gmail.nossr50.config.skills.acrobatics.dodge.ConfigDodge; +import com.gmail.nossr50.config.skills.acrobatics.roll.ConfigRoll; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobaticsSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobaticsSubSkills.java similarity index 79% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobaticsSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobaticsSubSkills.java index e8814c1ec..794ddf15c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobaticsSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/ConfigAcrobaticsSubSkills.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.config.hocon.skills.acrobatics; +package com.gmail.nossr50.config.skills.acrobatics; -import com.gmail.nossr50.config.hocon.skills.acrobatics.dodge.ConfigDodge; -import com.gmail.nossr50.config.hocon.skills.acrobatics.roll.ConfigRoll; +import com.gmail.nossr50.config.skills.acrobatics.dodge.ConfigDodge; +import com.gmail.nossr50.config.skills.acrobatics.roll.ConfigRoll; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/dodge/ConfigDodge.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/dodge/ConfigDodge.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/dodge/ConfigDodge.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/dodge/ConfigDodge.java index b2fe29485..2c0becdbf 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/dodge/ConfigDodge.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/dodge/ConfigDodge.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.acrobatics.dodge; +package com.gmail.nossr50.config.skills.acrobatics.dodge; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/roll/ConfigRoll.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/roll/ConfigRoll.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/roll/ConfigRoll.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/roll/ConfigRoll.java index ea1da1955..d13bcfeed 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/roll/ConfigRoll.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/acrobatics/roll/ConfigRoll.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.acrobatics.roll; +package com.gmail.nossr50.config.skills.acrobatics.roll; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/alchemy/ConfigAlchemy.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/ConfigAlchemy.java similarity index 69% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/alchemy/ConfigAlchemy.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/ConfigAlchemy.java index c1a22e3e0..e9f7e4ad7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/alchemy/ConfigAlchemy.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/ConfigAlchemy.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.alchemy; +package com.gmail.nossr50.config.skills.alchemy; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArchery.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArchery.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArchery.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArchery.java index d20eb8634..cb7a43066 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArchery.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArchery.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryArrowRetrieval.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryArrowRetrieval.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryArrowRetrieval.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryArrowRetrieval.java index e7fe5d6bd..cf0749122 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryArrowRetrieval.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryArrowRetrieval.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryDaze.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryDaze.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryDaze.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryDaze.java index baaeea618..844c78301 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryDaze.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryDaze.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryLimitBreak.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryLimitBreak.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryLimitBreak.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryLimitBreak.java index 7a0bcf117..964b80928 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryLimitBreak.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcheryLimitBreak.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySkillShot.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySkillShot.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySkillShot.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySkillShot.java index 1d3594ab0..b5d771e43 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySkillShot.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySkillShot.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySubSkills.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySubSkills.java index c43c65709..dc178a844 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcherySubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/archery/ConfigArcherySubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.archery; +package com.gmail.nossr50.config.skills.archery; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxes.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxes.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxes.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxes.java index 30938049f..4205b1089 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxes.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxes.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.DamageProperty; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesAxeMastery.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesAxeMastery.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesAxeMastery.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesAxeMastery.java index c1c25add2..19dad6837 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesAxeMastery.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesAxeMastery.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesCriticalStrikes.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesCriticalStrikes.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesCriticalStrikes.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesCriticalStrikes.java index c297c0a28..9c1d267a7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesCriticalStrikes.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesCriticalStrikes.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractDamageProperty; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesGreaterImpact.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesGreaterImpact.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesGreaterImpact.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesGreaterImpact.java index d94cc3fa1..c4395a339 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesGreaterImpact.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesGreaterImpact.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesImpact.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesImpact.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesImpact.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesImpact.java index de9aea56f..21b5189ee 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesImpact.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesImpact.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesLimitBreak.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesLimitBreak.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesLimitBreak.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesLimitBreak.java index ccb3ce2a2..345d2aae0 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesLimitBreak.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesLimitBreak.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSkullSplitter.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSkullSplitter.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSkullSplitter.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSkullSplitter.java index 4d45b7e9f..153c4476d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSkullSplitter.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSkullSplitter.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSubSkills.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSubSkills.java index a5eac757b..b1ea90416 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/axes/ConfigAxesSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/axes/ConfigAxesSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.axes; +package com.gmail.nossr50.config.skills.axes; import com.gmail.nossr50.datatypes.skills.properties.DamageProperty; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillCombatMap.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillCombatMap.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillCombatMap.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillCombatMap.java index 73b76146a..e909b8f9a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillCombatMap.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillCombatMap.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.coreskills; +package com.gmail.nossr50.config.skills.coreskills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkills.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkills.java index 5ca737ef5..8c6ddc0a9 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.coreskills; +package com.gmail.nossr50.config.skills.coreskills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsAcrobatics.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsAcrobatics.java index e0d83e5e6..ef136b3ed 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsAcrobatics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.coreskills; +package com.gmail.nossr50.config.skills.coreskills; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsCombatToggles.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsCombatToggles.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsCombatToggles.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsCombatToggles.java index 7dc1b8494..9aa646b3c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsCombatToggles.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/coreskills/ConfigCoreSkillsCombatToggles.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.coreskills; +package com.gmail.nossr50.config.skills.coreskills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/ConfigNameRegisterDefaults.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/ConfigNameRegisterDefaults.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/ConfigNameRegisterDefaults.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/ConfigNameRegisterDefaults.java index 19df506da..28374f1dc 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/ConfigNameRegisterDefaults.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/ConfigNameRegisterDefaults.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.exampleconfigs; +package com.gmail.nossr50.config.skills.exampleconfigs; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/MinecraftMaterialWrapper.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/MinecraftMaterialWrapper.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/MinecraftMaterialWrapper.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/MinecraftMaterialWrapper.java index e63703594..ca6786716 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/exampleconfigs/MinecraftMaterialWrapper.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/exampleconfigs/MinecraftMaterialWrapper.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.exampleconfigs; +package com.gmail.nossr50.config.skills.exampleconfigs; import org.bukkit.Material; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/excavation/ConfigExcavation.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/excavation/ConfigExcavation.java similarity index 69% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/excavation/ConfigExcavation.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/excavation/ConfigExcavation.java index 0810a38b5..587d48188 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/excavation/ConfigExcavation.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/excavation/ConfigExcavation.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.excavation; +package com.gmail.nossr50.config.skills.excavation; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishing.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishing.java index 650542a4b..de98156be 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.fishing; +package com.gmail.nossr50.config.skills.fishing; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingGeneral.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingGeneral.java index 5be66c913..1d924174e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.fishing; +package com.gmail.nossr50.config.skills.fishing; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingInnerPeace.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingInnerPeace.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingInnerPeace.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingInnerPeace.java index 072f2f155..9b2fb85ca 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingInnerPeace.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingInnerPeace.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.fishing; +package com.gmail.nossr50.config.skills.fishing; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingSubskills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingSubskills.java similarity index 87% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingSubskills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingSubskills.java index db938c38b..fdf55beb6 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingSubskills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/fishing/ConfigFishingSubskills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.fishing; +package com.gmail.nossr50.config.skills.fishing; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalism.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalism.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalism.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalism.java index 295b57324..1252e6e16 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalism.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalism.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismDoubleDrops.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismDoubleDrops.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismDoubleDrops.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismDoubleDrops.java index 35d254ee6..f286d0f08 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismDoubleDrops.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismDoubleDrops.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismGreenThumb.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismGreenThumb.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismGreenThumb.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismGreenThumb.java index 9ae5f8a94..5bd7f9bec 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismGreenThumb.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismGreenThumb.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismHylianLuck.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismHylianLuck.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismHylianLuck.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismHylianLuck.java index 830e2f824..46291e22f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismHylianLuck.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismHylianLuck.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismShroomThumb.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismShroomThumb.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismShroomThumb.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismShroomThumb.java index 8e4fce6a4..c7b37be90 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismShroomThumb.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismShroomThumb.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismSubSkills.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismSubSkills.java index fbf684ce9..49ee6b39e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/herbalism/ConfigHerbalismSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/herbalism/ConfigHerbalismSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.herbalism; +package com.gmail.nossr50.config.skills.herbalism; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMining.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMining.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMining.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMining.java index 3d877aa9e..e12716193 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMining.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMining.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.mining; +package com.gmail.nossr50.config.skills.mining; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningBlastMining.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningBlastMining.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningBlastMining.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningBlastMining.java index 352f3519d..059fa8b40 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningBlastMining.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningBlastMining.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.mining; +package com.gmail.nossr50.config.skills.mining; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningDoubleDrops.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningDoubleDrops.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningDoubleDrops.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningDoubleDrops.java index e580c52eb..66be8fa93 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningDoubleDrops.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningDoubleDrops.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.mining; +package com.gmail.nossr50.config.skills.mining; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningSubskills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningSubskills.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningSubskills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningSubskills.java index 79fad7b0f..e157a7066 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/mining/ConfigMiningSubskills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/mining/ConfigMiningSubskills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.mining; +package com.gmail.nossr50.config.skills.mining; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanks.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanks.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanks.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanks.java index bce37ccf2..464cd673b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanks.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanks.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAcrobatics.java similarity index 87% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAcrobatics.java index d70d14a03..7660ff4d8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAcrobatics.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAlchemy.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAlchemy.java similarity index 71% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAlchemy.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAlchemy.java index 78c17843c..5719ff7e0 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAlchemy.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAlchemy.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksArchery.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksArchery.java index c8d8ea28d..8d09e875b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksArchery.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAxes.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAxes.java index 47eff4ce7..ba8f9aa75 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksAxes.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksExcavation.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksExcavation.java index d47794c37..c3292d86d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksExcavation.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksFishing.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksFishing.java index d65eaf8be..5fdd8547b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksFishing.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksHerbalism.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksHerbalism.java index 7a366b89b..d78f80f1a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksHerbalism.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksMining.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksMining.java index ddbbade3d..d13cd48c2 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksMining.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksRepair.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksRepair.java index 06f9326ad..9fb747457 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksRepair.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSalvage.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSalvage.java index ffc972470..7adce9ad8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSalvage.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSmelting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSmelting.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSmelting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSmelting.java index 082e66460..d34bffd00 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSmelting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSmelting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSwords.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSwords.java index a7eafdeb2..52810cd9a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksSwords.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksTaming.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksTaming.java index fb8296adc..2e4565b32 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksTaming.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksUnarmed.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksUnarmed.java index ec252dd25..18b386684 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksUnarmed.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksWoodcutting.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksWoodcutting.java index d52ba6c0d..b8177a679 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/ConfigRanksWoodcutting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/SkillRankProperty.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/SkillRankProperty.java index eebad9da9..819750803 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/ranks/SkillRankProperty.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.ranks; +package com.gmail.nossr50.config.skills.ranks; import com.gmail.nossr50.api.exceptions.MissingSkillPropertyDefinition; import com.gmail.nossr50.datatypes.skills.properties.SkillProperty; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepair.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepair.java index b50493271..c308258fd 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepair.java @@ -1,9 +1,9 @@ -package com.gmail.nossr50.config.hocon.skills.repair; +package com.gmail.nossr50.config.skills.repair; import com.gmail.nossr50.config.ConfigConstants; -import com.gmail.nossr50.config.hocon.skills.repair.general.ConfigRepairGeneral; -import com.gmail.nossr50.config.hocon.skills.repair.repairmastery.ConfigRepairRepairMastery; -import com.gmail.nossr50.config.hocon.skills.repair.subskills.ConfigRepairSubSkills; +import com.gmail.nossr50.config.skills.repair.general.ConfigRepairGeneral; +import com.gmail.nossr50.config.skills.repair.repairmastery.ConfigRepairRepairMastery; +import com.gmail.nossr50.config.skills.repair.subskills.ConfigRepairSubSkills; import com.gmail.nossr50.datatypes.items.BukkitMMOItem; import com.gmail.nossr50.datatypes.items.ItemMatch; import com.gmail.nossr50.datatypes.items.ItemWildcards; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairArcaneForging.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairArcaneForging.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairArcaneForging.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairArcaneForging.java index 997749707..01803b3d5 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairArcaneForging.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairArcaneForging.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.repair; +package com.gmail.nossr50.config.skills.repair; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairSuperRepair.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairSuperRepair.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairSuperRepair.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairSuperRepair.java index 1cd9e3f25..cabddd2c0 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepairSuperRepair.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/ConfigRepairSuperRepair.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.repair; +package com.gmail.nossr50.config.skills.repair; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/general/ConfigRepairGeneral.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/general/ConfigRepairGeneral.java index 30f6ecc4a..5b6f99f47 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/general/ConfigRepairGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.repair.general; +package com.gmail.nossr50.config.skills.repair.general; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/ConfigRepairRepairMastery.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/repairmastery/ConfigRepairRepairMastery.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/ConfigRepairRepairMastery.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/repairmastery/ConfigRepairRepairMastery.java index d59122a00..3f019124f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/ConfigRepairRepairMastery.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/repairmastery/ConfigRepairRepairMastery.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.repair.repairmastery; +package com.gmail.nossr50.config.skills.repair.repairmastery; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/subskills/ConfigRepairSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/subskills/ConfigRepairSubSkills.java similarity index 76% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/subskills/ConfigRepairSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/subskills/ConfigRepairSubSkills.java index 94a173244..efe80ddda 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/subskills/ConfigRepairSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/repair/subskills/ConfigRepairSubSkills.java @@ -1,8 +1,8 @@ -package com.gmail.nossr50.config.hocon.skills.repair.subskills; +package com.gmail.nossr50.config.skills.repair.subskills; -import com.gmail.nossr50.config.hocon.skills.repair.ConfigRepairArcaneForging; -import com.gmail.nossr50.config.hocon.skills.repair.ConfigRepairSuperRepair; -import com.gmail.nossr50.config.hocon.skills.repair.repairmastery.ConfigRepairRepairMastery; +import com.gmail.nossr50.config.skills.repair.ConfigRepairArcaneForging; +import com.gmail.nossr50.config.skills.repair.ConfigRepairSuperRepair; +import com.gmail.nossr50.config.skills.repair.repairmastery.ConfigRepairRepairMastery; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigArcaneSalvage.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigArcaneSalvage.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigArcaneSalvage.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigArcaneSalvage.java index 41878509f..38aeb3a49 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigArcaneSalvage.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigArcaneSalvage.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.salvage; +package com.gmail.nossr50.config.skills.salvage; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigSalvage.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigSalvage.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigSalvage.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigSalvage.java index 98a1eaf6c..538d91fd7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/ConfigSalvage.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/ConfigSalvage.java @@ -1,6 +1,6 @@ -package com.gmail.nossr50.config.hocon.skills.salvage; +package com.gmail.nossr50.config.skills.salvage; -import com.gmail.nossr50.config.hocon.skills.salvage.general.ConfigSalvageGeneral; +import com.gmail.nossr50.config.skills.salvage.general.ConfigSalvageGeneral; import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/general/ConfigSalvageGeneral.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/general/ConfigSalvageGeneral.java index add55f934..408de1ce2 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/salvage/general/ConfigSalvageGeneral.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.salvage.general; +package com.gmail.nossr50.config.skills.salvage.general; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmelting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmelting.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmelting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmelting.java index bfb8c1558..8d64d2448 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmelting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmelting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.smelting; +package com.gmail.nossr50.config.skills.smelting; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSecondSmelt.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSecondSmelt.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSecondSmelt.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSecondSmelt.java index ade22f3ae..a673fbb44 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSecondSmelt.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSecondSmelt.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.smelting; +package com.gmail.nossr50.config.skills.smelting; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSubSkills.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSubSkills.java index 46f017cb0..26e25a850 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/smelting/ConfigSmeltingSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/smelting/ConfigSmeltingSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.smelting; +package com.gmail.nossr50.config.skills.smelting; import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwords.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwords.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwords.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwords.java index 83ce4cc43..498097fb5 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwords.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwords.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsCounterAttack.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsCounterAttack.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsCounterAttack.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsCounterAttack.java index b24dfa37e..c67c873bb 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsCounterAttack.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsCounterAttack.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsLimitBreak.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsLimitBreak.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsLimitBreak.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsLimitBreak.java index 4fce2c9fa..b675b0d4d 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsLimitBreak.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsLimitBreak.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsRupture.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsRupture.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsRupture.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsRupture.java index 1892d30f2..027470292 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsRupture.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsRupture.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSerratedStrikes.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSerratedStrikes.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSerratedStrikes.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSerratedStrikes.java index 740c86233..6af543351 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSerratedStrikes.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSerratedStrikes.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSubSkills.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSubSkills.java index 046e43579..97290467e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/swords/ConfigSwordsSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/swords/ConfigSwordsSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.swords; +package com.gmail.nossr50.config.skills.swords; import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTaming.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTaming.java index 62741e615..4ddc6a24f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTaming.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingCallOfTheWild.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingCallOfTheWild.java index c8adc1d0e..d428996b7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingCallOfTheWild.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType; import com.gmail.nossr50.datatypes.skills.subskills.taming.TamingSummon; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentallyAware.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingEnvironmentallyAware.java similarity index 73% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentallyAware.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingEnvironmentallyAware.java index 39d91915a..b400eb9b7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentallyAware.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingEnvironmentallyAware.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingFastFoodService.java similarity index 72% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingFastFoodService.java index b36c5d43a..746aaba3e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingFastFoodService.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingGore.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingGore.java index 3e7b4eee3..e261e1d4e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingGore.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingPummel.java similarity index 71% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingPummel.java index 24fccd0cb..f21049b17 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingPummel.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSharpenedClaws.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSharpenedClaws.java index 973160903..8513e64b3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSharpenedClaws.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import com.gmail.nossr50.datatypes.skills.properties.AbstractDamageProperty; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingShockProof.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingShockProof.java index 97a844542..5d625363e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingShockProof.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSubSkills.java similarity index 97% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSubSkills.java index 3bbba81e6..3b31fca72 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingThickFur.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingThickFur.java index fe0dcd7c0..b2476e05e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/taming/ConfigTamingThickFur.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.taming; +package com.gmail.nossr50.config.skills.taming; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmed.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmed.java index 0525635ce..a4627bfc8 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmed.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.unarmed; +package com.gmail.nossr50.config.skills.unarmed; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedDisarm.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedDisarm.java index 8f56b334d..b07bb91b3 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedDisarm.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.unarmed; +package com.gmail.nossr50.config.skills.unarmed; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedLimitBreak.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedLimitBreak.java similarity index 90% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedLimitBreak.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedLimitBreak.java index 3feff5c35..faec06fb0 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedLimitBreak.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedLimitBreak.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.unarmed; +package com.gmail.nossr50.config.skills.unarmed; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubSkills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedSubSkills.java similarity index 92% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubSkills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedSubSkills.java index 51fa31c49..13cf35f96 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubSkills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/unarmed/ConfigUnarmedSubSkills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.unarmed; +package com.gmail.nossr50.config.skills.unarmed; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcutting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcutting.java similarity index 89% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcutting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcutting.java index 7c2dea742..cea92501a 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcutting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcutting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.woodcutting; +package com.gmail.nossr50.config.skills.woodcutting; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingHarvest.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingHarvest.java similarity index 93% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingHarvest.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingHarvest.java index 78bbe3807..57e1796d7 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingHarvest.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingHarvest.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.woodcutting; +package com.gmail.nossr50.config.skills.woodcutting; import com.gmail.nossr50.config.ConfigConstants; import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingSubskills.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingSubskills.java similarity index 87% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingSubskills.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingSubskills.java index af544e2fb..bdc3a0182 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/skills/woodcutting/ConfigWoodcuttingSubskills.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/skills/woodcutting/ConfigWoodcuttingSubskills.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.skills.woodcutting; +package com.gmail.nossr50.config.skills.woodcutting; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/ConfigSound.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/ConfigSound.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/ConfigSound.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/ConfigSound.java index 51031ec7d..dee1e4932 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/ConfigSound.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/ConfigSound.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.sound; +package com.gmail.nossr50.config.sound; import com.gmail.nossr50.util.sounds.SoundType; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/SoundSetting.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/SoundSetting.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/SoundSetting.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/SoundSetting.java index ffa5054a1..8eef0a1ec 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/sound/SoundSetting.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/sound/SoundSetting.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.sound; +package com.gmail.nossr50.config.sound; public class SoundSetting { private boolean enabled; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityCooldowns.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityCooldowns.java similarity index 96% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityCooldowns.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityCooldowns.java index 9af509169..d8bfa3b3c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityCooldowns.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityCooldowns.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.superabilities; +package com.gmail.nossr50.config.superabilities; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityLimits.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityLimits.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityLimits.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityLimits.java index 39625b21c..1a420dd4c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityLimits.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityLimits.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.superabilities; +package com.gmail.nossr50.config.superabilities; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityMaxLength.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityMaxLength.java similarity index 95% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityMaxLength.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityMaxLength.java index 38e431680..0982bc397 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionSuperAbilityMaxLength.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionSuperAbilityMaxLength.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.superabilities; +package com.gmail.nossr50.config.superabilities; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionTreeFeller.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionTreeFeller.java similarity index 91% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionTreeFeller.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionTreeFeller.java index 3bb03d9b7..8dff01e1c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSectionTreeFeller.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSectionTreeFeller.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.superabilities; +package com.gmail.nossr50.config.superabilities; import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSuperAbilities.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSuperAbilities.java similarity index 98% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSuperAbilities.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSuperAbilities.java index 2c6ff02c6..722aa7bd9 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/superabilities/ConfigSuperAbilities.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/superabilities/ConfigSuperAbilities.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.superabilities; +package com.gmail.nossr50.config.superabilities; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/worldblacklist/ConfigWorldBlacklist.java b/mcmmo-core/src/main/java/com/gmail/nossr50/config/worldblacklist/ConfigWorldBlacklist.java similarity index 94% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/worldblacklist/ConfigWorldBlacklist.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/config/worldblacklist/ConfigWorldBlacklist.java index 5f860c927..3d0bb47bf 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/config/hocon/worldblacklist/ConfigWorldBlacklist.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/config/worldblacklist/ConfigWorldBlacklist.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon.worldblacklist; +package com.gmail.nossr50.config.worldblacklist; import com.gmail.nossr50.config.ConfigConstants; import ninja.leaping.configurate.objectmapping.Setting; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java index 498e88b00..85497e25c 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.datatypes.skills; -import com.gmail.nossr50.config.hocon.HOCONUtil; +import com.gmail.nossr50.config.HOCONUtil; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.StringUtils; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/mcmmo-core/src/main/java/com/gmail/nossr50/dumpster/ExperienceConfig.java similarity index 100% rename from mcmmo-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java rename to mcmmo-core/src/main/java/com/gmail/nossr50/dumpster/ExperienceConfig.java diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java b/mcmmo-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java index 1641d2f50..55ce25ba6 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.events.skills; -import com.gmail.nossr50.config.hocon.notifications.PlayerNotificationSettings; +import com.gmail.nossr50.config.notifications.PlayerNotificationSettings; import com.gmail.nossr50.datatypes.interactions.NotificationType; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java b/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java index d14c103cc..cf512f20e 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java @@ -2,12 +2,12 @@ package com.gmail.nossr50; import com.gmail.nossr50.chat.ChatManager; import com.gmail.nossr50.config.ConfigManager; -import com.gmail.nossr50.config.hocon.database.ConfigSectionCleaning; -import com.gmail.nossr50.config.hocon.database.ConfigSectionMySQL; -import com.gmail.nossr50.config.hocon.party.ConfigSectionPartyExperienceSharing; -import com.gmail.nossr50.config.hocon.party.ConfigSectionPartyLevel; -import com.gmail.nossr50.config.hocon.playerleveling.ConfigLeveling; -import com.gmail.nossr50.config.hocon.scoreboard.ConfigScoreboard; +import com.gmail.nossr50.config.database.ConfigSectionCleaning; +import com.gmail.nossr50.config.database.ConfigSectionMySQL; +import com.gmail.nossr50.config.party.ConfigSectionPartyExperienceSharing; +import com.gmail.nossr50.config.party.ConfigSectionPartyLevel; +import com.gmail.nossr50.config.playerleveling.ConfigLeveling; +import com.gmail.nossr50.config.scoreboard.ConfigScoreboard; import com.gmail.nossr50.core.DynamicSettingsManager; import com.gmail.nossr50.core.MaterialMapStore; import com.gmail.nossr50.core.MetadataConstants; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java b/mcmmo-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java index 8f8d2d255..28ab65343 100755 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java @@ -27,7 +27,7 @@ public class PrimitiveExChunkletStore implements ChunkletStore, Externalizable { * - z = 0001 = 1 * => Chunklet coordinates (0, 1) * - * 01011111 + * 01011111: * - x = 0101 = 5 * - z = 1111 = 15 * => Chunklet coordinates (5, 15) diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/mcmmo-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java index 84b461f00..5978049d9 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util.player; -import com.gmail.nossr50.config.hocon.notifications.PlayerNotificationSettings; +import com.gmail.nossr50.config.notifications.PlayerNotificationSettings; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.notifications.SensitiveCommandType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/util/skills/RankTools.java b/mcmmo-core/src/main/java/com/gmail/nossr50/util/skills/RankTools.java index fd21df7e7..0f0a6135f 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/util/skills/RankTools.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/util/skills/RankTools.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.util.skills; import com.gmail.nossr50.api.exceptions.MissingSkillPropertyDefinition; -import com.gmail.nossr50.config.hocon.skills.ranks.SkillRankProperty; +import com.gmail.nossr50.config.skills.ranks.SkillRankProperty; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/mcmmo-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java index 005176f4f..3de1da72b 100644 --- a/mcmmo-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java +++ b/mcmmo-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.util.sounds; -import com.gmail.nossr50.config.hocon.sound.SoundSetting; +import com.gmail.nossr50.config.sound.SoundSetting; import com.gmail.nossr50.mcMMO; import org.bukkit.Location; import org.bukkit.Sound;