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

Enforce complexity limit for multiparts.

Browse Source
This commit is contained in:
Florian Nücke 2016-04-02 14:47:21 +02:00
parent 94eff66b34
commit 54eef9bb0c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/item/data/PrintData.scala
View File

@ -33,6 +33,8 @@ class PrintData extends ItemData(Constants.BlockName.Print) {
var noclipOff = false var noclipOff = false
var noclipOn = false var noclipOn = false
def complexity = stateOn.size max stateOff.size
def hasActiveState = stateOn.nonEmpty def hasActiveState = stateOn.nonEmpty
def emitLight = lightLevel > 0 def emitLight = lightLevel > 0

16
src/main/scala/li/cil/oc/integration/mcmp/PartFactory.scala
View File

@ -1,11 +1,14 @@
package li.cil.oc.integration.mcmp package li.cil.oc.integration.mcmp
import li.cil.oc.Constants import li.cil.oc.Constants
import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.common.item.data.PrintData
import li.cil.oc.integration.Mods import li.cil.oc.integration.Mods
import mcmultipart.item.IItemMultipartFactory import mcmultipart.item.IItemMultipartFactory
import mcmultipart.multipart.IMultipart import mcmultipart.multipart.IMultipart
import mcmultipart.multipart.IPartFactory import mcmultipart.multipart.IPartFactory
import mcmultipart.multipart.MultipartHelper
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.util.BlockPos import net.minecraft.util.BlockPos
@ -13,6 +16,8 @@ import net.minecraft.util.EnumFacing
import net.minecraft.util.Vec3 import net.minecraft.util.Vec3
import net.minecraft.world.World import net.minecraft.world.World
import scala.collection.convert.WrapAsScala._
object PartFactory extends IPartFactory with IItemMultipartFactory { object PartFactory extends IPartFactory with IItemMultipartFactory {
final val PartTypeCable = Mods.IDs.OpenComputers + ":" + Constants.BlockName.Cable final val PartTypeCable = Mods.IDs.OpenComputers + ":" + Constants.BlockName.Cable
final val PartTypePrint = Mods.IDs.OpenComputers + ":" + Constants.BlockName.Print final val PartTypePrint = Mods.IDs.OpenComputers + ":" + Constants.BlockName.Print
@ -29,7 +34,7 @@ object PartFactory extends IPartFactory with IItemMultipartFactory {
override def createPart(world: World, pos: BlockPos, side: EnumFacing, hit: Vec3, stack: ItemStack, player: EntityPlayer): IMultipart = { override def createPart(world: World, pos: BlockPos, side: EnumFacing, hit: Vec3, stack: ItemStack, player: EntityPlayer): IMultipart = {
val descriptor = api.Items.get(stack) val descriptor = api.Items.get(stack)
if (descriptor == CableDescriptor) new PartCable() if (descriptor == CableDescriptor) new PartCable()
else if (descriptor == PrintDescriptor) { else if (descriptor == PrintDescriptor && canAddPrint(world, pos, stack)) {
val part = new PartPrint() val part = new PartPrint()
part.wrapped.data.load(stack) part.wrapped.data.load(stack)
part.wrapped.setFromEntityPitchAndYaw(player) part.wrapped.setFromEntityPitchAndYaw(player)
@ -40,4 +45,13 @@ object PartFactory extends IPartFactory with IItemMultipartFactory {
} }
else null else null
} }
private def canAddPrint(world: World, pos: BlockPos, stack: ItemStack): Boolean = {
val container = MultipartHelper.getPartContainer(world, pos)
val complexity = container.getParts.collect {
case print: PartPrint => print.wrapped.data.complexity
}.sum
val data = new PrintData(stack)
data.complexity + complexity <= Settings.get.maxPrintComplexity
}
} }