diff --git a/build.gradle.kts b/build.gradle.kts index 311672d..264999a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,7 +160,8 @@ afterEvaluate { optional.project(mrIds.ae2) optional.project(mrIds.alloyForge) -// optional.project(mrIds.create) + optional.project(mrIds.create) + optional.project(mrIds.dml) optional.project(mrIds.extraGen) optional.project(mrIds.kibe) optional.project(mrIds.modernDynamics) @@ -189,8 +190,8 @@ afterEvaluate { addOptional(cfSlugs.ae2) addOptional(cfSlugs.alloyForge) -// addOptional(cfSlugs.create) -// addOptional(cfSlugs.dmlSim) + addOptional(cfSlugs.create) + addOptional(cfSlugs.dml) addOptional(cfSlugs.extraGen) addOptional(cfSlugs.indrev) addOptional(cfSlugs.kibe) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 522bb84..836aa5b 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -9,37 +9,37 @@ object versions { object deps { val minecraft = "com.mojang:minecraft:${versions.minecraft}" val yarn = "net.fabricmc:yarn:1.19.2+build.8:v2" - val fabricLoader = "net.fabricmc:fabric-loader:0.14.9" + val fabricLoader = "net.fabricmc:fabric-loader:0.14.15" - val wthit = "mcp.mobius.waila:wthit:fabric-5.11.3" + val wthit = "mcp.mobius.waila:wthit:fabric-5.13.5" - val ae2 = "appeng:appliedenergistics2-fabric:12.1.2-beta" - val alloyForge = "maven.modrinth:jhl28YkY:2.0.16+1.19" - val create = "com.simibubi:Create:0.5.0c-708" - val clothConfig = "me.shedaniel.cloth:cloth-config-fabric:8.0.75+fabric" + val ae2 = "appeng:appliedenergistics2-fabric:12.9.2" + val alloyForge = "maven.modrinth:jhl28YkY:2.0.19+1.19" + val architectury = "dev.architectury:architectury-fabric:6.5.69" + val create = "com.simibubi.create:create-fabric-1.19.2:0.5.0.i-961+1.19.2" + val clothConfig = "me.shedaniel.cloth:cloth-config-fabric:8.2.88" val extraGen = "maven.modrinth:VXtwLg17:1.2.1-BETA+1.19" - val fabricApi = "net.fabricmc.fabric-api:fabric-api:0.60.0+1.19.2" - val flk = "net.fabricmc:fabric-language-kotlin:1.8.3+kotlin.1.7.10" - val kibe = "maven.modrinth:OvlwmUdC:1.9.9-BETA+1.19" - val modernDynamics = "maven.modrinth:fMpvLrnF:0.3.2-beta" - val modmenu = "com.terraformersmc:modmenu:4.0.6" + val fabricApi = "net.fabricmc.fabric-api:fabric-api:0.73.2+1.19.2" + val flk = "net.fabricmc:fabric-language-kotlin:1.9.1+kotlin.1.8.10" + val kibe = "maven.modrinth:OvlwmUdC:1.9.11-BETA+1.19" + val modernDynamics = "maven.modrinth:fMpvLrnF:0.4.0-alpha" + val modmenu = "com.terraformersmc:modmenu:4.2.0-beta.2" val noIndium = "me.luligabi:NoIndium:1.1.0+1.19" - val owo = "io.wispforest:owo-lib:0.7.3+1.19" - val patchouli = "vazkii.patchouli:Patchouli:1.19.2-76-FABRIC" - val powah = "maven.modrinth:KZO4S4DO:3.0.7-fabric" + val owo = "io.wispforest:owo-lib:0.9.3+1.19" + val patchouli = "vazkii.patchouli:Patchouli:1.19.2-77-FABRIC" + val powah = "maven.modrinth:KZO4S4DO:4.0.6-fabric" - val dmlSim = "curse.maven:cursemod-508931:3785658" - val indrev = "curse.maven:cursemod-391708:3940035" - val luggage = "curse.maven:cursemod-594709:3901069" + val indrev = "curse.maven:cursemod-391708:4020957" + val luggage = "curse.maven:cursemod-594709:4284469" val pal = "io.github.ladysnake:PlayerAbilityLib:1.6.0" - val rebornCore = "RebornCore:RebornCore-1.19:5.3.4" - val techReborn = "TechReborn:TechReborn-1.19:5.3.4" + val rebornCore = "RebornCore:RebornCore-1.19:5.4.0" + val techReborn = "TechReborn:TechReborn-1.19:5.4.0" val wirelessNet = "curse.maven:cursemod-461316:3876132" object lba { - val core = "alexiil.mc.lib:libblockattributes-core:0.10.2" - val fluids = "alexiil.mc.lib:libblockattributes-fluids:0.10.2" - val items = "alexiil.mc.lib:libblockattributes-items:0.10.2" + val core = "alexiil.mc.lib:libblockattributes-core:0.11.1" + val fluids = "alexiil.mc.lib:libblockattributes-fluids:0.11.1" + val items = "alexiil.mc.lib:libblockattributes-items:0.11.1" } val trEnergy = "teamreborn:energy:2.2.0" @@ -48,8 +48,8 @@ object deps { val stepAttr = "com.github.emilyploszaj:step-height-entity-attribute:v1.0.1" val fakePlayer = "dev.cafeteria:fake-player-api:0.5.0" val mixinExtras = "com.github.LlamaLad7:MixinExtras:0.1.1-rc.4" - val portingLib = "io.github.fabricators_of_create:Porting-Lib:1.2.783-beta+1.18.2" - val registrate = "com.tterrag.registrate_fabric:Registrate:MC1.18.2-1.1.10" + val portingLib = "io.github.fabricators_of_create.Porting-Lib:porting-lib:2.1.811+1.19.2" + val registrate = "com.tterrag.registrate_fabric:Registrate:1.1.50-MC1.19.2" } fun DependencyHandlerScope.modImpl(dep: String, dependencyConfiguration: ExternalModuleDependency.() -> Unit = {}) { diff --git a/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt b/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt index caa277e..99dff1b 100644 --- a/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt +++ b/buildSrc/src/main/kotlin/FetchLatestVersionsTask.kt @@ -43,19 +43,15 @@ abstract class FetchLatestVersionsTask : DefaultTask() { fetch(deps::wthit, mrIds.wthit) { "mcp.mobius.waila:wthit:${it.version_number}" } out() - fetch(deps::ae2, mrIds.ae2, "1.19.1") { "appeng:appliedenergistics2-fabric:${it.version_number.removePrefix("fabric-")}" } - fetch(deps::alloyForge, mrIds.alloyForge, "1.19") { it.maven } + fetch(deps::ae2, mrIds.ae2) { "appeng:appliedenergistics2-fabric:${it.version_number.removePrefix("fabric-")}" } + fetch(deps::alloyForge, mrIds.alloyForge) { it.maven } fetch(deps::architectury, mrIds.architectury) { "dev.architectury:architectury-fabric:${it.version_number.removeSuffix("+fabric")}" } - fetch(deps::create, mrIds.create, "1.18.2") { - "com.simibubi.create:create-fabric-${ - it.version_number.removePrefix("create-fabric-").replaceFirst('-', ':') - }" - } - fetch(deps::clothConfig, mrIds.clothConfig) { "me.shedaniel.cloth:cloth-config-fabric:${it.version_number}" } + fetch(deps::create, mrIds.create) { "com.simibubi.create:create-fabric-1.19.2:${it.version_number}" } + fetch(deps::clothConfig, mrIds.clothConfig) { "me.shedaniel.cloth:cloth-config-fabric:${it.version_number.removeSuffix("+fabric")}" } fetch(deps::extraGen, mrIds.extraGen, "1.19") { it.maven } fetch(deps::fabricApi, mrIds.fabricApi) { "net.fabricmc.fabric-api:fabric-api:${it.version_number}" } fetch(deps::flk, mrIds.flk) { "net.fabricmc:fabric-language-kotlin:${it.version_number}" } - fetch(deps::kibe, mrIds.kibe, "1.19") { it.maven } + fetch(deps::kibe, mrIds.kibe) { it.maven } fetch(deps::modernDynamics, mrIds.modernDynamics) { it.maven } fetch(deps::modmenu, mrIds.modmenu) { "com.terraformersmc:modmenu:${it.version_number}" } fetch(deps::noIndium, mrIds.noIndium, "1.19") { "me.luligabi:NoIndium:${it.version_number}" } @@ -67,7 +63,6 @@ abstract class FetchLatestVersionsTask : DefaultTask() { out() fetcher(CurseForgeVersionFetcher) { - fetch(deps::dmlSim, cfIds.dmlSim, "1.18.2") { it.maven } fetch(deps::indrev, cfIds.indrev) { it.maven } fetch(deps::luggage, cfIds.luggage) { it.maven } fetch(deps::pal, cfIds.pal) { "io.github.ladysnake:PlayerAbilityLib:${it.download.fileName.removePrefix("pal-")}" } @@ -78,7 +73,7 @@ abstract class FetchLatestVersionsTask : DefaultTask() { out("\nobject lba {") deps.lba::class.memberProperties.forEach { module -> @Suppress("UNCHECKED_CAST") - fetch(module as KProperty, cfIds.lba, "1.18.2") { + fetch(module as KProperty, cfIds.lba) { "alexiil.mc.lib:libblockattributes-${module.name}:${it.download.fileName.removePrefix("libblockattributes-all-")}" } } diff --git a/buildSrc/src/main/kotlin/Uploads.kt b/buildSrc/src/main/kotlin/Uploads.kt index 4ef770b..708032b 100644 --- a/buildSrc/src/main/kotlin/Uploads.kt +++ b/buildSrc/src/main/kotlin/Uploads.kt @@ -1,7 +1,7 @@ object cfIds { val megane = "408118" - val dmlSim = "508931" + val dml = "398614" val indrev = "391708" val lba = "317995" val luggage = "594709" @@ -16,7 +16,7 @@ object cfSlugs { val ae2 = "applied-energistics-2" val alloyForge = "alloy-forgery" val create = "create-fabric" - val dmlSim = "deep-mob-learning-simulacrum" + val dml = "deep-mob-learning-refabricated" val extraGen = "extra-generators" val indrev = "industrial-revolution" val kibe = "kibe" @@ -37,6 +37,7 @@ object mrIds { val alloyForge = "jhl28YkY" val architectury = "lhGA9TYQ" val create = "Xbc0uyRg" + val dml = "osuPHzT3" val clothConfig = "9s6osm5g" val extraGen = "VXtwLg17" val fabricApi = "P7dR8mSH" diff --git a/module-compat/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProgressProvider.java b/module-compat/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProgressProvider.java index 78e423b..fe80630 100644 --- a/module-compat/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProgressProvider.java +++ b/module-compat/applied-energistics-2/src/main/java/lol/bai/megane/module/ae2/provider/VibrationChamberProgressProvider.java @@ -16,7 +16,7 @@ public int getOutputSlotCount() { @Override public int getPercentage() { - return 100 - (int) (getObject().getBurnTime() / getObject().getMaxBurnTime() * 100); + return remainingPercentage(getObject().getRemainingFuelTicks(), getObject().getFuelItemFuelTicks()); } } diff --git a/module-compat/create/src/main/java/lol/bai/megane/module/create/provider/SimpleFlowableFluidInfoProvider.java b/module-compat/create/src/main/java/lol/bai/megane/module/create/provider/SimpleFlowableFluidInfoProvider.java index c45dda3..12333d2 100644 --- a/module-compat/create/src/main/java/lol/bai/megane/module/create/provider/SimpleFlowableFluidInfoProvider.java +++ b/module-compat/create/src/main/java/lol/bai/megane/module/create/provider/SimpleFlowableFluidInfoProvider.java @@ -8,18 +8,16 @@ import com.tterrag.registrate.util.entry.FluidEntry; import lol.bai.megane.api.provider.FluidInfoProvider; import net.minecraft.fluid.Fluid; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; public class SimpleFlowableFluidInfoProvider extends FluidInfoProvider { - private final static Entry NONE = new Entry(0x0, new LiteralText("ERROR PLZ REPORT")); + private final static Entry NONE = new Entry(0x0, Text.of("ERROR PLZ REPORT")); private final static Map, Entry> MAP = Map.of( - AllFluids.TEA, new Entry(0xC56A4D, new TranslatableText("fluid.create.tea")), - AllFluids.HONEY, new Entry(0xF0A90E, new TranslatableText("block.create.honey")), - AllFluids.CHOCOLATE, new Entry(0x8E4137, new TranslatableText("block.create.chocolate")) + AllFluids.TEA, new Entry(0xC56A4D, Text.translatable("fluid.create.tea")), + AllFluids.HONEY, new Entry(0xF0A90E, Text.translatable("block.create.honey")), + AllFluids.CHOCOLATE, new Entry(0x8E4137, Text.translatable("block.create.chocolate")) ); private final static Map CACHE = new HashMap<>(); @@ -53,6 +51,7 @@ public Text getName() { } private record Entry(int color, Text name) { + } } diff --git a/module-compat/deep-mob-learning-simulacrum/build.gradle.kts b/module-compat/deep-mob-learning-simulacrum/build.gradle.kts index 42ca871..392abce 100644 --- a/module-compat/deep-mob-learning-simulacrum/build.gradle.kts +++ b/module-compat/deep-mob-learning-simulacrum/build.gradle.kts @@ -9,7 +9,6 @@ repositories { } dependencies { - modImpl(deps.dmlSim) modImpl(deps.fabricApi) modImpl(deps.trEnergy) modImpl(deps.flk) diff --git a/module-compat/deep-mob-learning-simulacrum/setup.sh b/module-compat/deep-mob-learning-simulacrum/setup.sh index 03013d6..efdeac2 100644 --- a/module-compat/deep-mob-learning-simulacrum/setup.sh +++ b/module-compat/deep-mob-learning-simulacrum/setup.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash DML_PROJECT_ID="398614" -DML_FILE_ID="3758209" +DML_FILE_ID="4393333" rm -rf "dml_modules" mkdir -p "dml_modules" diff --git a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java index ff4974c..b83d731 100644 --- a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java +++ b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/MeganeDmlSimulacrum.java @@ -1,7 +1,7 @@ package lol.bai.megane.module.dmlsimulacrum; -import io.github.projectet.dmlSimulacrum.block.entity.SimulationChamberEntity; -import io.github.projectet.dmlSimulacrum.dmlSimulacrum; +import dev.nathanpb.dml.DeepMobLearningKt; +import dev.nathanpb.dml.simulacrum.block.chamber.BlockEntitySimulationChamber; import lol.bai.megane.api.MeganeModule; import lol.bai.megane.api.registry.ClientRegistrar; import lol.bai.megane.api.registry.CommonRegistrar; @@ -13,14 +13,14 @@ public class MeganeDmlSimulacrum implements MeganeModule { @Override public void registerCommon(CommonRegistrar registrar) { - registrar.addEnergy(SimulationChamberEntity.class, new SimulationChamberEnergyProvider()); + registrar.addEnergy(BlockEntitySimulationChamber.class, new SimulationChamberEnergyProvider()); - registrar.addProgress(SimulationChamberEntity.class, new SimulationChamberProgressProvider()); + registrar.addProgress(BlockEntitySimulationChamber.class, new SimulationChamberProgressProvider()); } @Override public void registerClient(ClientRegistrar registrar) { - registrar.addEnergyInfo(dmlSimulacrum.MOD_ID, 0xC01414, "E"); + registrar.addEnergyInfo(DeepMobLearningKt.MOD_ID, 0xC01414, "E"); } } diff --git a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberEnergyProvider.java b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberEnergyProvider.java index bba4980..ed1fc6e 100644 --- a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberEnergyProvider.java +++ b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberEnergyProvider.java @@ -1,18 +1,18 @@ package lol.bai.megane.module.dmlsimulacrum.provider; -import io.github.projectet.dmlSimulacrum.block.entity.SimulationChamberEntity; +import dev.nathanpb.dml.simulacrum.block.chamber.BlockEntitySimulationChamber; import lol.bai.megane.api.provider.EnergyProvider; -public class SimulationChamberEnergyProvider extends EnergyProvider { +public class SimulationChamberEnergyProvider extends EnergyProvider { @Override public long getStored() { - return getObject().energyStorage.getAmount(); + return getObject().getEnergyStorage().getAmount(); } @Override public long getMax() { - return getObject().energyStorage.getCapacity(); + return getObject().getEnergyStorage().getCapacity(); } } diff --git a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProgressProvider.java b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProgressProvider.java index 98436b1..c00865d 100644 --- a/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProgressProvider.java +++ b/module-compat/deep-mob-learning-simulacrum/src/main/java/lol/bai/megane/module/dmlsimulacrum/provider/SimulationChamberProgressProvider.java @@ -1,11 +1,11 @@ package lol.bai.megane.module.dmlsimulacrum.provider; -import io.github.projectet.dmlSimulacrum.block.entity.SimulationChamberEntity; +import dev.nathanpb.dml.simulacrum.block.chamber.BlockEntitySimulationChamber; import lol.bai.megane.api.provider.base.SlotArrayProgressProvider; import net.minecraft.item.ItemStack; import org.jetbrains.annotations.NotNull; -public class SimulationChamberProgressProvider extends SlotArrayProgressProvider { +public class SimulationChamberProgressProvider extends SlotArrayProgressProvider { private static final int[] inputSlots = {0, 1}; private static final int[] outputSlots = {2, 3}; @@ -27,7 +27,7 @@ protected int[] getOutputSlots() { @Override public int getPercentage() { - return getObject().percentDone; + return getObject().getPercentDone(); } } diff --git a/module-compat/tech-reborn/build.gradle.kts b/module-compat/tech-reborn/build.gradle.kts index 2be777b..8e965b2 100644 --- a/module-compat/tech-reborn/build.gradle.kts +++ b/module-compat/tech-reborn/build.gradle.kts @@ -1,3 +1,7 @@ +repositories { + shedaniel() +} + dependencies { runtimeOnly(namedProject("reborn-core")) diff --git a/module-compat/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java b/module-compat/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java index 22b0a12..7e6d66a 100644 --- a/module-compat/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java +++ b/module-compat/tech-reborn/src/main/java/lol/bai/megane/module/techreborn/MeganeTechReborn.java @@ -12,7 +12,7 @@ import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; -import techreborn.blockentity.machine.multiblock.fusion.FusionControlComputerBlockEntity; +import techreborn.blockentity.machine.multiblock.FusionControlComputerBlockEntity; import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; diff --git a/settings.gradle.kts b/settings.gradle.kts index 7888bea..76cfb54 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,8 +16,8 @@ base("test") compat("alloy-forgery") compat("applied-energistics-2") -//compat("create") -//compat("deep-mob-learning-simulacrum") +compat("create") +compat("deep-mob-learning-simulacrum") compat("extra-generators") compat("fabric-transfer") compat("industrial-revolution")