diff --git a/codechicken/microblock/CommonMicroblock.scala b/codechicken/microblock/CommonMicroblock.scala index 27bf198..4acf9c0 100644 --- a/codechicken/microblock/CommonMicroblock.scala +++ b/codechicken/microblock/CommonMicroblock.scala @@ -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 { diff --git a/codechicken/microblock/EdgeMicroblock.scala b/codechicken/microblock/EdgeMicroblock.scala index a34c4bd..73fe0ef 100644 --- a/codechicken/microblock/EdgeMicroblock.scala +++ b/codechicken/microblock/EdgeMicroblock.scala @@ -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 diff --git a/codechicken/microblock/HolloMicroblock.scala b/codechicken/microblock/HolloMicroblock.scala index 71c3f3b..03e3f82 100644 --- a/codechicken/microblock/HolloMicroblock.scala +++ b/codechicken/microblock/HolloMicroblock.scala @@ -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 { diff --git a/codechicken/microblock/handler/ModContainer.scala b/codechicken/microblock/handler/ModContainer.scala index ed58cb4..bf7cf99 100644 --- a/codechicken/microblock/handler/ModContainer.scala +++ b/codechicken/microblock/handler/ModContainer.scala @@ -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 diff --git a/codechicken/multipart/BlockMultipart.scala b/codechicken/multipart/BlockMultipart.scala index 5741e31..e279b31 100644 --- a/codechicken/multipart/BlockMultipart.scala +++ b/codechicken/multipart/BlockMultipart.scala @@ -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 diff --git a/codechicken/multipart/IRandomDisplayTick.scala b/codechicken/multipart/IRandomDisplayTick.scala index 96ab1fd..d813926 100644 --- a/codechicken/multipart/IRandomDisplayTick.scala +++ b/codechicken/multipart/IRandomDisplayTick.scala @@ -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)) } } \ No newline at end of file diff --git a/codechicken/multipart/TCuboidPart.scala b/codechicken/multipart/TCuboidPart.scala index e7a43ed..66f5826 100644 --- a/codechicken/multipart/TCuboidPart.scala +++ b/codechicken/multipart/TCuboidPart.scala @@ -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 diff --git a/codechicken/multipart/TMultiPart.scala b/codechicken/multipart/TMultiPart.scala index b92ecbf..4815f36 100644 --- a/codechicken/multipart/TMultiPart.scala +++ b/codechicken/multipart/TMultiPart.scala @@ -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 diff --git a/codechicken/multipart/TNormalOcclusion.scala b/codechicken/multipart/TNormalOcclusion.scala index a796306..f923b03 100644 --- a/codechicken/multipart/TNormalOcclusion.scala +++ b/codechicken/multipart/TNormalOcclusion.scala @@ -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 { diff --git a/codechicken/multipart/TPartialOcclusion.scala b/codechicken/multipart/TPartialOcclusion.scala index f3987a1..8a14122 100644 --- a/codechicken/multipart/TPartialOcclusion.scala +++ b/codechicken/multipart/TPartialOcclusion.scala @@ -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 { diff --git a/codechicken/multipart/TileMultipart.scala b/codechicken/multipart/TileMultipart.scala index 2930aa7..d0ac005 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -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 diff --git a/codechicken/multipart/minecraft/TorchPart.java b/codechicken/multipart/minecraft/TorchPart.java index b774f12..302473d 100644 --- a/codechicken/multipart/minecraft/TorchPart.java +++ b/codechicken/multipart/minecraft/TorchPart.java @@ -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; diff --git a/net/minecraftforge/scala/ScalaBridge.scala b/codechicken/scala/ScalaBridge.scala similarity index 84% rename from net/minecraftforge/scala/ScalaBridge.scala rename to codechicken/scala/ScalaBridge.scala index 89f1132..1325184 100644 --- a/net/minecraftforge/scala/ScalaBridge.scala +++ b/codechicken/scala/ScalaBridge.scala @@ -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 {