From 15cd3b0ba45d2b34c59302f3566ce75507f7e41f Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Mon, 1 Jul 2013 07:11:18 +1000 Subject: [PATCH] Added light emission to microblocks like glowstone. Cleaned up item sizes to be static. --- .../microblock/BlockMicroMaterial.scala | 2 ++ codechicken/microblock/CommonMicroblock.scala | 26 ++++++------------- codechicken/microblock/CornerMicroblock.scala | 2 -- codechicken/microblock/EdgeMicroblock.scala | 6 ----- codechicken/microblock/ItemMicroPart.scala | 12 ++++----- codechicken/microblock/MicroClass.scala | 4 --- .../microblock/MicroMaterialRegistry.scala | 2 ++ .../microblock/MicroblockPlacement.scala | 20 -------------- 8 files changed, 18 insertions(+), 56 deletions(-) diff --git a/codechicken/microblock/BlockMicroMaterial.scala b/codechicken/microblock/BlockMicroMaterial.scala index 0e9dc69..3951817 100644 --- a/codechicken/microblock/BlockMicroMaterial.scala +++ b/codechicken/microblock/BlockMicroMaterial.scala @@ -90,6 +90,8 @@ class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMateri def getStrength(player:EntityPlayer) = player.getCurrentPlayerStrVsBlock(block, false, meta)/block.blockHardness def isTransparent = !block.isOpaqueCube + + def getLightValue = Block.lightValue(block.blockID) } object BlockMicroMaterial diff --git a/codechicken/microblock/CommonMicroblock.scala b/codechicken/microblock/CommonMicroblock.scala index d5d95b0..c28be1d 100644 --- a/codechicken/microblock/CommonMicroblock.scala +++ b/codechicken/microblock/CommonMicroblock.scala @@ -113,26 +113,18 @@ abstract class Microblock(var shape:Byte = 0, var material:Int = 0) extends TCub def getMaterial = material - def itemSizes():Seq[Int] = Seq() - def itemClassID:Int = -1 - def sizeToVolume(size:Int):Int = size - override def getDrops() = { var size = getSize val items = ListBuffer[ItemStack]() - for(s <- itemSizes.reverseIterator) + for(s <- Seq(4, 2, 1)) { - var m = size/sizeToVolume(s) - size-=m*sizeToVolume(s) - while(m > 0) - { - val k = Math.min(m, 64) - m-=k - items+=ItemMicroPart.create(k, s|itemClassID<<8, MicroMaterialRegistry.materialName(material)) - } + var m = size/s + size-=m*s + if(m > 0) + items+=ItemMicroPart.create(m, s|itemClassID<<8, MicroMaterialRegistry.materialName(material)) } items } @@ -140,7 +132,7 @@ abstract class Microblock(var shape:Byte = 0, var material:Int = 0) extends TCub override def pickItem(hit:MovingObjectPosition):ItemStack = { val size = getSize - for(s <- itemSizes.reverseIterator) + for(s <- Seq(4, 2, 1)) if(size%s == 0 && size/s >= 1) return ItemMicroPart.create(s|itemClassID<<8, MicroMaterialRegistry.materialName(material)) return null//unreachable @@ -178,6 +170,8 @@ abstract class Microblock(var shape:Byte = 0, var material:Int = 0) extends TCub } def isTransparent = MicroMaterialRegistry.getMaterial(material).isTransparent + + override def getLightValue = MicroMaterialRegistry.getMaterial(material).getLightValue } trait CommonMicroblockClient extends CommonMicroblock with MicroblockClient with TMicroOcclusionClient @@ -203,8 +197,4 @@ abstract class CommonMicroblock(shape$:Byte = 0, material$:Int = 0) extends Micr def getPartialOcclusionBoxes = Seq(getBounds) override def itemClassID = microClass.classID - - override def itemSizes = microClass.itemSizes - - override def sizeToVolume(size:Int) = microClass.sizeToVolume(size) } \ No newline at end of file diff --git a/codechicken/microblock/CornerMicroblock.scala b/codechicken/microblock/CornerMicroblock.scala index 9d6957f..fe1ec29 100644 --- a/codechicken/microblock/CornerMicroblock.scala +++ b/codechicken/microblock/CornerMicroblock.scala @@ -50,8 +50,6 @@ object CornerMicroClass extends MicroblockClass def placementProperties = CornerPlacement - override def sizeToVolume(size:Int) = (size+1)*(size+1)*(size+1) - def getDisplayName(size:Int):String = size match { case 1 => "Nook" diff --git a/codechicken/microblock/EdgeMicroblock.scala b/codechicken/microblock/EdgeMicroblock.scala index c84ba7c..6d686b0 100644 --- a/codechicken/microblock/EdgeMicroblock.scala +++ b/codechicken/microblock/EdgeMicroblock.scala @@ -102,8 +102,6 @@ object EdgeMicroClass extends MicroblockClass def placementProperties = EdgePlacement - override def sizeToVolume(size:Int) = size*size - def getDisplayName(size:Int):String = size match { case 1 => "Strip" @@ -250,12 +248,8 @@ class PostMicroblock(shape$:Byte = 0, material$:Int = 0) extends Microblock(shap def getPartialOcclusionBoxes = getOcclusionBoxes - override def itemSizes = EdgeMicroClass.itemSizes - override def itemClassID = EdgeMicroClass.classID - override def sizeToVolume(size:Int) = EdgeMicroClass.sizeToVolume(size) - override def occlusionTest(npart:TMultiPart): Boolean = { if(npart.isInstanceOf[PostMicroblock]) diff --git a/codechicken/microblock/ItemMicroPart.scala b/codechicken/microblock/ItemMicroPart.scala index 6936cfc..06c08a5 100644 --- a/codechicken/microblock/ItemMicroPart.scala +++ b/codechicken/microblock/ItemMicroPart.scala @@ -32,7 +32,7 @@ class ItemMicroPart(id:Int) extends Item(id) val material = getMaterial(stack) val mcrClass = MicroblockClassRegistry.getMicroClass(stack.getItemDamage) val size = stack.getItemDamage&0xFF - if(material == null || mcrClass == null || !mcrClass.itemSizes.contains(size)) + if(material == null || mcrClass == null) return "Unnamed" return material.getLocalizedName+" "+mcrClass.getDisplayName(size) @@ -45,8 +45,8 @@ class ItemMicroPart(id:Int) extends Item(id) { val mcrClass = classes(classId) if(mcrClass != null) - mcrClass.itemSizes.foreach(size => - MicroMaterialRegistry.materials_foreach((s, m) => list.add(create(classId<<8|size, s)))) + for(size <- Seq(1, 2, 4)) + MicroMaterialRegistry.materials_foreach((s, m) => list.add(create(classId<<8|size, s))) } } @@ -57,7 +57,7 @@ class ItemMicroPart(id:Int) extends Item(id) val material = getMaterialID(item) val mcrClass = MicroblockClassRegistry.getMicroClass(item.getItemDamage) val size = item.getItemDamage&0xFF - if(material < 0 || mcrClass == null || !mcrClass.itemSizes.contains(size)) + if(material < 0 || mcrClass == null) return false val hit = RayTracer.retraceBlock(world, player, x, y, z) @@ -137,7 +137,7 @@ object ItemMicroPartRenderer extends IItemRenderer val material = getMaterial(item) val mcrClass = MicroblockClassRegistry.getMicroClass(item.getItemDamage) val size = item.getItemDamage&0xFF - if(material == null || mcrClass == null || !mcrClass.itemSizes.contains(size)) + if(material == null || mcrClass == null) return CCRenderState.reset() @@ -157,7 +157,7 @@ object ItemMicroPartRenderer extends IItemRenderer val material = getMaterialID(stack) val mcrClass = MicroblockClassRegistry.getMicroClass(stack.getItemDamage) val size = stack.getItemDamage&0xFF - if(material < 0 || mcrClass == null || !mcrClass.itemSizes.contains(size)) + if(material < 0 || mcrClass == null) return false return mcrClass.renderHighlight(world, player, hit, size, material) diff --git a/codechicken/microblock/MicroClass.scala b/codechicken/microblock/MicroClass.scala index 6d9422c..b477441 100644 --- a/codechicken/microblock/MicroClass.scala +++ b/codechicken/microblock/MicroClass.scala @@ -18,8 +18,6 @@ trait MicroblockClass def getDisplayName(size:Int):String - def itemSizes() = Seq(1, 2, 4) - def itemSlot() = 3 @SideOnly(Side.CLIENT) @@ -40,8 +38,6 @@ trait MicroblockClass def create(size:Int, slot:Int, material:Int, client:Boolean):CommonMicroblock - def sizeToVolume(size:Int) = size - def placementProperties():PlacementProperties def register(id:Int) = MicroblockClassRegistry.registerMicroClass(this, id) diff --git a/codechicken/microblock/MicroMaterialRegistry.scala b/codechicken/microblock/MicroMaterialRegistry.scala index c03ed60..7df8136 100644 --- a/codechicken/microblock/MicroMaterialRegistry.scala +++ b/codechicken/microblock/MicroMaterialRegistry.scala @@ -34,6 +34,8 @@ object MicroMaterialRegistry def isTransparent():Boolean + def getLightValue():Int + def getStrength(player:EntityPlayer):Float def getLocalizedName:String diff --git a/codechicken/microblock/MicroblockPlacement.scala b/codechicken/microblock/MicroblockPlacement.scala index 32f5aa7..daf5fbd 100644 --- a/codechicken/microblock/MicroblockPlacement.scala +++ b/codechicken/microblock/MicroblockPlacement.scala @@ -140,30 +140,10 @@ class MicroblockPlacement(val world:World, val player:EntityPlayer, val hit:Movi return ret } - def materialCheck(sizea:Int):Boolean = - { - if(!checkMaterial) - return true - - val mUnits = mcrClass.sizeToVolume(sizea) - mcrClass.sizeToVolume(sizea+size) - var mat = 0 - player.inventory.mainInventory.foreach(item => - if(item != null && item.itemID == MicroblockProxy.item.itemID) - { - val mcrClass = MicroblockClassRegistry.getMicroClass(item.getItemDamage) - if(ItemMicroPart.getMaterialID(item) == material) - mat+=mcrClass.sizeToVolume(item.getItemDamage&0xFF) - }) - return mat >= mUnits - } - def expand(mpart:CommonMicroblock):ExecutablePlacement = expand(mpart, create(mpart.getSize+size, mpart.getSlot, mpart.material)) def expand(mpart:Microblock, npart:Microblock):ExecutablePlacement = { - if(!materialCheck(mpart.getSize)) - return null - if(mpart.tile.canReplacePart(mpart, npart)) return new ExpandingPlacement(new BlockCoord(mpart.tile), npart, mpart) return null