Cleaned up collection mess to java.util.Iterable

This commit is contained in:
Chicken Bones committed 2013-06-27 15:44:08 +10:00
1 parent 8e18807f77
commit 18c1b79361
11 files changed
+36 -63

No files matched your search

@@ -24,13 +24,12 @@ import codechicken.core.render.Vertex5
import net.minecraft.item.ItemStack
import scala.collection.mutable.ListBuffer
import codechicken.multipart.TMultiPart
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
import codechicken.core.data.MCDataOutput
import codechicken.core.data.MCDataInput
import codechicken.core.render.RenderUtils
import codechicken.core.render.IFaceRenderer
import codechicken.multipart.TSlottedPart
import scala.collection.JavaConversions._
object CommonMicroblock
{
@@ -121,7 +120,7 @@ abstract class Microblock(var shape:Byte = 0, var material:Int = 0) extends TCub
def sizeToVolume(size:Int):Int = size
override def getDrops():JSeq[ItemStack] =
override def getDrops() =
{
var size = getSize
val items = ListBuffer[ItemStack]()
@@ -136,7 +135,7 @@ abstract class Microblock(var shape:Byte = 0, var material:Int = 0) extends TCub
items+=ItemMicroPart.create(k, s|itemClassID<<8, MicroMaterialRegistry.materialName(material))
}
}
return items
items
}
override def pickItem(hit:MovingObjectPosition):ItemStack =
+1 -1
View File
@@ -17,9 +17,9 @@ import codechicken.core.lighting.LazyLightMatrix
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
import cpw.mods.fml.relauncher.SideOnly
import cpw.mods.fml.relauncher.Side
import codechicken.scala.ScalaBridge._
import codechicken.core.raytracer.ExtendedMOP
import codechicken.multipart.TEdgePart
import scala.collection.JavaConversions._
object EdgePlacement extends PlacementProperties
{
+3 -4
View File
@@ -16,8 +16,7 @@ import net.minecraft.client.renderer.RenderBlocks
import codechicken.core.render.IconTransformation
import codechicken.core.render.RenderUtils
import codechicken.core.render.CCRenderState
import codechicken.scala.ScalaBridge._
import codechicken.scala.JSeq
import scala.collection.JavaConversions._
object HollowPlacement extends PlacementProperties
{
@@ -189,7 +188,7 @@ class HollowMicroblock(shape$:Byte = 0, material$:Int = 0) extends CommonMicrobl
}
}
def getOcclusionBoxes:JSeq[Cuboid6] =
def getOcclusionBoxes =
{
val size = getHollowSize
val c = HollowMicroClass.occBounds(shape)
@@ -202,7 +201,7 @@ class HollowMicroblock(shape$:Byte = 0, material$:Int = 0) extends CommonMicrobl
val z1 = c.min.z
val z2 = c.max.z
return getSlot match
getSlot match
{
case 0 | 1 =>
{
+1 -1
View File
@@ -25,9 +25,9 @@ import net.minecraft.util.Icon
import net.minecraft.client.renderer.texture.IconRegister
import codechicken.core.render.TextureSpecial
import codechicken.core.render.TextureUtils
import codechicken.scala.ScalaBridge._
import net.minecraft.world.IBlockAccess
import codechicken.core.raytracer.ExtendedMOP
import scala.collection.JavaConversions._
object BlockMultipart
{
+4 -4
View File
@@ -5,10 +5,10 @@ import codechicken.core.raytracer.IndexedCuboid6
import net.minecraft.client.renderer.RenderBlocks
import codechicken.core.render.CCRenderState
import codechicken.core.render.RenderUtils
import codechicken.scala.ScalaBridge._
import codechicken.core.vec.Vector3
import codechicken.core.render.IconTransformation
import codechicken.scala.JSeq
import scala.collection.JavaConversions._
import java.lang.Iterable
abstract class JCuboidPart extends TCuboidPart
@@ -16,9 +16,9 @@ trait TCuboidPart extends TMultiPart
{
def getBounds:Cuboid6
override def getSubParts:JSeq[IndexedCuboid6] = Seq(new IndexedCuboid6(0, getBounds))
override def getSubParts:Iterable[IndexedCuboid6] = Seq(new IndexedCuboid6(0, getBounds))
override def getCollisionBoxes:JSeq[Cuboid6] = Seq(getBounds)
override def getCollisionBoxes:Iterable[Cuboid6] = Seq(getBounds)
override def drawBreaking(renderBlocks:RenderBlocks)
{
+5 -5
View File
@@ -18,12 +18,12 @@ import codechicken.core.vec.BlockCoord
import net.minecraft.world.World
import net.minecraft.tileentity.TileEntity
import codechicken.core.render.CCRenderState
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
import codechicken.core.lighting.LazyLightMatrix
import codechicken.core.data.MCDataOutput
import codechicken.core.data.MCDataInput
import net.minecraft.entity.Entity
import java.lang.Iterable
import scala.collection.JavaConversions._
abstract class TMultiPart
{
@@ -42,10 +42,10 @@ abstract class TMultiPart
}
def occlusionTest(npart:TMultiPart):Boolean = true
def getSubParts:JSeq[IndexedCuboid6] = Seq()
def getCollisionBoxes:JSeq[Cuboid6] = Seq()
def getSubParts:Iterable[IndexedCuboid6] = Seq()
def getCollisionBoxes:Iterable[Cuboid6] = Seq()
def getDrops:JSeq[ItemStack] = Seq()
def getDrops:Iterable[ItemStack] = Seq()
def getStrength(hit:MovingObjectPosition, player:EntityPlayer):Float = 1
def getLightValue = 0
+3 -3
View File
@@ -1,8 +1,8 @@
package codechicken.multipart
import codechicken.core.vec.Cuboid6
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
import scala.collection.JavaConversions._
import java.lang.Iterable
object NormalOcclusionTest
{
@@ -24,7 +24,7 @@ object NormalOcclusionTest
trait JNormalOcclusion
{
def getOcclusionBoxes():JSeq[Cuboid6]
def getOcclusionBoxes():Iterable[Cuboid6]
}
trait TNormalOcclusion extends TMultiPart with JNormalOcclusion
@@ -1,12 +1,12 @@
package codechicken.multipart
import codechicken.core.vec.Cuboid6
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
import scala.collection.JavaConversions._
import java.lang.Iterable
trait JPartialOcclusion
{
def getPartialOcclusionBoxes():JSeq[Cuboid6]
def getPartialOcclusionBoxes():Iterable[Cuboid6]
def allowCompleteOcclusion = false
}
@@ -22,7 +22,7 @@ class PartialOcclusionTest(size:Int)
fill(i, part.getPartialOcclusionBoxes, part.allowCompleteOcclusion)
}
def fill(i:Int, boxes:Seq[Cuboid6], complete:Boolean)
def fill(i:Int, boxes:Iterable[Cuboid6], complete:Boolean)
{
partial(i) = !complete
boxes.foreach(box => fill(i+1, box))
+3 -3
View File
@@ -27,7 +27,6 @@ import net.minecraft.nbt.NBTTagList
import net.minecraft.client.particle.EffectRenderer
import net.minecraft.util.MovingObjectPosition
import scala.collection.mutable.ArrayBuffer
import codechicken.scala.ScalaBridge._
import java.util.Random
import cpw.mods.fml.relauncher.SideOnly
import cpw.mods.fml.relauncher.Side
@@ -38,6 +37,7 @@ import net.minecraft.world.ChunkCoordIntPair
import net.minecraft.entity.item.EntityItem
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.Entity
import scala.collection.JavaConversions._
class TileMultipart extends TileEntity
{
@@ -71,7 +71,7 @@ class TileMultipart extends TileEntity
*/
def partMap(slot:Int):TMultiPart = null
def jPartList():List[TMultiPart] = partList.asJava
def jPartList():List[TMultiPart] = partList
override def canUpdate() = doesTick//TODO: part merging true
@@ -314,7 +314,7 @@ class TileMultipart extends TileEntity
return true
}
def dropItems(items:Seq[ItemStack])
def dropItems(items:Iterable[ItemStack])
{
val pos = Vector3.fromTileEntityCenter(this)
items.foreach(item => TileMultipart.dropItem(item, worldObj, pos))
@@ -1,5 +1,8 @@
package codechicken.multipart.minecraft;
import java.util.Arrays;
import java.util.Collections;
import net.minecraft.block.Block;
import net.minecraft.client.particle.EffectRenderer;
import net.minecraft.entity.player.EntityPlayer;
@@ -13,8 +16,6 @@ import codechicken.multipart.JIconHitEffects;
import codechicken.multipart.JNormalOcclusion;
import codechicken.multipart.NormalOcclusionTest;
import codechicken.multipart.TMultiPart;
import codechicken.scala.JSeq;
import codechicken.scala.ScalaBridge;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -29,21 +30,21 @@ public abstract class McBlockPart extends JCuboidPart implements JNormalOcclusio
}
@Override
public JSeq<Cuboid6> getOcclusionBoxes()
public Iterable<Cuboid6> getOcclusionBoxes()
{
return ScalaBridge.seq(getBounds());
return Arrays.asList(getBounds());
}
@Override
public JSeq<Cuboid6> getCollisionBoxes()
public Iterable<Cuboid6> getCollisionBoxes()
{
return ScalaBridge.seq();
return Collections.EMPTY_LIST;
}
@Override
public JSeq<ItemStack> getDrops()
public Iterable<ItemStack> getDrops()
{
return ScalaBridge.seq(new ItemStack(getBlock()));
return Arrays.asList(new ItemStack(getBlock()));
}
@Override
-26
View File
@@ -1,26 +0,0 @@
package codechicken.scala
import java.util.List
import scala.collection.JavaConverters._
object ScalaBridge
{
implicit def wrapSeq[T](seq:Seq[T]) = new ScalaSeq[T](seq)
implicit def unwrapSeq[T](JSeq:JSeq[T]) = JSeq.seq
def toSeq[T](c:List[T]):JSeq[T] = c.asScala
def toSeq[T](a:Array[T]):JSeq[T] = a.toSeq
def seq[T]():JSeq[T] = Seq()
def seq[T](t1:T):JSeq[T] = Seq(t1)
def seq[T](t1:T, t2:T):JSeq[T] = Seq(t1, t2)
def seq[T](t1:T, t2:T, t3:T):JSeq[T] = Seq(t1, t2, t3)
def seq[T](t1:T, t2:T, t3:T, t4:T):JSeq[T] = Seq(t1, t2, t3, t4)
}
class ScalaSeq[T](val seq:Seq[T]) extends JSeq[T]
trait JSeq[T]
{
def seq():Seq[T]
}