From ed64f6b750684c3faa4ee56904ee3f10dbd201e6 Mon Sep 17 00:00:00 2001 From: deirn Date: Sun, 8 Sep 2024 23:09:51 +0700 Subject: [PATCH] simplify my life --- build.gradle.kts | 72 ++++++- buildSrc/build.gradle.kts | 2 - buildSrc/src/main/kotlin/Dependencies.kt | 15 ++ .../main/kotlin/FetchLatestVersionsTask.kt | 6 + buildSrc/src/main/kotlin/GenFmjTask.kt | 94 --------- .../src/main/kotlin/GenFmlEntrypointTask.kt | 62 ------ buildSrc/src/main/kotlin/GenLanguageTask.kt | 56 ------ buildSrc/src/main/kotlin/GenMixinTask.kt | 180 ------------------ buildSrc/src/main/kotlin/GenModsTomlTask.kt | 95 --------- buildSrc/src/main/kotlin/GenPackMcmetaTask.kt | 47 ----- buildSrc/src/main/kotlin/GenWailaTask.kt | 62 ------ buildSrc/src/main/kotlin/MergeWailaTask.kt | 33 ---- buildSrc/src/main/kotlin/Metadata.kt | 37 ---- buildSrc/src/main/kotlin/Repositories.kt | 46 ----- dependencies.json | 2 + modules/fabric/alloy-forgery/build.gradle.kts | 21 -- .../megane-alloy-forgery/lang/zh_tw.json | 3 - .../applied-energistics-2/build.gradle.kts | 22 --- modules/fabric/build.gradle.kts | 133 +++++++------ modules/fabric/create/build.gradle.kts | 34 ---- .../build.gradle.kts | 24 --- .../fabric/extra-generators/build.gradle.kts | 15 -- .../industrial-revolution/build.gradle.kts | 30 --- modules/fabric/kibe/build.gradle.kts | 19 -- modules/fabric/lapis-reserve/build.gradle.kts | 13 -- modules/fabric/luggage/build.gradle.kts | 13 -- .../fabric/modern-dynamics/build.gradle.kts | 15 -- modules/fabric/powah/build.gradle.kts | 20 -- modules/fabric/reborn-core/build.gradle.kts | 13 -- .../fabric/resource-chickens/build.gradle.kts | 18 -- .../bai/megane/mixin/MixinConfigPlugin.java | 61 ++++++ .../megane/mixin/ae2}/MixinWthitModule1.java | 2 +- .../AccessorForgeControllerBlockEntity.java | 2 +- .../mixin/create}/AccessBasinBlockEntity.java | 2 +- .../AccessBasinOperatingBlockEntity.java | 2 +- .../AccessBlockBreakingKineticTileEntity.java | 2 +- .../mixin/create}/AccessContraption.java | 2 +- .../AccessMillstoneProgressProvider.java | 2 +- .../create}/AccessMountedStorageManager.java | 2 +- ...xinCrushingWheelControllerBlockEntity.java | 2 +- .../MixinMechanicalMixerBlockEntity.java | 2 +- .../moderndynamics}/AccessorItemHost.java | 2 +- .../module/ae2/MeganeAppliedEnergistics2.java | 0 .../ae2/provider/AEBaseInvProvider.java | 0 .../ae2/provider/EnergyCellProvider.java | 0 .../ae2/provider/InscriberProvider.java | 0 .../ae2/provider/SkyStoneTankProvider.java | 0 .../provider/VibrationChamberProvider.java | 0 .../alloyforgery/MeganeAlloyForgery.java | 0 .../provider/ForgeControllerProvider.java | 2 +- .../megane/module/create/MeganeCreate.java | 0 .../module/create/provider/BasinProvider.java | 2 +- .../BlockBreakingKineticProvider.java | 2 +- .../create/provider/ContraptionProvider.java | 4 +- .../CrushingWheelControllerProvider.java | 0 .../create/provider/DeployerProvider.java | 0 .../create/provider/FluidTankProvider.java | 0 .../create/provider/ItemVaultProvider.java | 0 .../provider/MechanicalMixerProvider.java | 2 +- .../create/provider/MillstoneProvider.java | 2 +- .../provider/SchematicTableProvider.java | 0 .../provider/SchematicannonProvider.java | 0 .../dmlsimulacrum/MeganeDmlSimulacrum.java | 0 .../provider/SimulationChamberProvider.java | 0 .../MeganeExtraGenerators.java | 0 .../provider/GeneratorProvider.java | 0 .../indrev/MeganeIndustrialRevolution.java | 0 .../provider/CraftingMachineProvider.java | 0 .../FluidComponentHolderProvider.java | 0 .../indrev/provider/MachineProvider.java | 0 .../provider/ModularWorkbenchProvider.java | 0 .../bai/megane/module/kibe/MeganeKibe.java | 0 .../module/kibe/provider/TankProvider.java | 0 .../lapisreserve/MeganeLapisReserve.java | 0 .../provider/LapisReserveProvider.java | 0 .../megane/module/luggage/MeganeLuggage.java | 0 .../luggage/provider/LuggageProvider.java | 0 .../moderndynamics/MeganeModernDynamics.java | 0 .../provider/FluidPipeProvider.java | 0 .../provider/ItemPipeProvider.java | 2 +- .../bai/megane/module/powah/MeganePowah.java | 0 .../powah/provider/EnergyStorageProvider.java | 0 .../powah/provider/FurnatorProvider.java | 0 .../provider/InventoryHolderProvider.java | 0 .../powah/provider/ReactorPartProvider.java | 0 .../powah/provider/TankHolderProvider.java | 0 .../module/reborncore/MeganeRebornCore.java | 0 .../provider/MachineBaseProvider.java | 0 .../provider/PowerAcceptorProvider.java | 0 .../MeganeResourceChickens.java | 0 .../provider/ChickenProvider.java | 0 .../provider/NestProvider.java | 0 .../module/techreborn/MeganeTechReborn.java | 0 .../provider/GenericMachineProvider.java | 0 .../provider/HardCodedProgressProvider.java | 0 .../MeganeWirelessNetworks.java | 0 .../provider/NetworkNodeProvider.java | 0 .../runtime/mixin/MixinPluginConfig.java | 5 +- .../resources/assets/megane/lang/en_us.json | 112 ++++++----- .../resources/assets/megane/lang/zh_tw.json | 3 + .../fabric/src/main/resources/fabric.mod.json | 3 +- .../src/main/resources/megane.mixins.json | 24 +++ .../src/main/resources/waila_plugins.json | 92 +++++++++ modules/fabric/tech-reborn/build.gradle.kts | 17 -- .../fabric/wireless-networks/build.gradle.kts | 20 -- .../applied-energistics-2/build.gradle.kts | 28 --- modules/forge/build.gradle.kts | 145 +++----------- modules/forge/create/build.gradle.kts | 24 --- .../immersive-engineering/build.gradle.kts | 24 --- modules/forge/lapis-reserve/build.gradle.kts | 16 -- modules/forge/mekanism/build.gradle.kts | 28 --- .../forge/productive-bees/build.gradle.kts | 17 -- .../forge/refined-storage/build.gradle.kts | 15 -- .../module/rs/MeganeRefinedStorage.java | 13 -- .../forge/resource-chickens/build.gradle.kts | 22 --- .../bai/megane/mixin/MixinConfigPlugin.java | 61 ++++++ .../megane/mixin/ae2}/MixinWthitModule1.java | 2 +- .../mixin/create}/AccessBasinBlockEntity.java | 2 +- .../AccessBasinOperatingBlockEntity.java | 2 +- .../AccessBlockBreakingKineticTileEntity.java | 2 +- .../mixin/create}/AccessContraption.java | 2 +- .../AccessMillstoneProgressProvider.java | 2 +- .../create}/AccessMountedStorageManager.java | 2 +- ...xinCrushingWheelControllerBlockEntity.java | 2 +- .../MixinMechanicalMixerBlockEntity.java | 2 +- .../ie}/AccessFurnaceLikeBlockEntity.java | 2 +- .../ie}/MixinFurnaceLikeBlockEntitySlots.java | 2 +- .../mekanism}/AccessBasicInventorySlot.java | 2 +- .../mixin/mekanism}/AccessLookingAtUtils.java | 2 +- .../mekanism}/MixinMekanismWTHITPlugin.java | 2 +- .../module/ae2/MeganeAppliedEnergistics2.java | 0 .../ae2/provider/EnergyCellProvider.java | 0 .../ae2/provider/InscriberProvider.java | 0 .../provider/VibrationChamberProvider.java | 0 .../megane/module/create/MeganeCreate.java | 0 .../module/create/provider/BasinProvider.java | 2 +- .../BlockBreakingKineticProvider.java | 2 +- .../create/provider/ContraptionProvider.java | 4 +- .../CrushingWheelControllerProvider.java | 0 .../create/provider/DeployerProvider.java | 0 .../create/provider/FluidTankProvider.java | 0 .../create/provider/ItemVaultProvider.java | 0 .../provider/MechanicalMixerProvider.java | 2 +- .../create/provider/MillstoneProvider.java | 2 +- .../provider/SchematicTableProvider.java | 0 .../provider/SchematicannonProvider.java | 0 .../module/ie/MeganeImmersiveEngineering.java | 0 .../module/ie/provider/AssemblerProvider.java | 0 .../module/ie/provider/CokeOvenProvider.java | 0 .../ie/provider/FurnaceLikeProvider.java | 2 +- .../ie/provider/IEInventoryProvider.java | 0 .../ie/provider/MetalPressProvider.java | 0 .../ie/provider/SheetmetalTankProvider.java | 0 .../module/ie/provider/SiloProvider.java | 0 .../lapisreserve/MeganeLapisReserve.java | 0 .../provider/LapisReserveProvider.java | 0 .../module/mekanism/MeganeMekaninsm.java | 0 .../mekanism/provider/ChemicalProvider.java | 2 +- .../mekanism/provider/FactoryProvider.java | 2 +- .../mekanism/provider/FluidProvider.java | 2 +- .../mekanism/provider/MultiblockProvider.java | 2 +- .../mekanism/provider/SecurityProvider.java | 0 .../provider/StrictEnergyProvider.java | 0 .../productivebees/MeganeProductiveBees.java | 0 .../provider/AdvancedBeehiveProvider.java | 0 .../productivebees/provider/JarProvider.java | 0 .../provider/ProductiveBeeProvider.java | 0 .../provider/RecipeProcessingProvider.java | 0 .../provider/SolitaryNestProvider.java | 0 .../MeganeResourceChickens.java | 0 .../provider/ChickenProvider.java | 0 .../provider/NestProvider.java | 0 .../resources/assets/megane/lang/en_us.json | 51 +++++ .../src/main/resources/megane.mixins.json | 29 +++ .../src/main/resources/waila_plugins.json | 44 +++++ .../forge/thermal-expansion/build.gradle.kts | 17 -- .../thermal/MeganeThermalExpansion.java | 13 -- settings.gradle.kts | 56 +++--- src/translation/resources/lang/en_us.json | 102 ---------- 179 files changed, 701 insertions(+), 1631 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/GenFmjTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenFmlEntrypointTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenLanguageTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenMixinTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenModsTomlTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenPackMcmetaTask.kt delete mode 100644 buildSrc/src/main/kotlin/GenWailaTask.kt delete mode 100644 buildSrc/src/main/kotlin/MergeWailaTask.kt delete mode 100644 buildSrc/src/main/kotlin/Metadata.kt delete mode 100644 buildSrc/src/main/kotlin/Repositories.kt delete mode 100644 modules/fabric/alloy-forgery/build.gradle.kts delete mode 100644 modules/fabric/alloy-forgery/src/main/resources/assets/megane-alloy-forgery/lang/zh_tw.json delete mode 100644 modules/fabric/applied-energistics-2/build.gradle.kts delete mode 100644 modules/fabric/create/build.gradle.kts delete mode 100644 modules/fabric/deep-mob-learning-simulacrum/build.gradle.kts delete mode 100644 modules/fabric/extra-generators/build.gradle.kts delete mode 100644 modules/fabric/industrial-revolution/build.gradle.kts delete mode 100644 modules/fabric/kibe/build.gradle.kts delete mode 100644 modules/fabric/lapis-reserve/build.gradle.kts delete mode 100644 modules/fabric/luggage/build.gradle.kts delete mode 100644 modules/fabric/modern-dynamics/build.gradle.kts delete mode 100644 modules/fabric/powah/build.gradle.kts delete mode 100644 modules/fabric/reborn-core/build.gradle.kts delete mode 100644 modules/fabric/resource-chickens/build.gradle.kts create mode 100644 modules/fabric/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java rename modules/fabric/{applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin => src/main/java/lol/bai/megane/mixin/ae2}/MixinWthitModule1.java (96%) rename modules/fabric/{alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/mixin => src/main/java/lol/bai/megane/mixin/alloyforgery}/AccessorForgeControllerBlockEntity.java (88%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessBasinBlockEntity.java (90%) rename modules/{forge/create/src/main/java/lol/bai/megane/module/create/mixin => fabric/src/main/java/lol/bai/megane/mixin/create}/AccessBasinOperatingBlockEntity.java (90%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessBlockBreakingKineticTileEntity.java (88%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessContraption.java (89%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessMillstoneProgressProvider.java (89%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessMountedStorageManager.java (93%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/MixinCrushingWheelControllerBlockEntity.java (96%) rename modules/fabric/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/MixinMechanicalMixerBlockEntity.java (95%) rename modules/fabric/{modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/mixin => src/main/java/lol/bai/megane/mixin/moderndynamics}/AccessorItemHost.java (87%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java (100%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/AEBaseInvProvider.java (100%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java (100%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java (100%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/SkyStoneTankProvider.java (100%) rename modules/fabric/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java (100%) rename modules/fabric/{alloy-forgery => }/src/main/java/lol/bai/megane/module/alloyforgery/MeganeAlloyForgery.java (100%) rename modules/fabric/{alloy-forgery => }/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java (93%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/MeganeCreate.java (100%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java (97%) rename modules/{forge/create => fabric}/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java (91%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java (98%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java (100%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java (100%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java (100%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java (100%) rename modules/{forge/create => fabric}/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java (95%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java (96%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java (100%) rename modules/fabric/{create => }/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java (100%) rename modules/fabric/{deep-mob-learning-simulacrum => }/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java (100%) rename modules/fabric/{deep-mob-learning-simulacrum => }/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProvider.java (100%) rename modules/fabric/{extra-generators => }/src/main/java/lol/bai/megane/module/extragenerators/MeganeExtraGenerators.java (100%) rename modules/fabric/{extra-generators => }/src/main/java/lol/bai/megane/module/extragenerators/provider/GeneratorProvider.java (100%) rename modules/fabric/{industrial-revolution => }/src/main/java/lol/bai/megane/module/indrev/MeganeIndustrialRevolution.java (100%) rename modules/fabric/{industrial-revolution => }/src/main/java/lol/bai/megane/module/indrev/provider/CraftingMachineProvider.java (100%) rename modules/fabric/{industrial-revolution => }/src/main/java/lol/bai/megane/module/indrev/provider/FluidComponentHolderProvider.java (100%) rename modules/fabric/{industrial-revolution => }/src/main/java/lol/bai/megane/module/indrev/provider/MachineProvider.java (100%) rename modules/fabric/{industrial-revolution => }/src/main/java/lol/bai/megane/module/indrev/provider/ModularWorkbenchProvider.java (100%) rename modules/fabric/{kibe => }/src/main/java/lol/bai/megane/module/kibe/MeganeKibe.java (100%) rename modules/fabric/{kibe => }/src/main/java/lol/bai/megane/module/kibe/provider/TankProvider.java (100%) rename modules/fabric/{lapis-reserve => }/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java (100%) rename modules/fabric/{lapis-reserve => }/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java (100%) rename modules/fabric/{luggage => }/src/main/java/lol/bai/megane/module/luggage/MeganeLuggage.java (100%) rename modules/fabric/{luggage => }/src/main/java/lol/bai/megane/module/luggage/provider/LuggageProvider.java (100%) rename modules/fabric/{modern-dynamics => }/src/main/java/lol/bai/megane/module/moderndynamics/MeganeModernDynamics.java (100%) rename modules/fabric/{modern-dynamics => }/src/main/java/lol/bai/megane/module/moderndynamics/provider/FluidPipeProvider.java (100%) rename modules/fabric/{modern-dynamics => }/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java (94%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/MeganePowah.java (100%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/provider/EnergyStorageProvider.java (100%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/provider/FurnatorProvider.java (100%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/provider/InventoryHolderProvider.java (100%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/provider/ReactorPartProvider.java (100%) rename modules/fabric/{powah => }/src/main/java/lol/bai/megane/module/powah/provider/TankHolderProvider.java (100%) rename modules/fabric/{reborn-core => }/src/main/java/lol/bai/megane/module/reborncore/MeganeRebornCore.java (100%) rename modules/fabric/{reborn-core => }/src/main/java/lol/bai/megane/module/reborncore/provider/MachineBaseProvider.java (100%) rename modules/fabric/{reborn-core => }/src/main/java/lol/bai/megane/module/reborncore/provider/PowerAcceptorProvider.java (100%) rename modules/fabric/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java (100%) rename modules/fabric/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java (100%) rename modules/fabric/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java (100%) rename modules/fabric/{tech-reborn => }/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java (100%) rename modules/fabric/{tech-reborn => }/src/main/java/lol/bai/megane/module/techreborn/provider/GenericMachineProvider.java (100%) rename modules/fabric/{tech-reborn => }/src/main/java/lol/bai/megane/module/techreborn/provider/HardCodedProgressProvider.java (100%) rename modules/fabric/{wireless-networks => }/src/main/java/lol/bai/megane/module/wirelessnetworks/MeganeWirelessNetworks.java (100%) rename modules/fabric/{wireless-networks => }/src/main/java/lol/bai/megane/module/wirelessnetworks/provider/NetworkNodeProvider.java (100%) create mode 100644 modules/fabric/src/main/resources/megane.mixins.json create mode 100644 modules/fabric/src/main/resources/waila_plugins.json delete mode 100644 modules/fabric/tech-reborn/build.gradle.kts delete mode 100644 modules/fabric/wireless-networks/build.gradle.kts delete mode 100644 modules/forge/applied-energistics-2/build.gradle.kts delete mode 100644 modules/forge/create/build.gradle.kts delete mode 100644 modules/forge/immersive-engineering/build.gradle.kts delete mode 100644 modules/forge/lapis-reserve/build.gradle.kts delete mode 100644 modules/forge/mekanism/build.gradle.kts delete mode 100644 modules/forge/productive-bees/build.gradle.kts delete mode 100644 modules/forge/refined-storage/build.gradle.kts delete mode 100644 modules/forge/refined-storage/src/main/java/lol/bai/megane/module/rs/MeganeRefinedStorage.java delete mode 100644 modules/forge/resource-chickens/build.gradle.kts create mode 100644 modules/forge/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java rename modules/forge/{applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin => src/main/java/lol/bai/megane/mixin/ae2}/MixinWthitModule1.java (96%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessBasinBlockEntity.java (90%) rename modules/{fabric/create/src/main/java/lol/bai/megane/module/create/mixin => forge/src/main/java/lol/bai/megane/mixin/create}/AccessBasinOperatingBlockEntity.java (90%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessBlockBreakingKineticTileEntity.java (88%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessContraption.java (89%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessMillstoneProgressProvider.java (89%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/AccessMountedStorageManager.java (93%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/MixinCrushingWheelControllerBlockEntity.java (96%) rename modules/forge/{create/src/main/java/lol/bai/megane/module/create/mixin => src/main/java/lol/bai/megane/mixin/create}/MixinMechanicalMixerBlockEntity.java (96%) rename modules/forge/{immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin => src/main/java/lol/bai/megane/mixin/ie}/AccessFurnaceLikeBlockEntity.java (93%) rename modules/forge/{immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin => src/main/java/lol/bai/megane/mixin/ie}/MixinFurnaceLikeBlockEntitySlots.java (94%) rename modules/forge/{mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin => src/main/java/lol/bai/megane/mixin/mekanism}/AccessBasicInventorySlot.java (88%) rename modules/forge/{mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin => src/main/java/lol/bai/megane/mixin/mekanism}/AccessLookingAtUtils.java (97%) rename modules/forge/{mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin => src/main/java/lol/bai/megane/mixin/mekanism}/MixinMekanismWTHITPlugin.java (95%) rename modules/forge/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java (100%) rename modules/forge/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java (100%) rename modules/forge/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java (100%) rename modules/forge/{applied-energistics-2 => }/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/MeganeCreate.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java (97%) rename modules/{fabric/create => forge}/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java (91%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java (98%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java (100%) rename modules/{fabric/create => forge}/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java (95%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java (96%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java (100%) rename modules/forge/{create => }/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/MeganeImmersiveEngineering.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/AssemblerProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/CokeOvenProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java (96%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/IEInventoryProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/MetalPressProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/SheetmetalTankProvider.java (100%) rename modules/forge/{immersive-engineering => }/src/main/java/lol/bai/megane/module/ie/provider/SiloProvider.java (100%) rename modules/forge/{lapis-reserve => }/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java (100%) rename modules/forge/{lapis-reserve => }/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java (100%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/MeganeMekaninsm.java (100%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java (98%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java (95%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java (96%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java (95%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/SecurityProvider.java (100%) rename modules/forge/{mekanism => }/src/main/java/lol/bai/megane/module/mekanism/provider/StrictEnergyProvider.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/MeganeProductiveBees.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/provider/AdvancedBeehiveProvider.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/provider/JarProvider.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/provider/ProductiveBeeProvider.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/provider/RecipeProcessingProvider.java (100%) rename modules/forge/{productive-bees => }/src/main/java/lol/bai/megane/module/productivebees/provider/SolitaryNestProvider.java (100%) rename modules/forge/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java (100%) rename modules/forge/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java (100%) rename modules/forge/{resource-chickens => }/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java (100%) create mode 100644 modules/forge/src/main/resources/assets/megane/lang/en_us.json create mode 100644 modules/forge/src/main/resources/megane.mixins.json create mode 100644 modules/forge/src/main/resources/waila_plugins.json delete mode 100644 modules/forge/thermal-expansion/build.gradle.kts delete mode 100644 modules/forge/thermal-expansion/src/main/java/lol/bai/megane/module/thermal/MeganeThermalExpansion.java delete mode 100644 src/translation/resources/lang/en_us.json diff --git a/build.gradle.kts b/build.gradle.kts index 8c837e6..d0e0dfd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import groovy.json.JsonGenerator +import groovy.json.JsonSlurper import java.nio.charset.StandardCharsets plugins { @@ -36,11 +38,71 @@ allprojects { } } - badasintended() - cursemaven() - modrinth() - mavenLocal() - minecraft() + maven("https://libraries.minecraft.net") + maven("https://maven.bai.lol") + maven("https://server.bbkr.space/artifactory/libs-release") + maven("https://maven.shedaniel.me/") + maven("https://maven.jamieswhiteshirt.com/libs-release") + maven("https://maven.blamejared.com") + maven("https://mod-buildcraft.com/maven") + maven("https://maven.cafeteria.dev/releases") + maven("https://jitpack.io") + maven("https://maven.ladysnake.org/releases") + maven("https://maven.wispforest.io") + maven("https://mvn.devos.one/snapshots") + maven("https://maven.tterrag.com") + maven("https://maven.terraformersmc.com/releases") + maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") + + maven("https://repo.spongepowered.org/repository/maven-public") { + content { + includeGroup("org.spongepowered") + } + } + + maven("https://cursemaven.com") { + content { + includeGroup("curse.maven") + } + } + + maven("https://api.modrinth.com/maven") { + content { + includeGroup("maven.modrinth") + } + } + + ivy("https://www.curseforge.com/api/v1/mods") { + patternLayout { + artifact("[module]/files/[revision]/download") + } + + metadataSources { + artifact() + } + + content { + includeGroup("curse.api") + } + } + + maven("https://modmaven.dev") + } + + tasks.withType { + doLast { + val slurper = JsonSlurper() + val json = JsonGenerator.Options() + .disableUnicodeEscaping() + .build() + fileTree(outputs.files.asPath) { + include("**/*.json") + forEach { + val mini = json.toJson(slurper.parse(it, StandardCharsets.UTF_8.name())) + it.writeText(mini) + } + } + } } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4cb9b95..50d949b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,6 +10,4 @@ repositories { dependencies { implementation(platform("com.fasterxml.jackson:jackson-bom:2.16.0")) implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.16.0") - - implementation("com.squareup:javapoet:1.13.0") } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index eb19109..cb12099 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -15,6 +15,21 @@ object deps { const val minecraft = "com.mojang:minecraft:${versions.minecraft}" const val mixinAp = "org.spongepowered:mixin:0.8.5:processor" + object common : DependencyPath { + override val prefix = "common" + + object wthit : DependencyPath { + override val prefix = "common.wthit" + + val api by json() + val runtime by json() + } + + const val mixin = "org.spongepowered:mixin:0.8.5" + const val asmTree = "org.ow2.asm:asm-tree:9.6" + const val fabricLoaderEnv = "lol.bai:fabric-loader-environment:0.0.1" + } + object fabric : DependencyPath { override val prefix = "fabric" diff --git a/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt b/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt index e0745bd..626940a 100644 --- a/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt +++ b/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt @@ -1,4 +1,5 @@ import com.fasterxml.jackson.databind.json.JsonMapper +import deps.common import deps.fabric import deps.forge import org.gradle.api.DefaultTask @@ -52,6 +53,11 @@ abstract class FetchLatestVersionsTask : DefaultTask() { action(VersionFetcherDsl(versionFetcher, loader, path)) } + fetcher(ModrinthVersionFetcher, "fabric", common.wthit) { + fetch(common.wthit::api, mrIds.wthit) { "mcp.mobius.waila:wthit-api:${it.version_number.replace("fabric", "mojmap")}" } + fetch(common.wthit::runtime, mrIds.wthit) { "mcp.mobius.waila:wthit:${it.version_number.replace("fabric", "mojmap")}" } + } + fetcher(ModrinthVersionFetcher, "fabric", fabric.wthit) { fetch(fabric.wthit::api, mrIds.wthit) { "mcp.mobius.waila:wthit-api:${it.version_number}" } fetch(fabric.wthit::runtime, mrIds.wthit) { "mcp.mobius.waila:wthit:${it.version_number}" } diff --git a/buildSrc/src/main/kotlin/GenFmjTask.kt b/buildSrc/src/main/kotlin/GenFmjTask.kt deleted file mode 100644 index c58bf1f..0000000 --- a/buildSrc/src/main/kotlin/GenFmjTask.kt +++ /dev/null @@ -1,94 +0,0 @@ -import com.fasterxml.jackson.databind.json.JsonMapper -import org.gradle.api.DefaultTask -import org.gradle.api.provider.ListProperty -import org.gradle.api.provider.MapProperty -import org.gradle.api.provider.Property -import org.gradle.api.tasks.* -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File - -fun Metadata.fmj(fn: GenFmjTask.() -> Unit) { - val genFmj by project.tasks.creating(GenFmjTask::class) { - id.set(this@fmj.id) - mixin.set(prop[GenMixinTask.JSON] as? String) - - fn(this) - } - - task.dependsOn(genFmj) -} - -@Suppress("LeakingThis") -abstract class GenFmjTask : DefaultTask() { - - @get:Internal - val any = "*" - - @get:Input - abstract val id: Property - - @get:Input - @get:Optional - abstract val mixin: Property - - @get:Input - abstract val contributors: ListProperty - - @get:Input - abstract val depends: MapProperty - - @get:OutputFile - abstract val output: Property - - init { - group = "megane" - - contributors.convention(listOf()) - depends.convention(mapOf()) - - output.convention(project.file("src/generated/resources/fabric.mod.json")) - } - - fun contributors(vararg v: String) = contributors.addAll(*v) - fun depends(vararg v: Pair) = v.forEach { depends.put(it.first, it.second) } - - @TaskAction - fun generate() { - val mapper = JsonMapper() - val node = mapper.createObjectNode().apply { - put("schemaVersion", 1) - put("id", id.get()) - put("version", "${project.version}") - - putArray("authors").apply { - add("deirn") - } - - if (contributors.get().isNotEmpty()) putArray("contributors").apply { - contributors.get().forEach(::add) - } - - put("license", "All Rights Reserved") - put("icon", "megane.png") - - if (mixin.isPresent) putArray("mixins").apply { - add(mixin.get()) - } - - putObject("depends").apply { - put("wthit", "*") - depends.get().forEach(::put) - } - - putObject("custom").apply { - putObject("modmenu").apply { - put("parent", "megane") - } - } - } - - mapper.writeValue(output.get(), node) - } - -} diff --git a/buildSrc/src/main/kotlin/GenFmlEntrypointTask.kt b/buildSrc/src/main/kotlin/GenFmlEntrypointTask.kt deleted file mode 100644 index 758c5cc..0000000 --- a/buildSrc/src/main/kotlin/GenFmlEntrypointTask.kt +++ /dev/null @@ -1,62 +0,0 @@ -import com.squareup.javapoet.AnnotationSpec -import com.squareup.javapoet.ClassName -import com.squareup.javapoet.JavaFile -import com.squareup.javapoet.TypeSpec -import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.OutputDirectory -import org.gradle.api.tasks.TaskAction -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File -import javax.lang.model.element.Modifier - -fun Metadata.forgeFml() { - val genFmlEntrypoint by project.tasks.creating(GenFmlEntrypointTask::class) { - id.set(this@forgeFml.id) - annotation.set("net.minecraftforge.fml.common.Mod") - clazz.set("${pkg}.Main") - output.set(project.file("src/generated/java/")) - } - - task.dependsOn(genFmlEntrypoint) -} - -abstract class GenFmlEntrypointTask : DefaultTask() { - @get:Input - abstract val id: Property - - @get:Input - abstract val annotation: Property - - @get:Input - abstract val clazz: Property - - @get:OutputDirectory - abstract val output: Property - - init { - group = "megane" - } - - @TaskAction - fun generate() { - val pkgName = clazz.get().substringBeforeLast('.') - val className = clazz.get().substringAfterLast('.') - - val type = TypeSpec.classBuilder(className) - .addModifiers(Modifier.PUBLIC, Modifier.FINAL) - .addAnnotation( - AnnotationSpec - .builder(ClassName.bestGuess(annotation.get())) - .addMember("value", "\$S", id.get().replace("-", "_")) - .build() - ) - .build() - - JavaFile.builder(pkgName, type) - .build() - .writeTo(output.get()) - } -} diff --git a/buildSrc/src/main/kotlin/GenLanguageTask.kt b/buildSrc/src/main/kotlin/GenLanguageTask.kt deleted file mode 100644 index 550ec87..0000000 --- a/buildSrc/src/main/kotlin/GenLanguageTask.kt +++ /dev/null @@ -1,56 +0,0 @@ -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.ObjectMapper -import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property -import org.gradle.api.tasks.InputDirectory -import org.gradle.api.tasks.OutputDirectory -import org.gradle.api.tasks.TaskAction -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File - -fun Metadata.language() { - val genLanguage by project.tasks.creating(GenLanguageTask::class) { - input.set(project.rootProject.file("src/translation/resources/lang")) - output.set(project.file("src/generated/resources/assets/${id}/lang")) - } - - task.dependsOn(genLanguage) -} - -abstract class GenLanguageTask : DefaultTask() { - - @get:InputDirectory - abstract val input: Property - - @get:OutputDirectory - abstract val output: Property - - init { - group = "megane" - } - - @TaskAction - fun generate() { - val languages = input.get().listFiles { it -> it.extension == "json" } ?: arrayOf() - - val mapper = ObjectMapper() - - for (language in languages) { - val out = mapper.createObjectNode() - - fun writeFields(entry: JsonNode) { - entry.fields().forEach { (k, v) -> - out.put(k, v.asText()) - } - } - - val json = mapper.readTree(language) - writeFields(json["base"]) - json[project.parent!!.name][project.name]?.let(::writeFields) - - mapper.writeValue(output.get().resolve(language.relativeTo(input.get())), out) - } - } - -} diff --git a/buildSrc/src/main/kotlin/GenMixinTask.kt b/buildSrc/src/main/kotlin/GenMixinTask.kt deleted file mode 100644 index f23650d..0000000 --- a/buildSrc/src/main/kotlin/GenMixinTask.kt +++ /dev/null @@ -1,180 +0,0 @@ -import com.fasterxml.jackson.databind.json.JsonMapper -import com.squareup.javapoet.* -import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property -import org.gradle.api.tasks.* -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.get -import org.gradle.kotlin.dsl.getByType -import org.gradle.kotlin.dsl.getValue -import java.io.File -import javax.lang.model.element.Modifier - -fun Metadata.mixin(fn: GenMixinConfig.() -> Unit = { }) { - val sourceSets = project.extensions.getByType() - var requireExp: String? = null - - fn(object : GenMixinConfig { - override fun callback(refmapFn: (SourceSet, String) -> Unit, configFn: (String) -> Unit) { - refmapFn(sourceSets["main"], "megane-${project.name}.refmap.json") - configFn("megane-${project.name}.mixins.json") - } - - override fun require(vararg expressions: String) { - requireExp = expressions.joinToString(separator = " && ") - } - }) - - val mixinPkg = "${pkg}.mixin" - val mixinJson = "megane-${project.name}.mixins.json" - val genMixin by project.tasks.creating(GenMixinTask::class) { - id.set(this@mixin.id) - pkg.set(mixinPkg) - pkgDir.set(project.file("src/main/java/" + mixinPkg.replace(".", "/"))) - mixinJsonOutput.set(project.file("src/generated/resources/${mixinJson}")) - - if (requireExp != null) { - mixinPluginOutput.set(project.file("src/generated/java/")) - require.set(requireExp) - } - } - - prop[GenMixinTask.JSON] = mixinJson - task.dependsOn(genMixin) -} - -interface GenMixinConfig { - fun callback( - refmapFn: (SourceSet, String) -> Unit = { _, _ -> }, - configFn: (String) -> Unit = { _ -> } - ) - - fun require(vararg expressions: String) - - fun forgeMod(id: String) = "net.minecraftforge.fml.loading.FMLLoader.getLoadingModList().getModFileById(\"${id}\") != null" - fun fabricMod(id: String) = "net.fabricmc.loader.api.FabricLoader.getInstance().isModLoaded(\"${id}\")" -} - -abstract class GenMixinTask : DefaultTask() { - - companion object { - const val JSON = "mixin.json" - } - - @get:Input - abstract val id: Property - - @get:Input - abstract val pkg: Property - - @get:InputDirectory - abstract val pkgDir: Property - - @get:OutputFile - abstract val mixinJsonOutput: Property - - @get:OutputDirectory - @get:Optional - abstract val mixinPluginOutput: Property - - @get:Input - @get:Optional - abstract val require: Property - - init { - group = "megane" - } - - @TaskAction - fun generate() { - val main = pkgDir.get().listFiles { it -> it.extension == "java" } ?: arrayOf() - val client = pkgDir.get().resolve("client").listFiles { it -> it.extension == "java" } ?: arrayOf() - - val mapper = JsonMapper() - val node = mapper.createObjectNode().apply { - put("required", true) - put("minVersion", "0.8") - put("package", pkg.get()) - put("compatibilityLevel", "JAVA_8") - - putObject("injectors").apply { - put("defaultRequire", 1) - } - - putArray("mixins").apply { - main.forEach { add(it.nameWithoutExtension) } - } - - putArray("client").apply { - client.forEach { add("client.${it.nameWithoutExtension}") } - } - - put("refmap", "${id.get()}.refmap.json") - - if (require.isPresent) { - put("plugin", "${pkg.get()}.MixinConfigPlugin") - } - } - - mapper.writeValue(mixinJsonOutput.get(), node) - - if (require.isPresent) { - val classNodeName = ClassName.bestGuess("org.objectweb.asm.tree.ClassNode") - val iMixinInfoName = ClassName.bestGuess("org.spongepowered.asm.mixin.extensibility.IMixinInfo") - - val type = TypeSpec.classBuilder("MixinConfigPlugin") - .addModifiers(Modifier.PUBLIC, Modifier.FINAL) - .addSuperinterface(ClassName.bestGuess("org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin")) - .addMethod(MethodSpec.methodBuilder("shouldApplyMixin") - .addModifiers(Modifier.PUBLIC) - .returns(TypeName.BOOLEAN) - .addParameter(String::class.java, "targetClassName") - .addParameter(String::class.java, "mixinClassName") - .addStatement("return \$L", require.get()) - .build()) - .addMethod(MethodSpec.methodBuilder("onLoad") - .addModifiers(Modifier.PUBLIC) - .returns(TypeName.VOID) - .addParameter(String::class.java, "mixinPackage") - .build()) - .addMethod(MethodSpec.methodBuilder("getRefMapperConfig") - .addModifiers(Modifier.PUBLIC) - .returns(String::class.java) - .addStatement("return null") - .build()) - .addMethod(MethodSpec.methodBuilder("acceptTargets") - .addModifiers(Modifier.PUBLIC) - .returns(TypeName.VOID) - .addParameter(ParameterizedTypeName.get(Set::class.java, String::class.java), "myTargets") - .addParameter(ParameterizedTypeName.get(Set::class.java, String::class.java), "otherTargets") - .build()) - .addMethod(MethodSpec.methodBuilder("getMixins") - .addModifiers(Modifier.PUBLIC) - .returns(ParameterizedTypeName.get(List::class.java, String::class.java)) - .addStatement("return null") - .build()) - .addMethod(MethodSpec.methodBuilder("preApply") - .addModifiers(Modifier.PUBLIC) - .returns(TypeName.VOID) - .addParameter(String::class.java, "targetClassName") - .addParameter(classNodeName, "targetClass") - .addParameter(String::class.java, "mixinClassName") - .addParameter(iMixinInfoName, "mixinInfo") - .build()) - .addMethod(MethodSpec.methodBuilder("postApply") - .addModifiers(Modifier.PUBLIC) - .returns(TypeName.VOID) - .addParameter(String::class.java, "targetClassName") - .addParameter(classNodeName, "targetClass") - .addParameter(String::class.java, "mixinClassName") - .addParameter(iMixinInfoName, "mixinInfo") - .build()) - .build() - - JavaFile.builder(pkg.get(), type) - .build() - .writeTo(mixinPluginOutput.get()) - } - } - -} diff --git a/buildSrc/src/main/kotlin/GenModsTomlTask.kt b/buildSrc/src/main/kotlin/GenModsTomlTask.kt deleted file mode 100644 index 52af99a..0000000 --- a/buildSrc/src/main/kotlin/GenModsTomlTask.kt +++ /dev/null @@ -1,95 +0,0 @@ -import com.fasterxml.jackson.dataformat.toml.TomlMapper -import org.gradle.api.DefaultTask -import org.gradle.api.provider.ListProperty -import org.gradle.api.provider.MapProperty -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File - -fun Metadata.modsToml(fn: GenModsTomlTask.() -> Unit = {}) { - val genModsToml by project.tasks.creating(GenModsTomlTask::class) { - id.set(this@modsToml.id) - - fn(this) - } - - task.dependsOn(genModsToml) -} - -@Suppress("LeakingThis") -abstract class GenModsTomlTask : DefaultTask() { - - @get:Internal - val any = "[0,)" - - @get:Input - abstract val id: Property - - @get:OutputFile - abstract val output: Property - - @get:Input - abstract val contributors: ListProperty - - @get:Input - abstract val depends: MapProperty - - init { - group = "megane" - - output.convention(project.file("src/generated/resources/META-INF/mods.toml")) - contributors.convention(listOf()) - depends.convention(mapOf()) - } - - fun contributors(vararg v: String) = contributors.addAll(*v) - fun depends(vararg v: Pair) = v.forEach { depends.put(it.first, it.second) } - - @TaskAction - fun generate() { - val id = this.id.get().replace("-", "_") - - val mapper = TomlMapper() - val node = mapper.createObjectNode().apply { - put("modLoader", "javafml") - put("loaderVersion", "[1,)") - put("license", "All Rights Reserved") - - putArray("mods").addObject().apply { - put("modId", id) - put("version", "${project.version}") - put("authors", "deirn") - put("logoFile", "megane.png") - - if (contributors.get().isNotEmpty()) { - put("credits", contributors.get().joinToString(separator = ", ")) - } - } - - putObject("dependencies").putArray(id).apply { - addObject().apply { - put("modId", "wthit") - put("mandatory", true) - put("versionRange", "[0,)") - } - - depends.get().forEach { (k, v) -> - addObject().apply { - put("modId", k) - put("mandatory", true) - put("versionRange", v) - } - } - } - } - - mapper.writeValue(output.get(), node) - } - -} - diff --git a/buildSrc/src/main/kotlin/GenPackMcmetaTask.kt b/buildSrc/src/main/kotlin/GenPackMcmetaTask.kt deleted file mode 100644 index 0140c10..0000000 --- a/buildSrc/src/main/kotlin/GenPackMcmetaTask.kt +++ /dev/null @@ -1,47 +0,0 @@ -import com.fasterxml.jackson.databind.ObjectMapper -import org.gradle.api.DefaultTask -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File - -fun Metadata.packMcmeta() { - val genPackMcmeta by project.tasks.creating(GenPackMcmetaTask::class) { - id.set(this@packMcmeta.id) - } - - task.dependsOn(genPackMcmeta) -} - -@Suppress("LeakingThis") -abstract class GenPackMcmetaTask : DefaultTask() { - - @get:Input - abstract val id: Property - - @get:OutputFile - abstract val output: Property - - init { - group = "megane" - - output.convention(project.file("src/generated/resources/pack.mcmeta")) - } - - @TaskAction - fun generate() { - val mapper = ObjectMapper() - val node = mapper.createObjectNode().apply { - putObject("pack").apply { - put("description", id.get()) - put("pack_format", 8) - } - } - - mapper.writeValue(output.get(), node) - } - -} diff --git a/buildSrc/src/main/kotlin/GenWailaTask.kt b/buildSrc/src/main/kotlin/GenWailaTask.kt deleted file mode 100644 index 5c9c26e..0000000 --- a/buildSrc/src/main/kotlin/GenWailaTask.kt +++ /dev/null @@ -1,62 +0,0 @@ -import com.fasterxml.jackson.databind.json.JsonMapper -import org.gradle.api.DefaultTask -import org.gradle.api.provider.ListProperty -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.getValue -import java.io.File - -fun Metadata.waila(initializer: String, fn: GenWailaTask.() -> Unit = {}) { - val genWaila by project.tasks.creating(GenWailaTask::class) { - this.initializer.set("${pkg}.${initializer}") - fn(this) - } - - task.dependsOn(genWaila) -} - -@Suppress("LeakingThis") -abstract class GenWailaTask : DefaultTask() { - - @get:Input - abstract val initializer: Property - - @get:Input - abstract val required: ListProperty - - @get:OutputFile - abstract val output: Property - - init { - group = "megane" - - output.convention(project.file("src/generated/resources/waila_plugins.json")) - required.convention(listOf()) - } - - fun required(vararg v: String) { - required.addAll(*v) - } - - @TaskAction - fun generate() { - val mapper = JsonMapper() - val node = mapper.createObjectNode().apply { - putObject("megane:${project.name}").apply { - put("initializer", initializer.get()) - - if (required.get().isNotEmpty()) { - putArray("required").apply { - required.get().forEach { add(it) } - } - } - } - } - - mapper.writeValue(output.get(), node) - } - -} diff --git a/buildSrc/src/main/kotlin/MergeWailaTask.kt b/buildSrc/src/main/kotlin/MergeWailaTask.kt deleted file mode 100644 index f07fdd4..0000000 --- a/buildSrc/src/main/kotlin/MergeWailaTask.kt +++ /dev/null @@ -1,33 +0,0 @@ -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.json.JsonMapper -import org.gradle.api.DefaultTask -import org.gradle.api.file.RegularFileProperty -import org.gradle.api.provider.ListProperty -import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import java.io.File - -abstract class MergeWailaTask : DefaultTask() { - - @get:InputFiles - abstract val input: ListProperty - - @get:OutputFile - abstract val output: RegularFileProperty - - @TaskAction - fun execute() { - val mapper = JsonMapper() - val outputJson = mapper.createObjectNode() - - input.get().forEach { file -> - mapper.readTree(file).fields().forEach { (k, v) -> - outputJson.set(k, v) - } - } - - mapper.writeValue(output.get().asFile, outputJson) - } - -} diff --git a/buildSrc/src/main/kotlin/Metadata.kt b/buildSrc/src/main/kotlin/Metadata.kt deleted file mode 100644 index 2600bf4..0000000 --- a/buildSrc/src/main/kotlin/Metadata.kt +++ /dev/null @@ -1,37 +0,0 @@ -import org.gradle.api.Project -import org.gradle.api.Task -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.extra -import org.gradle.kotlin.dsl.getValue - -val Project.metadata get() = if (extra.has(Metadata.KEY)) extra.get(Metadata.KEY) as? Metadata else null - -fun Project.metadata(pkg: String, fn: Metadata.() -> Unit) { - val genMetadata by project.tasks.creating { - group = "megane" - } - - project.tasks.getByName("compileJava").dependsOn(genMetadata) - project.tasks.getByName("processResources").dependsOn(genMetadata) - project.tasks.getByName("sourcesJar").dependsOn(genMetadata) - - val metadata = Metadata(project, pkg, genMetadata) - fn(metadata) - - extra.set(Metadata.KEY, metadata) -} - -class Metadata( - val project: Project, - val pkg: String, - val task: Task -) { - - companion object { - const val KEY = "metadata" - } - - val id = "megane-${project.name}" - val prop = hashMapOf() - -} diff --git a/buildSrc/src/main/kotlin/Repositories.kt b/buildSrc/src/main/kotlin/Repositories.kt deleted file mode 100644 index 98a4cc0..0000000 --- a/buildSrc/src/main/kotlin/Repositories.kt +++ /dev/null @@ -1,46 +0,0 @@ -import org.gradle.kotlin.dsl.ivy -import org.gradle.kotlin.dsl.maven -import org.gradle.api.artifacts.dsl.RepositoryHandler as Repo - -fun Repo.minecraft() = maven("https://libraries.minecraft.net") -fun Repo.badasintended() = maven("https://maven.bai.lol") -fun Repo.bbkr() = maven("https://server.bbkr.space/artifactory/libs-release") -fun Repo.shedaniel() = maven("https://maven.shedaniel.me/") -fun Repo.modmaven() = maven("https://modmaven.dev") -fun Repo.jamieswhiteshirt() = maven("https://maven.jamieswhiteshirt.com/libs-release") -fun Repo.blamejared() = maven("https://maven.blamejared.com") -fun Repo.buildcraft() = maven("https://mod-buildcraft.com/maven") -fun Repo.cafeteria() = maven("https://maven.cafeteria.dev/releases") -fun Repo.jitpack() = maven("https://jitpack.io") -fun Repo.ladysnake() = maven("https://maven.ladysnake.org/releases") -fun Repo.wispforest() = maven("https://maven.wispforest.io") -fun Repo.devos() = maven("https://mvn.devos.one/snapshots") -fun Repo.tterrag() = maven("https://maven.tterrag.com") -fun Repo.terraformers() = maven("https://maven.terraformersmc.com/releases") -fun Repo.fuzs() = maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") - -fun Repo.cursemaven() = maven("https://cursemaven.com") { - content { - includeGroup("curse.maven") - } -} - -fun Repo.modrinth() = maven("https://api.modrinth.com/maven") { - content { - includeGroup("maven.modrinth") - } -} - -fun Repo.curseApi() = ivy("https://www.curseforge.com/api/v1/mods") { - patternLayout { - artifact("[module]/files/[revision]/download") - } - - metadataSources { - artifact() - } - - content { - includeGroup("curse.api") - } -} diff --git a/dependencies.json b/dependencies.json index 3535c9e..978f9ae 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,4 +1,6 @@ { + "common.wthit.api" : "mcp.mobius.waila:wthit-api:mojmap-5.30.1", + "common.wthit.runtime" : "mcp.mobius.waila:wthit:mojmap-5.30.1", "fabric.wthit.api" : "mcp.mobius.waila:wthit-api:fabric-5.30.1", "fabric.wthit.runtime" : "mcp.mobius.waila:wthit:fabric-5.30.1", "fabric.badpackets" : "lol.bai:badpackets:fabric-0.2.3", diff --git a/modules/fabric/alloy-forgery/build.gradle.kts b/modules/fabric/alloy-forgery/build.gradle.kts deleted file mode 100644 index a8a867c..0000000 --- a/modules/fabric/alloy-forgery/build.gradle.kts +++ /dev/null @@ -1,21 +0,0 @@ -metadata("lol.bai.megane.module.alloyforgery") { - waila("MeganeAlloyForgery") - mixin() - language() - - fmj { - contributors("StarskyXIII") - depends( - "alloy_forgery" to any - ) - } -} - -repositories { - wispforest() -} - -dependencies { - modImplementation(deps.fabric.alloyForge) - modImplementation(deps.fabric.owo) -} diff --git a/modules/fabric/alloy-forgery/src/main/resources/assets/megane-alloy-forgery/lang/zh_tw.json b/modules/fabric/alloy-forgery/src/main/resources/assets/megane-alloy-forgery/lang/zh_tw.json deleted file mode 100644 index fd91d6a..0000000 --- a/modules/fabric/alloy-forgery/src/main/resources/assets/megane-alloy-forgery/lang/zh_tw.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "megane.alloy_forgery.fuel": "燃料" -} diff --git a/modules/fabric/applied-energistics-2/build.gradle.kts b/modules/fabric/applied-energistics-2/build.gradle.kts deleted file mode 100644 index d3c8dbe..0000000 --- a/modules/fabric/applied-energistics-2/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -metadata("lol.bai.megane.module.ae2") { - waila("MeganeAppliedEnergistics2") - mixin() - - fmj { - depends( - "ae2" to any - ) - } -} - -repositories { - shedaniel() - modmaven() -} - -dependencies { - modImplementation(deps.fabric.ae2) { - exclude("curse.maven:jade-324717") - exclude("mezz.jei:jei-${versions.minecraft}-fabric") - } -} diff --git a/modules/fabric/build.gradle.kts b/modules/fabric/build.gradle.kts index 187bd23..d1c68cf 100644 --- a/modules/fabric/build.gradle.kts +++ b/modules/fabric/build.gradle.kts @@ -3,6 +3,7 @@ import me.modmuss50.mpp.ReleaseType plugins { id("fabric-loom") version "1.6.12" id("me.modmuss50.mod-publish-plugin") + id("lol.bai.explosion") } publishMods { @@ -58,89 +59,101 @@ publishMods { } } -allprojects { - apply(plugin = "fabric-loom") - - configurations.all { - resolutionStrategy { - force(deps.fabric.loader) - } +configurations.all { + resolutionStrategy { + force(deps.fabric.loader) } +} - dependencies { - minecraft(deps.minecraft) - mappings(loom.officialMojangMappings()) - - modImplementation(deps.fabric.loader) - modImplementation(deps.fabric.fabricApi) +dependencies { + minecraft(deps.minecraft) + mappings(loom.officialMojangMappings()) - modCompileOnly(deps.fabric.wthit.api) - modRuntimeOnly(deps.fabric.wthit.runtime) - modRuntimeOnly(deps.fabric.badpackets) - } + modImplementation(deps.fabric.loader) + modImplementation(deps.fabric.fabricApi) + modImplementation(deps.fabric.modmenu) + modImplementation(deps.fabric.wthit.runtime) + modRuntimeOnly(deps.fabric.badpackets) - loom { - interfaceInjection.enableDependencyInterfaceInjection.set(false) + modImplementation(deps.fabric.alloyForge) + modImplementation(deps.fabric.owo) - mixin { - defaultRefmapName.set("megane-${project.name}.refmap.json") - } + modImplementation(deps.fabric.ae2) { + exclude("curse.maven:jade-324717") + exclude("mezz.jei:jei-${versions.minecraft}-fabric") } - sourceSets { - main { - resources.srcDir("src/generated/resources") - } + modImplementation(deps.fabric.create) { + exclude("dev.emi:emi") + exclude("com.github.LlamaLad7:MixinExtras") + exclude("com.github.llamalad7.mixinextras:mixinextras-fabric") + exclude("me.luligabi:NoIndium") } + modImplementation(deps.fabric.mixinExtras) + modImplementation(deps.fabric.noIndium) - tasks.processResources { - inputs.property("version", project.version) + modImplementation(explosion.fabric(deps.fabric.dml)) + modImplementation(deps.fabric.flk) + modImplementation(deps.fabric.clothConfig) - filesMatching("fabric.mod.json") { - expand("version" to project.version) - } - } -} + modImplementation(deps.fabric.extraGen) + modImplementation(deps.fabric.trEnergy) + modImplementation(deps.fabric.flk) -repositories { - terraformers() -} + modImplementation(deps.fabric.indrev) + modImplementation(deps.fabric.flk) + modImplementation(deps.fabric.trEnergy) + modImplementation(deps.fabric.libgui) + modImplementation(deps.fabric.patchouli) + modImplementation(deps.fabric.magna) + modImplementation(deps.fabric.stepAttr) + modImplementation(deps.fabric.fakePlayer) + modImplementation(deps.fabric.noIndium) -dependencies { - modImplementation(deps.fabric.modmenu) - modImplementation(deps.fabric.wthit.runtime) + modImplementation(deps.fabric.kibe) + modImplementation(deps.fabric.flk) + modImplementation(deps.fabric.pal) + + modImplementation(deps.fabric.lapisReserve) + + modImplementation(deps.fabric.luggage) + + modImplementation(deps.fabric.modernDynamics) + modImplementation(deps.fabric.trEnergy) + + modImplementation(deps.fabric.powah) + modImplementation(deps.fabric.trEnergy) + modImplementation(deps.fabric.architectury) + modImplementation(deps.fabric.clothConfig) + + modImplementation(deps.fabric.rebornCore) + + modImplementation(deps.fabric.resourceChickens) + + modImplementation(deps.fabric.techReborn) + + modImplementation(deps.fabric.wirelessNet) + modImplementation(deps.fabric.trEnergy) + modImplementation(deps.fabric.libgui) } loom { runs.configureEach { ideConfigGenerated(true) + vmArgs("-XX:+AllowEnhancedClassRedefinition") } } -afterEvaluate { - subprojects.forEach { - dependencies { - implementation(project(path = it.path, configuration = "namedElements")) - - include(project(it.path)) { - isTransitive = false - } - } - - sourceSets { - main { - runtimeClasspath += it.sourceSets.main.get().runtimeClasspath - } - } - } +tasks.processResources { + inputs.property("version", project.version) - publishMods { - file.set(tasks.remapJar.get().archiveFile) + filesMatching("fabric.mod.json") { + expand("version" to project.version) } } -subprojects { - base { - archivesName.set("megane-fabric-${project.name}") +afterEvaluate { + publishMods { + file.set(tasks.remapJar.get().archiveFile) } } diff --git a/modules/fabric/create/build.gradle.kts b/modules/fabric/create/build.gradle.kts deleted file mode 100644 index 1e66339..0000000 --- a/modules/fabric/create/build.gradle.kts +++ /dev/null @@ -1,34 +0,0 @@ -metadata("lol.bai.megane.module.create") { - waila("MeganeCreate") - mixin() - language() - - fmj { - depends( - "create" to any - ) - } -} - -repositories { - devos() - tterrag() - shedaniel() - jamieswhiteshirt() - cafeteria() - ladysnake() - fuzs() - jitpack() -} - -dependencies { - modImplementation(deps.fabric.create) { - exclude("dev.emi:emi") - exclude("com.github.LlamaLad7:MixinExtras") - exclude("com.github.llamalad7.mixinextras:mixinextras-fabric") - exclude("me.luligabi:NoIndium") - } - - modImplementation(deps.fabric.mixinExtras) - modImplementation(deps.fabric.noIndium) -} diff --git a/modules/fabric/deep-mob-learning-simulacrum/build.gradle.kts b/modules/fabric/deep-mob-learning-simulacrum/build.gradle.kts deleted file mode 100644 index a1b80a5..0000000 --- a/modules/fabric/deep-mob-learning-simulacrum/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id("lol.bai.explosion") -} - -metadata("lol.bai.megane.module.dmlsimulacrum") { - waila("MeganeDmlSimulacrum") - - fmj { - depends( - "dmlsimulacrum" to any - ) - } -} - -repositories { - shedaniel() -} - -dependencies { - modImplementation(explosion.fabric(deps.fabric.dml)) - - modImplementation(deps.fabric.flk) - modImplementation(deps.fabric.clothConfig) -} diff --git a/modules/fabric/extra-generators/build.gradle.kts b/modules/fabric/extra-generators/build.gradle.kts deleted file mode 100644 index cbe87ba..0000000 --- a/modules/fabric/extra-generators/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -metadata("lol.bai.megane.module.extragenerators") { - waila("MeganeExtraGenerators") - - fmj { - depends( - "extragenerators" to any - ) - } -} - -dependencies { - modImplementation(deps.fabric.extraGen) - modImplementation(deps.fabric.trEnergy) - modImplementation(deps.fabric.flk) -} diff --git a/modules/fabric/industrial-revolution/build.gradle.kts b/modules/fabric/industrial-revolution/build.gradle.kts deleted file mode 100644 index 58a7b35..0000000 --- a/modules/fabric/industrial-revolution/build.gradle.kts +++ /dev/null @@ -1,30 +0,0 @@ -metadata("lol.bai.megane.module.indrev") { - waila("MeganeIndustrialRevolution") - - fmj { - depends( - "indrev" to any - ) - } -} - -repositories { - bbkr() - jamieswhiteshirt() - blamejared() - buildcraft() - cafeteria() - jitpack() -} - -dependencies { - modImplementation(deps.fabric.indrev) - modImplementation(deps.fabric.flk) - modImplementation(deps.fabric.trEnergy) - modImplementation(deps.fabric.libgui) - modImplementation(deps.fabric.patchouli) - modImplementation(deps.fabric.magna) - modImplementation(deps.fabric.stepAttr) - modImplementation(deps.fabric.fakePlayer) - modImplementation(deps.fabric.noIndium) -} diff --git a/modules/fabric/kibe/build.gradle.kts b/modules/fabric/kibe/build.gradle.kts deleted file mode 100644 index b41a9ca..0000000 --- a/modules/fabric/kibe/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -metadata("lol.bai.megane.module.kibe") { - waila("MeganeKibe") - - fmj { - depends( - "kibe" to any - ) - } -} - -repositories { - ladysnake() -} - -dependencies { - modImplementation(deps.fabric.kibe) - modImplementation(deps.fabric.flk) - modImplementation(deps.fabric.pal) -} diff --git a/modules/fabric/lapis-reserve/build.gradle.kts b/modules/fabric/lapis-reserve/build.gradle.kts deleted file mode 100644 index 4bb9f14..0000000 --- a/modules/fabric/lapis-reserve/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -metadata("lol.bai.megane.module.lapisreserve") { - waila("MeganeLapisReserve") - - fmj { - depends( - "lapisreserve" to any - ) - } -} - -dependencies { - modImplementation(deps.fabric.lapisReserve) -} diff --git a/modules/fabric/luggage/build.gradle.kts b/modules/fabric/luggage/build.gradle.kts deleted file mode 100644 index e56dd97..0000000 --- a/modules/fabric/luggage/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -metadata("lol.bai.megane.module.luggage") { - waila("MeganeLuggage") - - fmj { - depends( - "luggage" to any - ) - } -} - -dependencies { - modImplementation(deps.fabric.luggage) -} diff --git a/modules/fabric/modern-dynamics/build.gradle.kts b/modules/fabric/modern-dynamics/build.gradle.kts deleted file mode 100644 index eb0aa07..0000000 --- a/modules/fabric/modern-dynamics/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -metadata("lol.bai.megane.module.moderndynamics") { - waila("MeganeModernDynamics") - mixin() - - fmj { - depends( - "moderndynamics" to any - ) - } -} - -dependencies { - modImplementation(deps.fabric.modernDynamics) - modImplementation(deps.fabric.trEnergy) -} diff --git a/modules/fabric/powah/build.gradle.kts b/modules/fabric/powah/build.gradle.kts deleted file mode 100644 index a633848..0000000 --- a/modules/fabric/powah/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -metadata("lol.bai.megane.module.powah") { - waila("MeganePowah") - - fmj { - depends( - "powah" to any - ) - } -} - -repositories { - shedaniel() -} - -dependencies { - modImplementation(deps.fabric.powah) - modImplementation(deps.fabric.trEnergy) - modImplementation(deps.fabric.architectury) - modImplementation(deps.fabric.clothConfig) -} diff --git a/modules/fabric/reborn-core/build.gradle.kts b/modules/fabric/reborn-core/build.gradle.kts deleted file mode 100644 index b6a5638..0000000 --- a/modules/fabric/reborn-core/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -metadata("lol.bai.megane.module.reborncore") { - waila("MeganeRebornCore") - - fmj { - depends( - "reborncore" to any - ) - } -} - -dependencies { - modImplementation(deps.fabric.rebornCore) -} diff --git a/modules/fabric/resource-chickens/build.gradle.kts b/modules/fabric/resource-chickens/build.gradle.kts deleted file mode 100644 index 36adce7..0000000 --- a/modules/fabric/resource-chickens/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -metadata("lol.bai.megane.module.resourcechickens") { - waila("MeganeResourceChickens") - language() - - fmj { - depends( - "resourcechickens" to any - ) - } -} - -repositories { - curseApi() -} - -dependencies { - modImplementation(deps.fabric.resourceChickens) -} diff --git a/modules/fabric/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java new file mode 100644 index 0000000..8e66eb9 --- /dev/null +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java @@ -0,0 +1,61 @@ +package lol.bai.megane.mixin; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.fabricmc.loader.api.FabricLoader; +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +public class MixinConfigPlugin implements IMixinConfigPlugin { + + private static final Map MAP = Map.of( + "ae2", "ae2", + "alloyforgery", "alloy_forgery", + "create", "create", + "moderndynamics", "moderndynamics" + ); + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + var split = mixinClassName.replace('/', '.').split("\\."); + var packageName = split[split.length - 2]; + + if (MAP.containsKey(packageName)) { + return FabricLoader.getInstance().isModLoaded(MAP.get(packageName)); + } else { + return true; + } + } + + // + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java similarity index 96% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java index 21d2abf..6825733 100644 --- a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.ae2.mixin; +package lol.bai.megane.mixin.ae2; import appeng.api.integrations.igtooltip.providers.ServerDataProvider; import appeng.integration.modules.igtooltip.blocks.PowerStorageDataProvider; diff --git a/modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/mixin/AccessorForgeControllerBlockEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/alloyforgery/AccessorForgeControllerBlockEntity.java similarity index 88% rename from modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/mixin/AccessorForgeControllerBlockEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/alloyforgery/AccessorForgeControllerBlockEntity.java index 98b7ce4..0774fd4 100644 --- a/modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/mixin/AccessorForgeControllerBlockEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/alloyforgery/AccessorForgeControllerBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.alloyforgery.mixin; +package lol.bai.megane.mixin.alloyforgery; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java similarity index 90% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java index bfb1182..1476927 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java similarity index 90% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java index 8a4f035..7ae48e7 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java similarity index 88% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java index 98a8606..ee98b9d 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java similarity index 89% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java index 01712ac..2b4a335 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.contraptions.Contraption; import com.simibubi.create.content.contraptions.MountedStorageManager; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java similarity index 89% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java index fa80acc..e474c1d 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.millstone.MillingRecipe; import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java similarity index 93% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java index c17e370..0c527fd 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Map; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java similarity index 96% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java index fbf2a19..0cf090b 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java similarity index 95% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java index 75fe06a..78c2072 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import lol.bai.megane.module.create.provider.MechanicalMixerProvider; diff --git a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/mixin/AccessorItemHost.java b/modules/fabric/src/main/java/lol/bai/megane/mixin/moderndynamics/AccessorItemHost.java similarity index 87% rename from modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/mixin/AccessorItemHost.java rename to modules/fabric/src/main/java/lol/bai/megane/mixin/moderndynamics/AccessorItemHost.java index edecb49..f51b915 100644 --- a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/mixin/AccessorItemHost.java +++ b/modules/fabric/src/main/java/lol/bai/megane/mixin/moderndynamics/AccessorItemHost.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.moderndynamics.mixin; +package lol.bai.megane.mixin.moderndynamics; import java.util.List; diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/AEBaseInvProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/AEBaseInvProvider.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/AEBaseInvProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/AEBaseInvProvider.java diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/SkyStoneTankProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/SkyStoneTankProvider.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/SkyStoneTankProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/SkyStoneTankProvider.java diff --git a/modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java similarity index 100% rename from modules/fabric/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java diff --git a/modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/MeganeAlloyForgery.java b/modules/fabric/src/main/java/lol/bai/megane/module/alloyforgery/MeganeAlloyForgery.java similarity index 100% rename from modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/MeganeAlloyForgery.java rename to modules/fabric/src/main/java/lol/bai/megane/module/alloyforgery/MeganeAlloyForgery.java diff --git a/modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java similarity index 93% rename from modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java index 730e233..db077ea 100644 --- a/modules/fabric/alloy-forgery/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/alloyforgery/provider/ForgeControllerProvider.java @@ -1,6 +1,6 @@ package lol.bai.megane.module.alloyforgery.provider; -import lol.bai.megane.module.alloyforgery.mixin.AccessorForgeControllerBlockEntity; +import lol.bai.megane.mixin.alloyforgery.AccessorForgeControllerBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/MeganeCreate.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/MeganeCreate.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/MeganeCreate.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/MeganeCreate.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java similarity index 97% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java index 8e511be..5b4e808 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java @@ -4,7 +4,7 @@ import com.simibubi.create.content.processing.basin.BasinBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.item.SmartInventory; -import lol.bai.megane.module.create.mixin.AccessBasinBlockEntity; +import lol.bai.megane.mixin.create.AccessBasinBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java similarity index 91% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java index 87afc02..0c98669 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity; -import lol.bai.megane.module.create.mixin.AccessBlockBreakingKineticTileEntity; +import lol.bai.megane.mixin.create.AccessBlockBreakingKineticTileEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java similarity index 98% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java index 51ba4aa..ce00582 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java @@ -1,8 +1,8 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; -import lol.bai.megane.module.create.mixin.AccessContraption; -import lol.bai.megane.module.create.mixin.AccessMountedStorageManager; +import lol.bai.megane.mixin.create.AccessContraption; +import lol.bai.megane.mixin.create.AccessMountedStorageManager; import mcp.mobius.waila.api.IData; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java similarity index 95% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java index 6abf2f9..29120b2 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java @@ -2,7 +2,7 @@ import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import com.simibubi.create.foundation.item.SmartInventory; -import lol.bai.megane.module.create.mixin.AccessBasinOperatingBlockEntity; +import lol.bai.megane.mixin.create.AccessBasinOperatingBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java similarity index 96% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java index 20a843a..ce9035d 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity; -import lol.bai.megane.module.create.mixin.AccessMillstoneProgressProvider; +import lol.bai.megane.mixin.create.AccessMillstoneProgressProvider; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java similarity index 100% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java diff --git a/modules/fabric/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java b/modules/fabric/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java similarity index 100% rename from modules/fabric/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java rename to modules/fabric/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java diff --git a/modules/fabric/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProvider.java similarity index 100% rename from modules/fabric/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProvider.java diff --git a/modules/fabric/extra-generators/src/main/java/lol/bai/megane/module/extragenerators/MeganeExtraGenerators.java b/modules/fabric/src/main/java/lol/bai/megane/module/extragenerators/MeganeExtraGenerators.java similarity index 100% rename from modules/fabric/extra-generators/src/main/java/lol/bai/megane/module/extragenerators/MeganeExtraGenerators.java rename to modules/fabric/src/main/java/lol/bai/megane/module/extragenerators/MeganeExtraGenerators.java diff --git a/modules/fabric/extra-generators/src/main/java/lol/bai/megane/module/extragenerators/provider/GeneratorProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/extragenerators/provider/GeneratorProvider.java similarity index 100% rename from modules/fabric/extra-generators/src/main/java/lol/bai/megane/module/extragenerators/provider/GeneratorProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/extragenerators/provider/GeneratorProvider.java diff --git a/modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/MeganeIndustrialRevolution.java b/modules/fabric/src/main/java/lol/bai/megane/module/indrev/MeganeIndustrialRevolution.java similarity index 100% rename from modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/MeganeIndustrialRevolution.java rename to modules/fabric/src/main/java/lol/bai/megane/module/indrev/MeganeIndustrialRevolution.java diff --git a/modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/CraftingMachineProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/CraftingMachineProvider.java similarity index 100% rename from modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/CraftingMachineProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/CraftingMachineProvider.java diff --git a/modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/FluidComponentHolderProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/FluidComponentHolderProvider.java similarity index 100% rename from modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/FluidComponentHolderProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/FluidComponentHolderProvider.java diff --git a/modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/MachineProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/MachineProvider.java similarity index 100% rename from modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/MachineProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/MachineProvider.java diff --git a/modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/ModularWorkbenchProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/ModularWorkbenchProvider.java similarity index 100% rename from modules/fabric/industrial-revolution/src/main/java/lol/bai/megane/module/indrev/provider/ModularWorkbenchProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/indrev/provider/ModularWorkbenchProvider.java diff --git a/modules/fabric/kibe/src/main/java/lol/bai/megane/module/kibe/MeganeKibe.java b/modules/fabric/src/main/java/lol/bai/megane/module/kibe/MeganeKibe.java similarity index 100% rename from modules/fabric/kibe/src/main/java/lol/bai/megane/module/kibe/MeganeKibe.java rename to modules/fabric/src/main/java/lol/bai/megane/module/kibe/MeganeKibe.java diff --git a/modules/fabric/kibe/src/main/java/lol/bai/megane/module/kibe/provider/TankProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/kibe/provider/TankProvider.java similarity index 100% rename from modules/fabric/kibe/src/main/java/lol/bai/megane/module/kibe/provider/TankProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/kibe/provider/TankProvider.java diff --git a/modules/fabric/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java b/modules/fabric/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java similarity index 100% rename from modules/fabric/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java rename to modules/fabric/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java diff --git a/modules/fabric/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java similarity index 100% rename from modules/fabric/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java diff --git a/modules/fabric/luggage/src/main/java/lol/bai/megane/module/luggage/MeganeLuggage.java b/modules/fabric/src/main/java/lol/bai/megane/module/luggage/MeganeLuggage.java similarity index 100% rename from modules/fabric/luggage/src/main/java/lol/bai/megane/module/luggage/MeganeLuggage.java rename to modules/fabric/src/main/java/lol/bai/megane/module/luggage/MeganeLuggage.java diff --git a/modules/fabric/luggage/src/main/java/lol/bai/megane/module/luggage/provider/LuggageProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/luggage/provider/LuggageProvider.java similarity index 100% rename from modules/fabric/luggage/src/main/java/lol/bai/megane/module/luggage/provider/LuggageProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/luggage/provider/LuggageProvider.java diff --git a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/MeganeModernDynamics.java b/modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/MeganeModernDynamics.java similarity index 100% rename from modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/MeganeModernDynamics.java rename to modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/MeganeModernDynamics.java diff --git a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/FluidPipeProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/provider/FluidPipeProvider.java similarity index 100% rename from modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/FluidPipeProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/provider/FluidPipeProvider.java diff --git a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java similarity index 94% rename from modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java index 59b94fd..0522ea3 100644 --- a/modules/fabric/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java +++ b/modules/fabric/src/main/java/lol/bai/megane/module/moderndynamics/provider/ItemPipeProvider.java @@ -3,7 +3,7 @@ import com.google.common.primitives.Ints; import dev.technici4n.moderndynamics.network.item.TravelingItem; import dev.technici4n.moderndynamics.pipe.ItemPipeBlockEntity; -import lol.bai.megane.module.moderndynamics.mixin.AccessorItemHost; +import lol.bai.megane.mixin.moderndynamics.AccessorItemHost; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/MeganePowah.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/MeganePowah.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/MeganePowah.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/MeganePowah.java diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/EnergyStorageProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/EnergyStorageProvider.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/EnergyStorageProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/EnergyStorageProvider.java diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/FurnatorProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/FurnatorProvider.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/FurnatorProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/FurnatorProvider.java diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/InventoryHolderProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/InventoryHolderProvider.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/InventoryHolderProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/InventoryHolderProvider.java diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/ReactorPartProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/ReactorPartProvider.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/ReactorPartProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/ReactorPartProvider.java diff --git a/modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/TankHolderProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/TankHolderProvider.java similarity index 100% rename from modules/fabric/powah/src/main/java/lol/bai/megane/module/powah/provider/TankHolderProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/powah/provider/TankHolderProvider.java diff --git a/modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/MeganeRebornCore.java b/modules/fabric/src/main/java/lol/bai/megane/module/reborncore/MeganeRebornCore.java similarity index 100% rename from modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/MeganeRebornCore.java rename to modules/fabric/src/main/java/lol/bai/megane/module/reborncore/MeganeRebornCore.java diff --git a/modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/provider/MachineBaseProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/reborncore/provider/MachineBaseProvider.java similarity index 100% rename from modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/provider/MachineBaseProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/reborncore/provider/MachineBaseProvider.java diff --git a/modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/provider/PowerAcceptorProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/reborncore/provider/PowerAcceptorProvider.java similarity index 100% rename from modules/fabric/reborn-core/src/main/java/lol/bai/megane/module/reborncore/provider/PowerAcceptorProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/reborncore/provider/PowerAcceptorProvider.java diff --git a/modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java b/modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java similarity index 100% rename from modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java rename to modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java diff --git a/modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java similarity index 100% rename from modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java diff --git a/modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java similarity index 100% rename from modules/fabric/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java diff --git a/modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java b/modules/fabric/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java similarity index 100% rename from modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java rename to modules/fabric/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java diff --git a/modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/provider/GenericMachineProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/techreborn/provider/GenericMachineProvider.java similarity index 100% rename from modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/provider/GenericMachineProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/techreborn/provider/GenericMachineProvider.java diff --git a/modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/provider/HardCodedProgressProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/techreborn/provider/HardCodedProgressProvider.java similarity index 100% rename from modules/fabric/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/provider/HardCodedProgressProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/techreborn/provider/HardCodedProgressProvider.java diff --git a/modules/fabric/wireless-networks/src/main/java/lol/bai/megane/module/wirelessnetworks/MeganeWirelessNetworks.java b/modules/fabric/src/main/java/lol/bai/megane/module/wirelessnetworks/MeganeWirelessNetworks.java similarity index 100% rename from modules/fabric/wireless-networks/src/main/java/lol/bai/megane/module/wirelessnetworks/MeganeWirelessNetworks.java rename to modules/fabric/src/main/java/lol/bai/megane/module/wirelessnetworks/MeganeWirelessNetworks.java diff --git a/modules/fabric/wireless-networks/src/main/java/lol/bai/megane/module/wirelessnetworks/provider/NetworkNodeProvider.java b/modules/fabric/src/main/java/lol/bai/megane/module/wirelessnetworks/provider/NetworkNodeProvider.java similarity index 100% rename from modules/fabric/wireless-networks/src/main/java/lol/bai/megane/module/wirelessnetworks/provider/NetworkNodeProvider.java rename to modules/fabric/src/main/java/lol/bai/megane/module/wirelessnetworks/provider/NetworkNodeProvider.java diff --git a/modules/fabric/src/main/java/lol/bai/megane/runtime/mixin/MixinPluginConfig.java b/modules/fabric/src/main/java/lol/bai/megane/runtime/mixin/MixinPluginConfig.java index 8cce6a8..f475087 100644 --- a/modules/fabric/src/main/java/lol/bai/megane/runtime/mixin/MixinPluginConfig.java +++ b/modules/fabric/src/main/java/lol/bai/megane/runtime/mixin/MixinPluginConfig.java @@ -26,7 +26,7 @@ private static void migrateConfig(CallbackInfo ci) { MeganeUtils.LOGGER.info("[megane] Migrated plugin config"); - save(); + write(); config.setPluginConfigMigrated(true); MeganeUtils.CONFIG.save(); } @@ -37,9 +37,8 @@ public static void set(ResourceLocation key, T value) { } @Shadow - public static void save() { + public static void write() { throw new AssertionError(); } - } diff --git a/modules/fabric/src/main/resources/assets/megane/lang/en_us.json b/modules/fabric/src/main/resources/assets/megane/lang/en_us.json index 8ea88ea..d4f9b42 100644 --- a/modules/fabric/src/main/resources/assets/megane/lang/en_us.json +++ b/modules/fabric/src/main/resources/assets/megane/lang/en_us.json @@ -1,46 +1,70 @@ { - "config.waila.megane" : "Megane: Legacy", - "config.megane.side.server" : "§7This option will get overloaded by the server", - "config.megane.side.and" : "§7Both client and server needs to have the same value", - "config.megane.side.plus" : "§7Server values will be added to the list", - "config.megane.side.client" : "§7This option is client side only", - "config.megane.enabled" : "Enabled", - "config.megane.expand" : "Expand when Sneaking", - "config.megane.add" : "Add New", - "config.megane.blacklist" : "Blacklist", - "config.megane.inventory" : "Block Inventory", - "config.megane.entityInventory" : "Entity Inventory", - "config.megane.inventory.itemCount" : "Show Item Count", - "config.megane.inventory.nbt" : "NBT Data", - "config.megane.inventory.nbt_desc" : "§7While this makes two stack with same item but different NBT not merged in the tooltip, this makes the packet sent to client significantly bigger, so it's not recommended for dedicated server", - "config.megane.inventory.maxWidth" : "Max Width", - "config.megane.inventory.maxHeight" : "Max Height", - "config.megane.inventory.blacklist" : "Inventory Blacklist", - "config.megane.energy" : "Energy", - "config.megane.energy.color" : "Bar Colors", - "config.megane.energy.color_desc" : "RRGGBB", - "config.megane.energy.unit" : "Units", - "config.megane.energy.blacklist" : "Energy Blacklist", - "config.megane.fluid" : "Fluid", - "config.megane.fluid.color" : "Bar Colors", - "config.megane.fluid.color_desc" : "RRGGBB", - "config.megane.fluid.blacklist" : "Fluid Blacklist", - "config.megane.progress" : "Progress", - "config.megane.progress.showWhenZero" : "Show when 0%", - "config.megane.progress.blacklist" : "Progress Blacklist", - "config.megane.effect" : "Status Effect", - "config.megane.effect.level" : "Show Level", - "config.megane.effect.hidden" : "Show Hidden Effect", - "config.megane.effect.roman" : "Use Roman Numeral", - "config.megane.effect.blacklist" : "Status Effect Blacklist", - "config.megane.other" : "Other", - "config.megane.playerHead" : "Player Head Icon", - "config.megane.spawnEgg" : "Spawn Egg Icon", - "config.megane.catchServerErrors" : "Catch Server Errors", - "config.megane.catchServerErrors_desc": "§7Make errors on block/entity data provider not crashing the server but instead, just simply disable the data for that specific block/entity", - "megane.energy" : "Energy", - "megane.level" : "Level", - "megane.fluid.unknown" : "Unknown Fluid", - "megane.configToast.title" : "Megane Config Reset", - "megane.configToast.desc" : "Found version %d, not %d" + "config.waila.plugin_megane" : "Megane", + + "megane.alloy_forgery.fuel" : "Fuel", + + "config.waila.plugin_megane.create" : "Create", + "config.waila.plugin_megane.create.schematicannon.gunpowder": "Show Schematicannon Gunpowder Level", + "config.waila.plugin_megane.create.contraption" : "Show Contraption Blocks", + "config.waila.plugin_megane.create.contraption_desc" : "Show the correct blocks for the contraption entity\nOnly limited block tooltips are supported", + + "megane.resource_chickens.next_drop" : "Next Drop", + "megane.resource_chickens.gain" : "Gain", + "megane.resource_chickens.growth" : "Growth", + "megane.resource_chickens.strength" : "Strength", + "megane.resource_chickens.conversion" : "Conversion", + "megane.resource_chickens.progress" : "Progress", + "config.waila.plugin_megane.resource_chickens" : "Resource Chickens", + "config.waila.plugin_megane.resource_chickens.gain" : "Show Gain", + "config.waila.plugin_megane.resource_chickens.growth" : "Show Growth", + "config.waila.plugin_megane.resource_chickens.strength" : "Show Stregth", + "config.waila.plugin_megane.resource_chickens.grow" : "Show Nest Grow Timer", + "config.waila.plugin_megane.resource_chickens.drop" : "Show Drop Timer", + "config.waila.plugin_megane.resource_chickens.food" : "Show Nest Food Level", + "config.waila.plugin_megane.resource_chickens.conversion" : "Show Conversion Progress", + + "config.waila.megane" : "Megane: Legacy", + "config.megane.side.server" : "§7This option will get overloaded by the server", + "config.megane.side.and" : "§7Both client and server needs to have the same value", + "config.megane.side.plus" : "§7Server values will be added to the list", + "config.megane.side.client" : "§7This option is client side only", + "config.megane.enabled" : "Enabled", + "config.megane.expand" : "Expand when Sneaking", + "config.megane.add" : "Add New", + "config.megane.blacklist" : "Blacklist", + "config.megane.inventory" : "Block Inventory", + "config.megane.entityInventory" : "Entity Inventory", + "config.megane.inventory.itemCount" : "Show Item Count", + "config.megane.inventory.nbt" : "NBT Data", + "config.megane.inventory.nbt_desc" : "§7While this makes two stack with same item but different NBT not merged in the tooltip, this makes the packet sent to client significantly bigger, so it's not recommended for dedicated server", + "config.megane.inventory.maxWidth" : "Max Width", + "config.megane.inventory.maxHeight" : "Max Height", + "config.megane.inventory.blacklist" : "Inventory Blacklist", + "config.megane.energy" : "Energy", + "config.megane.energy.color" : "Bar Colors", + "config.megane.energy.color_desc" : "RRGGBB", + "config.megane.energy.unit" : "Units", + "config.megane.energy.blacklist" : "Energy Blacklist", + "config.megane.fluid" : "Fluid", + "config.megane.fluid.color" : "Bar Colors", + "config.megane.fluid.color_desc" : "RRGGBB", + "config.megane.fluid.blacklist" : "Fluid Blacklist", + "config.megane.progress" : "Progress", + "config.megane.progress.showWhenZero" : "Show when 0%", + "config.megane.progress.blacklist" : "Progress Blacklist", + "config.megane.effect" : "Status Effect", + "config.megane.effect.level" : "Show Level", + "config.megane.effect.hidden" : "Show Hidden Effect", + "config.megane.effect.roman" : "Use Roman Numeral", + "config.megane.effect.blacklist" : "Status Effect Blacklist", + "config.megane.other" : "Other", + "config.megane.playerHead" : "Player Head Icon", + "config.megane.spawnEgg" : "Spawn Egg Icon", + "config.megane.catchServerErrors" : "Catch Server Errors", + "config.megane.catchServerErrors_desc" : "§7Make errors on block/entity data provider not crashing the server but instead, just simply disable the data for that specific block/entity", + "megane.energy" : "Energy", + "megane.level" : "Level", + "megane.fluid.unknown" : "Unknown Fluid", + "megane.configToast.title" : "Megane Config Reset", + "megane.configToast.desc" : "Found version %d, not %d" } diff --git a/modules/fabric/src/main/resources/assets/megane/lang/zh_tw.json b/modules/fabric/src/main/resources/assets/megane/lang/zh_tw.json index 17e4f47..7e1248e 100644 --- a/modules/fabric/src/main/resources/assets/megane/lang/zh_tw.json +++ b/modules/fabric/src/main/resources/assets/megane/lang/zh_tw.json @@ -1,4 +1,7 @@ { + "megane.alloy_forgery.fuel": "燃料", + + "config.waila.megane" : "Megane", "config.megane.side.server" : "§7這個選項將會隨伺服器設定而多載", "config.megane.side.and" : "§7用戶端與伺服器端需要使用相同的值", diff --git a/modules/fabric/src/main/resources/fabric.mod.json b/modules/fabric/src/main/resources/fabric.mod.json index dc847cc..19f964a 100644 --- a/modules/fabric/src/main/resources/fabric.mod.json +++ b/modules/fabric/src/main/resources/fabric.mod.json @@ -12,7 +12,8 @@ "license" : "All Rights Reserved", "icon" : "megane.png", "mixins" : [ - "megane-runtime.mixins.json" + "megane-runtime.mixins.json", + "megane.mixins.json" ], "depends" : { "minecraft" : ">=1.19", diff --git a/modules/fabric/src/main/resources/megane.mixins.json b/modules/fabric/src/main/resources/megane.mixins.json new file mode 100644 index 0000000..48042db --- /dev/null +++ b/modules/fabric/src/main/resources/megane.mixins.json @@ -0,0 +1,24 @@ +{ + "required" : true, + "minVersion" : "0.8", + "package" : "lol.bai.megane.mixin", + "plugin" : "lol.bai.megane.mixin.MixinConfigPlugin", + "compatibilityLevel": "JAVA_8", + "mixins" : [ + "ae2.MixinWthitModule1", + "alloyforgery.AccessorForgeControllerBlockEntity", + "create.AccessBasinBlockEntity", + "create.AccessBasinOperatingBlockEntity", + "create.AccessBlockBreakingKineticTileEntity", + "create.AccessContraption", + "create.AccessMillstoneProgressProvider", + "create.AccessMountedStorageManager", + "create.MixinCrushingWheelControllerBlockEntity", + "create.MixinMechanicalMixerBlockEntity" + ], + "client" : [ + ], + "injectors" : { + "defaultRequire": 1 + } +} diff --git a/modules/fabric/src/main/resources/waila_plugins.json b/modules/fabric/src/main/resources/waila_plugins.json new file mode 100644 index 0000000..2e883f6 --- /dev/null +++ b/modules/fabric/src/main/resources/waila_plugins.json @@ -0,0 +1,92 @@ +{ + "megane:alloy-forgery" : { + "initializer": "lol.bai.megane.module.alloyforgery.MeganeAlloyForgery", + "required" : { + "alloy_forgery": "*" + } + }, + "megane:applied-energistics-2" : { + "initializer": "lol.bai.megane.module.ae2.MeganeAppliedEnergistics2", + "required" : { + "ae2": "*" + } + }, + "megane:create" : { + "initializer": "lol.bai.megane.module.create.MeganeCreate", + "required" : { + "create": "*" + } + }, + "megane:deep-mob-learning-simulacrum": { + "initializer": "lol.bai.megane.module.dmlsimulacrum.MeganeDmlSimulacrum", + "required" : { + "dmlsimulacrum": "*" + } + }, + "megane:extra-generators" : { + "initializer": "lol.bai.megane.module.extragenerators.MeganeExtraGenerators", + "required" : { + "extragenerators": "*" + } + }, + "megane:industrial-revolution" : { + "initializer": "lol.bai.megane.module.indrev.MeganeIndustrialRevolution", + "required" : { + "indrev": "*" + } + }, + "megane:kibe" : { + "initializer": "lol.bai.megane.module.kibe.MeganeKibe", + "required" : { + "kibe": "*" + } + }, + "megane:lapis-reserve" : { + "initializer": "lol.bai.megane.module.lapisreserve.MeganeLapisReserve", + "required" : { + "lapisreserve": "*" + } + }, + "megane:luggage" : { + "initializer": "lol.bai.megane.module.luggage.MeganeLuggage", + "required" : { + "luggage": "*" + } + }, + "megane:modern-dynamics" : { + "initializer": "lol.bai.megane.module.moderndynamics.MeganeModernDynamics", + "required" : { + "moderndynamics": "*" + } + }, + "megane:powah" : { + "initializer": "lol.bai.megane.module.powah.MeganePowah", + "required" : { + "powah": "*" + } + }, + "megane:reborn-core" : { + "initializer": "lol.bai.megane.module.reborncore.MeganeRebornCore", + "required" : { + "reborncore": "*" + } + }, + "megane:resource-chickens" : { + "initializer": "lol.bai.megane.module.resourcechickens.MeganeResourceChickens", + "required" : { + "resourcechickens": "*" + } + }, + "megane:tech-reborn" : { + "initializer": "lol.bai.megane.module.techreborn.MeganeTechReborn", + "required" : { + "techreborn": "*" + } + }, + "megane:wireless-networks" : { + "initializer": "lol.bai.megane.module.wirelessnetworks.MeganeWirelessNetworks", + "required" : { + "wirelessnetworks": "*" + } + } +} diff --git a/modules/fabric/tech-reborn/build.gradle.kts b/modules/fabric/tech-reborn/build.gradle.kts deleted file mode 100644 index 2d47153..0000000 --- a/modules/fabric/tech-reborn/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -metadata("lol.bai.megane.module.techreborn") { - waila("MeganeTechReborn") - - fmj { - depends( - "techreborn" to any - ) - } -} - -repositories { - shedaniel() -} - -dependencies { - modImplementation(deps.fabric.techReborn) -} diff --git a/modules/fabric/wireless-networks/build.gradle.kts b/modules/fabric/wireless-networks/build.gradle.kts deleted file mode 100644 index 352be44..0000000 --- a/modules/fabric/wireless-networks/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -metadata("lol.bai.megane.module.wirelessnetworks") { - waila("MeganeWirelessNetworks") - - fmj { - depends( - "wirelessnetworks" to any - ) - } -} - -repositories { - bbkr() -} - -dependencies { - modImplementation(deps.fabric.wirelessNet) - modImplementation(deps.fabric.fabricApi) - modImplementation(deps.fabric.trEnergy) - modImplementation(deps.fabric.libgui) -} diff --git a/modules/forge/applied-energistics-2/build.gradle.kts b/modules/forge/applied-energistics-2/build.gradle.kts deleted file mode 100644 index 718ae89..0000000 --- a/modules/forge/applied-energistics-2/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -metadata("lol.bai.megane.module.ae2") { - waila("MeganeAppliedEnergistics2") { - required("ae2") - } - - mixin { - callback(mixin::add, mixin::config) - require(forgeMod("ae2")) - } - - forgeFml() - packMcmeta() - - modsToml { - depends("ae2" to any) - } -} - -repositories { - shedaniel() - modmaven() -} - -dependencies { - annotationProcessor(deps.mixinAp) - - implementation(fg.deobf(deps.forge.ae2)) -} diff --git a/modules/forge/build.gradle.kts b/modules/forge/build.gradle.kts index 0c3d974..ccd05d1 100644 --- a/modules/forge/build.gradle.kts +++ b/modules/forge/build.gradle.kts @@ -46,53 +46,34 @@ publishMods { } } -allprojects { - apply(plugin = "net.minecraftforge.gradle") - apply(plugin = "org.spongepowered.mixin") +dependencies { + minecraft(deps.forge.forge) - minecraft { - mappings("official", versions.minecraft) - } + compileOnly(fg.deobf(deps.forge.wthit.api)) + runtimeOnly(fg.deobf(deps.forge.wthit.runtime)) + runtimeOnly(fg.deobf(deps.forge.badpackets)) + runtimeOnly(fg.deobf(deps.forge.jei)) + annotationProcessor(deps.mixinAp) - mixin { - debug.apply { - this as GroovyObject - setProperty("export", true) - setProperty("verbose", true) - } - } + implementation(fg.deobf(deps.forge.ae2)) - dependencies { - minecraft(deps.forge.forge) + implementation(fg.deobf(deps.forge.create)) - compileOnly(fg.deobf(deps.forge.wthit.api)) - runtimeOnly(fg.deobf(deps.forge.wthit.runtime)) - runtimeOnly(fg.deobf(deps.forge.badpackets)) + implementation(fg.deobf(deps.forge.ie)) - runtimeOnly(fg.deobf(deps.forge.jei)) - } + implementation(fg.deobf(deps.forge.lapisReserve)) - sourceSets { - main { - java.srcDir("src/generated/java") - resources.srcDir("src/generated/resources") - } - } + implementation(fg.deobf(deps.forge.mekanism.core)) - tasks.jar { - finalizedBy("reobfJar") - } - - tasks.processResources { - inputs.property("version", project.version) + implementation(fg.deobf(deps.forge.productiveBees)) - filesMatching("META-INF/mods.toml") { - expand("version" to project.version) - } - } + implementation(fg.deobf(deps.forge.resourceChickens)) + runtimeOnly(fg.deobf(deps.forge.top)) } minecraft { + mappings("official", versions.minecraft) + runs { val runConfig = Action { ideaModule(rootProject.name + project.path.replace(':', '.') + ".main") @@ -109,92 +90,24 @@ minecraft { } } -tasks { - val build by getting +mixin { + add(sourceSets.main.get(), "megane.refmap.json") + config("megane.mixins.json") - val mergeWaila by creating(MergeWailaTask::class) { - output.set(layout.buildDirectory.file("mergeWaila/waila_plugins.json")) - } - - val jar by getting(Jar::class) { - archiveClassifier.set("dev") - } - - val fatJar by creating(Jar::class) { - dependsOn(jar) - dependsOn(mergeWaila) - build.dependsOn(this) - - archiveClassifier.set("") - - from(mergeWaila.output) - from(zipTree(jar.archiveFile)) - - subprojects.forEach { sub -> - val subJar = sub.tasks.getByName("jar") - dependsOn(subJar) - - from(zipTree(subJar.archiveFile)) { - include("**/*.class") - exclude("**/Main.class") - - include("*.mixins.json") - include("*.refmap.json") - include("assets/**") - } - } - } - - subprojects { - afterEvaluate { - val mixinJson = metadata?.let { it.prop[GenMixinTask.JSON] as? String } - - if (mixinJson != null) { - val otherJson = fatJar.manifest.attributes["MixinConfigs"]?.toString() - - fatJar.manifest.attributes( - "MixinConfigs" to if (otherJson == null) mixinJson else "${otherJson},${mixinJson}" - ) - } - - tasks.withType(GenWailaTask::class) { - mergeWaila.dependsOn(this) - mergeWaila.input.add(output) - } - } - } - - project.publishMods { - file.set(fatJar.archiveFile) + debug.apply { + this as GroovyObject + setProperty("export", true) } } -subprojects.forEach { sub -> - val subMain = sub.sourceSets.main.get() - - sourceSets { - main { - runtimeClasspath += subMain.runtimeClasspath + subMain.output - } - } +tasks.jar { + finalizedBy("reobfJar") } -val thisProject = project -subprojects.forEach { sub -> - sub.afterEvaluate { - thisProject.minecraft.runs.configureEach { - mods.create("megane-${sub.name}".replace("-", "_")) { - source(sourceSets["main"]) - } - - val mixin = metadata?.let { it.prop[GenMixinTask.JSON] as? String } - if (mixin != null) args("--mixin.config", mixin) - } - } -} +tasks.processResources { + inputs.property("version", project.version) -subprojects { - base { - archivesName.set("megane-forge-${project.name}") + filesMatching("META-INF/mods.toml") { + expand("version" to project.version) } } diff --git a/modules/forge/create/build.gradle.kts b/modules/forge/create/build.gradle.kts deleted file mode 100644 index d691951..0000000 --- a/modules/forge/create/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -metadata("lol.bai.megane.module.create") { - waila("MeganeCreate") { - required("create") - } - - mixin { - callback(mixin::add, mixin::config) - require(forgeMod("create")) - } - - forgeFml() - packMcmeta() - language() - - modsToml{ - depends("create" to any) - } -} - -dependencies { - annotationProcessor(deps.mixinAp) - - implementation(fg.deobf(deps.forge.create)) -} diff --git a/modules/forge/immersive-engineering/build.gradle.kts b/modules/forge/immersive-engineering/build.gradle.kts deleted file mode 100644 index 26439f4..0000000 --- a/modules/forge/immersive-engineering/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -metadata("lol.bai.megane.module.ie") { - waila("MeganeImmersiveEngineering") { - required("immersiveengineering") - } - - mixin { - callback(mixin::add, mixin::config) - require(forgeMod("immersiveengineering")) - } - - forgeFml() - packMcmeta() - language() - - modsToml{ - depends("immersiveengineering" to any) - } -} - -dependencies { - annotationProcessor(deps.mixinAp) - - implementation(fg.deobf(deps.forge.ie)) -} diff --git a/modules/forge/lapis-reserve/build.gradle.kts b/modules/forge/lapis-reserve/build.gradle.kts deleted file mode 100644 index 2082e37..0000000 --- a/modules/forge/lapis-reserve/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -metadata("lol.bai.megane.module.lapisreserve") { - waila("MeganeLapisReserve") { - required("lapisreserve") - } - - forgeFml() - packMcmeta() - - modsToml{ - depends("lapisreserve" to any) - } -} - -dependencies { - implementation(fg.deobf(deps.forge.lapisReserve)) -} diff --git a/modules/forge/mekanism/build.gradle.kts b/modules/forge/mekanism/build.gradle.kts deleted file mode 100644 index 6567e70..0000000 --- a/modules/forge/mekanism/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -metadata("lol.bai.megane.module.mekanism") { - waila("MeganeMekaninsm") { - required("mekanism") - } - - mixin { - callback(mixin::add, mixin::config) - require(forgeMod("mekanism")) - } - - forgeFml() - packMcmeta() - language() - - modsToml { - depends( - "mekanism" to any - ) - } -} - -repositories { - modmaven() -} - -dependencies { - implementation(fg.deobf(deps.forge.mekanism.core)) -} diff --git a/modules/forge/productive-bees/build.gradle.kts b/modules/forge/productive-bees/build.gradle.kts deleted file mode 100644 index d6f21e6..0000000 --- a/modules/forge/productive-bees/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -metadata("lol.bai.megane.module.productivebees") { - waila("MeganeProductiveBees") { - required("productivebees") - } - - forgeFml() - packMcmeta() - language() - - modsToml{ - depends("productivebees" to any) - } -} - -dependencies { - implementation(fg.deobf(deps.forge.productiveBees)) -} diff --git a/modules/forge/refined-storage/build.gradle.kts b/modules/forge/refined-storage/build.gradle.kts deleted file mode 100644 index 1365283..0000000 --- a/modules/forge/refined-storage/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -metadata("lol.bai.megane.module.rs") { - waila("MeganeRefinedStorage") - forgeFml() - packMcmeta() - - modsToml { - depends( - "refinedstorage" to any - ) - } -} - -dependencies { - implementation(fg.deobf(deps.forge.rs)) -} diff --git a/modules/forge/refined-storage/src/main/java/lol/bai/megane/module/rs/MeganeRefinedStorage.java b/modules/forge/refined-storage/src/main/java/lol/bai/megane/module/rs/MeganeRefinedStorage.java deleted file mode 100644 index 4ab6eb5..0000000 --- a/modules/forge/refined-storage/src/main/java/lol/bai/megane/module/rs/MeganeRefinedStorage.java +++ /dev/null @@ -1,13 +0,0 @@ -package lol.bai.megane.module.rs; - -import mcp.mobius.waila.api.IRegistrar; -import mcp.mobius.waila.api.IWailaPlugin; - -public class MeganeRefinedStorage implements IWailaPlugin { - - @Override - public void register(IRegistrar registrar) { - - } - -} diff --git a/modules/forge/resource-chickens/build.gradle.kts b/modules/forge/resource-chickens/build.gradle.kts deleted file mode 100644 index ec96d79..0000000 --- a/modules/forge/resource-chickens/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -metadata("lol.bai.megane.module.resourcechickens") { - waila("MeganeResourceChickens") { - required("resourcechickens") - } - - forgeFml() - packMcmeta() - language() - - modsToml{ - depends("resourcechickens" to any) - } -} - -repositories { - curseApi() -} - -dependencies { - implementation(fg.deobf(deps.forge.resourceChickens)) - runtimeOnly(fg.deobf(deps.forge.top)) -} diff --git a/modules/forge/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java b/modules/forge/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java new file mode 100644 index 0000000..07eb567 --- /dev/null +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/MixinConfigPlugin.java @@ -0,0 +1,61 @@ +package lol.bai.megane.mixin; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraftforge.fml.loading.FMLLoader; +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +public class MixinConfigPlugin implements IMixinConfigPlugin { + + private static final Map MAP = Map.of( + "ae2", "ae2", + "alloyforgery", "alloy_forgery", + "create", "create", + "moderndynamics", "moderndynamics" + ); + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + var split = mixinClassName.replace('/', '.').split("\\."); + var packageName = split[split.length - 2]; + + if (MAP.containsKey(packageName)) { + return FMLLoader.getLoadingModList().getModFileById(MAP.get(packageName)) != null; + } else { + return true; + } + } + + // + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java b/modules/forge/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java similarity index 96% rename from modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java index 530999f..57e7b4c 100644 --- a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/mixin/MixinWthitModule1.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/ae2/MixinWthitModule1.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.ae2.mixin; +package lol.bai.megane.mixin.ae2; import appeng.api.integrations.igtooltip.providers.ServerDataProvider; import appeng.integration.modules.igtooltip.blocks.PowerStorageDataProvider; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java similarity index 90% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java index bfb1182..1476927 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinBlockEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java similarity index 90% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java index 8a4f035..7ae48e7 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBasinOperatingBlockEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBasinOperatingBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java similarity index 88% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java index 98a8606..ee98b9d 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessBlockBreakingKineticTileEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessBlockBreakingKineticTileEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java similarity index 89% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java index 01712ac..2b4a335 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessContraption.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessContraption.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.contraptions.Contraption; import com.simibubi.create.content.contraptions.MountedStorageManager; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java similarity index 89% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java index fa80acc..e474c1d 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMillstoneProgressProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMillstoneProgressProvider.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.millstone.MillingRecipe; import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java similarity index 93% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java index c17e370..0c527fd 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/AccessMountedStorageManager.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/AccessMountedStorageManager.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Map; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java similarity index 96% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java index 4172385..b6afa80 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinCrushingWheelControllerBlockEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinCrushingWheelControllerBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import java.util.Optional; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java similarity index 96% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java index 08428ca..d07d570 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/mixin/MixinMechanicalMixerBlockEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/create/MixinMechanicalMixerBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.create.mixin; +package lol.bai.megane.mixin.create; import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import lol.bai.megane.module.create.provider.MechanicalMixerProvider; diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/AccessFurnaceLikeBlockEntity.java b/modules/forge/src/main/java/lol/bai/megane/mixin/ie/AccessFurnaceLikeBlockEntity.java similarity index 93% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/AccessFurnaceLikeBlockEntity.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/ie/AccessFurnaceLikeBlockEntity.java index f8a13a1..41b63d7 100644 --- a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/AccessFurnaceLikeBlockEntity.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/ie/AccessFurnaceLikeBlockEntity.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.ie.mixin; +package lol.bai.megane.mixin.ie; import java.util.List; diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/MixinFurnaceLikeBlockEntitySlots.java b/modules/forge/src/main/java/lol/bai/megane/mixin/ie/MixinFurnaceLikeBlockEntitySlots.java similarity index 94% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/MixinFurnaceLikeBlockEntitySlots.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/ie/MixinFurnaceLikeBlockEntitySlots.java index 2df0798..5b0da04 100644 --- a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/mixin/MixinFurnaceLikeBlockEntitySlots.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/ie/MixinFurnaceLikeBlockEntitySlots.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.ie.mixin; +package lol.bai.megane.mixin.ie; import lol.bai.megane.module.ie.provider.FurnaceLikeProvider; import org.spongepowered.asm.mixin.Final; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessBasicInventorySlot.java b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessBasicInventorySlot.java similarity index 88% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessBasicInventorySlot.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessBasicInventorySlot.java index f1a8c6f..25530ff 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessBasicInventorySlot.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessBasicInventorySlot.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.mekanism.mixin; +package lol.bai.megane.mixin.mekanism; import mekanism.common.inventory.container.slot.ContainerSlotType; import mekanism.common.inventory.slot.BasicInventorySlot; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessLookingAtUtils.java b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessLookingAtUtils.java similarity index 97% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessLookingAtUtils.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessLookingAtUtils.java index 4fe5a1c..82187a0 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/AccessLookingAtUtils.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/AccessLookingAtUtils.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.mekanism.mixin; +package lol.bai.megane.mixin.mekanism; import java.util.List; import java.util.function.Function; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/MixinMekanismWTHITPlugin.java b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/MixinMekanismWTHITPlugin.java similarity index 95% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/MixinMekanismWTHITPlugin.java rename to modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/MixinMekanismWTHITPlugin.java index f1aa28e..c83a77d 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/mixin/MixinMekanismWTHITPlugin.java +++ b/modules/forge/src/main/java/lol/bai/megane/mixin/mekanism/MixinMekanismWTHITPlugin.java @@ -1,4 +1,4 @@ -package lol.bai.megane.module.mekanism.mixin; +package lol.bai.megane.mixin.mekanism; import mcp.mobius.waila.api.IRegistrar; import mekanism.common.integration.lookingat.wthit.MekanismWTHITPlugin; diff --git a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java b/modules/forge/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java similarity index 100% rename from modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java rename to modules/forge/src/main/java/lol/bai/megane/module/ae2/MeganeAppliedEnergistics2.java diff --git a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java similarity index 100% rename from modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/EnergyCellProvider.java diff --git a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java similarity index 100% rename from modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/InscriberProvider.java diff --git a/modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java similarity index 100% rename from modules/forge/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/MeganeCreate.java b/modules/forge/src/main/java/lol/bai/megane/module/create/MeganeCreate.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/MeganeCreate.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/MeganeCreate.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java similarity index 97% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java index 65ae70b..89b27d7 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/BasinProvider.java @@ -3,7 +3,7 @@ import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import com.simibubi.create.content.processing.basin.BasinBlockEntity; import com.simibubi.create.foundation.item.SmartInventory; -import lol.bai.megane.module.create.mixin.AccessBasinBlockEntity; +import lol.bai.megane.mixin.create.AccessBasinBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java similarity index 91% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java index 87afc02..0c98669 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/BlockBreakingKineticProvider.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity; -import lol.bai.megane.module.create.mixin.AccessBlockBreakingKineticTileEntity; +import lol.bai.megane.mixin.create.AccessBlockBreakingKineticTileEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java similarity index 98% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java index b7926e8..f71bcdb 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/ContraptionProvider.java @@ -1,8 +1,8 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; -import lol.bai.megane.module.create.mixin.AccessContraption; -import lol.bai.megane.module.create.mixin.AccessMountedStorageManager; +import lol.bai.megane.mixin.create.AccessContraption; +import lol.bai.megane.mixin.create.AccessMountedStorageManager; import mcp.mobius.waila.api.IData; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/CrushingWheelControllerProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/FluidTankProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/ItemVaultProvider.java diff --git a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java similarity index 95% rename from modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java index 6abf2f9..29120b2 100644 --- a/modules/fabric/create/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/MechanicalMixerProvider.java @@ -2,7 +2,7 @@ import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import com.simibubi.create.foundation.item.SmartInventory; -import lol.bai.megane.module.create.mixin.AccessBasinOperatingBlockEntity; +import lol.bai.megane.mixin.create.AccessBasinOperatingBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java similarity index 96% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java index 20a843a..ce9035d 100644 --- a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/MillstoneProvider.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.create.provider; import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity; -import lol.bai.megane.module.create.mixin.AccessMillstoneProgressProvider; +import lol.bai.megane.mixin.create.AccessMillstoneProgressProvider; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/SchematicTableProvider.java diff --git a/modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java similarity index 100% rename from modules/forge/create/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/create/provider/SchematicannonProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/MeganeImmersiveEngineering.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/MeganeImmersiveEngineering.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/MeganeImmersiveEngineering.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/MeganeImmersiveEngineering.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/AssemblerProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/AssemblerProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/AssemblerProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/AssemblerProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/CokeOvenProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/CokeOvenProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/CokeOvenProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/CokeOvenProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java similarity index 96% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java index 019e696..f747029 100644 --- a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/FurnaceLikeProvider.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.ie.provider; import blusunrize.immersiveengineering.common.blocks.stone.FurnaceLikeBlockEntity; -import lol.bai.megane.module.ie.mixin.AccessFurnaceLikeBlockEntity; +import lol.bai.megane.mixin.ie.AccessFurnaceLikeBlockEntity; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/IEInventoryProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/IEInventoryProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/IEInventoryProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/IEInventoryProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/MetalPressProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/MetalPressProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/MetalPressProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/MetalPressProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/SheetmetalTankProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/SheetmetalTankProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/SheetmetalTankProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/SheetmetalTankProvider.java diff --git a/modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/SiloProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/ie/provider/SiloProvider.java similarity index 100% rename from modules/forge/immersive-engineering/src/main/java/lol/bai/megane/module/ie/provider/SiloProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/ie/provider/SiloProvider.java diff --git a/modules/forge/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java b/modules/forge/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java similarity index 100% rename from modules/forge/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java rename to modules/forge/src/main/java/lol/bai/megane/module/lapisreserve/MeganeLapisReserve.java diff --git a/modules/forge/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java similarity index 100% rename from modules/forge/lapis-reserve/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/lapisreserve/provider/LapisReserveProvider.java diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/MeganeMekaninsm.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/MeganeMekaninsm.java similarity index 100% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/MeganeMekaninsm.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/MeganeMekaninsm.java diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java similarity index 98% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java index 2b7a582..ea5e820 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/ChemicalProvider.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; +import lol.bai.megane.mixin.mekanism.AccessLookingAtUtils; import lol.bai.megane.module.mekanism.MeganeMekaninsm; -import lol.bai.megane.module.mekanism.mixin.AccessLookingAtUtils; import mcp.mobius.waila.api.IBlockAccessor; import mcp.mobius.waila.api.IBlockComponentProvider; import mcp.mobius.waila.api.IData; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java similarity index 95% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java index a1d022b..f26c6ef 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FactoryProvider.java @@ -1,6 +1,6 @@ package lol.bai.megane.module.mekanism.provider; -import lol.bai.megane.module.mekanism.mixin.AccessBasicInventorySlot; +import lol.bai.megane.mixin.mekanism.AccessBasicInventorySlot; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java similarity index 96% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java index 8d01b7c..0aaab65 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/FluidProvider.java @@ -1,6 +1,6 @@ package lol.bai.megane.module.mekanism.provider; -import lol.bai.megane.module.mekanism.mixin.AccessLookingAtUtils; +import lol.bai.megane.mixin.mekanism.AccessLookingAtUtils; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java similarity index 95% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java index 227d874..6e6cc5c 100644 --- a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java +++ b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/MultiblockProvider.java @@ -1,6 +1,6 @@ package lol.bai.megane.module.mekanism.provider; -import lol.bai.megane.module.mekanism.mixin.AccessLookingAtUtils; +import lol.bai.megane.mixin.mekanism.AccessLookingAtUtils; import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.IDataWriter; import mcp.mobius.waila.api.IPluginConfig; diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/SecurityProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/SecurityProvider.java similarity index 100% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/SecurityProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/SecurityProvider.java diff --git a/modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/StrictEnergyProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/StrictEnergyProvider.java similarity index 100% rename from modules/forge/mekanism/src/main/java/lol/bai/megane/module/mekanism/provider/StrictEnergyProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/mekanism/provider/StrictEnergyProvider.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/MeganeProductiveBees.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/MeganeProductiveBees.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/MeganeProductiveBees.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/MeganeProductiveBees.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/AdvancedBeehiveProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/AdvancedBeehiveProvider.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/AdvancedBeehiveProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/AdvancedBeehiveProvider.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/JarProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/JarProvider.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/JarProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/JarProvider.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/ProductiveBeeProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/ProductiveBeeProvider.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/ProductiveBeeProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/ProductiveBeeProvider.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/RecipeProcessingProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/RecipeProcessingProvider.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/RecipeProcessingProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/RecipeProcessingProvider.java diff --git a/modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/SolitaryNestProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/SolitaryNestProvider.java similarity index 100% rename from modules/forge/productive-bees/src/main/java/lol/bai/megane/module/productivebees/provider/SolitaryNestProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/productivebees/provider/SolitaryNestProvider.java diff --git a/modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java b/modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java similarity index 100% rename from modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java rename to modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/MeganeResourceChickens.java diff --git a/modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java similarity index 100% rename from modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/provider/ChickenProvider.java diff --git a/modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java b/modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java similarity index 100% rename from modules/forge/resource-chickens/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java rename to modules/forge/src/main/java/lol/bai/megane/module/resourcechickens/provider/NestProvider.java diff --git a/modules/forge/src/main/resources/assets/megane/lang/en_us.json b/modules/forge/src/main/resources/assets/megane/lang/en_us.json new file mode 100644 index 0000000..3ff11a9 --- /dev/null +++ b/modules/forge/src/main/resources/assets/megane/lang/en_us.json @@ -0,0 +1,51 @@ +{ + "config.waila.plugin_megane" : "Megane", + + "config.waila.plugin_megane.create" : "Create", + "config.waila.plugin_megane.create.schematicannon.gunpowder": "Show Schematicannon Gunpowder Level", + "config.waila.plugin_megane.create.contraption" : "Show Contraption Blocks", + "config.waila.plugin_megane.create.contraption_desc" : "Show the correct blocks for the contraption entity\nOnly limited block tooltips are supported", + + "config.waila.plugin_megane.ie" : "Immersive Engineering", + "config.waila.plugin_megane.ie.metal_press_mold" : "Show Metal Press Mold", + "config.waila.plugin_megane.ie.assembler_recipes": "Show Assembler Recipes", + + "megane.mekanism.owner" : "Owner", + "config.waila.plugin_megane.mekanism" : "Mekanism", + "config.waila.plugin_megane.mekanism.chemical": "Show Block Chemical Contents", + "config.waila.plugin_megane.mekanism.security": "Show Block Security", + + "megane.productive_bees.bee.type" : "Type", + "megane.productive_bees.bee.productivity" : "Productivity", + "megane.productive_bees.bee.tolerance" : "Tolerance", + "megane.productive_bees.bee.behavior" : "Behavior", + "megane.productive_bees.bee.endurance" : "Endurance", + "megane.productive_bees.bee.temper" : "Temper", + "megane.productive_bees.hive.cooldown" : "Temper", + "megane.productive_bees.hive.can_repopulate" : "Can Repopulate", + "config.waila.plugin_megane.productive_bees" : "Productive Bees", + "config.waila.plugin_megane.productive_bees.bee_type" : "Show Bee Type", + "config.waila.plugin_megane.productive_bees.bee_productivity": "Show Bee Productivity", + "config.waila.plugin_megane.productive_bees.bee_tolerance" : "Show Bee Tolerance", + "config.waila.plugin_megane.productive_bees.bee_behavior" : "Show Bee Behavior", + "config.waila.plugin_megane.productive_bees.bee_endurance" : "Show Bee Endurance", + "config.waila.plugin_megane.productive_bees.bee_temper" : "Show Bee Temper", + "config.waila.plugin_megane.productive_bees.hive_honey_level": "Show Beehive Honey Level", + "config.waila.plugin_megane.productive_bees.hive_occupants" : "Show Beehive Occupants", + "config.waila.plugin_megane.productive_bees.hive_cooldown" : "Show Solitary Nest Cooldown", + + "megane.resource_chickens.next_drop" : "Next Drop", + "megane.resource_chickens.gain" : "Gain", + "megane.resource_chickens.growth" : "Growth", + "megane.resource_chickens.strength" : "Strength", + "megane.resource_chickens.conversion" : "Conversion", + "megane.resource_chickens.progress" : "Progress", + "config.waila.plugin_megane.resource_chickens" : "Resource Chickens", + "config.waila.plugin_megane.resource_chickens.gain" : "Show Gain", + "config.waila.plugin_megane.resource_chickens.growth" : "Show Growth", + "config.waila.plugin_megane.resource_chickens.strength" : "Show Stregth", + "config.waila.plugin_megane.resource_chickens.grow" : "Show Nest Grow Timer", + "config.waila.plugin_megane.resource_chickens.drop" : "Show Drop Timer", + "config.waila.plugin_megane.resource_chickens.food" : "Show Nest Food Level", + "config.waila.plugin_megane.resource_chickens.conversion": "Show Conversion Progress" +} diff --git a/modules/forge/src/main/resources/megane.mixins.json b/modules/forge/src/main/resources/megane.mixins.json new file mode 100644 index 0000000..e02ddc9 --- /dev/null +++ b/modules/forge/src/main/resources/megane.mixins.json @@ -0,0 +1,29 @@ +{ + "required" : true, + "minVersion" : "0.8", + "package" : "lol.bai.megane.mixin", + "plugin" : "lol.bai.megane.mixin.MixinConfigPlugin", + "refmap" : "megane.refmap.json", + "compatibilityLevel": "JAVA_8", + "mixins" : [ + "ae2.MixinWthitModule1", + "create.AccessBasinBlockEntity", + "create.AccessBasinOperatingBlockEntity", + "create.AccessBlockBreakingKineticTileEntity", + "create.AccessContraption", + "create.AccessMillstoneProgressProvider", + "create.AccessMountedStorageManager", + "create.MixinCrushingWheelControllerBlockEntity", + "create.MixinMechanicalMixerBlockEntity", + "ie.AccessFurnaceLikeBlockEntity", + "ie.MixinFurnaceLikeBlockEntitySlots", + "mekanism.AccessBasicInventorySlot", + "mekanism.AccessLookingAtUtils", + "mekanism.MixinMekanismWTHITPlugin" + ], + "client" : [ + ], + "injectors" : { + "defaultRequire": 1 + } +} diff --git a/modules/forge/src/main/resources/waila_plugins.json b/modules/forge/src/main/resources/waila_plugins.json new file mode 100644 index 0000000..440027b --- /dev/null +++ b/modules/forge/src/main/resources/waila_plugins.json @@ -0,0 +1,44 @@ +{ + "megane:applied-energistics-2": { + "initializer": "lol.bai.megane.module.ae2.MeganeAppliedEnergistics2", + "required" : { + "ae2": "*" + } + }, + "megane:create" : { + "initializer": "lol.bai.megane.module.create.MeganeCreate", + "required" : { + "create": "*" + } + }, + "megane:immersive-engineering": { + "initializer": "lol.bai.megane.module.ie.MeganeImmersiveEngineering", + "required" : { + "immersiveengineering": "*" + } + }, + "megane:lapis-reserve" : { + "initializer": "lol.bai.megane.module.lapisreserve.MeganeLapisReserve", + "required" : { + "lapisreserve": "*" + } + }, + "megane:mekanism" : { + "initializer": "lol.bai.megane.module.mekanism.MeganeMekaninsm", + "required" : { + "mekanism": "*" + } + }, + "megane:productive-bees" : { + "initializer": "lol.bai.megane.module.productivebees.MeganeProductiveBees", + "required" : { + "productivebees": "*" + } + }, + "megane:resource-chickens" : { + "initializer": "lol.bai.megane.module.resourcechickens.MeganeResourceChickens", + "required" : { + "resourcechickens": "*" + } + } +} diff --git a/modules/forge/thermal-expansion/build.gradle.kts b/modules/forge/thermal-expansion/build.gradle.kts deleted file mode 100644 index d1b57eb..0000000 --- a/modules/forge/thermal-expansion/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -metadata("lol.bai.megane.module.thermal") { - waila("MeganeThermalExpansion") - forgeFml() - packMcmeta() - - modsToml { - depends( - "thermal_expansion" to any - ) - } -} - -dependencies { - implementation(fg.deobf(deps.forge.thermal.cofhCore)) - implementation(fg.deobf(deps.forge.thermal.foundation)) - implementation(fg.deobf(deps.forge.thermal.expansion)) -} diff --git a/modules/forge/thermal-expansion/src/main/java/lol/bai/megane/module/thermal/MeganeThermalExpansion.java b/modules/forge/thermal-expansion/src/main/java/lol/bai/megane/module/thermal/MeganeThermalExpansion.java deleted file mode 100644 index 59ebeb1..0000000 --- a/modules/forge/thermal-expansion/src/main/java/lol/bai/megane/module/thermal/MeganeThermalExpansion.java +++ /dev/null @@ -1,13 +0,0 @@ -package lol.bai.megane.module.thermal; - -import mcp.mobius.waila.api.IRegistrar; -import mcp.mobius.waila.api.IWailaPlugin; - -public class MeganeThermalExpansion implements IWailaPlugin { - - @Override - public void register(IRegistrar registrar) { - - } - -} diff --git a/settings.gradle.kts b/settings.gradle.kts index e6bb6d9..d2c1a87 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,31 +23,31 @@ include("modules") include("modules:fabric") include("modules:forge") -fun fabric(name: String) = include("modules:fabric:$name") -fun forge(name: String) = include("modules:forge:$name") - -fabric("alloy-forgery") -fabric("applied-energistics-2") -fabric("create") -fabric("deep-mob-learning-simulacrum") -fabric("extra-generators") -fabric("industrial-revolution") -fabric("kibe") -fabric("lapis-reserve") -fabric("luggage") -fabric("modern-dynamics") -fabric("powah") -fabric("reborn-core") -fabric("resource-chickens") -fabric("tech-reborn") -fabric("wireless-networks") - -forge("applied-energistics-2") -forge("create") -forge("immersive-engineering") -forge("lapis-reserve") -forge("mekanism") -forge("productive-bees") -//forge("refined-storage") -forge("resource-chickens") -//forge("thermal-expansion") +//fun fabric(name: String) = include("modules:fabric:$name") +//fun forge(name: String) = include("modules:forge:$name") +// +//fabric("alloy-forgery") +//fabric("applied-energistics-2") +//fabric("create") +//fabric("deep-mob-learning-simulacrum") +//fabric("extra-generators") +//fabric("industrial-revolution") +//fabric("kibe") +//fabric("lapis-reserve") +//fabric("luggage") +//fabric("modern-dynamics") +//fabric("powah") +//fabric("reborn-core") +//fabric("resource-chickens") +//fabric("tech-reborn") +//fabric("wireless-networks") +// +//forge("applied-energistics-2") +//forge("create") +//forge("immersive-engineering") +//forge("lapis-reserve") +//forge("mekanism") +//forge("productive-bees") +////forge("refined-storage") +//forge("resource-chickens") +////forge("thermal-expansion") diff --git a/src/translation/resources/lang/en_us.json b/src/translation/resources/lang/en_us.json deleted file mode 100644 index 3941184..0000000 --- a/src/translation/resources/lang/en_us.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "base" : { - "config.waila.plugin_megane": "Megane" - }, - - "fabric": { - "alloy-forgery" : { - "megane.alloy_forgery.fuel": "Fuel" - }, - - "create" : { - "config.waila.plugin_megane.create" : "Create", - "config.waila.plugin_megane.create.schematicannon.gunpowder": "Show Schematicannon Gunpowder Level", - "config.waila.plugin_megane.create.contraption" : "Show Contraption Blocks", - "config.waila.plugin_megane.create.contraption_desc" : "Show the correct blocks for the contraption entity\nOnly limited block tooltips are supported" - }, - - "resource-chickens": { - "megane.resource_chickens.next_drop" : "Next Drop", - "megane.resource_chickens.gain" : "Gain", - "megane.resource_chickens.growth" : "Growth", - "megane.resource_chickens.strength" : "Strength", - "megane.resource_chickens.conversion" : "Conversion", - "megane.resource_chickens.progress" : "Progress", - - "config.waila.plugin_megane.resource_chickens" : "Resource Chickens", - "config.waila.plugin_megane.resource_chickens.gain" : "Show Gain", - "config.waila.plugin_megane.resource_chickens.growth" : "Show Growth", - "config.waila.plugin_megane.resource_chickens.strength" : "Show Stregth", - "config.waila.plugin_megane.resource_chickens.grow" : "Show Nest Grow Timer", - "config.waila.plugin_megane.resource_chickens.drop" : "Show Drop Timer", - "config.waila.plugin_megane.resource_chickens.food" : "Show Nest Food Level", - "config.waila.plugin_megane.resource_chickens.conversion": "Show Conversion Progress" - } - }, - - "forge" : { - "create" : { - "config.waila.plugin_megane.create" : "Create", - "config.waila.plugin_megane.create.schematicannon.gunpowder": "Show Schematicannon Gunpowder Level", - "config.waila.plugin_megane.create.contraption" : "Show Contraption Blocks", - "config.waila.plugin_megane.create.contraption_desc" : "Show the correct blocks for the contraption entity\nOnly limited block tooltips are supported" - }, - - "immersive-engineering": { - "config.waila.plugin_megane.ie" : "Immersive Engineering", - "config.waila.plugin_megane.ie.metal_press_mold" : "Show Metal Press Mold", - "config.waila.plugin_megane.ie.assembler_recipes": "Show Assembler Recipes" - }, - - "mekanism" : { - "megane.mekanism.owner" : "Owner", - - "config.waila.plugin_megane.mekanism" : "Mekanism", - "config.waila.plugin_megane.mekanism.chemical": "Show Block Chemical Contents", - "config.waila.plugin_megane.mekanism.security": "Show Block Security" - }, - - "productive-bees" : { - "megane.productive_bees.bee.type" : "Type", - "megane.productive_bees.bee.productivity" : "Productivity", - "megane.productive_bees.bee.tolerance" : "Tolerance", - "megane.productive_bees.bee.behavior" : "Behavior", - "megane.productive_bees.bee.endurance" : "Endurance", - "megane.productive_bees.bee.temper" : "Temper", - - "megane.productive_bees.hive.cooldown" : "Temper", - "megane.productive_bees.hive.can_repopulate" : "Can Repopulate", - - "config.waila.plugin_megane.productive_bees" : "Productive Bees", - - "config.waila.plugin_megane.productive_bees.bee_type" : "Show Bee Type", - "config.waila.plugin_megane.productive_bees.bee_productivity": "Show Bee Productivity", - "config.waila.plugin_megane.productive_bees.bee_tolerance" : "Show Bee Tolerance", - "config.waila.plugin_megane.productive_bees.bee_behavior" : "Show Bee Behavior", - "config.waila.plugin_megane.productive_bees.bee_endurance" : "Show Bee Endurance", - "config.waila.plugin_megane.productive_bees.bee_temper" : "Show Bee Temper", - - "config.waila.plugin_megane.productive_bees.hive_honey_level": "Show Beehive Honey Level", - "config.waila.plugin_megane.productive_bees.hive_occupants" : "Show Beehive Occupants", - "config.waila.plugin_megane.productive_bees.hive_cooldown" : "Show Solitary Nest Cooldown" - }, - - "resource-chickens" : { - "megane.resource_chickens.next_drop" : "Next Drop", - "megane.resource_chickens.gain" : "Gain", - "megane.resource_chickens.growth" : "Growth", - "megane.resource_chickens.strength" : "Strength", - "megane.resource_chickens.conversion" : "Conversion", - "megane.resource_chickens.progress" : "Progress", - - "config.waila.plugin_megane.resource_chickens" : "Resource Chickens", - "config.waila.plugin_megane.resource_chickens.gain" : "Show Gain", - "config.waila.plugin_megane.resource_chickens.growth" : "Show Growth", - "config.waila.plugin_megane.resource_chickens.strength" : "Show Stregth", - "config.waila.plugin_megane.resource_chickens.grow" : "Show Nest Grow Timer", - "config.waila.plugin_megane.resource_chickens.drop" : "Show Drop Timer", - "config.waila.plugin_megane.resource_chickens.food" : "Show Nest Food Level", - "config.waila.plugin_megane.resource_chickens.conversion": "Show Conversion Progress" - } - } -}