diff --git a/dependencies.gradle b/dependencies.gradle index 17442e05c4..4edcd424e8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,24 +7,24 @@ dependencies { compile("com.google.code.findbugs:jsr305:3.0.2") - compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-405-GTNH:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-421-GTNH:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:EnderStorage:1.6.0:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.75:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.120:dev") {transitive = false } compile("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Railcraft:9.15.11:dev") {transitive = false } - compile("com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev") {transitive = false } + compile("com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev") {transitive = false } compile("com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev") {transitive = false } - compile("com.github.GTNewHorizons:CodeChickenCore:1.3.4:dev") {transitive = false } + compile("com.github.GTNewHorizons:CodeChickenCore:1.3.6:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:waila:1.8.1:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.7-GTNH:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:TinkersMechworks:0.3.1:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:ProjectRed:4.10.1-GTNH:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.2:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.10-GTNH:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.18-GTNH:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.34:dev") {transitive = false } - compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.12-gtnh:dev') {transitive = false } - compile("com.github.GTNewHorizons:EnderIO:2.8.14:dev") { + compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.20-gtnh:dev') {transitive = false } + compile("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { compile("com.github.GTNewHorizons:EnderCore:0.4.6:dev") transitive = false } @@ -47,7 +47,7 @@ dependencies { compileOnly("curse.maven:agricraft-225635:2284133") {transitive = false } compileOnly("curse.maven:stargatetech-2-226769:2230351") {transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:Angelica:1.0.0-beta2:api") { transitive = false } compileOnly(deobf("https://immibis.com/mcmoddl/files/redlogic-59.1.13.jar")) compileOnly files("dependencies/ic2classic-api.zip") //curseforge one does NOT work ... diff --git a/gradle.properties b/gradle.properties index cf6c55019b..186cba8e0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,6 +85,11 @@ accessTransformersFile = oc_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + # Adds some debug arguments like verbose output and class export. usesMixinDebug = false @@ -117,9 +122,15 @@ minimizeShadowedDependencies = false # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = false -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3..2c3521197d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..09523c0e54 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1339..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbde..9d21a21834 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle b/settings.gradle index 6fe010ce8b..54797868d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25' } diff --git a/src/main/scala/li/cil/oc/integration/appeng/ConverterCellInventory.java b/src/main/scala/li/cil/oc/integration/appeng/ConverterCellInventory.java index 98cfdaf4ab..c85c39d44c 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/ConverterCellInventory.java +++ b/src/main/scala/li/cil/oc/integration/appeng/ConverterCellInventory.java @@ -7,6 +7,8 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.StorageChannel; import java.util.Map; + +import appeng.util.IterationCounter; import li.cil.oc.api.driver.Converter; import net.minecraft.item.ItemStack; @@ -23,7 +25,7 @@ public void convert(final Object value, final Map output) { output.put("getTotalItemTypes", cell.getTotalItemTypes()); output.put( "getAvailableItems", - cell.getAvailableItems(AEApi.instance().storage().createItemList())); + cell.getAvailableItems(AEApi.instance().storage().createItemList(), IterationCounter.fetchNewId())); output.put("totalBytes", cell.getTotalBytes()); output.put("freeBytes", cell.getFreeBytes());