Merge remote-tracking branch 'refs/remotes/origin/master' into feat/r…

…eactor-heat-storage

dependencies.gradle

@@ -7,30 +7,30 @@ dependencies {
 
     compile("com.google.code.findbugs:jsr305:3.0.2")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-349-GTNH:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:EnderStorage:1.5.0:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.155:dev") {transitive = false }
-    compile("com.github.GTNewHorizons:ForestryMC:4.8.9:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:Railcraft:9.15.7:dev") {transitive = false }
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev") {transitive = false }
-    compile("com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev") {transitive = false }
-    compile("com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:waila:1.7.3:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.4-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-405-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:EnderStorage:1.6.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.70:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:Railcraft:9.15.8:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.6.14-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 }
+    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:TinkersMechworks:0.3.1:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:ProjectRed:4.9.5-GTNH:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.5.2:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.4-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:ProjectRed:4.10.1-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:ExtraCells2:2.5.34:dev") {transitive = false }
-    compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.28-gtnh:dev') {transitive = false }
-    compile("com.github.GTNewHorizons:EnderIO:2.7.3:dev") {
+    compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.12-gtnh:dev') {transitive = false }
+    compile("com.github.GTNewHorizons:EnderIO:2.8.11:dev") {
         compile("com.github.GTNewHorizons:EnderCore:0.4.6:dev")
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.7.1-GTNH:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:gendustry:1.7.0-GTNH:dev") {transitive = false }
-    compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.5.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:gendustry:1.8.0-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.6.0:dev") {transitive = false }
     compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") {transitive = false }
     compileOnly("appeng:RotaryCraft:V5c:api") {transitive = false }
     compileOnly("com.bluepowermod:BluePower:0.2.928:deobf") {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-alpha37:api") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Angelica:1.0.0-alpha52: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 ...
@@ -63,6 +63,6 @@ dependencies {
     testCompile "org.scalactic:scalactic_2.11:2.2.6"
     testCompile "org.scalatest:scalatest_2.11:2.2.6"
 
-    compileOnly("com.github.GTNewHorizons:ModularUI:1.1.42:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI:1.2.0:dev") {transitive = false}
     compileOnly("com.github.GTNewHorizons:StructureLib:1.3.1:dev") {transitive = false}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala

@@ -31,6 +31,7 @@ import li.cil.oc.util.DatabaseAccess
 import li.cil.oc.util.ExtendedArguments._
 import li.cil.oc.util.ExtendedNBT._
 import li.cil.oc.util.ResultWrapper._
+import net.minecraft.item.Item
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.DimensionManager
@@ -92,6 +93,24 @@ trait NetworkControl[AETile >: Null <: TileEntity with IGridProxyable with IActi
       .toArray)
   }
 
+  @Callback(doc = "function(filter:table):table -- Get a list of the stored items in the network matching the filter. Filter is an Array of Item IDs")
+  def getItemsInNetworkById(context: Context, args: Arguments): Array[AnyRef] = {
+    val table = args.checkTable(0)
+
+    val itemFilterSet = mutable.LinkedHashSet.empty[Item]
+    for (i <- 0 until table.size()) {
+      table.get(i + 1) match {
+        case itemNumberId: Number => itemFilterSet += Item.itemRegistry.getObjectById(itemNumberId.intValue()).asInstanceOf[Item]
+        case itemStringId: String => itemFilterSet += Item.itemRegistry.getObject(itemStringId).asInstanceOf[Item]
+        case other: Any => throw new IllegalArgumentException(s"bad argument in filter table at index ${i + 1} (number or string expected)")
+      }
+    }
+    result(allItems
+      .filter(item => itemFilterSet.contains(item.getItem))
+      .map(item => convert(item, tile))
+      .toArray)
+  }
+
   @Callback(doc = "function():userdata -- Get an iterator object for the list of the items in the network.")
   def allItems(context: Context, args: Arguments): Array[AnyRef] = {
     result(new NetworkContents(tile))