From ee24d3362c4bc87e6b934fb798098ab65ca21123 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Sun, 26 Jan 2014 15:37:04 +1000 Subject: [PATCH] Added multipart inventory trait. (Untested) --- .../multipart/asm/ASMMixinCompiler.scala | 2 +- codechicken/multipart/handler/proxies.scala | 2 + .../scalatraits/TFluidHandlerTile.scala | 5 +- .../scalatraits/TIInventoryTile.scala | 126 ++++++++++++++++++ 4 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 codechicken/multipart/scalatraits/TIInventoryTile.scala diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index b5017ca..dd52c28 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -97,7 +97,7 @@ object ASMMixinCompiler def useTransformers = f_transformerExceptions.get(cl).asInstanceOf[JSet[String]] .find(jName.startsWith).isEmpty - val obfName = FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') + val obfName = if(ObfMapping.obfuscated) FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') else jName val bytes = cl.getClassBytes(obfName) if(bytes != null && useTransformers) return m_runTransformers.invoke(cl, jName, obfName, bytes).asInstanceOf[Array[Byte]] diff --git a/codechicken/multipart/handler/proxies.scala b/codechicken/multipart/handler/proxies.scala index 6087595..aeb2860 100644 --- a/codechicken/multipart/handler/proxies.scala +++ b/codechicken/multipart/handler/proxies.scala @@ -32,6 +32,8 @@ class MultipartProxy_serverImpl MultipartGenerator.registerTrait("codechicken.multipart.TSlottedPart", "codechicken.multipart.scalatraits.TSlottedTile") MultipartGenerator.registerTrait("net.minecraftforge.fluids.IFluidHandler", "codechicken.multipart.scalatraits.TFluidHandlerTile") + MultipartGenerator.registerTrait("net.minecraft.inventory.IInventory", "codechicken.multipart.scalatraits.TIInventoryTile") + MultipartGenerator.registerTrait("net.minecraft.inventory.ISIdedInventory", "codechicken.multipart.scalatraits.TIInventoryTile") MultipartGenerator.registerTrait("codechicken.multipart.JPartialOcclusion", "codechicken.multipart.scalatraits.TPartialOcclusionTile") MultipartGenerator.registerTrait("codechicken.multipart.IRedstonePart", "codechicken.multipart.scalatraits.TRedstoneTile") MultipartGenerator.registerTrait("codechicken.multipart.IRandomDisplayTick", "codechicken.multipart.scalatraits.TRandomDisplayTickTile", null) diff --git a/codechicken/multipart/scalatraits/TFluidHandlerTile.scala b/codechicken/multipart/scalatraits/TFluidHandlerTile.scala index 2d49b37..32538f3 100644 --- a/codechicken/multipart/scalatraits/TFluidHandlerTile.scala +++ b/codechicken/multipart/scalatraits/TFluidHandlerTile.scala @@ -1,6 +1,5 @@ package codechicken.multipart.scalatraits -import scala.collection.mutable.ListBuffer import net.minecraftforge.common.ForgeDirection import codechicken.multipart.TMultiPart import codechicken.multipart.TileMultipart @@ -8,6 +7,8 @@ import net.minecraftforge.fluids.IFluidHandler import net.minecraftforge.fluids.FluidStack import net.minecraftforge.fluids.FluidTankInfo import net.minecraftforge.fluids.Fluid +import java.util.LinkedList +import scala.collection.JavaConversions._ /** * Mixin trait implementation for parts implementing IFluidHandler. @@ -15,7 +16,7 @@ import net.minecraftforge.fluids.Fluid */ trait TFluidHandlerTile extends TileMultipart with IFluidHandler { - var tankList = ListBuffer[IFluidHandler]() + var tankList = new LinkedList[IFluidHandler]() override def copyFrom(that:TileMultipart) { diff --git a/codechicken/multipart/scalatraits/TIInventoryTile.scala b/codechicken/multipart/scalatraits/TIInventoryTile.scala new file mode 100644 index 0000000..ee16eca --- /dev/null +++ b/codechicken/multipart/scalatraits/TIInventoryTile.scala @@ -0,0 +1,126 @@ +package codechicken.multipart.scalatraits + +import net.minecraft.inventory.{IInventory, ISidedInventory} +import codechicken.multipart.{TMultiPart, TileMultipart} +import java.util.LinkedList +import net.minecraft.item.ItemStack +import net.minecraft.entity.player.EntityPlayer +import scala.collection.JavaConversions._ +import scala.collection.mutable.ArrayBuffer + +trait TIInventoryTile extends TileMultipart with ISidedInventory +{ + var invList = new LinkedList[IInventory]() + var slotMap = Array[(IInventory, Int)]() + + override def copyFrom(that:TileMultipart) + { + super.copyFrom(that) + if(that.isInstanceOf[TIInventoryTile]) { + invList = that.asInstanceOf[TIInventoryTile].invList + rebuildSlotMap() + } + } + + override def bindPart(part:TMultiPart) + { + super.bindPart(part) + if(part.isInstanceOf[IInventory]) { + invList+=part.asInstanceOf[IInventory] + rebuildSlotMap() + } + } + + override def partRemoved(part:TMultiPart, p:Int) + { + super.partRemoved(part, p) + if(part.isInstanceOf[IInventory]) { + invList-=part.asInstanceOf[IInventory] + rebuildSlotMap() + } + } + + override def clearParts() + { + super.clearParts() + invList.clear() + slotMap = Array() + } + + def rebuildSlotMap() { + slotMap = Array.ofDim(invList.map(_.getSizeInventory).sum) + var i = 0 + for(inv <- invList; s <- 0 until inv.getSizeInventory) { + slotMap(i) = (inv, s) + i+=1 + } + } + + def getSizeInventory:Int = slotMap.length + + def getStackInSlot(i:Int) = { + val (inv, slot) = slotMap(i) + inv.getStackInSlot(slot) + } + + def decrStackSize(i:Int, j:Int) = { + val (inv, slot) = slotMap(i) + inv.decrStackSize(slot, j) + } + + def getStackInSlotOnClosing(i:Int) = { + val (inv, slot) = slotMap(i) + inv.getStackInSlotOnClosing(slot) + } + + def setInventorySlotContents(i:Int, itemstack:ItemStack) = { + val (inv, slot) = slotMap(i) + inv.setInventorySlotContents(slot, itemstack) + } + + def getInvName = "Multipart Inventory" + + def isInvNameLocalized = false + + def getInventoryStackLimit = 64 + + def isUseableByPlayer(entityplayer:EntityPlayer) = true + + def openChest(){} + + def closeChest(){} + + def isItemValidForSlot(i:Int, itemstack:ItemStack) = { + val (inv, slot) = slotMap(i) + inv.isItemValidForSlot(slot, itemstack) + } + + def getAccessibleSlotsFromSide(side:Int) = { + val buf = new ArrayBuffer[Int]() + var base = 0 + for(inv <- invList) { + inv match { + case isided:ISidedInventory => buf++=isided.getAccessibleSlotsFromSide(side).map(_ + base) + case _ => + } + base+=inv.getSizeInventory + } + buf.toArray + } + + def canInsertItem(i:Int, itemstack:ItemStack, j:Int) = { + val (inv, slot) = slotMap(i) + inv match { + case isided:ISidedInventory => isided.canInsertItem(slot, itemstack, j) + case _ => true + } + } + + def canExtractItem(i:Int, itemstack:ItemStack, j:Int) = { + val (inv, slot) = slotMap(i) + inv match { + case isided:ISidedInventory => isided.canExtractItem(slot, itemstack, j) + case _ => true + } + } +}