diff --git a/dependencies.gradle b/dependencies.gradle index 828eccb9..4829ec61 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,24 +1,24 @@ // Add your dependencies here dependencies { - implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.93-GTNH:dev") + implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.98-GTNH:dev") implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.12:dev") - implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-928-GTNH:dev") + implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-944-GTNH:dev") implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:AspectRecipeIndex:1.0.16:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:AspectRecipeIndex:1.1.0:dev") compileOnly(rfg.deobf("curse.maven:thaumcraft-nei-plugin-225095:2241913")) { transitive = false } - compileOnly("com.github.GTNewHorizons:waila:1.19.23:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:waila:1.19.28:dev") { transitive = false } compileOnly("curse.maven:computercraft-67504:2269339") { transitive = false } compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false } compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false } - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.60:dev') {transitive = false} //compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly("org.jetbrains:annotations:26.0.2") - runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.9.54:dev') - runtimeOnly("com.github.GTNewHorizons:Baubles-Expanded:2.2.13-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.19.23:dev") + runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.10.2:dev') + runtimeOnly("com.github.GTNewHorizons:Baubles-Expanded:2.2.19-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.19.28:dev") //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } } diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 991a69c7..fa4ed510 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/src/main/java/thaumicenergistics/common/items/ItemEssentiaCell.java b/src/main/java/thaumicenergistics/common/items/ItemEssentiaCell.java index 3f999f73..34362cec 100644 --- a/src/main/java/thaumicenergistics/common/items/ItemEssentiaCell.java +++ b/src/main/java/thaumicenergistics/common/items/ItemEssentiaCell.java @@ -532,9 +532,4 @@ public class ItemEssentiaCell extends Item implements ICellHandler, IStorageCell } return new EssentiaCellConfig(is); } - - @Override - public int getTypeWeight() { - return 2; - } } diff --git a/src/main/java/thaumicenergistics/common/storage/AEEssentiaStackType.java b/src/main/java/thaumicenergistics/common/storage/AEEssentiaStackType.java index 63efafd0..df34f982 100644 --- a/src/main/java/thaumicenergistics/common/storage/AEEssentiaStackType.java +++ b/src/main/java/thaumicenergistics/common/storage/AEEssentiaStackType.java @@ -400,4 +400,9 @@ public class AEEssentiaStackType implements IAEStackType { public AEEssentiaStack getTestStack() { return this.testStack.copy(); } + + @Override + public int getAmountPerByte() { + return 2; + } }