Moved ScalaBridge out of minecraftforge package

Cut down unnecessary memory consumption on IRandomDisplayTick
This commit is contained in:
Chicken Bones committed 2013-05-20 18:42:58 +10:00
1 parent 26f9cbcb09
commit 92b0dd1f5d
13 files changed
+21 -52

No files matched your search

@@ -24,8 +24,8 @@ import codechicken.core.render.Vertex5
import net.minecraft.item.ItemStack
import scala.collection.mutable.ListBuffer
import codechicken.multipart.TMultiPart
import net.minecraftforge.scala.JSeq
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
object CommonMicroblock
{
+1 -1
View File
@@ -17,7 +17,7 @@ import codechicken.core.lighting.LazyLightMatrix
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
import cpw.mods.fml.relauncher.SideOnly
import cpw.mods.fml.relauncher.Side
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.ScalaBridge._
import codechicken.core.raytracer.ExtendedMOP
object EdgePlacement extends PlacementProperties
+2 -2
View File
@@ -16,8 +16,8 @@ import net.minecraft.client.renderer.RenderBlocks
import codechicken.core.render.IconTransformation
import codechicken.core.render.RenderUtils
import codechicken.core.render.CCRenderState
import net.minecraftforge.scala.ScalaBridge._
import net.minecraftforge.scala.JSeq
import codechicken.scala.ScalaBridge._
import codechicken.scala.JSeq
object HollowPlacement extends PlacementProperties
{
@@ -12,7 +12,6 @@ import cpw.mods.fml.common.event.FMLServerAboutToStartEvent
import cpw.mods.fml.common.network.NetworkMod
import cpw.mods.fml.common.Mod.Instance
import codechicken.microblock.MicroMaterialRegistry
import codechicken.scala.ScalaHelper
import codechicken.microblock.DefaultContent
import cpw.mods.fml.common.event.FMLPostInitializationEvent
+1 -1
View File
@@ -25,7 +25,7 @@ import net.minecraft.util.Icon
import net.minecraft.client.renderer.texture.IconRegister
import codechicken.core.render.TextureSpecial
import codechicken.core.render.TextureUtils
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.ScalaBridge._
import net.minecraft.world.IBlockAccess
import codechicken.core.raytracer.ExtendedMOP
+3 -30
View File
@@ -10,37 +10,10 @@ trait IRandomDisplayTick
trait TRandomDisplayTickTile extends TileMultipartClient
{
var displayParts = ArrayBuffer[IRandomDisplayTick]()
override def loadFrom(that:TileMultipart)
{
super.loadFrom(that)
if(that.isInstanceOf[TRandomDisplayTickTile])
displayParts = that.asInstanceOf[TRandomDisplayTickTile].displayParts
}
override def randomDisplayTick(random:Random)
{
displayParts.foreach(_.randomDisplayTick(random))
}
override def partAdded(part:TMultiPart)
{
super.partAdded(part)
if(part.isInstanceOf[IRandomDisplayTick])
displayParts+=part.asInstanceOf[IRandomDisplayTick]
}
override def partRemoved(part:TMultiPart, p:Int)
{
super.partRemoved(part, p)
if(part.isInstanceOf[IRandomDisplayTick])
displayParts-=part.asInstanceOf[IRandomDisplayTick]
}
override def clearParts()
{
super.clearParts()
displayParts.clear
partList.foreach(p =>
if(p.isInstanceOf[IRandomDisplayTick])
p.asInstanceOf[IRandomDisplayTick].randomDisplayTick(random))
}
}
+2 -2
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 net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.ScalaBridge._
import codechicken.core.vec.Vector3
import codechicken.core.render.IconTransformation
import net.minecraftforge.scala.JSeq
import codechicken.scala.JSeq
abstract class JCuboidPart extends TCuboidPart
+2 -2
View File
@@ -20,8 +20,8 @@ import codechicken.core.vec.BlockCoord
import net.minecraft.world.World
import net.minecraft.tileentity.TileEntity
import codechicken.core.render.CCRenderState
import net.minecraftforge.scala.JSeq
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
import codechicken.core.lighting.LazyLightMatrix
abstract class TMultiPart
+2 -2
View File
@@ -1,8 +1,8 @@
package codechicken.multipart
import codechicken.core.vec.Cuboid6
import net.minecraftforge.scala.JSeq
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
object NormalOcclusionTest
{
@@ -1,8 +1,8 @@
package codechicken.multipart
import codechicken.core.vec.Cuboid6
import net.minecraftforge.scala.JSeq
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.JSeq
import codechicken.scala.ScalaBridge._
trait JPartialOcclusion
{
+1 -1
View File
@@ -28,7 +28,7 @@ import net.minecraft.nbt.NBTTagList
import net.minecraft.client.particle.EffectRenderer
import net.minecraft.util.MovingObjectPosition
import scala.collection.mutable.ArrayBuffer
import net.minecraftforge.scala.ScalaBridge._
import codechicken.scala.ScalaBridge._
import java.util.Random
import cpw.mods.fml.relauncher.SideOnly
import cpw.mods.fml.relauncher.Side
@@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.scala.JSeq;
import net.minecraftforge.scala.ScalaBridge;
import codechicken.scala.JSeq;
import codechicken.scala.ScalaBridge;
import codechicken.multipart.JCuboidPart;
import codechicken.multipart.JNormalOcclusion;
import codechicken.multipart.NormalOcclusionTest;
@@ -1,10 +1,7 @@
package net.minecraftforge.scala
package codechicken.scala
import java.util.List
import java.util.Map
import scala.collection.JavaConverters._
import codechicken.core.vec.Cuboid6
import java.util.Collection
object ScalaBridge
{