From 674fb6687f920158d2dd83276287db412e8e9f27 Mon Sep 17 00:00:00 2001 From: deirn Date: Fri, 20 Aug 2021 11:00:21 +0700 Subject: [PATCH] update dependencies closes #29 --- gradle.properties | 4 ++-- src/extra-generators/build.gradle | 3 ++- src/fabric-transfer/build.gradle | 2 +- src/fast-transfer-lib/build.gradle | 2 +- src/industrial-revolution/build.gradle | 9 ++++++--- src/kibe/build.gradle | 5 +++-- src/modern-industrialization/build.gradle | 12 ++++++------ src/tech-reborn/build.gradle | 4 ++-- .../java/badasintended/megane/impl/TechReborn.java | 7 ++++--- src/wireless-networks/build.gradle | 6 ++++-- 10 files changed, 31 insertions(+), 23 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8e4308c..f314253 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,14 +2,14 @@ org.gradle.jvmargs = -Xmx1G minecraft = 1.17.1 yarn = 1.17.1+build.1 -loader = 0.11.3 +loader = 0.11.6 # Mod Properties group = com.github.badasintended archivesBaseName = megane # Dependencies -wthit = 3.7.0 +wthit = 3.8.1 modmenu = 2.0.2 fabricKotlin = 1.6.1+kotlin.1.5.10 diff --git a/src/extra-generators/build.gradle b/src/extra-generators/build.gradle index f51c472..cd92d3e 100644 --- a/src/extra-generators/build.gradle +++ b/src/extra-generators/build.gradle @@ -8,7 +8,8 @@ repositories { } dependencies { - implFor "curse.maven:extra-generators-475623:3355730" + // https://www.curseforge.com/minecraft/mc-mods/extra-generators + implFor "curse.maven:extra-generators-475623:3369727" modCompileOnly fabricApi.module("fabric-networking-blockentity-v0", "0.35.2+1.17") diff --git a/src/fabric-transfer/build.gradle b/src/fabric-transfer/build.gradle index 99a23d3..c5c8112 100644 --- a/src/fabric-transfer/build.gradle +++ b/src/fabric-transfer/build.gradle @@ -1,5 +1,5 @@ dependencies { - implFor(fabricApi.module("fabric-transfer-api-v1", "0.37.1+1.17")) + implFor(fabricApi.module("fabric-transfer-api-v1", "0.38.0+1.17")) } apply from: "impl.gradle" \ No newline at end of file diff --git a/src/fast-transfer-lib/build.gradle b/src/fast-transfer-lib/build.gradle index 9b9fbf2..9df88a7 100644 --- a/src/fast-transfer-lib/build.gradle +++ b/src/fast-transfer-lib/build.gradle @@ -9,7 +9,7 @@ repositories { } dependencies { - implFor "dev.technici4n:FastTransferLib:0.4.2" + implFor "dev.technici4n:FastTransferLib:0.5.6" } apply from: "impl.gradle" diff --git a/src/industrial-revolution/build.gradle b/src/industrial-revolution/build.gradle index a665cd6..f8cfbe8 100644 --- a/src/industrial-revolution/build.gradle +++ b/src/industrial-revolution/build.gradle @@ -19,12 +19,15 @@ repositories { } dependencies { - implFor "curse.maven:indrev-391708:3357406" + // https://www.curseforge.com/minecraft/mc-mods/industrial-revolution + implFor "curse.maven:indrev-391708:3404494" modCompileOnly "alexiil.mc.lib:libblockattributes-fluids:0.9.0" modCompileOnly "alexiil.mc.lib:libblockattributes-items:0.9.0" - modCompileOnly "dev.technici4n:FastTransferLib:0.4.2" - modCompileOnly "io.github.cottonmc:LibGui:4.0.0+1.17" + modCompileOnly "dev.technici4n:FastTransferLib:0.5.6" + modCompileOnly "io.github.cottonmc:LibGui:4.1.4+1.17.1" + + modCompileOnly fabricApi.module("fabric-networking-blockentity-v0", "0.37.1+1.17") } apply from: "impl.gradle" diff --git a/src/kibe/build.gradle b/src/kibe/build.gradle index 0d9bab2..0eb113a 100644 --- a/src/kibe/build.gradle +++ b/src/kibe/build.gradle @@ -8,9 +8,10 @@ repositories { } dependencies { - implFor "curse.maven:kibe-388832:3342100" + // https://www.curseforge.com/minecraft/mc-mods/kibe + implFor "curse.maven:kibe-388832:3424890" - modCompileOnly "alexiil.mc.lib:libblockattributes-fluids:0.8.7" + modCompileOnly "alexiil.mc.lib:libblockattributes-fluids:0.8.17003" } apply from: "impl.gradle" diff --git a/src/modern-industrialization/build.gradle b/src/modern-industrialization/build.gradle index eae3503..0755a7c 100644 --- a/src/modern-industrialization/build.gradle +++ b/src/modern-industrialization/build.gradle @@ -8,19 +8,19 @@ repositories { } dependencies { - implFor "curse.maven:modern-industrialization-405388:3418603" + // https://www.curseforge.com/minecraft/mc-mods/modern-industrialization + implFor "curse.maven:modern-industrialization-405388:3431281" def fapi = [ "fabric-networking-blockentity-v0", "fabric-screen-handler-api-v1", - "fabric-rendering-data-attachment-v1" + "fabric-rendering-data-attachment-v1", + "fabric-api-lookup-api-v1", + "fabric-transfer-api-v1" ] fapi.forEach { - modCompileOnly fabricApi.module(it, "0.37.0+1.17") + modCompileOnly fabricApi.module(it, "0.38.0+1.17") } - - modCompileOnly "net.fabricmc.fabric-api:fabric-api-lookup-api-v1:1.3.0+b246072f13" - modCompileOnly "net.fabricmc.fabric-api:fabric-transfer-api-v1:1.1.0-pre.05+973bc52a18" } apply from: "impl.gradle" diff --git a/src/tech-reborn/build.gradle b/src/tech-reborn/build.gradle index 51a9e01..202eb51 100644 --- a/src/tech-reborn/build.gradle +++ b/src/tech-reborn/build.gradle @@ -1,7 +1,7 @@ dependencies { - implFor "TechReborn:TechReborn-1.17:5.0.2-beta+build.38" + implFor "TechReborn:TechReborn-1.17:5.0.6-beta+build.95" - modCompileOnly "RebornCore:RebornCore-1.17:5.0.2-beta+build.38" + modCompileOnly "RebornCore:RebornCore-1.17:5.0.6-beta+build.95" modCompileOnly "teamreborn:energy:0.1.0" } diff --git a/src/tech-reborn/java/badasintended/megane/impl/TechReborn.java b/src/tech-reborn/java/badasintended/megane/impl/TechReborn.java index 1286344..529c4ac 100644 --- a/src/tech-reborn/java/badasintended/megane/impl/TechReborn.java +++ b/src/tech-reborn/java/badasintended/megane/impl/TechReborn.java @@ -54,6 +54,7 @@ import static techreborn.init.ModFluids.TRITIUM; import static techreborn.init.ModFluids.WOLFRAMIUM; +@SuppressWarnings("UnstableApiUsage") public class TechReborn implements MeganeModule { private static final int[] A_012345 = new int[]{0, 1, 2, 3, 4, 5}; @@ -95,9 +96,9 @@ public void register(MeganeRegistrar registrar) { )) .fluid(MachineBaseBlockEntity.class, FluidProvider.conditional( MachineBaseBlockEntity::showTankConfig, t -> 1, - (t, i) -> t.getTank().getFluid(), - (t, i) -> (double) t.getTank().getFluidAmount().getRawValue(), - (t, i) -> (double) t.getTank().getCapacity().getRawValue() + (t, i) -> t.getTank().getResource().getFluid(), + (t, i) -> t.getTank().getAmount() / 81.0, + (t, i) -> t.getTank().getCapacity() / 81.0 )); } diff --git a/src/wireless-networks/build.gradle b/src/wireless-networks/build.gradle index 8bce033..f46fd98 100644 --- a/src/wireless-networks/build.gradle +++ b/src/wireless-networks/build.gradle @@ -9,8 +9,10 @@ repositories { } dependencies { - implFor "curse.maven:wireless-networks-461316:3351667" - modCompileOnly "dev.technici4n:FastTransferLib:0.4.2" + // https://www.curseforge.com/minecraft/mc-mods/wireless-networks + implFor "curse.maven:wireless-networks-461316:3382566" + + modCompileOnly "dev.technici4n:FastTransferLib:0.5.5" } apply from: "impl.gradle"