AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 02:39:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'payo/master-MC1.11' into master-MC1.12-payo

Browse Source
This commit is contained in:
payonel 2018-03-09 00:02:26 -08:00
commit 5c99f29641
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/li/cil/oc/common/init/Items.scala
View File

@ -22,6 +22,7 @@ import li.cil.oc.common.item.data.TabletData
import li.cil.oc.common.item.traits.Delegate import li.cil.oc.common.item.traits.Delegate
import li.cil.oc.common.item.traits.SimpleItem import li.cil.oc.common.item.traits.SimpleItem
import li.cil.oc.common.recipe.Recipes import li.cil.oc.common.recipe.Recipes
import li.cil.oc.server.machine.luac.LuaStateFactory
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import net.minecraft.item.EnumDyeColor import net.minecraft.item.EnumDyeColor
@ -298,7 +299,7 @@ object Items extends ItemAPI {
safeGetStack(Constants.ItemName.RedstoneCardTier2), safeGetStack(Constants.ItemName.RedstoneCardTier2),
safeGetStack(Constants.ItemName.WirelessNetworkCardTier2), safeGetStack(Constants.ItemName.WirelessNetworkCardTier2),
safeGetStack(LuaStateFactory.setDefaultArch(safeGetStack(Constants.ItemName.CPUTier3))), LuaStateFactory.setDefaultArch(safeGetStack(Constants.ItemName.CPUTier3)),
safeGetStack(Constants.ItemName.RAMTier6), safeGetStack(Constants.ItemName.RAMTier6),
safeGetStack(Constants.ItemName.RAMTier6), safeGetStack(Constants.ItemName.RAMTier6),

1
src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
View File

@ -11,6 +11,7 @@ import li.cil.oc.common.item.data.MicrocontrollerData
import li.cil.oc.common.item.data.PrintData import li.cil.oc.common.item.data.PrintData
import li.cil.oc.common.item.data.RobotData import li.cil.oc.common.item.data.RobotData
import li.cil.oc.common.item.data.TabletData import li.cil.oc.common.item.data.TabletData
import li.cil.oc.server.machine.luac.LuaStateFactory
import li.cil.oc.util.Color import li.cil.oc.util.Color
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.SideTracker import li.cil.oc.util.SideTracker

1
src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
View File

@ -13,6 +13,7 @@ import li.cil.oc.api.network._
import li.cil.oc.common.inventory.InventoryProxy import li.cil.oc.common.inventory.InventoryProxy
import li.cil.oc.common.tileentity.traits.RedstoneAware import li.cil.oc.common.tileentity.traits.RedstoneAware
import li.cil.oc.server.agent.Player import li.cil.oc.server.agent.Player
import li.cil.oc.server.{PacketSender => ServerPacketSender}
import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.Capability
import net.minecraftforge.fluids.capability.CapabilityFluidHandler import net.minecraftforge.fluids.capability.CapabilityFluidHandler
import net.minecraftforge.fluids.capability.IFluidHandler import net.minecraftforge.fluids.capability.IFluidHandler

6
src/main/scala/li/cil/oc/server/agent/Player.scala
View File

@ -121,11 +121,11 @@ object Player {
inv.setInventorySlotContents(index, result) inv.setInventorySlotContents(index, result)
} }
} }
val size = inventory.mainInventory.length min agent.mainInventory.getSizeInventory val size = player.inventory.mainInventory.length min agent.mainInventory.getSizeInventory
for (i <- 0 until size) { for (i <- 0 until size) {
setCopy(agent.mainInventory, i, inventory.mainInventory(i)) setCopy(agent.mainInventory, i, player.inventory.mainInventory(i))
} }
setCopy(agent.equipmentInventory, 0, inventory.offHandInventory(0)) setCopy(agent.equipmentInventory, 0, player.inventory.offHandInventory(0))
} }
} }