From 59660ee3c7ca2953d75328554903fda106834101 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Wed, 30 Oct 2024 23:10:53 +0100 Subject: [PATCH] Start migrating to unimined 1.3.9 --- apron/build.gradle | 13 - build.gradle | 493 +++++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 48 +- .../apron}/java/forge/ArmorProperties.java | 0 .../java/forge/BlockTextureParticles.java | 0 .../apron}/java/forge/Configuration.java | 0 .../apron}/java/forge/ForgeHooks.java | 0 .../apron}/java/forge/ForgeHooksClient.java | 0 .../java/forge/IArmorTextureProvider.java | 0 .../java/forge/IBlockSecondaryProperties.java | 0 .../apron}/java/forge/IBucketHandler.java | 0 .../apron}/java/forge/IConnectRedstone.java | 0 .../apron}/java/forge/ICraftingHandler.java | 0 .../java/forge/ICustomItemRenderer.java | 0 .../java/forge/IDestroyToolHandler.java | 0 .../apron}/java/forge/IHighlightHandler.java | 0 .../apron}/java/forge/IMultipassRender.java | 0 .../apron}/java/forge/IOreHandler.java | 0 .../apron}/java/forge/IOverrideReplace.java | 0 .../apron}/java/forge/IShearable.java | 0 .../apron}/java/forge/ISleepHandler.java | 0 .../apron}/java/forge/ISpecialArmor.java | 0 .../apron}/java/forge/ISpecialResistance.java | 0 .../apron}/java/forge/ITextureProvider.java | 0 .../apron}/java/forge/IUseItemFirst.java | 0 .../apron}/java/forge/MinecraftForge.java | 0 .../java/forge/MinecraftForgeClient.java | 0 .../apron}/java/forge/Property.java | 0 .../apron}/java/guiapi/GuiApiHelper.java | 0 .../apron}/java/guiapi/ModAction.java | 0 .../apron}/java/guiapi/ModScreen.java | 0 .../apron}/java/guiapi/ModSelect.java | 0 .../apron}/java/guiapi/ModSettingScreen.java | 0 .../apron}/java/guiapi/ModSettings.java | 0 .../java/guiapi/setting/BooleanSetting.java | 0 .../java/guiapi/setting/FloatSetting.java | 0 .../java/guiapi/setting/IntSetting.java | 0 .../java/guiapi/setting/KeySetting.java | 0 .../java/guiapi/setting/MultiSetting.java | 0 .../apron}/java/guiapi/setting/Setting.java | 0 .../java/guiapi/setting/TextSetting.java | 0 .../java/guiapi/widget/BooleanWidget.java | 0 .../guiapi/widget/ClassicTwoColumnWidget.java | 0 .../java/guiapi/widget/FloatWidget.java | 0 .../apron}/java/guiapi/widget/IntWidget.java | 0 .../java/guiapi/widget/KeybindingWidget.java | 0 .../java/guiapi/widget/MultiWidget.java | 0 .../java/guiapi/widget/ScreenWidget.java | 0 .../java/guiapi/widget/SettingWidget.java | 0 .../guiapi/widget/SimpleWindowWidget.java | 0 .../guiapi/widget/SingleColumnWidget.java | 0 .../java/guiapi/widget/SingleRowWidget.java | 0 .../java/guiapi/widget/SliderWidget.java | 0 .../apron}/java/guiapi/widget/TextWidget.java | 0 .../io/github/betterthanupdates/Legacy.java | 0 .../betterthanupdates/apron/APIInternal.java | 0 .../github/betterthanupdates/apron/Apron.java | 0 .../apron/ApronMixinPlugin.java | 0 .../apron/ApronModRemapper.java | 0 .../apron/LifecycleUtils.java | 0 .../github/betterthanupdates/apron/Pair.java | 0 .../apron/ReflectionUtils.java | 0 .../betterthanupdates/apron/api/ApronApi.java | 0 .../apron/impl/client/ApronClientImpl.java | 0 .../apron/impl/package-info.java | 0 .../apron/impl/server/ApronServerImpl.java | 0 .../apron/item/ItemConvertible.java | 0 .../apron/mixin/BlockMixin.java | 0 .../apron/mixin/EntityAccessor.java | 0 .../apron/mixin/ItemEntityMixin.java | 0 .../apron/mixin/ItemMixin.java | 0 .../apron/mixin/ItemStackMixin.java | 0 .../apron/mixin/WorldAccessor.java | 0 .../mixin/client/ButtonWidgetAccessor.java | 0 .../apron/mixin/client/InGameHudMixin.java | 0 .../mixin/client/MinecraftClientMixin.java | 0 .../mixin/client/SoundHelperAccessor.java | 0 .../apron/mixin/client/TitleScreenMixin.java | 0 .../betterthanupdates/apron/package-info.java | 0 .../apron/remapped/BetterClassWriter.java | 0 .../apron/remapped/BetterFieldInsnNode.java | 0 .../apron/remapped/BetterMethodInsnNode.java | 0 .../apron/remapped/RemapAwareClass.java | 0 .../mixin/client/SoundHelperMixin.java | 0 .../forge/ForgeClientReflection.java | 0 .../forge/block/ForgeBlock.java | 0 .../client/particle/ForgeParticleManager.java | 0 .../forge/client/render/ForgeTessellator.java | 0 .../entity/player/ForgePlayerEntity.java | 0 .../forge/item/ForgeItem.java | 0 .../forge/item/ForgeTool.java | 0 .../forge/item/ToolEffectiveness.java | 0 .../forge/mixin/block/BlockMixin.java | 0 .../forge/mixin/block/ButtonBlockMixin.java | 0 .../forge/mixin/block/ChestBlockMixin.java | 0 .../forge/mixin/block/DoorBlockMixin.java | 0 .../forge/mixin/block/LadderBlockMixin.java | 0 .../forge/mixin/block/LeverBlockMixin.java | 0 .../mixin/block/PressurePlateBlockMixin.java | 0 .../forge/mixin/block/RailBlockMixin.java | 0 .../mixin/block/RedstoneDustBlockMixin.java | 0 .../block/RedstoneRepeaterBlockMixin.java | 0 .../forge/mixin/block/TorchBlockMixin.java | 0 .../forge/mixin/block/TrapdoorBlockMixin.java | 0 .../mixin/client/BlockRendererMixin.java | 0 .../client/ClientInteractionManagerMixin.java | 0 .../forge/mixin/client/GameRendererMixin.java | 0 .../mixin/client/ParticleManagerMixin.java | 0 .../mixin/client/PistonRendererMixin.java | 0 .../mixin/client/PlayerRendererMixin.java | 0 .../forge/mixin/client/TessellatorMixin.java | 0 .../mixin/client/TextureManagerMixin.java | 0 .../mixin/client/VanillaTessellatorMixin.java | 0 .../mixin/client/WorldRendererMixin.java | 0 .../nostation/HeldItemRendererMixin.java | 0 .../client/nostation/ItemRendererMixin.java | 0 ...tiplayerClientInteractionManagerMixin.java | 0 .../SinglePlayerInteractionManagerMixin.java | 0 .../slot/CraftingResultSlotMixin.java | 0 .../forge/mixin/entity/LivingEntityMixin.java | 0 .../entity/player/PlayerEntityMixin.java | 0 .../forge/mixin/item/BucketItemMixin.java | 0 .../forge/mixin/item/ItemMixin.java | 0 .../forge/mixin/server/class_417Mixin.java | 0 .../mixin/server/item/ToolItemMixin.java | 0 .../ServerPlayerView_class_514Mixin.java | 3 +- .../player/ServerInteractionManagerMixin.java | 0 .../ServerInteractionManagerMixin.java | 0 .../forge/mixin/util/hit/HitResultMixin.java | 0 .../forge/mixin/world/WorldMixin.java | 0 .../forge/mixin/world/chunk/ChunkMixin.java | 0 .../mixin/world/explosion/ExplosionMixin.java | 0 .../betterthanupdates/forge/package-info.java | 0 .../forge/world/ForgeWorld.java | 0 .../mixin/client/OptionsScreenMixin.java | 0 .../modloader/mixin/DispenserBlockMixin.java | 0 .../mixin/FurnaceBlockEntityMixin.java | 0 .../mixin/FurnaceOutputSlotMixin.java | 0 .../client/ClientPlayPacketHandlerMixin.java | 0 .../mixin/client/DisconnectPacketMixin.java | 0 .../client/DisconnectingScreenMixin.java | 0 .../client/EntityRenderDispatcherMixin.java | 0 .../client/GameStartupErrorPanelMixin.java | 0 .../mixin/client/ItemEntityMixin.java | 0 .../mixin/client/ServerChunkCacheMixin.java | 0 .../VanillaFurnaceBlockEntityMixin.java | 0 .../mixin/server/CommandManagerMixin.java | 0 .../mixin/server/MinecraftServerMixin.java | 0 .../server/ServerEntityTrackerMixin.java | 0 .../server/ServerLoginPacketHandlerMixin.java | 0 .../mixin/server/ServerWorldSourceMixin.java | 0 .../mixin/server/TrackedEntityMixin.java | 0 .../modloader/package-info.java | 0 .../mixin/client/ConnectingScreenMixin.java | 0 .../mixin/client/OptionsScreenMixin.java | 0 .../mixin/client/PauseMenuMixin.java | 0 .../mixin/client/SelectWorldScreenMixin.java | 0 .../betterthanupdates/package-info.java | 0 .../player/PlayerAPIClientPlayerEntity.java | 0 .../AbstractClientPlayerEntityMixin.java | 0 .../reforged/block/ReforgedBlock.java | 0 .../reforged/item/ReforgedItem.java | 0 .../reforged/mixin/BlockMixin.java | 0 .../mixin/FurnaceBlockEntityMixin.java | 0 .../reforged/mixin/ItemMixin.java | 0 .../reforged/mixin/ShearsItemMixin.java | 0 .../reforged/mixin/SheepEntityMixin.java | 0 .../mixin/SmeltingRecipeRegistryMixin.java | 0 ...tiplayerClientInteractionManagerMixin.java | 0 .../SinglePlayerInteractionManagerMixin.java | 0 .../client/nostation/GameRendererMixin.java | 0 .../ReforgedSmeltingRecipeRegistry.java | 0 .../shockahpi/block/ShockAhPIPortalBlock.java | 0 .../screen/ShockAhPIAchievementsScreen.java | 0 .../mixin/client/AchievementsScreenMixin.java | 0 .../mixin/client/DungeonFeatureMixin.java | 0 ...tiplayerClientInteractionManagerMixin.java | 0 .../mixin/client/PortalBlockMixin.java | 0 .../SinglePlayerInteractionManagerMixin.java | 0 .../shockahpi/mixin/client/ToolItemMixin.java | 0 .../shockahpi/mixin/client/WorldMixin.java | 0 .../nostation/AchievementsScreenMixin.java | 0 .../client/nostation/DimensionFileMixin.java | 0 .../client/nostation/DimensionMixin.java | 0 .../nostation/McRegionDimensionFileMixin.java | 0 .../client/nostation/PortalBlockMixin.java | 0 .../betterthanupdates/stapi/StAPIBlock.java | 0 .../stapi/StAPIMinecraftClient.java | 0 .../java/itemspriteapi/IItemTexture.java | 0 .../java/itemspriteapi/ItemTexture.java | 0 .../apron}/java/modloader/BaseMod.java | 0 .../java/modloader/EntityRendererProxy.java | 0 .../apron}/java/modloader/MLProp.java | 0 .../apron}/java/modloader/ModLoader.java | 0 .../java/modloader/ModTextureAnimation.java | 0 .../java/modloader/ModTextureStatic.java | 0 .../apron}/java/modloader/package-info.java | 0 .../apron}/java/modloadermp/BaseModMp.java | 0 .../java/modloadermp/EntityTrackerEntry.java | 0 .../apron}/java/modloadermp/ISpawnable.java | 0 .../apron}/java/modloadermp/ModLoaderMp.java | 0 .../java/modloadermp/ModLoaderPacket.java | 0 .../modloadermp/NetClientHandlerEntity.java | 0 .../apron}/java/modloadermp/Pair.java | 0 .../IncompatibleOptionTypeException.java | 0 .../KeyAlreadyBoundException.java | 0 .../apron}/java/modoptionsapi/MOCallback.java | 0 .../java/modoptionsapi/MODisplayString.java | 0 .../java/modoptionsapi/MOFormatters.java | 0 .../modoptionsapi/MOMissingModException.java | 0 .../java/modoptionsapi/ModBooleanOption.java | 0 .../java/modoptionsapi/ModKeyOption.java | 0 .../modoptionsapi/ModMappedMultiOption.java | 0 .../java/modoptionsapi/ModMultiOption.java | 0 .../apron}/java/modoptionsapi/ModOption.java | 0 .../apron}/java/modoptionsapi/ModOptions.java | 0 .../java/modoptionsapi/ModOptionsAPI.java | 0 .../ModOptionsGuiController.java | 0 .../java/modoptionsapi/ModSliderOption.java | 0 .../java/modoptionsapi/ModTextOption.java | 0 .../modoptionsapi/NoSuchOptionException.java | 0 .../modoptionsapi/gui/KeyBindingField.java | 0 .../java/modoptionsapi/gui/ModMenu.java | 0 .../apron}/java/modoptionsapi/gui/Slider.java | 0 .../java/modoptionsapi/gui/TextField.java | 0 .../modoptionsapi/gui/TextInputField.java | 0 .../paulscode/sound/codecs/CodecIBXM.java | 0 .../apron}/java/playerapi/PlayerAPI.java | 0 .../apron}/java/playerapi/PlayerBase.java | 0 .../apron}/java/reforged/ICustomDrop.java | 0 .../apron}/java/reforged/IReachEntity.java | 0 .../apron}/java/reforged/Reforged.java | 0 .../apron}/java/reforged/ReforgedHooks.java | 0 .../apron}/java/reforged/ReforgedMod.java | 0 .../java/shockahpi/AchievementPage.java | 0 .../apron}/java/shockahpi/AnimBase.java | 0 .../apron}/java/shockahpi/AnimPulse.java | 0 .../apron}/java/shockahpi/AnimShift.java | 0 .../java/shockahpi/BlockHarvestPower.java | 0 .../apron}/java/shockahpi/DimensionBase.java | 0 .../java/shockahpi/DimensionNether.java | 0 .../java/shockahpi/DimensionOverworld.java | 0 .../apron}/java/shockahpi/DungeonLoot.java | 0 .../apron}/java/shockahpi/GenDeposit.java | 0 .../java/shockahpi/IInterceptBlockSet.java | 0 .../java/shockahpi/IInterceptHarvest.java | 0 .../apron}/java/shockahpi/IReach.java | 0 .../apron}/java/shockahpi/Loc.java | 0 .../apron}/java/shockahpi/PlayerBaseSAPI.java | 0 .../apron}/java/shockahpi/SAPI.java | 0 .../apron}/java/shockahpi/Tool.java | 0 .../apron}/java/shockahpi/ToolBase.java | 0 .../apron}/resources/apron.accesswidener | 0 .../apron}/resources/apron.mixins.json | 0 .../apron}/resources/apron.parent.mixins.json | 0 .../apron}/resources/assets/apron/icon.png | Bin .../apron}/resources/audiomod.mixins.json | 0 .../apron}/resources/fabric.mod.json | 0 .../src/main => src/apron}/resources/font.fnt | 0 .../apron}/resources/font/default.png | Bin .../apron}/resources/forge.mixins.json | 0 .../main => src/apron}/resources/gui/gui.png | Bin .../apron}/resources/guiapi.mixins.json | 0 .../resources/minecraftforge_credits.txt | 0 .../apron}/resources/modloader.mixins.json | 0 .../resources/modoptionsapi.mixins.json | 0 .../apron}/resources/playerapi.mixins.json | 0 .../apron}/resources/reforged.mixins.json | 0 .../apron}/resources/scrollwindow.png | Bin .../apron}/resources/shockahpi.mixins.json | 0 .../apron}/resources/twlGuiTheme.xml | 0 .../resources/twlGuiThemeIndentedbuttons.png | Bin src/{main => full}/resources/fabric.mod.json | 0 274 files changed, 348 insertions(+), 211 deletions(-) delete mode 100644 apron/build.gradle rename {apron/src/main => src/apron}/java/forge/ArmorProperties.java (100%) rename {apron/src/main => src/apron}/java/forge/BlockTextureParticles.java (100%) rename {apron/src/main => src/apron}/java/forge/Configuration.java (100%) rename {apron/src/main => src/apron}/java/forge/ForgeHooks.java (100%) rename {apron/src/main => src/apron}/java/forge/ForgeHooksClient.java (100%) rename {apron/src/main => src/apron}/java/forge/IArmorTextureProvider.java (100%) rename {apron/src/main => src/apron}/java/forge/IBlockSecondaryProperties.java (100%) rename {apron/src/main => src/apron}/java/forge/IBucketHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/IConnectRedstone.java (100%) rename {apron/src/main => src/apron}/java/forge/ICraftingHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/ICustomItemRenderer.java (100%) rename {apron/src/main => src/apron}/java/forge/IDestroyToolHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/IHighlightHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/IMultipassRender.java (100%) rename {apron/src/main => src/apron}/java/forge/IOreHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/IOverrideReplace.java (100%) rename {apron/src/main => src/apron}/java/forge/IShearable.java (100%) rename {apron/src/main => src/apron}/java/forge/ISleepHandler.java (100%) rename {apron/src/main => src/apron}/java/forge/ISpecialArmor.java (100%) rename {apron/src/main => src/apron}/java/forge/ISpecialResistance.java (100%) rename {apron/src/main => src/apron}/java/forge/ITextureProvider.java (100%) rename {apron/src/main => src/apron}/java/forge/IUseItemFirst.java (100%) rename {apron/src/main => src/apron}/java/forge/MinecraftForge.java (100%) rename {apron/src/main => src/apron}/java/forge/MinecraftForgeClient.java (100%) rename {apron/src/main => src/apron}/java/forge/Property.java (100%) rename {apron/src/main => src/apron}/java/guiapi/GuiApiHelper.java (100%) rename {apron/src/main => src/apron}/java/guiapi/ModAction.java (100%) rename {apron/src/main => src/apron}/java/guiapi/ModScreen.java (100%) rename {apron/src/main => src/apron}/java/guiapi/ModSelect.java (100%) rename {apron/src/main => src/apron}/java/guiapi/ModSettingScreen.java (100%) rename {apron/src/main => src/apron}/java/guiapi/ModSettings.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/BooleanSetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/FloatSetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/IntSetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/KeySetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/MultiSetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/Setting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/setting/TextSetting.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/BooleanWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/ClassicTwoColumnWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/FloatWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/IntWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/KeybindingWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/MultiWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/ScreenWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/SettingWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/SimpleWindowWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/SingleColumnWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/SingleRowWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/SliderWidget.java (100%) rename {apron/src/main => src/apron}/java/guiapi/widget/TextWidget.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/Legacy.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/APIInternal.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/Apron.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/ApronMixinPlugin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/ApronModRemapper.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/LifecycleUtils.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/Pair.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/ReflectionUtils.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/api/ApronApi.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/impl/client/ApronClientImpl.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/impl/package-info.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/impl/server/ApronServerImpl.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/item/ItemConvertible.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/package-info.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/remapped/BetterClassWriter.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/remapped/BetterFieldInsnNode.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/remapped/BetterMethodInsnNode.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/apron/remapped/RemapAwareClass.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/ForgeClientReflection.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/block/ForgeBlock.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/client/particle/ForgeParticleManager.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/client/render/ForgeTessellator.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/entity/player/ForgePlayerEntity.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/item/ForgeItem.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/item/ForgeTool.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/item/ToolEffectiveness.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/BlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/ButtonBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/ChestBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/DoorBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/LadderBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/LeverBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/PressurePlateBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/RailBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/RedstoneRepeaterBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/TorchBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/block/TrapdoorBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/GameRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/ParticleManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/PistonRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/VanillaTessellatorMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/nostation/HeldItemRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/entity/LivingEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/entity/player/PlayerEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/item/BucketItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/item/ItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/server/class_417Mixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/server/item/ToolItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java (85%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/util/hit/HitResultMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/world/WorldMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/world/chunk/ChunkMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/mixin/world/explosion/ExplosionMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/package-info.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/forge/world/ForgeWorld.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/FurnaceOutputSlotMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/ClientPlayPacketHandlerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectPacketMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectingScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/EntityRenderDispatcherMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/GameStartupErrorPanelMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/ItemEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/client/ServerChunkCacheMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/nostation/VanillaFurnaceBlockEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/CommandManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/MinecraftServerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/ServerEntityTrackerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/ServerLoginPacketHandlerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/ServerWorldSourceMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/mixin/server/TrackedEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modloader/package-info.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modoptionsapi/mixin/client/ConnectingScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modoptionsapi/mixin/client/OptionsScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modoptionsapi/mixin/client/PauseMenuMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/modoptionsapi/mixin/client/SelectWorldScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/package-info.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/playerapi/client/entity/player/PlayerAPIClientPlayerEntity.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/playerapi/mixin/client/AbstractClientPlayerEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/block/ReforgedBlock.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/item/ReforgedItem.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/BlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/FurnaceBlockEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/ItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/ShearsItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/SheepEntityMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/SmeltingRecipeRegistryMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/client/MultiplayerClientInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/client/SinglePlayerInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/mixin/client/nostation/GameRendererMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/reforged/recipe/ReforgedSmeltingRecipeRegistry.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/block/ShockAhPIPortalBlock.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/client/gui/screen/ShockAhPIAchievementsScreen.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/AchievementsScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/DungeonFeatureMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/MultiplayerClientInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/PortalBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/SinglePlayerInteractionManagerMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/ToolItemMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/WorldMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/AchievementsScreenMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionFileMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/McRegionDimensionFileMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/PortalBlockMixin.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/stapi/StAPIBlock.java (100%) rename {apron/src/main => src/apron}/java/io/github/betterthanupdates/stapi/StAPIMinecraftClient.java (100%) rename {apron/src/main => src/apron}/java/itemspriteapi/IItemTexture.java (100%) rename {apron/src/main => src/apron}/java/itemspriteapi/ItemTexture.java (100%) rename {apron/src/main => src/apron}/java/modloader/BaseMod.java (100%) rename {apron/src/main => src/apron}/java/modloader/EntityRendererProxy.java (100%) rename {apron/src/main => src/apron}/java/modloader/MLProp.java (100%) rename {apron/src/main => src/apron}/java/modloader/ModLoader.java (100%) rename {apron/src/main => src/apron}/java/modloader/ModTextureAnimation.java (100%) rename {apron/src/main => src/apron}/java/modloader/ModTextureStatic.java (100%) rename {apron/src/main => src/apron}/java/modloader/package-info.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/BaseModMp.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/EntityTrackerEntry.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/ISpawnable.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/ModLoaderMp.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/ModLoaderPacket.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/NetClientHandlerEntity.java (100%) rename {apron/src/main => src/apron}/java/modloadermp/Pair.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/IncompatibleOptionTypeException.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/KeyAlreadyBoundException.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/MOCallback.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/MODisplayString.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/MOFormatters.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/MOMissingModException.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModBooleanOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModKeyOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModMappedMultiOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModMultiOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModOptions.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModOptionsAPI.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModOptionsGuiController.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModSliderOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/ModTextOption.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/NoSuchOptionException.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/gui/KeyBindingField.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/gui/ModMenu.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/gui/Slider.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/gui/TextField.java (100%) rename {apron/src/main => src/apron}/java/modoptionsapi/gui/TextInputField.java (100%) rename {apron/src/main => src/apron}/java/paulscode/sound/codecs/CodecIBXM.java (100%) rename {apron/src/main => src/apron}/java/playerapi/PlayerAPI.java (100%) rename {apron/src/main => src/apron}/java/playerapi/PlayerBase.java (100%) rename {apron/src/main => src/apron}/java/reforged/ICustomDrop.java (100%) rename {apron/src/main => src/apron}/java/reforged/IReachEntity.java (100%) rename {apron/src/main => src/apron}/java/reforged/Reforged.java (100%) rename {apron/src/main => src/apron}/java/reforged/ReforgedHooks.java (100%) rename {apron/src/main => src/apron}/java/reforged/ReforgedMod.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/AchievementPage.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/AnimBase.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/AnimPulse.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/AnimShift.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/BlockHarvestPower.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/DimensionBase.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/DimensionNether.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/DimensionOverworld.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/DungeonLoot.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/GenDeposit.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/IInterceptBlockSet.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/IInterceptHarvest.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/IReach.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/Loc.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/PlayerBaseSAPI.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/SAPI.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/Tool.java (100%) rename {apron/src/main => src/apron}/java/shockahpi/ToolBase.java (100%) rename {apron/src/main => src/apron}/resources/apron.accesswidener (100%) rename {apron/src/main => src/apron}/resources/apron.mixins.json (100%) rename {apron/src/main => src/apron}/resources/apron.parent.mixins.json (100%) rename {apron/src/main => src/apron}/resources/assets/apron/icon.png (100%) rename {apron/src/main => src/apron}/resources/audiomod.mixins.json (100%) rename {apron/src/main => src/apron}/resources/fabric.mod.json (100%) rename {apron/src/main => src/apron}/resources/font.fnt (100%) rename {apron/src/main => src/apron}/resources/font/default.png (100%) rename {apron/src/main => src/apron}/resources/forge.mixins.json (100%) rename {apron/src/main => src/apron}/resources/gui/gui.png (100%) rename {apron/src/main => src/apron}/resources/guiapi.mixins.json (100%) rename {apron/src/main => src/apron}/resources/minecraftforge_credits.txt (100%) rename {apron/src/main => src/apron}/resources/modloader.mixins.json (100%) rename {apron/src/main => src/apron}/resources/modoptionsapi.mixins.json (100%) rename {apron/src/main => src/apron}/resources/playerapi.mixins.json (100%) rename {apron/src/main => src/apron}/resources/reforged.mixins.json (100%) rename {apron/src/main => src/apron}/resources/scrollwindow.png (100%) rename {apron/src/main => src/apron}/resources/shockahpi.mixins.json (100%) rename {apron/src/main => src/apron}/resources/twlGuiTheme.xml (100%) rename {apron/src/main => src/apron}/resources/twlGuiThemeIndentedbuttons.png (100%) rename src/{main => full}/resources/fabric.mod.json (100%) diff --git a/apron/build.gradle b/apron/build.gradle deleted file mode 100644 index bcd10c7e..00000000 --- a/apron/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -version = getSubprojectVersion(this) - -loom { - accessWidenerPath = file("src/main/resources/apron.accesswidener") -} - -dependencies { - modApi("maven.modrinth:mod-remapping-api:${rootProject.mod_remapping_api_version}") -// modApi(files("mod-remapping-api-1.16.5.jar")) - include implementation('org.slick2d:slick2d-core:1.0.2') - include compileOnly(group: "de.matthiasmann", name: "twl", version: "unknown") - include compileOnly(group: "org.xmlpull", name: "xml-pull", version: "unknown") -} diff --git a/build.gradle b/build.gradle index 3b33c1b4..b94d6701 100644 --- a/build.gradle +++ b/build.gradle @@ -1,226 +1,357 @@ -//file:noinspection GradlePackageVersionRange plugins { - id "java-library" - id "eclipse" - id "idea" - id "maven-publish" - id "babric-loom" version "1.4-SNAPSHOT" apply false + id 'java' + id 'xyz.wagyourtail.unimined' version '1.3.9' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - -def ENV = System.getenv() - +group = rootProject.maven_group version = rootProject.mod_version -def getSubprojectVersion(project) { - return rootProject.version -} - -def moduleDependencies(project, List depNames) { - def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: 'namedElements') } - - project.dependencies { - deps.each { - api it - } - } +base { + archivesName = rootProject.archives_base_name } -allprojects { - group = rootProject.maven_group +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 - apply plugin: "maven-publish" - apply plugin: "java-library" - //apply plugin: "checkstyle" - apply plugin: "babric-loom" +//sourceSets { +// babric { +// compileClasspath += sourceSets.main.output +// runtimeClasspath += sourceSets.main.output +// } +// modloader { +// compileClasspath += sourceSets.main.output +// runtimeClasspath += sourceSets.main.output +// } +//} - tasks.withType(JavaCompile).configureEach { - it.options.release = 8 +sourceSets { + apron { + compileClasspath += sourceSets.main.output + runtimeClasspath += sourceSets.main.output + } + full { + compileClasspath += sourceSets.main.output + runtimeClasspath += sourceSets.main.output } +} - java { - // Must be added before the split source sets are setup. - withSourcesJar() +repositories { + mavenLocal() + maven { + url "https://maven.wagyourtail.xyz/releases" } + mavenCentral() - loom { - gluedMinecraftJar() - customMinecraftManifest.set("https://babric.github.io/manifest-polyfill/${minecraft_version}.json") - intermediaryUrl.set("https://maven.glass-launcher.net/babric/babric/intermediary/%1\$s/intermediary-%1\$s-v2.jar") - enableTransitiveAccessWideners = true + flatDir { + dirs rootProject.rootDir.toString() + "/remapped/client" + dirs rootProject.rootDir.toString() + "/remapped/server" + dirs rootProject.rootDir.toString() + "/libs" } +} - repositories { - mavenCentral() - maven { - name 'Babric' - url 'https://maven.glass-launcher.net/babric' - content { - includeGroup 'babric' - includeGroup 'org.lwjgl.lwjgl' - } - } - maven { - name 'Legacy Fabric' - url "https://repo.legacyfabric.net/repository/legacyfabric/" - content { - includeGroup 'net.legacyfabric' - includeGroup 'net.legacyfabric.legacy-fabric-api' - } - } - // Used for StationAPI and HowManyItems. - maven { - name = 'Glass Snapshots' - url = 'https://maven.glass-launcher.net/snapshots' - } - maven { - name = 'Froge' - url 'https://maven.minecraftforge.net/' - } - // Used for mappings. - maven { - name = 'Glass Releases' - url = 'https://maven.glass-launcher.net/releases' - } +unimined.legacyFabricMaven() +unimined.modrinthMaven() +unimined.jitpack() - maven { - name 'Modrinth' - url 'https://api.modrinth.com/maven' - content { - includeGroup 'maven.modrinth' - } - } - maven { - name 'JitPack' - url 'https://jitpack.io' - } +unimined.minecraft([sourceSets.main, sourceSets.full]) { + version rootProject.minecraft_version - flatDir { - dirs rootProject.rootDir.toString() + "/remapped/client" - dirs rootProject.rootDir.toString() + "/remapped/server" - dirs rootProject.rootDir.toString() + "/libs" + mappings { +// babricIntermediary() + mapping("net.legacyfabric:beta-yarn:${rootProject.minecraft_version}+build.${rootProject.mappings}", "yarn") { + outputs("yarn", true) { ["intermediary"] } + mapNamespace("named", "yarn") + sourceNamespace("intermediary") + renest() } } - allprojects.each { p -> - loom.mods.register(p.name) { - sourceSet p.sourceSets.main - } + babric { + loader rootProject.loader_version } - dependencies { - minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - mappings "net.legacyfabric:beta-yarn:${rootProject.minecraft_version}+build.${rootProject.mappings}" - modApi "babric:fabric-loader:${rootProject.loader_version}" - - modApi("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:${rootProject.lfapi_version}") - - // Done - // modRuntimeOnly(group: "remapped.client", name: "modloader", version: "b1.7.3") - // modRuntimeOnly(group: "remapped.client", name: "modloadermp-1.7.3-unofficial", version: "v2") -// modRuntimeOnly(group: "remapped.server", name: "modloadermp-1.7.3-unofficial-server", version: "v2") - // modRuntimeOnly(group: "remapped.client", name: "reforged-client", version: "1.0.1") - // modRuntimeOnly(group: "remapped.client", name: "audiomod", version: "b1.7.3") -// modRuntimeOnly(group: "remapped.client", name: "shockahpi", version: "r5.1") - // modRuntimeOnly(group: "remapped.client", name: "playerapi-1.7.3", version: "v1.7") - // modRuntimeOnly(group: "remapped.client", name: "itemspriteapi", version: "v1.2") - // modRuntimeOnly(group: "remapped.client", name: "guiapi0.11.0", version: "1.7") - // modRuntimeOnly(group: "remapped.client", name: "modoptionsapi", version: "v0.7") -// modRuntimeOnly(group: "remapped.client", name: "reforgedsapi-client") -// modRuntimeOnly(group: "remapped.server", name: "minecraftforge-server", version: "1.0.7-20110907") - // Todo - implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")) - implementation("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0") + minecraftRemapper.config { + ignoreConflicts(true) } +} - tasks.withType(ProcessResources).configureEach { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } - } +unimined.minecraft(sourceSets.apron) { + combineWith(sourceSets.main) - tasks.withType(AbstractArchiveTask) { - preserveFileTimestamps = false - reproducibleFileOrder = true + babric { + accessWidener("src/apron/resources/apron.accesswidener") } +} - publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - repositories { - } +configurations { + mainImplementation + implementation { + extendsFrom apronImplementation } +} - tasks.withType(JavaCompile) { - options.deprecation = true +sourceSets { + main { + compileClasspath += configurations.mainImplementation + runtimeClasspath += configurations.mainImplementation } } -subprojects { - dependencies { - if (project.name != "apron") { - api(project.dependencies.project(path: ":apron", configuration: 'namedElements')) - } - } +jar { + enabled = false +} - javadoc.enabled = false +dependencies { + modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:${rootProject.lfapi_version}") + modImplementation("maven.modrinth:mod-remapping-api:${rootProject.mod_remapping_api_version}") + apronModImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:${rootProject.lfapi_version}") + apronModImplementation("maven.modrinth:mod-remapping-api:${rootProject.mod_remapping_api_version}") + apronInclude(apronImplementation('org.slick2d:slick2d-core:1.0.2')) + apronInclude(apronCompileOnly(group: "de.matthiasmann", name: "twl", version: "unknown")) + apronInclude(apronCompileOnly(group: "org.xmlpull", name: "xml-pull", version: "unknown")) + + apronImplementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")) + apronImplementation("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0") } -subprojects.each { - remapJar.dependsOn("${it.path}:remapJar") +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } } +processApronResources { + inputs.property "version", project.version -dependencies { - afterEvaluate { - subprojects.each { - api project(path: "${it.path}", configuration: "namedElements") - } + filesMatching("fabric.mod.json") { + expand "version": project.version } +} -// implementation "org.slf4j:slf4j-api:1.8.0-beta4" -// implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.17.2' +////file:noinspection GradlePackageVersionRange +//plugins { +// id "java-library" +// id "eclipse" +// id "idea" +// id "maven-publish" +// id "babric-loom" version "1.4-SNAPSHOT" apply false +//} +// +//sourceCompatibility = JavaVersion.VERSION_1_8 +//targetCompatibility = JavaVersion.VERSION_1_8 +// +//def ENV = System.getenv() +// +//version = rootProject.mod_version +// +//def getSubprojectVersion(project) { +// return rootProject.version +//} // -// modRuntimeOnly "net.modificationstation:StationAPI:${project.stapi_version}" +//def moduleDependencies(project, List depNames) { +// def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: 'namedElements') } // -// // Optional, but convenient mods for mod creators and users alike. -// modRuntimeOnly("com.github.calmilamsy:ModMenu:${project.modmenu_version}") { -// transitive false +// project.dependencies { +// deps.each { +// api it +// } // } -// modRuntimeOnly("net.glasslauncher.mods:GlassConfigAPI:${project.gcapi_version}") { -// transitive false +//} +// +//allprojects { +// group = rootProject.maven_group +// +// apply plugin: "maven-publish" +// apply plugin: "java-library" +// //apply plugin: "checkstyle" +// apply plugin: "babric-loom" +// +// tasks.withType(JavaCompile).configureEach { +// it.options.release = 8 // } -// modRuntimeOnly("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.howmanyitems_version}") { -// transitive false +// +// java { +// // Must be added before the split source sets are setup. +// withSourcesJar() // } -// modRuntimeOnly ("com.github.paulevsGitch:BHCreative:${project.bhcreative_version}") { -// transitive false +// +// loom { +// gluedMinecraftJar() +// customMinecraftManifest.set("https://babric.github.io/manifest-polyfill/${minecraft_version}.json") +// intermediaryUrl.set("https://maven.glass-launcher.net/babric/babric/intermediary/%1\$s/intermediary-%1\$s-v2.jar") +// enableTransitiveAccessWideners = true // } -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } - } - from("FORGE_LICENSE") - from("PAULSCODE_LICENSE") - - from("./original/client") { into("libs") } - from("./original/server") { into("libs") } -} - -remapJar { - afterEvaluate { - subprojects.each { - // Include the jar from the sub project. - nestedJars.from project("${it.path}").tasks.getByName("remapJar") - } - } -} +// +// repositories { +// mavenCentral() +// maven { +// name 'Babric' +// url 'https://maven.glass-launcher.net/babric' +// content { +// includeGroup 'babric' +// includeGroup 'org.lwjgl.lwjgl' +// } +// } +// maven { +// name 'Legacy Fabric' +// url "https://repo.legacyfabric.net/repository/legacyfabric/" +// content { +// includeGroup 'net.legacyfabric' +// includeGroup 'net.legacyfabric.legacy-fabric-api' +// } +// } +// // Used for StationAPI and HowManyItems. +// maven { +// name = 'Glass Snapshots' +// url = 'https://maven.glass-launcher.net/snapshots' +// } +// maven { +// name = 'Froge' +// url 'https://maven.minecraftforge.net/' +// } +// // Used for mappings. +// maven { +// name = 'Glass Releases' +// url = 'https://maven.glass-launcher.net/releases' +// } +// +// maven { +// name 'Modrinth' +// url 'https://api.modrinth.com/maven' +// content { +// includeGroup 'maven.modrinth' +// } +// } +// maven { +// name 'JitPack' +// url 'https://jitpack.io' +// } +// +// flatDir { +// dirs rootProject.rootDir.toString() + "/remapped/client" +// dirs rootProject.rootDir.toString() + "/remapped/server" +// dirs rootProject.rootDir.toString() + "/libs" +// } +// } +// +// allprojects.each { p -> +// loom.mods.register(p.name) { +// sourceSet p.sourceSets.main +// } +// } +// +// dependencies { +// minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" +// mappings "net.legacyfabric:beta-yarn:${rootProject.minecraft_version}+build.${rootProject.mappings}" +// modApi "babric:fabric-loader:${rootProject.loader_version}" +// +// modApi("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:${rootProject.lfapi_version}") +// +// // Done +// // modRuntimeOnly(group: "remapped.client", name: "modloader", version: "b1.7.3") +// // modRuntimeOnly(group: "remapped.client", name: "modloadermp-1.7.3-unofficial", version: "v2") +//// modRuntimeOnly(group: "remapped.server", name: "modloadermp-1.7.3-unofficial-server", version: "v2") +// // modRuntimeOnly(group: "remapped.client", name: "reforged-client", version: "1.0.1") +// // modRuntimeOnly(group: "remapped.client", name: "audiomod", version: "b1.7.3") +//// modRuntimeOnly(group: "remapped.client", name: "shockahpi", version: "r5.1") +// // modRuntimeOnly(group: "remapped.client", name: "playerapi-1.7.3", version: "v1.7") +// // modRuntimeOnly(group: "remapped.client", name: "itemspriteapi", version: "v1.2") +// // modRuntimeOnly(group: "remapped.client", name: "guiapi0.11.0", version: "1.7") +// // modRuntimeOnly(group: "remapped.client", name: "modoptionsapi", version: "v0.7") +//// modRuntimeOnly(group: "remapped.client", name: "reforgedsapi-client") +//// modRuntimeOnly(group: "remapped.server", name: "minecraftforge-server", version: "1.0.7-20110907") +// // Todo +// implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")) +// implementation("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0") +// } +// +// tasks.withType(ProcessResources).configureEach { +// inputs.property "version", project.version +// +// filesMatching("fabric.mod.json") { +// expand "version": project.version +// } +// } +// +// tasks.withType(AbstractArchiveTask) { +// preserveFileTimestamps = false +// reproducibleFileOrder = true +// } +// +// publishing { +// publications { +// mavenJava(MavenPublication) { +// from components.java +// } +// } +// +// repositories { +// } +// } +// +// tasks.withType(JavaCompile) { +// options.deprecation = true +// } +//} +// +//subprojects { +// dependencies { +// if (project.name != "apron") { +// api(project.dependencies.project(path: ":apron", configuration: 'namedElements')) +// } +// } +// +// javadoc.enabled = false +//} +// +//subprojects.each { +// remapJar.dependsOn("${it.path}:remapJar") +//} +// +//dependencies { +// afterEvaluate { +// subprojects.each { +// api project(path: "${it.path}", configuration: "namedElements") +// } +// } +// +//// implementation "org.slf4j:slf4j-api:1.8.0-beta4" +//// implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.17.2' +//// +//// modRuntimeOnly "net.modificationstation:StationAPI:${project.stapi_version}" +//// +//// // Optional, but convenient mods for mod creators and users alike. +//// modRuntimeOnly("com.github.calmilamsy:ModMenu:${project.modmenu_version}") { +//// transitive false +//// } +//// modRuntimeOnly("net.glasslauncher.mods:GlassConfigAPI:${project.gcapi_version}") { +//// transitive false +//// } +//// modRuntimeOnly("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.howmanyitems_version}") { +//// transitive false +//// } +//// modRuntimeOnly ("com.github.paulevsGitch:BHCreative:${project.bhcreative_version}") { +//// transitive false +//// } +//} +// +//jar { +// from("LICENSE") { +// rename { "${it}_${project.archivesBaseName}" } +// } +// from("FORGE_LICENSE") +// from("PAULSCODE_LICENSE") +// +// from("./original/client") { into("libs") } +// from("./original/server") { into("libs") } +//} +// +//remapJar { +// afterEvaluate { +// subprojects.each { +// // Include the jar from the sub project. +// nestedJars.from project("${it.path}").tasks.getByName("remapJar") +// } +// } +//} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862..a4413138 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e54aed13..5947623b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,25 +1,43 @@ pluginManagement { repositories { maven { - name 'Fabric' - url 'https://maven.fabricmc.net/' + url = uri("https://maven.wagyourtail.xyz/releases") } maven { - name 'Babric' - url 'https://maven.glass-launcher.net/babric' + url = uri("https://maven.wagyourtail.xyz/snapshots") } - mavenCentral() - gradlePluginPortal() - maven { - name 'JitPack' - url 'https://jitpack.io' + mavenCentral() // highly recommended, but not required + gradlePluginPortal { + content { + // this is not required either, unless jcenter goes down again, then it might fix things + excludeGroup("org.apache.logging.log4j") + } } } } -rootProject.name = "Apron" - -include "apron" -include "apron-compat" -include "apron-stapi" -include "apron-stapi-compat" +//pluginManagement { +// repositories { +// maven { +// name 'Fabric' +// url 'https://maven.fabricmc.net/' +// } +// maven { +// name 'Babric' +// url 'https://maven.glass-launcher.net/babric' +// } +// mavenCentral() +// gradlePluginPortal() +// maven { +// name 'JitPack' +// url 'https://jitpack.io' +// } +// } +//} +// +//rootProject.name = "Apron" +// +//include "apron" +//include "apron-compat" +//include "apron-stapi" +//include "apron-stapi-compat" diff --git a/apron/src/main/java/forge/ArmorProperties.java b/src/apron/java/forge/ArmorProperties.java similarity index 100% rename from apron/src/main/java/forge/ArmorProperties.java rename to src/apron/java/forge/ArmorProperties.java diff --git a/apron/src/main/java/forge/BlockTextureParticles.java b/src/apron/java/forge/BlockTextureParticles.java similarity index 100% rename from apron/src/main/java/forge/BlockTextureParticles.java rename to src/apron/java/forge/BlockTextureParticles.java diff --git a/apron/src/main/java/forge/Configuration.java b/src/apron/java/forge/Configuration.java similarity index 100% rename from apron/src/main/java/forge/Configuration.java rename to src/apron/java/forge/Configuration.java diff --git a/apron/src/main/java/forge/ForgeHooks.java b/src/apron/java/forge/ForgeHooks.java similarity index 100% rename from apron/src/main/java/forge/ForgeHooks.java rename to src/apron/java/forge/ForgeHooks.java diff --git a/apron/src/main/java/forge/ForgeHooksClient.java b/src/apron/java/forge/ForgeHooksClient.java similarity index 100% rename from apron/src/main/java/forge/ForgeHooksClient.java rename to src/apron/java/forge/ForgeHooksClient.java diff --git a/apron/src/main/java/forge/IArmorTextureProvider.java b/src/apron/java/forge/IArmorTextureProvider.java similarity index 100% rename from apron/src/main/java/forge/IArmorTextureProvider.java rename to src/apron/java/forge/IArmorTextureProvider.java diff --git a/apron/src/main/java/forge/IBlockSecondaryProperties.java b/src/apron/java/forge/IBlockSecondaryProperties.java similarity index 100% rename from apron/src/main/java/forge/IBlockSecondaryProperties.java rename to src/apron/java/forge/IBlockSecondaryProperties.java diff --git a/apron/src/main/java/forge/IBucketHandler.java b/src/apron/java/forge/IBucketHandler.java similarity index 100% rename from apron/src/main/java/forge/IBucketHandler.java rename to src/apron/java/forge/IBucketHandler.java diff --git a/apron/src/main/java/forge/IConnectRedstone.java b/src/apron/java/forge/IConnectRedstone.java similarity index 100% rename from apron/src/main/java/forge/IConnectRedstone.java rename to src/apron/java/forge/IConnectRedstone.java diff --git a/apron/src/main/java/forge/ICraftingHandler.java b/src/apron/java/forge/ICraftingHandler.java similarity index 100% rename from apron/src/main/java/forge/ICraftingHandler.java rename to src/apron/java/forge/ICraftingHandler.java diff --git a/apron/src/main/java/forge/ICustomItemRenderer.java b/src/apron/java/forge/ICustomItemRenderer.java similarity index 100% rename from apron/src/main/java/forge/ICustomItemRenderer.java rename to src/apron/java/forge/ICustomItemRenderer.java diff --git a/apron/src/main/java/forge/IDestroyToolHandler.java b/src/apron/java/forge/IDestroyToolHandler.java similarity index 100% rename from apron/src/main/java/forge/IDestroyToolHandler.java rename to src/apron/java/forge/IDestroyToolHandler.java diff --git a/apron/src/main/java/forge/IHighlightHandler.java b/src/apron/java/forge/IHighlightHandler.java similarity index 100% rename from apron/src/main/java/forge/IHighlightHandler.java rename to src/apron/java/forge/IHighlightHandler.java diff --git a/apron/src/main/java/forge/IMultipassRender.java b/src/apron/java/forge/IMultipassRender.java similarity index 100% rename from apron/src/main/java/forge/IMultipassRender.java rename to src/apron/java/forge/IMultipassRender.java diff --git a/apron/src/main/java/forge/IOreHandler.java b/src/apron/java/forge/IOreHandler.java similarity index 100% rename from apron/src/main/java/forge/IOreHandler.java rename to src/apron/java/forge/IOreHandler.java diff --git a/apron/src/main/java/forge/IOverrideReplace.java b/src/apron/java/forge/IOverrideReplace.java similarity index 100% rename from apron/src/main/java/forge/IOverrideReplace.java rename to src/apron/java/forge/IOverrideReplace.java diff --git a/apron/src/main/java/forge/IShearable.java b/src/apron/java/forge/IShearable.java similarity index 100% rename from apron/src/main/java/forge/IShearable.java rename to src/apron/java/forge/IShearable.java diff --git a/apron/src/main/java/forge/ISleepHandler.java b/src/apron/java/forge/ISleepHandler.java similarity index 100% rename from apron/src/main/java/forge/ISleepHandler.java rename to src/apron/java/forge/ISleepHandler.java diff --git a/apron/src/main/java/forge/ISpecialArmor.java b/src/apron/java/forge/ISpecialArmor.java similarity index 100% rename from apron/src/main/java/forge/ISpecialArmor.java rename to src/apron/java/forge/ISpecialArmor.java diff --git a/apron/src/main/java/forge/ISpecialResistance.java b/src/apron/java/forge/ISpecialResistance.java similarity index 100% rename from apron/src/main/java/forge/ISpecialResistance.java rename to src/apron/java/forge/ISpecialResistance.java diff --git a/apron/src/main/java/forge/ITextureProvider.java b/src/apron/java/forge/ITextureProvider.java similarity index 100% rename from apron/src/main/java/forge/ITextureProvider.java rename to src/apron/java/forge/ITextureProvider.java diff --git a/apron/src/main/java/forge/IUseItemFirst.java b/src/apron/java/forge/IUseItemFirst.java similarity index 100% rename from apron/src/main/java/forge/IUseItemFirst.java rename to src/apron/java/forge/IUseItemFirst.java diff --git a/apron/src/main/java/forge/MinecraftForge.java b/src/apron/java/forge/MinecraftForge.java similarity index 100% rename from apron/src/main/java/forge/MinecraftForge.java rename to src/apron/java/forge/MinecraftForge.java diff --git a/apron/src/main/java/forge/MinecraftForgeClient.java b/src/apron/java/forge/MinecraftForgeClient.java similarity index 100% rename from apron/src/main/java/forge/MinecraftForgeClient.java rename to src/apron/java/forge/MinecraftForgeClient.java diff --git a/apron/src/main/java/forge/Property.java b/src/apron/java/forge/Property.java similarity index 100% rename from apron/src/main/java/forge/Property.java rename to src/apron/java/forge/Property.java diff --git a/apron/src/main/java/guiapi/GuiApiHelper.java b/src/apron/java/guiapi/GuiApiHelper.java similarity index 100% rename from apron/src/main/java/guiapi/GuiApiHelper.java rename to src/apron/java/guiapi/GuiApiHelper.java diff --git a/apron/src/main/java/guiapi/ModAction.java b/src/apron/java/guiapi/ModAction.java similarity index 100% rename from apron/src/main/java/guiapi/ModAction.java rename to src/apron/java/guiapi/ModAction.java diff --git a/apron/src/main/java/guiapi/ModScreen.java b/src/apron/java/guiapi/ModScreen.java similarity index 100% rename from apron/src/main/java/guiapi/ModScreen.java rename to src/apron/java/guiapi/ModScreen.java diff --git a/apron/src/main/java/guiapi/ModSelect.java b/src/apron/java/guiapi/ModSelect.java similarity index 100% rename from apron/src/main/java/guiapi/ModSelect.java rename to src/apron/java/guiapi/ModSelect.java diff --git a/apron/src/main/java/guiapi/ModSettingScreen.java b/src/apron/java/guiapi/ModSettingScreen.java similarity index 100% rename from apron/src/main/java/guiapi/ModSettingScreen.java rename to src/apron/java/guiapi/ModSettingScreen.java diff --git a/apron/src/main/java/guiapi/ModSettings.java b/src/apron/java/guiapi/ModSettings.java similarity index 100% rename from apron/src/main/java/guiapi/ModSettings.java rename to src/apron/java/guiapi/ModSettings.java diff --git a/apron/src/main/java/guiapi/setting/BooleanSetting.java b/src/apron/java/guiapi/setting/BooleanSetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/BooleanSetting.java rename to src/apron/java/guiapi/setting/BooleanSetting.java diff --git a/apron/src/main/java/guiapi/setting/FloatSetting.java b/src/apron/java/guiapi/setting/FloatSetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/FloatSetting.java rename to src/apron/java/guiapi/setting/FloatSetting.java diff --git a/apron/src/main/java/guiapi/setting/IntSetting.java b/src/apron/java/guiapi/setting/IntSetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/IntSetting.java rename to src/apron/java/guiapi/setting/IntSetting.java diff --git a/apron/src/main/java/guiapi/setting/KeySetting.java b/src/apron/java/guiapi/setting/KeySetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/KeySetting.java rename to src/apron/java/guiapi/setting/KeySetting.java diff --git a/apron/src/main/java/guiapi/setting/MultiSetting.java b/src/apron/java/guiapi/setting/MultiSetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/MultiSetting.java rename to src/apron/java/guiapi/setting/MultiSetting.java diff --git a/apron/src/main/java/guiapi/setting/Setting.java b/src/apron/java/guiapi/setting/Setting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/Setting.java rename to src/apron/java/guiapi/setting/Setting.java diff --git a/apron/src/main/java/guiapi/setting/TextSetting.java b/src/apron/java/guiapi/setting/TextSetting.java similarity index 100% rename from apron/src/main/java/guiapi/setting/TextSetting.java rename to src/apron/java/guiapi/setting/TextSetting.java diff --git a/apron/src/main/java/guiapi/widget/BooleanWidget.java b/src/apron/java/guiapi/widget/BooleanWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/BooleanWidget.java rename to src/apron/java/guiapi/widget/BooleanWidget.java diff --git a/apron/src/main/java/guiapi/widget/ClassicTwoColumnWidget.java b/src/apron/java/guiapi/widget/ClassicTwoColumnWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/ClassicTwoColumnWidget.java rename to src/apron/java/guiapi/widget/ClassicTwoColumnWidget.java diff --git a/apron/src/main/java/guiapi/widget/FloatWidget.java b/src/apron/java/guiapi/widget/FloatWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/FloatWidget.java rename to src/apron/java/guiapi/widget/FloatWidget.java diff --git a/apron/src/main/java/guiapi/widget/IntWidget.java b/src/apron/java/guiapi/widget/IntWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/IntWidget.java rename to src/apron/java/guiapi/widget/IntWidget.java diff --git a/apron/src/main/java/guiapi/widget/KeybindingWidget.java b/src/apron/java/guiapi/widget/KeybindingWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/KeybindingWidget.java rename to src/apron/java/guiapi/widget/KeybindingWidget.java diff --git a/apron/src/main/java/guiapi/widget/MultiWidget.java b/src/apron/java/guiapi/widget/MultiWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/MultiWidget.java rename to src/apron/java/guiapi/widget/MultiWidget.java diff --git a/apron/src/main/java/guiapi/widget/ScreenWidget.java b/src/apron/java/guiapi/widget/ScreenWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/ScreenWidget.java rename to src/apron/java/guiapi/widget/ScreenWidget.java diff --git a/apron/src/main/java/guiapi/widget/SettingWidget.java b/src/apron/java/guiapi/widget/SettingWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/SettingWidget.java rename to src/apron/java/guiapi/widget/SettingWidget.java diff --git a/apron/src/main/java/guiapi/widget/SimpleWindowWidget.java b/src/apron/java/guiapi/widget/SimpleWindowWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/SimpleWindowWidget.java rename to src/apron/java/guiapi/widget/SimpleWindowWidget.java diff --git a/apron/src/main/java/guiapi/widget/SingleColumnWidget.java b/src/apron/java/guiapi/widget/SingleColumnWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/SingleColumnWidget.java rename to src/apron/java/guiapi/widget/SingleColumnWidget.java diff --git a/apron/src/main/java/guiapi/widget/SingleRowWidget.java b/src/apron/java/guiapi/widget/SingleRowWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/SingleRowWidget.java rename to src/apron/java/guiapi/widget/SingleRowWidget.java diff --git a/apron/src/main/java/guiapi/widget/SliderWidget.java b/src/apron/java/guiapi/widget/SliderWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/SliderWidget.java rename to src/apron/java/guiapi/widget/SliderWidget.java diff --git a/apron/src/main/java/guiapi/widget/TextWidget.java b/src/apron/java/guiapi/widget/TextWidget.java similarity index 100% rename from apron/src/main/java/guiapi/widget/TextWidget.java rename to src/apron/java/guiapi/widget/TextWidget.java diff --git a/apron/src/main/java/io/github/betterthanupdates/Legacy.java b/src/apron/java/io/github/betterthanupdates/Legacy.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/Legacy.java rename to src/apron/java/io/github/betterthanupdates/Legacy.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/APIInternal.java b/src/apron/java/io/github/betterthanupdates/apron/APIInternal.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/APIInternal.java rename to src/apron/java/io/github/betterthanupdates/apron/APIInternal.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/Apron.java b/src/apron/java/io/github/betterthanupdates/apron/Apron.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/Apron.java rename to src/apron/java/io/github/betterthanupdates/apron/Apron.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/ApronMixinPlugin.java b/src/apron/java/io/github/betterthanupdates/apron/ApronMixinPlugin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/ApronMixinPlugin.java rename to src/apron/java/io/github/betterthanupdates/apron/ApronMixinPlugin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java b/src/apron/java/io/github/betterthanupdates/apron/ApronModRemapper.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java rename to src/apron/java/io/github/betterthanupdates/apron/ApronModRemapper.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/LifecycleUtils.java b/src/apron/java/io/github/betterthanupdates/apron/LifecycleUtils.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/LifecycleUtils.java rename to src/apron/java/io/github/betterthanupdates/apron/LifecycleUtils.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/Pair.java b/src/apron/java/io/github/betterthanupdates/apron/Pair.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/Pair.java rename to src/apron/java/io/github/betterthanupdates/apron/Pair.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/ReflectionUtils.java b/src/apron/java/io/github/betterthanupdates/apron/ReflectionUtils.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/ReflectionUtils.java rename to src/apron/java/io/github/betterthanupdates/apron/ReflectionUtils.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/api/ApronApi.java b/src/apron/java/io/github/betterthanupdates/apron/api/ApronApi.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/api/ApronApi.java rename to src/apron/java/io/github/betterthanupdates/apron/api/ApronApi.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/impl/client/ApronClientImpl.java b/src/apron/java/io/github/betterthanupdates/apron/impl/client/ApronClientImpl.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/impl/client/ApronClientImpl.java rename to src/apron/java/io/github/betterthanupdates/apron/impl/client/ApronClientImpl.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/impl/package-info.java b/src/apron/java/io/github/betterthanupdates/apron/impl/package-info.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/impl/package-info.java rename to src/apron/java/io/github/betterthanupdates/apron/impl/package-info.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/impl/server/ApronServerImpl.java b/src/apron/java/io/github/betterthanupdates/apron/impl/server/ApronServerImpl.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/impl/server/ApronServerImpl.java rename to src/apron/java/io/github/betterthanupdates/apron/impl/server/ApronServerImpl.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/item/ItemConvertible.java b/src/apron/java/io/github/betterthanupdates/apron/item/ItemConvertible.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/item/ItemConvertible.java rename to src/apron/java/io/github/betterthanupdates/apron/item/ItemConvertible.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/BlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/EntityAccessor.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/ItemEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/ItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/ItemStackMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/WorldAccessor.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/client/ButtonWidgetAccessor.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/client/InGameHudMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/client/MinecraftClientMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/client/SoundHelperAccessor.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java b/src/apron/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/apron/mixin/client/TitleScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/package-info.java b/src/apron/java/io/github/betterthanupdates/apron/package-info.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/package-info.java rename to src/apron/java/io/github/betterthanupdates/apron/package-info.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterClassWriter.java b/src/apron/java/io/github/betterthanupdates/apron/remapped/BetterClassWriter.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterClassWriter.java rename to src/apron/java/io/github/betterthanupdates/apron/remapped/BetterClassWriter.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterFieldInsnNode.java b/src/apron/java/io/github/betterthanupdates/apron/remapped/BetterFieldInsnNode.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterFieldInsnNode.java rename to src/apron/java/io/github/betterthanupdates/apron/remapped/BetterFieldInsnNode.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterMethodInsnNode.java b/src/apron/java/io/github/betterthanupdates/apron/remapped/BetterMethodInsnNode.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/remapped/BetterMethodInsnNode.java rename to src/apron/java/io/github/betterthanupdates/apron/remapped/BetterMethodInsnNode.java diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/remapped/RemapAwareClass.java b/src/apron/java/io/github/betterthanupdates/apron/remapped/RemapAwareClass.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/apron/remapped/RemapAwareClass.java rename to src/apron/java/io/github/betterthanupdates/apron/remapped/RemapAwareClass.java diff --git a/apron/src/main/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java b/src/apron/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java rename to src/apron/java/io/github/betterthanupdates/audiomod/mixin/client/SoundHelperMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/ForgeClientReflection.java b/src/apron/java/io/github/betterthanupdates/forge/ForgeClientReflection.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/ForgeClientReflection.java rename to src/apron/java/io/github/betterthanupdates/forge/ForgeClientReflection.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/block/ForgeBlock.java b/src/apron/java/io/github/betterthanupdates/forge/block/ForgeBlock.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/block/ForgeBlock.java rename to src/apron/java/io/github/betterthanupdates/forge/block/ForgeBlock.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/client/particle/ForgeParticleManager.java b/src/apron/java/io/github/betterthanupdates/forge/client/particle/ForgeParticleManager.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/client/particle/ForgeParticleManager.java rename to src/apron/java/io/github/betterthanupdates/forge/client/particle/ForgeParticleManager.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/client/render/ForgeTessellator.java b/src/apron/java/io/github/betterthanupdates/forge/client/render/ForgeTessellator.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/client/render/ForgeTessellator.java rename to src/apron/java/io/github/betterthanupdates/forge/client/render/ForgeTessellator.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/entity/player/ForgePlayerEntity.java b/src/apron/java/io/github/betterthanupdates/forge/entity/player/ForgePlayerEntity.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/entity/player/ForgePlayerEntity.java rename to src/apron/java/io/github/betterthanupdates/forge/entity/player/ForgePlayerEntity.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/item/ForgeItem.java b/src/apron/java/io/github/betterthanupdates/forge/item/ForgeItem.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/item/ForgeItem.java rename to src/apron/java/io/github/betterthanupdates/forge/item/ForgeItem.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/item/ForgeTool.java b/src/apron/java/io/github/betterthanupdates/forge/item/ForgeTool.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/item/ForgeTool.java rename to src/apron/java/io/github/betterthanupdates/forge/item/ForgeTool.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/item/ToolEffectiveness.java b/src/apron/java/io/github/betterthanupdates/forge/item/ToolEffectiveness.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/item/ToolEffectiveness.java rename to src/apron/java/io/github/betterthanupdates/forge/item/ToolEffectiveness.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/BlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/BlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/BlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/BlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/ButtonBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/ButtonBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/ButtonBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/ButtonBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/ChestBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/ChestBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/ChestBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/ChestBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/DoorBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/DoorBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/DoorBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/DoorBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/LadderBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/LadderBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/LadderBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/LadderBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/LeverBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/LeverBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/LeverBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/LeverBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/PressurePlateBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/PressurePlateBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/PressurePlateBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/PressurePlateBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RailBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/RailBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RailBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/RailBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/RedstoneDustBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneRepeaterBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/RedstoneRepeaterBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/RedstoneRepeaterBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/RedstoneRepeaterBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/TorchBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/TorchBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/TorchBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/TorchBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/TrapdoorBlockMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/block/TrapdoorBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/block/TrapdoorBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/block/TrapdoorBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/BlockRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/ClientInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/GameRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/GameRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/GameRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/GameRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/ParticleManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/ParticleManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/ParticleManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/ParticleManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/PistonRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/PistonRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/PistonRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/PistonRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/PlayerRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/TessellatorMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/TextureManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/VanillaTessellatorMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/VanillaTessellatorMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/VanillaTessellatorMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/VanillaTessellatorMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/WorldRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/HeldItemRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/HeldItemRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/HeldItemRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/HeldItemRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/ItemRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/MultiplayerClientInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/client/nostation/SinglePlayerInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/container/slot/CraftingResultSlotMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/entity/LivingEntityMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/entity/LivingEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/entity/LivingEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/entity/LivingEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/entity/player/PlayerEntityMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/entity/player/PlayerEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/entity/player/PlayerEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/entity/player/PlayerEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/item/BucketItemMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/item/BucketItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/item/BucketItemMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/item/BucketItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/item/ItemMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/item/ItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/item/ItemMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/item/ItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/class_417Mixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/class_417Mixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/class_417Mixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/server/class_417Mixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/item/ToolItemMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/item/ToolItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/item/ToolItemMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/server/item/ToolItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java similarity index 85% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java index 2d5cd762..b693d627 100644 --- a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java +++ b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/nostation/ServerPlayerView_class_514Mixin.java @@ -1,13 +1,14 @@ package io.github.betterthanupdates.forge.mixin.server.server.nostation; import net.minecraft.server.ServerPlayerView; +import net.minecraft.server.ServerPlayerView$class_514; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import java.io.PrintStream; -@Mixin(ServerPlayerView.class_514.class) +@Mixin(ServerPlayerView$class_514.class) public class ServerPlayerView_class_514Mixin { @Redirect(method = "method_1752", at = @At(value = "INVOKE", target = "Ljava/io/PrintStream;println(Ljava/lang/String;)V", remap = false)) private void preventFromSpammingConsole(PrintStream instance, String x) { diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/player/ServerInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/server/server/player/nostation/ServerInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/util/hit/HitResultMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/util/hit/HitResultMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/util/hit/HitResultMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/util/hit/HitResultMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/WorldMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/world/WorldMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/WorldMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/world/WorldMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/chunk/ChunkMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/world/chunk/ChunkMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/chunk/ChunkMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/world/chunk/ChunkMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/explosion/ExplosionMixin.java b/src/apron/java/io/github/betterthanupdates/forge/mixin/world/explosion/ExplosionMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/mixin/world/explosion/ExplosionMixin.java rename to src/apron/java/io/github/betterthanupdates/forge/mixin/world/explosion/ExplosionMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/package-info.java b/src/apron/java/io/github/betterthanupdates/forge/package-info.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/package-info.java rename to src/apron/java/io/github/betterthanupdates/forge/package-info.java diff --git a/apron/src/main/java/io/github/betterthanupdates/forge/world/ForgeWorld.java b/src/apron/java/io/github/betterthanupdates/forge/world/ForgeWorld.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/forge/world/ForgeWorld.java rename to src/apron/java/io/github/betterthanupdates/forge/world/ForgeWorld.java diff --git a/apron/src/main/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java b/src/apron/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/guiapi/mixin/client/OptionsScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/DispenserBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/FurnaceBlockEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/FurnaceOutputSlotMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/FurnaceOutputSlotMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/FurnaceOutputSlotMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/FurnaceOutputSlotMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ClientPlayPacketHandlerMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ClientPlayPacketHandlerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ClientPlayPacketHandlerMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ClientPlayPacketHandlerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectPacketMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectPacketMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectPacketMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectPacketMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectingScreenMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectingScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectingScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/DisconnectingScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/EntityRenderDispatcherMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/EntityRenderDispatcherMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/EntityRenderDispatcherMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/EntityRenderDispatcherMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/GameStartupErrorPanelMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/GameStartupErrorPanelMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/GameStartupErrorPanelMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/GameStartupErrorPanelMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ItemEntityMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ItemEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ItemEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ItemEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ServerChunkCacheMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ServerChunkCacheMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/client/ServerChunkCacheMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/client/ServerChunkCacheMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/nostation/VanillaFurnaceBlockEntityMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/nostation/VanillaFurnaceBlockEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/nostation/VanillaFurnaceBlockEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/nostation/VanillaFurnaceBlockEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/CommandManagerMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/CommandManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/CommandManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/CommandManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/MinecraftServerMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/MinecraftServerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/MinecraftServerMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/MinecraftServerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerEntityTrackerMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerEntityTrackerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerEntityTrackerMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerEntityTrackerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerLoginPacketHandlerMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerLoginPacketHandlerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerLoginPacketHandlerMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerLoginPacketHandlerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerWorldSourceMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerWorldSourceMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/ServerWorldSourceMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/ServerWorldSourceMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/TrackedEntityMixin.java b/src/apron/java/io/github/betterthanupdates/modloader/mixin/server/TrackedEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/mixin/server/TrackedEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/modloader/mixin/server/TrackedEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modloader/package-info.java b/src/apron/java/io/github/betterthanupdates/modloader/package-info.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modloader/package-info.java rename to src/apron/java/io/github/betterthanupdates/modloader/package-info.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/ConnectingScreenMixin.java b/src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/ConnectingScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/ConnectingScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/ConnectingScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/OptionsScreenMixin.java b/src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/OptionsScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/OptionsScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/OptionsScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/PauseMenuMixin.java b/src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/PauseMenuMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/PauseMenuMixin.java rename to src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/PauseMenuMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/SelectWorldScreenMixin.java b/src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/SelectWorldScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/modoptionsapi/mixin/client/SelectWorldScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/modoptionsapi/mixin/client/SelectWorldScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/package-info.java b/src/apron/java/io/github/betterthanupdates/package-info.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/package-info.java rename to src/apron/java/io/github/betterthanupdates/package-info.java diff --git a/apron/src/main/java/io/github/betterthanupdates/playerapi/client/entity/player/PlayerAPIClientPlayerEntity.java b/src/apron/java/io/github/betterthanupdates/playerapi/client/entity/player/PlayerAPIClientPlayerEntity.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/playerapi/client/entity/player/PlayerAPIClientPlayerEntity.java rename to src/apron/java/io/github/betterthanupdates/playerapi/client/entity/player/PlayerAPIClientPlayerEntity.java diff --git a/apron/src/main/java/io/github/betterthanupdates/playerapi/mixin/client/AbstractClientPlayerEntityMixin.java b/src/apron/java/io/github/betterthanupdates/playerapi/mixin/client/AbstractClientPlayerEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/playerapi/mixin/client/AbstractClientPlayerEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/playerapi/mixin/client/AbstractClientPlayerEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/block/ReforgedBlock.java b/src/apron/java/io/github/betterthanupdates/reforged/block/ReforgedBlock.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/block/ReforgedBlock.java rename to src/apron/java/io/github/betterthanupdates/reforged/block/ReforgedBlock.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/item/ReforgedItem.java b/src/apron/java/io/github/betterthanupdates/reforged/item/ReforgedItem.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/item/ReforgedItem.java rename to src/apron/java/io/github/betterthanupdates/reforged/item/ReforgedItem.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/BlockMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/BlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/BlockMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/BlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/FurnaceBlockEntityMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/FurnaceBlockEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/FurnaceBlockEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/FurnaceBlockEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/ItemMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/ItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/ItemMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/ItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/ShearsItemMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/ShearsItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/ShearsItemMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/ShearsItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/SheepEntityMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/SheepEntityMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/SheepEntityMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/SheepEntityMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/SmeltingRecipeRegistryMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/SmeltingRecipeRegistryMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/SmeltingRecipeRegistryMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/SmeltingRecipeRegistryMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/MultiplayerClientInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/client/MultiplayerClientInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/MultiplayerClientInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/client/MultiplayerClientInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/SinglePlayerInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/client/SinglePlayerInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/SinglePlayerInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/client/SinglePlayerInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/nostation/GameRendererMixin.java b/src/apron/java/io/github/betterthanupdates/reforged/mixin/client/nostation/GameRendererMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/mixin/client/nostation/GameRendererMixin.java rename to src/apron/java/io/github/betterthanupdates/reforged/mixin/client/nostation/GameRendererMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/reforged/recipe/ReforgedSmeltingRecipeRegistry.java b/src/apron/java/io/github/betterthanupdates/reforged/recipe/ReforgedSmeltingRecipeRegistry.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/reforged/recipe/ReforgedSmeltingRecipeRegistry.java rename to src/apron/java/io/github/betterthanupdates/reforged/recipe/ReforgedSmeltingRecipeRegistry.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/block/ShockAhPIPortalBlock.java b/src/apron/java/io/github/betterthanupdates/shockahpi/block/ShockAhPIPortalBlock.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/block/ShockAhPIPortalBlock.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/block/ShockAhPIPortalBlock.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/client/gui/screen/ShockAhPIAchievementsScreen.java b/src/apron/java/io/github/betterthanupdates/shockahpi/client/gui/screen/ShockAhPIAchievementsScreen.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/client/gui/screen/ShockAhPIAchievementsScreen.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/client/gui/screen/ShockAhPIAchievementsScreen.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/AchievementsScreenMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/AchievementsScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/AchievementsScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/AchievementsScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/DungeonFeatureMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/DungeonFeatureMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/DungeonFeatureMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/DungeonFeatureMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/MultiplayerClientInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/MultiplayerClientInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/MultiplayerClientInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/MultiplayerClientInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/PortalBlockMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/PortalBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/PortalBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/PortalBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/SinglePlayerInteractionManagerMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/SinglePlayerInteractionManagerMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/SinglePlayerInteractionManagerMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/SinglePlayerInteractionManagerMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/ToolItemMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/ToolItemMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/ToolItemMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/ToolItemMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/WorldMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/WorldMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/WorldMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/WorldMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/AchievementsScreenMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/AchievementsScreenMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/AchievementsScreenMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/AchievementsScreenMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionFileMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionFileMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionFileMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionFileMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/DimensionMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/McRegionDimensionFileMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/McRegionDimensionFileMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/McRegionDimensionFileMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/McRegionDimensionFileMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/PortalBlockMixin.java b/src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/PortalBlockMixin.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/PortalBlockMixin.java rename to src/apron/java/io/github/betterthanupdates/shockahpi/mixin/client/nostation/PortalBlockMixin.java diff --git a/apron/src/main/java/io/github/betterthanupdates/stapi/StAPIBlock.java b/src/apron/java/io/github/betterthanupdates/stapi/StAPIBlock.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/stapi/StAPIBlock.java rename to src/apron/java/io/github/betterthanupdates/stapi/StAPIBlock.java diff --git a/apron/src/main/java/io/github/betterthanupdates/stapi/StAPIMinecraftClient.java b/src/apron/java/io/github/betterthanupdates/stapi/StAPIMinecraftClient.java similarity index 100% rename from apron/src/main/java/io/github/betterthanupdates/stapi/StAPIMinecraftClient.java rename to src/apron/java/io/github/betterthanupdates/stapi/StAPIMinecraftClient.java diff --git a/apron/src/main/java/itemspriteapi/IItemTexture.java b/src/apron/java/itemspriteapi/IItemTexture.java similarity index 100% rename from apron/src/main/java/itemspriteapi/IItemTexture.java rename to src/apron/java/itemspriteapi/IItemTexture.java diff --git a/apron/src/main/java/itemspriteapi/ItemTexture.java b/src/apron/java/itemspriteapi/ItemTexture.java similarity index 100% rename from apron/src/main/java/itemspriteapi/ItemTexture.java rename to src/apron/java/itemspriteapi/ItemTexture.java diff --git a/apron/src/main/java/modloader/BaseMod.java b/src/apron/java/modloader/BaseMod.java similarity index 100% rename from apron/src/main/java/modloader/BaseMod.java rename to src/apron/java/modloader/BaseMod.java diff --git a/apron/src/main/java/modloader/EntityRendererProxy.java b/src/apron/java/modloader/EntityRendererProxy.java similarity index 100% rename from apron/src/main/java/modloader/EntityRendererProxy.java rename to src/apron/java/modloader/EntityRendererProxy.java diff --git a/apron/src/main/java/modloader/MLProp.java b/src/apron/java/modloader/MLProp.java similarity index 100% rename from apron/src/main/java/modloader/MLProp.java rename to src/apron/java/modloader/MLProp.java diff --git a/apron/src/main/java/modloader/ModLoader.java b/src/apron/java/modloader/ModLoader.java similarity index 100% rename from apron/src/main/java/modloader/ModLoader.java rename to src/apron/java/modloader/ModLoader.java diff --git a/apron/src/main/java/modloader/ModTextureAnimation.java b/src/apron/java/modloader/ModTextureAnimation.java similarity index 100% rename from apron/src/main/java/modloader/ModTextureAnimation.java rename to src/apron/java/modloader/ModTextureAnimation.java diff --git a/apron/src/main/java/modloader/ModTextureStatic.java b/src/apron/java/modloader/ModTextureStatic.java similarity index 100% rename from apron/src/main/java/modloader/ModTextureStatic.java rename to src/apron/java/modloader/ModTextureStatic.java diff --git a/apron/src/main/java/modloader/package-info.java b/src/apron/java/modloader/package-info.java similarity index 100% rename from apron/src/main/java/modloader/package-info.java rename to src/apron/java/modloader/package-info.java diff --git a/apron/src/main/java/modloadermp/BaseModMp.java b/src/apron/java/modloadermp/BaseModMp.java similarity index 100% rename from apron/src/main/java/modloadermp/BaseModMp.java rename to src/apron/java/modloadermp/BaseModMp.java diff --git a/apron/src/main/java/modloadermp/EntityTrackerEntry.java b/src/apron/java/modloadermp/EntityTrackerEntry.java similarity index 100% rename from apron/src/main/java/modloadermp/EntityTrackerEntry.java rename to src/apron/java/modloadermp/EntityTrackerEntry.java diff --git a/apron/src/main/java/modloadermp/ISpawnable.java b/src/apron/java/modloadermp/ISpawnable.java similarity index 100% rename from apron/src/main/java/modloadermp/ISpawnable.java rename to src/apron/java/modloadermp/ISpawnable.java diff --git a/apron/src/main/java/modloadermp/ModLoaderMp.java b/src/apron/java/modloadermp/ModLoaderMp.java similarity index 100% rename from apron/src/main/java/modloadermp/ModLoaderMp.java rename to src/apron/java/modloadermp/ModLoaderMp.java diff --git a/apron/src/main/java/modloadermp/ModLoaderPacket.java b/src/apron/java/modloadermp/ModLoaderPacket.java similarity index 100% rename from apron/src/main/java/modloadermp/ModLoaderPacket.java rename to src/apron/java/modloadermp/ModLoaderPacket.java diff --git a/apron/src/main/java/modloadermp/NetClientHandlerEntity.java b/src/apron/java/modloadermp/NetClientHandlerEntity.java similarity index 100% rename from apron/src/main/java/modloadermp/NetClientHandlerEntity.java rename to src/apron/java/modloadermp/NetClientHandlerEntity.java diff --git a/apron/src/main/java/modloadermp/Pair.java b/src/apron/java/modloadermp/Pair.java similarity index 100% rename from apron/src/main/java/modloadermp/Pair.java rename to src/apron/java/modloadermp/Pair.java diff --git a/apron/src/main/java/modoptionsapi/IncompatibleOptionTypeException.java b/src/apron/java/modoptionsapi/IncompatibleOptionTypeException.java similarity index 100% rename from apron/src/main/java/modoptionsapi/IncompatibleOptionTypeException.java rename to src/apron/java/modoptionsapi/IncompatibleOptionTypeException.java diff --git a/apron/src/main/java/modoptionsapi/KeyAlreadyBoundException.java b/src/apron/java/modoptionsapi/KeyAlreadyBoundException.java similarity index 100% rename from apron/src/main/java/modoptionsapi/KeyAlreadyBoundException.java rename to src/apron/java/modoptionsapi/KeyAlreadyBoundException.java diff --git a/apron/src/main/java/modoptionsapi/MOCallback.java b/src/apron/java/modoptionsapi/MOCallback.java similarity index 100% rename from apron/src/main/java/modoptionsapi/MOCallback.java rename to src/apron/java/modoptionsapi/MOCallback.java diff --git a/apron/src/main/java/modoptionsapi/MODisplayString.java b/src/apron/java/modoptionsapi/MODisplayString.java similarity index 100% rename from apron/src/main/java/modoptionsapi/MODisplayString.java rename to src/apron/java/modoptionsapi/MODisplayString.java diff --git a/apron/src/main/java/modoptionsapi/MOFormatters.java b/src/apron/java/modoptionsapi/MOFormatters.java similarity index 100% rename from apron/src/main/java/modoptionsapi/MOFormatters.java rename to src/apron/java/modoptionsapi/MOFormatters.java diff --git a/apron/src/main/java/modoptionsapi/MOMissingModException.java b/src/apron/java/modoptionsapi/MOMissingModException.java similarity index 100% rename from apron/src/main/java/modoptionsapi/MOMissingModException.java rename to src/apron/java/modoptionsapi/MOMissingModException.java diff --git a/apron/src/main/java/modoptionsapi/ModBooleanOption.java b/src/apron/java/modoptionsapi/ModBooleanOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModBooleanOption.java rename to src/apron/java/modoptionsapi/ModBooleanOption.java diff --git a/apron/src/main/java/modoptionsapi/ModKeyOption.java b/src/apron/java/modoptionsapi/ModKeyOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModKeyOption.java rename to src/apron/java/modoptionsapi/ModKeyOption.java diff --git a/apron/src/main/java/modoptionsapi/ModMappedMultiOption.java b/src/apron/java/modoptionsapi/ModMappedMultiOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModMappedMultiOption.java rename to src/apron/java/modoptionsapi/ModMappedMultiOption.java diff --git a/apron/src/main/java/modoptionsapi/ModMultiOption.java b/src/apron/java/modoptionsapi/ModMultiOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModMultiOption.java rename to src/apron/java/modoptionsapi/ModMultiOption.java diff --git a/apron/src/main/java/modoptionsapi/ModOption.java b/src/apron/java/modoptionsapi/ModOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModOption.java rename to src/apron/java/modoptionsapi/ModOption.java diff --git a/apron/src/main/java/modoptionsapi/ModOptions.java b/src/apron/java/modoptionsapi/ModOptions.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModOptions.java rename to src/apron/java/modoptionsapi/ModOptions.java diff --git a/apron/src/main/java/modoptionsapi/ModOptionsAPI.java b/src/apron/java/modoptionsapi/ModOptionsAPI.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModOptionsAPI.java rename to src/apron/java/modoptionsapi/ModOptionsAPI.java diff --git a/apron/src/main/java/modoptionsapi/ModOptionsGuiController.java b/src/apron/java/modoptionsapi/ModOptionsGuiController.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModOptionsGuiController.java rename to src/apron/java/modoptionsapi/ModOptionsGuiController.java diff --git a/apron/src/main/java/modoptionsapi/ModSliderOption.java b/src/apron/java/modoptionsapi/ModSliderOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModSliderOption.java rename to src/apron/java/modoptionsapi/ModSliderOption.java diff --git a/apron/src/main/java/modoptionsapi/ModTextOption.java b/src/apron/java/modoptionsapi/ModTextOption.java similarity index 100% rename from apron/src/main/java/modoptionsapi/ModTextOption.java rename to src/apron/java/modoptionsapi/ModTextOption.java diff --git a/apron/src/main/java/modoptionsapi/NoSuchOptionException.java b/src/apron/java/modoptionsapi/NoSuchOptionException.java similarity index 100% rename from apron/src/main/java/modoptionsapi/NoSuchOptionException.java rename to src/apron/java/modoptionsapi/NoSuchOptionException.java diff --git a/apron/src/main/java/modoptionsapi/gui/KeyBindingField.java b/src/apron/java/modoptionsapi/gui/KeyBindingField.java similarity index 100% rename from apron/src/main/java/modoptionsapi/gui/KeyBindingField.java rename to src/apron/java/modoptionsapi/gui/KeyBindingField.java diff --git a/apron/src/main/java/modoptionsapi/gui/ModMenu.java b/src/apron/java/modoptionsapi/gui/ModMenu.java similarity index 100% rename from apron/src/main/java/modoptionsapi/gui/ModMenu.java rename to src/apron/java/modoptionsapi/gui/ModMenu.java diff --git a/apron/src/main/java/modoptionsapi/gui/Slider.java b/src/apron/java/modoptionsapi/gui/Slider.java similarity index 100% rename from apron/src/main/java/modoptionsapi/gui/Slider.java rename to src/apron/java/modoptionsapi/gui/Slider.java diff --git a/apron/src/main/java/modoptionsapi/gui/TextField.java b/src/apron/java/modoptionsapi/gui/TextField.java similarity index 100% rename from apron/src/main/java/modoptionsapi/gui/TextField.java rename to src/apron/java/modoptionsapi/gui/TextField.java diff --git a/apron/src/main/java/modoptionsapi/gui/TextInputField.java b/src/apron/java/modoptionsapi/gui/TextInputField.java similarity index 100% rename from apron/src/main/java/modoptionsapi/gui/TextInputField.java rename to src/apron/java/modoptionsapi/gui/TextInputField.java diff --git a/apron/src/main/java/paulscode/sound/codecs/CodecIBXM.java b/src/apron/java/paulscode/sound/codecs/CodecIBXM.java similarity index 100% rename from apron/src/main/java/paulscode/sound/codecs/CodecIBXM.java rename to src/apron/java/paulscode/sound/codecs/CodecIBXM.java diff --git a/apron/src/main/java/playerapi/PlayerAPI.java b/src/apron/java/playerapi/PlayerAPI.java similarity index 100% rename from apron/src/main/java/playerapi/PlayerAPI.java rename to src/apron/java/playerapi/PlayerAPI.java diff --git a/apron/src/main/java/playerapi/PlayerBase.java b/src/apron/java/playerapi/PlayerBase.java similarity index 100% rename from apron/src/main/java/playerapi/PlayerBase.java rename to src/apron/java/playerapi/PlayerBase.java diff --git a/apron/src/main/java/reforged/ICustomDrop.java b/src/apron/java/reforged/ICustomDrop.java similarity index 100% rename from apron/src/main/java/reforged/ICustomDrop.java rename to src/apron/java/reforged/ICustomDrop.java diff --git a/apron/src/main/java/reforged/IReachEntity.java b/src/apron/java/reforged/IReachEntity.java similarity index 100% rename from apron/src/main/java/reforged/IReachEntity.java rename to src/apron/java/reforged/IReachEntity.java diff --git a/apron/src/main/java/reforged/Reforged.java b/src/apron/java/reforged/Reforged.java similarity index 100% rename from apron/src/main/java/reforged/Reforged.java rename to src/apron/java/reforged/Reforged.java diff --git a/apron/src/main/java/reforged/ReforgedHooks.java b/src/apron/java/reforged/ReforgedHooks.java similarity index 100% rename from apron/src/main/java/reforged/ReforgedHooks.java rename to src/apron/java/reforged/ReforgedHooks.java diff --git a/apron/src/main/java/reforged/ReforgedMod.java b/src/apron/java/reforged/ReforgedMod.java similarity index 100% rename from apron/src/main/java/reforged/ReforgedMod.java rename to src/apron/java/reforged/ReforgedMod.java diff --git a/apron/src/main/java/shockahpi/AchievementPage.java b/src/apron/java/shockahpi/AchievementPage.java similarity index 100% rename from apron/src/main/java/shockahpi/AchievementPage.java rename to src/apron/java/shockahpi/AchievementPage.java diff --git a/apron/src/main/java/shockahpi/AnimBase.java b/src/apron/java/shockahpi/AnimBase.java similarity index 100% rename from apron/src/main/java/shockahpi/AnimBase.java rename to src/apron/java/shockahpi/AnimBase.java diff --git a/apron/src/main/java/shockahpi/AnimPulse.java b/src/apron/java/shockahpi/AnimPulse.java similarity index 100% rename from apron/src/main/java/shockahpi/AnimPulse.java rename to src/apron/java/shockahpi/AnimPulse.java diff --git a/apron/src/main/java/shockahpi/AnimShift.java b/src/apron/java/shockahpi/AnimShift.java similarity index 100% rename from apron/src/main/java/shockahpi/AnimShift.java rename to src/apron/java/shockahpi/AnimShift.java diff --git a/apron/src/main/java/shockahpi/BlockHarvestPower.java b/src/apron/java/shockahpi/BlockHarvestPower.java similarity index 100% rename from apron/src/main/java/shockahpi/BlockHarvestPower.java rename to src/apron/java/shockahpi/BlockHarvestPower.java diff --git a/apron/src/main/java/shockahpi/DimensionBase.java b/src/apron/java/shockahpi/DimensionBase.java similarity index 100% rename from apron/src/main/java/shockahpi/DimensionBase.java rename to src/apron/java/shockahpi/DimensionBase.java diff --git a/apron/src/main/java/shockahpi/DimensionNether.java b/src/apron/java/shockahpi/DimensionNether.java similarity index 100% rename from apron/src/main/java/shockahpi/DimensionNether.java rename to src/apron/java/shockahpi/DimensionNether.java diff --git a/apron/src/main/java/shockahpi/DimensionOverworld.java b/src/apron/java/shockahpi/DimensionOverworld.java similarity index 100% rename from apron/src/main/java/shockahpi/DimensionOverworld.java rename to src/apron/java/shockahpi/DimensionOverworld.java diff --git a/apron/src/main/java/shockahpi/DungeonLoot.java b/src/apron/java/shockahpi/DungeonLoot.java similarity index 100% rename from apron/src/main/java/shockahpi/DungeonLoot.java rename to src/apron/java/shockahpi/DungeonLoot.java diff --git a/apron/src/main/java/shockahpi/GenDeposit.java b/src/apron/java/shockahpi/GenDeposit.java similarity index 100% rename from apron/src/main/java/shockahpi/GenDeposit.java rename to src/apron/java/shockahpi/GenDeposit.java diff --git a/apron/src/main/java/shockahpi/IInterceptBlockSet.java b/src/apron/java/shockahpi/IInterceptBlockSet.java similarity index 100% rename from apron/src/main/java/shockahpi/IInterceptBlockSet.java rename to src/apron/java/shockahpi/IInterceptBlockSet.java diff --git a/apron/src/main/java/shockahpi/IInterceptHarvest.java b/src/apron/java/shockahpi/IInterceptHarvest.java similarity index 100% rename from apron/src/main/java/shockahpi/IInterceptHarvest.java rename to src/apron/java/shockahpi/IInterceptHarvest.java diff --git a/apron/src/main/java/shockahpi/IReach.java b/src/apron/java/shockahpi/IReach.java similarity index 100% rename from apron/src/main/java/shockahpi/IReach.java rename to src/apron/java/shockahpi/IReach.java diff --git a/apron/src/main/java/shockahpi/Loc.java b/src/apron/java/shockahpi/Loc.java similarity index 100% rename from apron/src/main/java/shockahpi/Loc.java rename to src/apron/java/shockahpi/Loc.java diff --git a/apron/src/main/java/shockahpi/PlayerBaseSAPI.java b/src/apron/java/shockahpi/PlayerBaseSAPI.java similarity index 100% rename from apron/src/main/java/shockahpi/PlayerBaseSAPI.java rename to src/apron/java/shockahpi/PlayerBaseSAPI.java diff --git a/apron/src/main/java/shockahpi/SAPI.java b/src/apron/java/shockahpi/SAPI.java similarity index 100% rename from apron/src/main/java/shockahpi/SAPI.java rename to src/apron/java/shockahpi/SAPI.java diff --git a/apron/src/main/java/shockahpi/Tool.java b/src/apron/java/shockahpi/Tool.java similarity index 100% rename from apron/src/main/java/shockahpi/Tool.java rename to src/apron/java/shockahpi/Tool.java diff --git a/apron/src/main/java/shockahpi/ToolBase.java b/src/apron/java/shockahpi/ToolBase.java similarity index 100% rename from apron/src/main/java/shockahpi/ToolBase.java rename to src/apron/java/shockahpi/ToolBase.java diff --git a/apron/src/main/resources/apron.accesswidener b/src/apron/resources/apron.accesswidener similarity index 100% rename from apron/src/main/resources/apron.accesswidener rename to src/apron/resources/apron.accesswidener diff --git a/apron/src/main/resources/apron.mixins.json b/src/apron/resources/apron.mixins.json similarity index 100% rename from apron/src/main/resources/apron.mixins.json rename to src/apron/resources/apron.mixins.json diff --git a/apron/src/main/resources/apron.parent.mixins.json b/src/apron/resources/apron.parent.mixins.json similarity index 100% rename from apron/src/main/resources/apron.parent.mixins.json rename to src/apron/resources/apron.parent.mixins.json diff --git a/apron/src/main/resources/assets/apron/icon.png b/src/apron/resources/assets/apron/icon.png similarity index 100% rename from apron/src/main/resources/assets/apron/icon.png rename to src/apron/resources/assets/apron/icon.png diff --git a/apron/src/main/resources/audiomod.mixins.json b/src/apron/resources/audiomod.mixins.json similarity index 100% rename from apron/src/main/resources/audiomod.mixins.json rename to src/apron/resources/audiomod.mixins.json diff --git a/apron/src/main/resources/fabric.mod.json b/src/apron/resources/fabric.mod.json similarity index 100% rename from apron/src/main/resources/fabric.mod.json rename to src/apron/resources/fabric.mod.json diff --git a/apron/src/main/resources/font.fnt b/src/apron/resources/font.fnt similarity index 100% rename from apron/src/main/resources/font.fnt rename to src/apron/resources/font.fnt diff --git a/apron/src/main/resources/font/default.png b/src/apron/resources/font/default.png similarity index 100% rename from apron/src/main/resources/font/default.png rename to src/apron/resources/font/default.png diff --git a/apron/src/main/resources/forge.mixins.json b/src/apron/resources/forge.mixins.json similarity index 100% rename from apron/src/main/resources/forge.mixins.json rename to src/apron/resources/forge.mixins.json diff --git a/apron/src/main/resources/gui/gui.png b/src/apron/resources/gui/gui.png similarity index 100% rename from apron/src/main/resources/gui/gui.png rename to src/apron/resources/gui/gui.png diff --git a/apron/src/main/resources/guiapi.mixins.json b/src/apron/resources/guiapi.mixins.json similarity index 100% rename from apron/src/main/resources/guiapi.mixins.json rename to src/apron/resources/guiapi.mixins.json diff --git a/apron/src/main/resources/minecraftforge_credits.txt b/src/apron/resources/minecraftforge_credits.txt similarity index 100% rename from apron/src/main/resources/minecraftforge_credits.txt rename to src/apron/resources/minecraftforge_credits.txt diff --git a/apron/src/main/resources/modloader.mixins.json b/src/apron/resources/modloader.mixins.json similarity index 100% rename from apron/src/main/resources/modloader.mixins.json rename to src/apron/resources/modloader.mixins.json diff --git a/apron/src/main/resources/modoptionsapi.mixins.json b/src/apron/resources/modoptionsapi.mixins.json similarity index 100% rename from apron/src/main/resources/modoptionsapi.mixins.json rename to src/apron/resources/modoptionsapi.mixins.json diff --git a/apron/src/main/resources/playerapi.mixins.json b/src/apron/resources/playerapi.mixins.json similarity index 100% rename from apron/src/main/resources/playerapi.mixins.json rename to src/apron/resources/playerapi.mixins.json diff --git a/apron/src/main/resources/reforged.mixins.json b/src/apron/resources/reforged.mixins.json similarity index 100% rename from apron/src/main/resources/reforged.mixins.json rename to src/apron/resources/reforged.mixins.json diff --git a/apron/src/main/resources/scrollwindow.png b/src/apron/resources/scrollwindow.png similarity index 100% rename from apron/src/main/resources/scrollwindow.png rename to src/apron/resources/scrollwindow.png diff --git a/apron/src/main/resources/shockahpi.mixins.json b/src/apron/resources/shockahpi.mixins.json similarity index 100% rename from apron/src/main/resources/shockahpi.mixins.json rename to src/apron/resources/shockahpi.mixins.json diff --git a/apron/src/main/resources/twlGuiTheme.xml b/src/apron/resources/twlGuiTheme.xml similarity index 100% rename from apron/src/main/resources/twlGuiTheme.xml rename to src/apron/resources/twlGuiTheme.xml diff --git a/apron/src/main/resources/twlGuiThemeIndentedbuttons.png b/src/apron/resources/twlGuiThemeIndentedbuttons.png similarity index 100% rename from apron/src/main/resources/twlGuiThemeIndentedbuttons.png rename to src/apron/resources/twlGuiThemeIndentedbuttons.png diff --git a/src/main/resources/fabric.mod.json b/src/full/resources/fabric.mod.json similarity index 100% rename from src/main/resources/fabric.mod.json rename to src/full/resources/fabric.mod.json