From 30457c29a14796ef7ebf352fab0f251c935d7629 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 2 Feb 2022 15:57:37 +0000 Subject: [PATCH] Gave up trying to have separate java and kotlin modules --- eco-api/api-java/build.gradle | 2 - eco-api/api-kotlin/build.gradle | 31 ----------- eco-api/build.gradle | 51 ++++++++++++------- .../eco/core/AbstractPacketAdapter.java | 0 .../main/java/com/willfp/eco/core/Eco.java | 0 .../java/com/willfp/eco/core/EcoPlugin.java | 0 .../java/com/willfp/eco/core/Handler.java | 0 .../com/willfp/eco/core/PluginDependent.java | 0 .../java/com/willfp/eco/core/PluginLike.java | 0 .../com/willfp/eco/core/Prerequisite.java | 0 .../willfp/eco/core/command/CommandBase.java | 0 .../eco/core/command/CommandHandler.java | 0 .../eco/core/command/TabCompleteHandler.java | 0 .../eco/core/command/impl/HandledCommand.java | 0 .../eco/core/command/impl/PluginCommand.java | 0 .../eco/core/command/impl/Subcommand.java | 0 .../willfp/eco/core/config/BaseConfig.java | 0 .../willfp/eco/core/config/ConfigType.java | 0 .../eco/core/config/ExtendableConfig.java | 0 .../eco/core/config/StaticBaseConfig.java | 0 .../eco/core/config/TransientConfig.java | 0 .../eco/core/config/base/ConfigYml.java | 0 .../willfp/eco/core/config/base/LangYml.java | 0 .../eco/core/config/interfaces/Config.java | 0 .../core/config/interfaces/JSONConfig.java | 0 .../config/interfaces/LoadableConfig.java | 0 .../interfaces/WrappedYamlConfiguration.java | 0 .../eco/core/config/json/JSONBaseConfig.java | 0 .../config/json/JSONExtendableConfig.java | 0 .../config/json/JSONStaticBaseConfig.java | 0 .../core/config/json/JSONTransientConfig.java | 0 .../json/wrapper/JSONConfigWrapper.java | 0 .../wrapper/LoadableJSONConfigWrapper.java | 0 .../core/config/updating/ConfigHandler.java | 0 .../core/config/updating/ConfigUpdater.java | 0 .../core/config/wrapper/ConfigFactory.java | 0 .../core/config/wrapper/ConfigWrapper.java | 0 .../config/wrapper/LoadableConfigWrapper.java | 0 .../eco/core/config/yaml/YamlBaseConfig.java | 0 .../config/yaml/YamlExtendableConfig.java | 0 .../config/yaml/YamlStaticBaseConfig.java | 0 .../core/config/yaml/YamlTransientConfig.java | 0 .../wrapper/LoadableYamlConfigWrapper.java | 0 .../yaml/wrapper/YamlConfigWrapper.java | 0 .../willfp/eco/core/data/PlayerProfile.java | 0 .../com/willfp/eco/core/data/Profile.java | 0 .../willfp/eco/core/data/ProfileHandler.java | 0 .../willfp/eco/core/data/ServerProfile.java | 0 .../eco/core/data/keys/KeyRegistry.java | 0 .../eco/core/data/keys/PersistentDataKey.java | 0 .../core/data/keys/PersistentDataKeyType.java | 0 .../com/willfp/eco/core/display/Display.java | 0 .../eco/core/display/DisplayHandler.java | 0 .../eco/core/display/DisplayModule.java | 0 .../eco/core/display/DisplayPriority.java | 0 .../com/willfp/eco/core/drops/DropQueue.java | 0 .../eco/core/drops/DropQueueFactory.java | 0 .../eco/core/drops/InternalDropQueue.java | 0 .../eco/core/entities/CustomEntity.java | 0 .../willfp/eco/core/entities/Entities.java | 0 .../eco/core/entities/TestableEntity.java | 0 .../entities/args/EntityArgParseResult.java | 0 .../core/entities/args/EntityArgParser.java | 0 .../entities/impl/EmptyTestableEntity.java | 0 .../entities/impl/ModifiedTestableEntity.java | 0 .../entities/impl/SimpleTestableEntity.java | 0 .../eco/core/events/ArmorChangeEvent.java | 0 .../eco/core/events/ArmorEquipEvent.java | 0 .../eco/core/events/DropQueuePushEvent.java | 0 .../core/events/EntityDeathByEntityEvent.java | 0 .../willfp/eco/core/events/EventManager.java | 0 .../eco/core/events/NaturalExpGainEvent.java | 0 .../eco/core/events/PlayerJumpEvent.java | 0 .../willfp/eco/core/extensions/Extension.java | 0 .../eco/core/extensions/ExtensionLoader.java | 0 .../core/extensions/ExtensionMetadata.java | 0 .../MalformedExtensionException.java | 0 .../core/factory/MetadataValueFactory.java | 0 .../core/factory/NamespacedKeyFactory.java | 0 .../eco/core/factory/RunnableFactory.java | 0 .../willfp/eco/core/fast/FastItemStack.java | 0 .../com/willfp/eco/core/gui/GUIFactory.java | 0 .../eco/core/gui/menu/CloseHandler.java | 0 .../com/willfp/eco/core/gui/menu/Menu.java | 0 .../willfp/eco/core/gui/menu/MenuBuilder.java | 0 .../willfp/eco/core/gui/slot/FillerMask.java | 0 .../willfp/eco/core/gui/slot/FillerSlot.java | 0 .../eco/core/gui/slot/MaskMaterials.java | 0 .../com/willfp/eco/core/gui/slot/Slot.java | 0 .../willfp/eco/core/gui/slot/SlotBuilder.java | 0 .../core/gui/slot/functional/SlotHandler.java | 0 .../gui/slot/functional/SlotModifier.java | 0 .../gui/slot/functional/SlotProvider.java | 0 .../eco/core/integrations/Integration.java | 0 .../core/integrations/IntegrationLoader.java | 0 .../eco/core/integrations/afk/AFKManager.java | 0 .../eco/core/integrations/afk/AFKWrapper.java | 0 .../anticheat/AnticheatManager.java | 0 .../anticheat/AnticheatWrapper.java | 0 .../antigrief/AntigriefManager.java | 0 .../antigrief/AntigriefWrapper.java | 0 .../customentities/CustomEntitiesManager.java | 0 .../customentities/CustomEntitiesWrapper.java | 0 .../customitems/CustomItemsManager.java | 0 .../customitems/CustomItemsWrapper.java | 0 .../integrations/economy/EconomyManager.java | 0 .../integrations/economy/EconomyWrapper.java | 0 .../integrations/hologram/DummyHologram.java | 0 .../core/integrations/hologram/Hologram.java | 0 .../hologram/HologramManager.java | 0 .../hologram/HologramWrapper.java | 0 .../core/integrations/mcmmo/McmmoManager.java | 0 .../core/integrations/mcmmo/McmmoWrapper.java | 0 .../placeholder/PlaceholderEntry.java | 0 .../placeholder/PlaceholderIntegration.java | 0 .../placeholder/PlaceholderManager.java | 0 .../core/integrations/shop/ShopManager.java | 0 .../core/integrations/shop/ShopWrapper.java | 0 .../com/willfp/eco/core/items/CustomItem.java | 0 .../com/willfp/eco/core/items/HashedItem.java | 0 .../java/com/willfp/eco/core/items/Items.java | 0 .../willfp/eco/core/items/TestableItem.java | 0 .../eco/core/items/args/LookupArgParser.java | 0 .../builder/AbstractItemStackBuilder.java | 0 .../items/builder/EnchantedBookBuilder.java | 0 .../eco/core/items/builder/ItemBuilder.java | 0 .../core/items/builder/ItemStackBuilder.java | 0 .../items/builder/LeatherArmorBuilder.java | 0 .../eco/core/items/builder/SkullBuilder.java | 0 .../eco/core/items/provider/ItemProvider.java | 0 .../willfp/eco/core/proxy/AbstractProxy.java | 0 .../com/willfp/eco/core/proxy/Cleaner.java | 0 .../willfp/eco/core/proxy/ProxyConstants.java | 0 .../willfp/eco/core/proxy/ProxyFactory.java | 0 .../eco/core/proxy/exceptions/ProxyError.java | 0 .../UnsupportedVersionException.java | 0 .../com/willfp/eco/core/recipe/Recipes.java | 0 .../core/recipe/parts/EmptyTestableItem.java | 0 .../recipe/parts/MaterialTestableItem.java | 0 .../recipe/parts/ModifiedTestableItem.java | 0 .../eco/core/recipe/parts/TestableStack.java | 0 .../core/recipe/recipes/CraftingRecipe.java | 0 .../core/recipe/recipes/RecipePosition.java | 0 .../recipe/recipes/ShapedCraftingRecipe.java | 0 .../eco/core/requirement/Requirement.java | 0 .../core/requirement/RequirementFactory.java | 0 .../eco/core/requirement/Requirements.java | 0 .../eco/core/scheduling/RunnableTask.java | 0 .../willfp/eco/core/scheduling/Scheduler.java | 0 .../java/com/willfp/eco/core/tuples/Pair.java | 0 .../com/willfp/eco/core/tuples/Triplet.java | 0 .../java/com/willfp/eco/core/web/Paste.java | 0 .../willfp/eco/core/web/UpdateChecker.java | 0 .../java/com/willfp/eco/util/ArrowUtils.java | 0 .../java/com/willfp/eco/util/BlockUtils.java | 0 .../java/com/willfp/eco/util/ClassUtils.java | 0 .../com/willfp/eco/util/DurabilityUtils.java | 0 .../com/willfp/eco/util/LightningUtils.java | 0 .../java/com/willfp/eco/util/ListUtils.java | 0 .../java/com/willfp/eco/util/MenuUtils.java | 0 .../willfp/eco/util/NamespacedKeyUtils.java | 0 .../java/com/willfp/eco/util/NumberUtils.java | 0 .../java/com/willfp/eco/util/PlayerUtils.java | 0 .../java/com/willfp/eco/util/PotionUtils.java | 0 .../java/com/willfp/eco/util/ServerUtils.java | 0 .../java/com/willfp/eco/util/SkullUtils.java | 0 .../java/com/willfp/eco/util/StringUtils.java | 0 .../java/com/willfp/eco/util/TeamUtils.java | 0 .../com/willfp/eco/util/TelekinesisUtils.java | 0 .../java/com/willfp/eco/util/VectorUtils.java | 0 .../com/willfp/eco/core/data/Profiles.kt | 0 .../com/willfp/eco/core/fast/FastItemStack.kt | 0 .../com/willfp/eco/core/gui/GUIHelpers.kt | 0 .../kotlin/com/willfp/eco/util/ArrowUtils.kt | 0 .../kotlin/com/willfp/eco/util/BlockUtils.kt | 0 .../kotlin/com/willfp/eco/util/ListUtils.kt | 0 .../kotlin/com/willfp/eco/util/PlayerUtils.kt | 0 .../kotlin/com/willfp/eco/util/PotionUtils.kt | 0 .../kotlin/com/willfp/eco/util/ServerUtils.kt | 0 .../kotlin/com/willfp/eco/util/SkullUtils.kt | 0 .../kotlin/com/willfp/eco/util/StringUtils.kt | 0 .../kotlin/com/willfp/eco/util/VectorUtils.kt | 0 .../src/test/java/NumberUtilsTest.java | 0 settings.gradle.kts | 4 +- 184 files changed, 33 insertions(+), 55 deletions(-) delete mode 100644 eco-api/api-java/build.gradle delete mode 100644 eco-api/api-kotlin/build.gradle rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/Eco.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/EcoPlugin.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/Handler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/PluginDependent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/PluginLike.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/Prerequisite.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/CommandBase.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/CommandHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/TabCompleteHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/BaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/ConfigType.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/TransientConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/base/LangYml.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/interfaces/Config.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/interfaces/WrappedYamlConfiguration.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/JSONBaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/JSONExtendableConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/JSONStaticBaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/JSONTransientConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/wrapper/LoadableConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/YamlTransientConfig.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/PlayerProfile.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/Profile.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/ProfileHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/ServerProfile.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/display/Display.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/display/DisplayHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/display/DisplayModule.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/display/DisplayPriority.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/drops/DropQueue.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/CustomEntity.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/Entities.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/TestableEntity.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/args/EntityArgParseResult.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/args/EntityArgParser.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/EventManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/events/PlayerJumpEvent.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/extensions/Extension.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/fast/FastItemStack.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/GUIFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/menu/CloseHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/menu/Menu.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/FillerSlot.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/Slot.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotHandler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotProvider.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/Integration.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/hologram/DummyHologram.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/hologram/Hologram.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/CustomItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/HashedItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/Items.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/TestableItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/args/LookupArgParser.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/items/provider/ItemProvider.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/Cleaner.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/exceptions/ProxyError.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/proxy/exceptions/UnsupportedVersionException.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/Recipes.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/parts/EmptyTestableItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/requirement/Requirement.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/requirement/Requirements.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/tuples/Pair.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/tuples/Triplet.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/web/Paste.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/core/web/UpdateChecker.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/ArrowUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/BlockUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/ClassUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/DurabilityUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/LightningUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/ListUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/MenuUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/NumberUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/PlayerUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/PotionUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/ServerUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/SkullUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/StringUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/TeamUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/TelekinesisUtils.java (100%) rename eco-api/{api-java => }/src/main/java/com/willfp/eco/util/VectorUtils.java (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/ListUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/StringUtils.kt (100%) rename eco-api/{api-kotlin => }/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt (100%) rename eco-api/{api-java => }/src/test/java/NumberUtilsTest.java (100%) diff --git a/eco-api/api-java/build.gradle b/eco-api/api-java/build.gradle deleted file mode 100644 index 50f9ee41..00000000 --- a/eco-api/api-java/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -group 'com.willfp' -version rootProject.version \ No newline at end of file diff --git a/eco-api/api-kotlin/build.gradle b/eco-api/api-kotlin/build.gradle deleted file mode 100644 index 896b8a7f..00000000 --- a/eco-api/api-kotlin/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0" - } -} - -apply plugin: "kotlin" - -group 'com.willfp' -version rootProject.version - -dependencies { - compileOnly project(":eco-api:api-java") - compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0' -} - -compileKotlin { - kotlinOptions { - jvmTarget = "17" - } - targetCompatibility = JavaVersion.VERSION_17 - sourceCompatibility = JavaVersion.VERSION_17 -} - -java { - withJavadocJar() -} diff --git a/eco-api/build.gradle b/eco-api/build.gradle index cc3b9fca..3888134b 100644 --- a/eco-api/build.gradle +++ b/eco-api/build.gradle @@ -1,32 +1,45 @@ -subprojects { - group 'com.willfp' - version rootProject.version +buildscript { + repositories { + mavenCentral() + } dependencies { - // Adventure - compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0' - compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT' - - // Other - compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' - compileOnly 'org.apache.maven:maven-artifact:3.8.1' - compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT' - compileOnly 'com.google.code.gson:gson:2.8.8' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0" } +} - java { - withJavadocJar() +apply plugin: 'kotlin' + +dependencies { + // Kotlin + compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0' + + // Adventure + compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0' + compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT' + + // Other + compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' + compileOnly 'org.apache.maven:maven-artifact:3.8.1' + compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT' + compileOnly 'com.google.code.gson:gson:2.8.8' +} + +compileKotlin { + kotlinOptions { + jvmTarget = "17" } + targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 +} + +java { + withJavadocJar() } group 'com.willfp' version rootProject.version -dependencies { - api project(":eco-api:api-java") - api project(":eco-api:api-kotlin") -} - build.dependsOn publishToMavenLocal publishing { diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java b/eco-api/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java rename to eco-api/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/Eco.java b/eco-api/src/main/java/com/willfp/eco/core/Eco.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/Eco.java rename to eco-api/src/main/java/com/willfp/eco/core/Eco.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/EcoPlugin.java b/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/EcoPlugin.java rename to eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/Handler.java b/eco-api/src/main/java/com/willfp/eco/core/Handler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/Handler.java rename to eco-api/src/main/java/com/willfp/eco/core/Handler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/PluginDependent.java b/eco-api/src/main/java/com/willfp/eco/core/PluginDependent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/PluginDependent.java rename to eco-api/src/main/java/com/willfp/eco/core/PluginDependent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/PluginLike.java b/eco-api/src/main/java/com/willfp/eco/core/PluginLike.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/PluginLike.java rename to eco-api/src/main/java/com/willfp/eco/core/PluginLike.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/Prerequisite.java b/eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/Prerequisite.java rename to eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/CommandBase.java b/eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/CommandBase.java rename to eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/CommandHandler.java b/eco-api/src/main/java/com/willfp/eco/core/command/CommandHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/CommandHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/command/CommandHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/TabCompleteHandler.java b/eco-api/src/main/java/com/willfp/eco/core/command/TabCompleteHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/TabCompleteHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/command/TabCompleteHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java b/eco-api/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java rename to eco-api/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java b/eco-api/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java rename to eco-api/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java b/eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java rename to eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/BaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/BaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/ConfigType.java b/eco-api/src/main/java/com/willfp/eco/core/config/ConfigType.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/ConfigType.java rename to eco-api/src/main/java/com/willfp/eco/core/config/ConfigType.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/TransientConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/TransientConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/TransientConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/TransientConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java b/eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java rename to eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/base/LangYml.java b/eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/base/LangYml.java rename to eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/Config.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/Config.java rename to eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/WrappedYamlConfiguration.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/WrappedYamlConfiguration.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/interfaces/WrappedYamlConfiguration.java rename to eco-api/src/main/java/com/willfp/eco/core/config/interfaces/WrappedYamlConfiguration.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONBaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JSONBaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONExtendableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONExtendableConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONExtendableConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JSONExtendableConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONStaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONStaticBaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONStaticBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JSONStaticBaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONTransientConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONTransientConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/JSONTransientConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JSONTransientConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java b/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java b/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java rename to eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/LoadableConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/wrapper/LoadableConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlTransientConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlTransientConfig.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/YamlTransientConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlTransientConfig.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/PlayerProfile.java b/eco-api/src/main/java/com/willfp/eco/core/data/PlayerProfile.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/PlayerProfile.java rename to eco-api/src/main/java/com/willfp/eco/core/data/PlayerProfile.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/Profile.java b/eco-api/src/main/java/com/willfp/eco/core/data/Profile.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/Profile.java rename to eco-api/src/main/java/com/willfp/eco/core/data/Profile.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/ProfileHandler.java b/eco-api/src/main/java/com/willfp/eco/core/data/ProfileHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/ProfileHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/data/ProfileHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/ServerProfile.java b/eco-api/src/main/java/com/willfp/eco/core/data/ServerProfile.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/ServerProfile.java rename to eco-api/src/main/java/com/willfp/eco/core/data/ServerProfile.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java rename to eco-api/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java rename to eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java rename to eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/display/Display.java b/eco-api/src/main/java/com/willfp/eco/core/display/Display.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/display/Display.java rename to eco-api/src/main/java/com/willfp/eco/core/display/Display.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayHandler.java b/eco-api/src/main/java/com/willfp/eco/core/display/DisplayHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/display/DisplayHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayModule.java b/eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayModule.java rename to eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayPriority.java b/eco-api/src/main/java/com/willfp/eco/core/display/DisplayPriority.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/display/DisplayPriority.java rename to eco-api/src/main/java/com/willfp/eco/core/display/DisplayPriority.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/drops/DropQueue.java b/eco-api/src/main/java/com/willfp/eco/core/drops/DropQueue.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/drops/DropQueue.java rename to eco-api/src/main/java/com/willfp/eco/core/drops/DropQueue.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java b/eco-api/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java b/eco-api/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java rename to eco-api/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/CustomEntity.java b/eco-api/src/main/java/com/willfp/eco/core/entities/CustomEntity.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/CustomEntity.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/CustomEntity.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/Entities.java b/eco-api/src/main/java/com/willfp/eco/core/entities/Entities.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/Entities.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/Entities.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/TestableEntity.java b/eco-api/src/main/java/com/willfp/eco/core/entities/TestableEntity.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/TestableEntity.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/TestableEntity.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/args/EntityArgParseResult.java b/eco-api/src/main/java/com/willfp/eco/core/entities/args/EntityArgParseResult.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/args/EntityArgParseResult.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/args/EntityArgParseResult.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/args/EntityArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/entities/args/EntityArgParser.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/args/EntityArgParser.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/args/EntityArgParser.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java b/eco-api/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/impl/EmptyTestableEntity.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java b/eco-api/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/impl/ModifiedTestableEntity.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java b/eco-api/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java rename to eco-api/src/main/java/com/willfp/eco/core/entities/impl/SimpleTestableEntity.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/EventManager.java b/eco-api/src/main/java/com/willfp/eco/core/events/EventManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/EventManager.java rename to eco-api/src/main/java/com/willfp/eco/core/events/EventManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/events/PlayerJumpEvent.java b/eco-api/src/main/java/com/willfp/eco/core/events/PlayerJumpEvent.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/events/PlayerJumpEvent.java rename to eco-api/src/main/java/com/willfp/eco/core/events/PlayerJumpEvent.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/Extension.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/Extension.java rename to eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java rename to eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java rename to eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java rename to eco-api/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java b/eco-api/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java b/eco-api/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java b/eco-api/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/fast/FastItemStack.java b/eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/fast/FastItemStack.java rename to eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/GUIFactory.java b/eco-api/src/main/java/com/willfp/eco/core/gui/GUIFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/GUIFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/GUIFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/CloseHandler.java b/eco-api/src/main/java/com/willfp/eco/core/gui/menu/CloseHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/CloseHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/menu/CloseHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/Menu.java b/eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/Menu.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/FillerSlot.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/FillerSlot.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/FillerSlot.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/FillerSlot.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/Slot.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/Slot.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/Slot.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/Slot.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotHandler.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotHandler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotHandler.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotHandler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotProvider.java b/eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotProvider.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotProvider.java rename to eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotProvider.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/Integration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/Integration.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/Integration.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/Integration.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/DummyHologram.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/DummyHologram.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/DummyHologram.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/DummyHologram.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/Hologram.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/Hologram.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/Hologram.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/Hologram.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/CustomItem.java b/eco-api/src/main/java/com/willfp/eco/core/items/CustomItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/CustomItem.java rename to eco-api/src/main/java/com/willfp/eco/core/items/CustomItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/HashedItem.java b/eco-api/src/main/java/com/willfp/eco/core/items/HashedItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/HashedItem.java rename to eco-api/src/main/java/com/willfp/eco/core/items/HashedItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/Items.java b/eco-api/src/main/java/com/willfp/eco/core/items/Items.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/Items.java rename to eco-api/src/main/java/com/willfp/eco/core/items/Items.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/TestableItem.java b/eco-api/src/main/java/com/willfp/eco/core/items/TestableItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/TestableItem.java rename to eco-api/src/main/java/com/willfp/eco/core/items/TestableItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/args/LookupArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/items/args/LookupArgParser.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/args/LookupArgParser.java rename to eco-api/src/main/java/com/willfp/eco/core/items/args/LookupArgParser.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java rename to eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/items/provider/ItemProvider.java b/eco-api/src/main/java/com/willfp/eco/core/items/provider/ItemProvider.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/items/provider/ItemProvider.java rename to eco-api/src/main/java/com/willfp/eco/core/items/provider/ItemProvider.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/Cleaner.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/Cleaner.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/Cleaner.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/Cleaner.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/exceptions/ProxyError.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/exceptions/ProxyError.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/exceptions/ProxyError.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/exceptions/ProxyError.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/exceptions/UnsupportedVersionException.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/exceptions/UnsupportedVersionException.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/proxy/exceptions/UnsupportedVersionException.java rename to eco-api/src/main/java/com/willfp/eco/core/proxy/exceptions/UnsupportedVersionException.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/Recipes.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/Recipes.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/Recipes.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/Recipes.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/EmptyTestableItem.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/EmptyTestableItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/EmptyTestableItem.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/parts/EmptyTestableItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/parts/ModifiedTestableItem.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java rename to eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/Requirement.java b/eco-api/src/main/java/com/willfp/eco/core/requirement/Requirement.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/Requirement.java rename to eco-api/src/main/java/com/willfp/eco/core/requirement/Requirement.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java b/eco-api/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java rename to eco-api/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/Requirements.java b/eco-api/src/main/java/com/willfp/eco/core/requirement/Requirements.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/requirement/Requirements.java rename to eco-api/src/main/java/com/willfp/eco/core/requirement/Requirements.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java b/eco-api/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java rename to eco-api/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java b/eco-api/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java rename to eco-api/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/tuples/Pair.java b/eco-api/src/main/java/com/willfp/eco/core/tuples/Pair.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/tuples/Pair.java rename to eco-api/src/main/java/com/willfp/eco/core/tuples/Pair.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/tuples/Triplet.java b/eco-api/src/main/java/com/willfp/eco/core/tuples/Triplet.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/tuples/Triplet.java rename to eco-api/src/main/java/com/willfp/eco/core/tuples/Triplet.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/web/Paste.java b/eco-api/src/main/java/com/willfp/eco/core/web/Paste.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/web/Paste.java rename to eco-api/src/main/java/com/willfp/eco/core/web/Paste.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/core/web/UpdateChecker.java b/eco-api/src/main/java/com/willfp/eco/core/web/UpdateChecker.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/core/web/UpdateChecker.java rename to eco-api/src/main/java/com/willfp/eco/core/web/UpdateChecker.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/ArrowUtils.java b/eco-api/src/main/java/com/willfp/eco/util/ArrowUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/ArrowUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/ArrowUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/BlockUtils.java b/eco-api/src/main/java/com/willfp/eco/util/BlockUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/BlockUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/BlockUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/ClassUtils.java b/eco-api/src/main/java/com/willfp/eco/util/ClassUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/ClassUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/ClassUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/DurabilityUtils.java b/eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/DurabilityUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/LightningUtils.java b/eco-api/src/main/java/com/willfp/eco/util/LightningUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/LightningUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/LightningUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/ListUtils.java b/eco-api/src/main/java/com/willfp/eco/util/ListUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/ListUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/ListUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/MenuUtils.java b/eco-api/src/main/java/com/willfp/eco/util/MenuUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/MenuUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/MenuUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java b/eco-api/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/NumberUtils.java b/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/NumberUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/PlayerUtils.java b/eco-api/src/main/java/com/willfp/eco/util/PlayerUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/PlayerUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/PlayerUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/PotionUtils.java b/eco-api/src/main/java/com/willfp/eco/util/PotionUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/PotionUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/PotionUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/ServerUtils.java b/eco-api/src/main/java/com/willfp/eco/util/ServerUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/ServerUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/ServerUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/SkullUtils.java b/eco-api/src/main/java/com/willfp/eco/util/SkullUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/SkullUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/SkullUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/StringUtils.java b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/StringUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/StringUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/TeamUtils.java b/eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/TeamUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/TelekinesisUtils.java b/eco-api/src/main/java/com/willfp/eco/util/TelekinesisUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/TelekinesisUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/TelekinesisUtils.java diff --git a/eco-api/api-java/src/main/java/com/willfp/eco/util/VectorUtils.java b/eco-api/src/main/java/com/willfp/eco/util/VectorUtils.java similarity index 100% rename from eco-api/api-java/src/main/java/com/willfp/eco/util/VectorUtils.java rename to eco-api/src/main/java/com/willfp/eco/util/VectorUtils.java diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt rename to eco-api/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt rename to eco-api/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt rename to eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ListUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/ListUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ListUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/ListUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/StringUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/StringUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt diff --git a/eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt similarity index 100% rename from eco-api/api-kotlin/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt rename to eco-api/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt diff --git a/eco-api/api-java/src/test/java/NumberUtilsTest.java b/eco-api/src/test/java/NumberUtilsTest.java similarity index 100% rename from eco-api/api-java/src/test/java/NumberUtilsTest.java rename to eco-api/src/test/java/NumberUtilsTest.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 77a54ca1..5ece98ae 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,9 +8,7 @@ pluginManagement { rootProject.name = "eco" // Core -include(":eco-api") -include(":eco-api:api-java") -include(":eco-api:api-kotlin") +include(":eco-api")G include(":eco-core") include(":eco-core:core-nms") include(":eco-core:core-nms:v1_16_R3")