AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 15:30:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from repo-alt/master-MC1.7.10

Browse Source 
Add fluid container item converter (Volumetric flask, certus tank, universal cell, etc.)
This commit is contained in:
Martin Robertz 2021-11-11 19:36:09 +01:00 committed by GitHub
commit a9faa643af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,7 +1,7 @@
minecraft.version=1.7.10
forge.version=10.13.4.1614-1.7.10
oc.version=1.7.5.14-GTNH
oc.version=1.7.5.15-GTNH
ae2.version=rv3-beta-31
bc.version=7.0.9

6
src/main/scala/li/cil/oc/integration/forestry/ConverterItemStack.scala
View File

@ -2,6 +2,7 @@ package li.cil.oc.integration.forestry
import java.util
import forestry.api.circuits.{ChipsetManager, ICircuit}
import forestry.api.genetics.AlleleManager
import li.cil.oc.api.driver.Converter
import net.minecraft.item.ItemStack
@ -12,6 +13,11 @@ object ConverterItemStack extends Converter {
override def convert(value: scala.Any, output: util.Map[AnyRef, AnyRef]): Unit = value match {
case stack: ItemStack if AlleleManager.alleleRegistry.isIndividual(stack) =>
output += "individual" -> AlleleManager.alleleRegistry.getIndividual(stack)
case stack: ItemStack if ChipsetManager.circuitRegistry.getCircuitboard(stack) != null => {
val cc = ChipsetManager.circuitRegistry.getCircuitboard(stack).getCircuits
val names = cc.collect{case c: ICircuit => c.getName}
output += "circuits" -> names
}
case _ =>
}
}

37
src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidContainerItem.scala Normal file
View File

@ -0,0 +1,37 @@
package li.cil.oc.integration.vanilla
import java.util
import li.cil.oc.{Settings, api}
import net.minecraft.item
import net.minecraft.item.ItemStack
import net.minecraftforge.fluids
import net.minecraftforge.fluids.FluidStack
import scala.collection.convert.WrapAsScala._
object ConverterFluidContainerItem extends api.driver.Converter {
override def convert(value: AnyRef, output: util.Map[AnyRef, AnyRef]): Unit =
value match {
case stack: item.ItemStack => stack.getItem match {
case fc: fluids.IFluidContainerItem =>
output += "capacity" -> Int.box(fc.getCapacity(stack))
val fluidStack = fc.getFluid(stack)
if (fluidStack != null && fluidStack.getFluid != null) {
val fluid = fluidStack.getFluid
if (Settings.get.insertIdsInConverters)
output += "fluid_id" -> Int.box(fluid.getID)
output += "amount" -> Int.box(fluidStack.amount)
output += "fluid_hasTag" -> Boolean.box(fluidStack.tag != null)
if (fluid != null) {
output += "fluid_name" -> fluid.getName
output += "fluid_label" -> fluid.getLocalizedName(fluidStack)
}
}
else
output += "amount" -> Int.box(0)
case _ =>
}
case _ =>
}
}

2
src/main/scala/li/cil/oc/integration/vanilla/ConverterFluidTankInfo.scala
View File

@ -8,7 +8,7 @@ import net.minecraftforge.fluids
import scala.collection.convert.WrapAsScala._
object ConverterFluidTankInfo extends api.driver.Converter {
override def convert(value: AnyRef, output: util.Map[AnyRef, AnyRef]) =
override def convert(value: AnyRef, output: util.Map[AnyRef, AnyRef]): Unit =
value match {
case tankInfo: fluids.FluidTankInfo =>
output += "capacity" -> Int.box(tankInfo.capacity)

1
src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
View File

@ -45,6 +45,7 @@ object ModVanilla extends ModProxy with RedstoneProvider {
Driver.add(ConverterFluidStack)
Driver.add(ConverterFluidTankInfo)
Driver.add(ConverterFluidContainerItem)
Driver.add(ConverterItemStack)
Driver.add(ConverterNBT)
Driver.add(ConverterWorld)