diff --git a/bukkit-loader/build.gradle.kts b/bukkit/loader/build.gradle.kts similarity index 100% rename from bukkit-loader/build.gradle.kts rename to bukkit/loader/build.gradle.kts diff --git a/bukkit-loader/src/main/java/net/momirealms/craftengine/bukkit/BukkitBootstrap.java b/bukkit/loader/src/main/java/net/momirealms/craftengine/bukkit/BukkitBootstrap.java similarity index 100% rename from bukkit-loader/src/main/java/net/momirealms/craftengine/bukkit/BukkitBootstrap.java rename to bukkit/loader/src/main/java/net/momirealms/craftengine/bukkit/BukkitBootstrap.java diff --git a/bukkit-loader/src/main/resources/additional-real-blocks.yml b/bukkit/loader/src/main/resources/additional-real-blocks.yml similarity index 100% rename from bukkit-loader/src/main/resources/additional-real-blocks.yml rename to bukkit/loader/src/main/resources/additional-real-blocks.yml diff --git a/bukkit-loader/src/main/resources/blockstates.yml b/bukkit/loader/src/main/resources/blockstates.yml similarity index 100% rename from bukkit-loader/src/main/resources/blockstates.yml rename to bukkit/loader/src/main/resources/blockstates.yml diff --git a/bukkit-loader/src/main/resources/commands.yml b/bukkit/loader/src/main/resources/commands.yml similarity index 100% rename from bukkit-loader/src/main/resources/commands.yml rename to bukkit/loader/src/main/resources/commands.yml diff --git a/bukkit-loader/src/main/resources/config.yml b/bukkit/loader/src/main/resources/config.yml similarity index 100% rename from bukkit-loader/src/main/resources/config.yml rename to bukkit/loader/src/main/resources/config.yml diff --git a/bukkit-loader/src/main/resources/craft-engine.properties b/bukkit/loader/src/main/resources/craft-engine.properties similarity index 100% rename from bukkit-loader/src/main/resources/craft-engine.properties rename to bukkit/loader/src/main/resources/craft-engine.properties diff --git a/bukkit-loader/src/main/resources/internal/items/_all.json b/bukkit/loader/src/main/resources/internal/items/_all.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/items/_all.json rename to bukkit/loader/src/main/resources/internal/items/_all.json diff --git a/bukkit-loader/src/main/resources/internal/items/_list.json b/bukkit/loader/src/main/resources/internal/items/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/items/_list.json rename to bukkit/loader/src/main/resources/internal/items/_list.json diff --git a/bukkit-loader/src/main/resources/internal/models/block/_all.json b/bukkit/loader/src/main/resources/internal/models/block/_all.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/block/_all.json rename to bukkit/loader/src/main/resources/internal/models/block/_all.json diff --git a/bukkit-loader/src/main/resources/internal/models/block/_list.json b/bukkit/loader/src/main/resources/internal/models/block/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/block/_list.json rename to bukkit/loader/src/main/resources/internal/models/block/_list.json diff --git a/bukkit-loader/src/main/resources/internal/models/item/legacy/_all.json b/bukkit/loader/src/main/resources/internal/models/item/legacy/_all.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/item/legacy/_all.json rename to bukkit/loader/src/main/resources/internal/models/item/legacy/_all.json diff --git a/bukkit-loader/src/main/resources/internal/models/item/legacy/_list.json b/bukkit/loader/src/main/resources/internal/models/item/legacy/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/item/legacy/_list.json rename to bukkit/loader/src/main/resources/internal/models/item/legacy/_list.json diff --git a/bukkit-loader/src/main/resources/internal/models/item/modern/_all.json b/bukkit/loader/src/main/resources/internal/models/item/modern/_all.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/item/modern/_all.json rename to bukkit/loader/src/main/resources/internal/models/item/modern/_all.json diff --git a/bukkit-loader/src/main/resources/internal/models/item/modern/_list.json b/bukkit/loader/src/main/resources/internal/models/item/modern/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/models/item/modern/_list.json rename to bukkit/loader/src/main/resources/internal/models/item/modern/_list.json diff --git a/bukkit-loader/src/main/resources/internal/sounds.json b/bukkit/loader/src/main/resources/internal/sounds.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/sounds.json rename to bukkit/loader/src/main/resources/internal/sounds.json diff --git a/bukkit-loader/src/main/resources/internal/textures/block/_list.json b/bukkit/loader/src/main/resources/internal/textures/block/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/textures/block/_list.json rename to bukkit/loader/src/main/resources/internal/textures/block/_list.json diff --git a/bukkit-loader/src/main/resources/internal/textures/font/_list.json b/bukkit/loader/src/main/resources/internal/textures/font/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/textures/font/_list.json rename to bukkit/loader/src/main/resources/internal/textures/font/_list.json diff --git a/bukkit-loader/src/main/resources/internal/textures/item/_list.json b/bukkit/loader/src/main/resources/internal/textures/item/_list.json similarity index 100% rename from bukkit-loader/src/main/resources/internal/textures/item/_list.json rename to bukkit/loader/src/main/resources/internal/textures/item/_list.json diff --git a/bukkit-loader/src/main/resources/mappings.yml b/bukkit/loader/src/main/resources/mappings.yml similarity index 100% rename from bukkit-loader/src/main/resources/mappings.yml rename to bukkit/loader/src/main/resources/mappings.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml b/bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/categories.yml b/bukkit/loader/src/main/resources/resources/default/configuration/categories.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/categories.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/categories.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/furniture.yml b/bukkit/loader/src/main/resources/resources/default/configuration/furniture.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/furniture.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/furniture.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/i18n.yml b/bukkit/loader/src/main/resources/resources/default/configuration/i18n.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/i18n.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/i18n.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/icons.yml b/bukkit/loader/src/main/resources/resources/default/configuration/icons.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/icons.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/icons.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml b/bukkit/loader/src/main/resources/resources/default/configuration/items.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/items.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/items.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml b/bukkit/loader/src/main/resources/resources/default/configuration/ores.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/ores.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/ores.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml b/bukkit/loader/src/main/resources/resources/default/configuration/palm_tree.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/palm_tree.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/plants.yml b/bukkit/loader/src/main/resources/resources/default/configuration/plants.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/plants.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/plants.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml b/bukkit/loader/src/main/resources/resources/default/configuration/templates.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/configuration/templates.yml rename to bukkit/loader/src/main/resources/resources/default/configuration/templates.yml diff --git a/bukkit-loader/src/main/resources/resources/default/pack.yml b/bukkit/loader/src/main/resources/resources/default/pack.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/pack.yml rename to bukkit/loader/src/main/resources/resources/default/pack.yml diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_1.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_1.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_1.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_1.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_2.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_2.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_2.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_2.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_3.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_3.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_3.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_3.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_4.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_4.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_4.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/fairy_flower_4.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_leaves.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_leaves.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_leaves.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_leaves.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log_top.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log_top.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log_top.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_log_top.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_planks.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_planks.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_planks.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_planks.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_sapling.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_sapling.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_sapling.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/palm_sapling.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/reed.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/reed.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/reed.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/reed.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log_top.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log_top.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log_top.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/stripped_palm_log_top.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/topaz_ore.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid/topaz.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid/topaz.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid/topaz.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid/topaz.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid_leggings/topaz.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid_leggings/topaz.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid_leggings/topaz.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/entity/equipment/humanoid_leggings/topaz.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_frame.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/bench.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/bench.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/bench.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/bench.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/fairy_flower.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/fairy_flower.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/fairy_flower.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/fairy_flower.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/reed.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/reed.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/reed.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/reed.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/table_lamp.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/table_lamp.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/table_lamp.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/table_lamp.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_axe.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_boots.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_chestplate.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_helmet.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_hoe.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_leggings.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_pickaxe.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_shovel.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_sword.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/wooden_chair.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/wooden_chair.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/wooden_chair.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/wooden_chair.png diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/pack.mcmeta b/bukkit/loader/src/main/resources/resources/default/resourcepack/pack.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/pack.mcmeta rename to bukkit/loader/src/main/resources/resources/default/resourcepack/pack.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/pack.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/pack.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/pack.png rename to bukkit/loader/src/main/resources/resources/default/resourcepack/pack.png diff --git a/bukkit-loader/src/main/resources/resources/internal/configuration/gui.yml b/bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/configuration/gui.yml rename to bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml diff --git a/bukkit-loader/src/main/resources/resources/internal/configuration/i18n.yml b/bukkit/loader/src/main/resources/resources/internal/configuration/i18n.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/configuration/i18n.yml rename to bukkit/loader/src/main/resources/resources/internal/configuration/i18n.yml diff --git a/bukkit-loader/src/main/resources/resources/internal/configuration/offset_chars.yml b/bukkit/loader/src/main/resources/resources/internal/configuration/offset_chars.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/configuration/offset_chars.yml rename to bukkit/loader/src/main/resources/resources/internal/configuration/offset_chars.yml diff --git a/bukkit-loader/src/main/resources/resources/internal/pack.yml b/bukkit/loader/src/main/resources/resources/internal/pack.yml similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/pack.yml rename to bukkit/loader/src/main/resources/resources/internal/pack.yml diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/models/block/default_chorus_plant.json b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/models/block/default_chorus_plant.json similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/models/block/default_chorus_plant.json rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/models/block/default_chorus_plant.json diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/blasting.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/blasting.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/blasting.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/blasting.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/campfire.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/campfire.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/campfire.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/campfire.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/category.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/category.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/category.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/category.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/cooking_recipe.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/cooking_recipe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/cooking_recipe.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/cooking_recipe.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/crafting_recipe.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/crafting_recipe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/crafting_recipe.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/crafting_recipe.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/item_browser.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/item_browser.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/item_browser.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/item_browser.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/no_recipe.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/no_recipe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/no_recipe.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/no_recipe.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smelting.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smelting.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smelting.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smelting.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smithing_transform_recipe.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smithing_transform_recipe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smithing_transform_recipe.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smithing_transform_recipe.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smoking.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smoking.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smoking.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/smoking.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/stonecutting_recipe.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/stonecutting_recipe.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/stonecutting_recipe.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/stonecutting_recipe.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/offset/space_split.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/offset/space_split.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/offset/space_split.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/font/offset/space_split.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png.mcmeta b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png.mcmeta similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png.mcmeta rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/cooking_info.png.mcmeta diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/exit.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/exit.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/exit.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/exit.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/get_item.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/get_item.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/get_item.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/get_item.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_0.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_0.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_0.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_0.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_1.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_1.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_1.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/next_page_1.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_0.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_0.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_0.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_0.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_1.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_1.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_1.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/previous_page_1.png diff --git a/bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/return.png b/bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/return.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/return.png rename to bukkit/loader/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/item/custom/gui/return.png diff --git a/bukkit-loader/src/main/resources/translations/en.yml b/bukkit/loader/src/main/resources/translations/en.yml similarity index 100% rename from bukkit-loader/src/main/resources/translations/en.yml rename to bukkit/loader/src/main/resources/translations/en.yml diff --git a/bukkit-loader/src/main/resources/translations/es.yml b/bukkit/loader/src/main/resources/translations/es.yml similarity index 100% rename from bukkit-loader/src/main/resources/translations/es.yml rename to bukkit/loader/src/main/resources/translations/es.yml diff --git a/bukkit-loader/src/main/resources/translations/zh_cn.yml b/bukkit/loader/src/main/resources/translations/zh_cn.yml similarity index 100% rename from bukkit-loader/src/main/resources/translations/zh_cn.yml rename to bukkit/loader/src/main/resources/translations/zh_cn.yml diff --git a/bukkit-loader/src/main/resources/translations/zh_tw.yml b/bukkit/loader/src/main/resources/translations/zh_tw.yml similarity index 100% rename from bukkit-loader/src/main/resources/translations/zh_tw.yml rename to bukkit/loader/src/main/resources/translations/zh_tw.yml diff --git a/gradle.properties b/gradle.properties index 283ccaa6d..31fb8339e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ +org.gradle.jvmargs=-Xmx1G + # Project settings # Rule: [major update].[feature update].[bug fix] project_version=0.0.37 @@ -54,7 +56,6 @@ loader_version=0.16.10 modmenu_version=13.0.3 cloth_version=17.0.144 -org.gradle.jvmargs=-Xmx1G # Proxy settings #systemProp.socks.proxyHost=127.0.0.1 #systemProp.socks.proxyPort=7890 diff --git a/settings.gradle.kts b/settings.gradle.kts index 35b81e042..e222e92cd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,12 +4,12 @@ include(":core") include(":bukkit") include(":bukkit:legacy") include(":bukkit:compatibility") -include(":bukkit-loader") +include(":bukkit:loader") include(":server-mod") include(":client-mod") pluginManagement { plugins { - kotlin("jvm") version "2.0.20" + kotlin("jvm") version "2.1.20" } repositories { gradlePluginPortal()