Refactored tile traits to fix compiler conflict.

This commit is contained in:
Chicken Bones committed 2013-07-29 11:58:22 +10:00
1 parent 54470dec6b
commit f607b01038
7 files changed
+8 -3

No files matched your search

+8 -1
View File
@@ -51,7 +51,6 @@ class MicroblockProxy_serverImpl
.setUnlocalizedName("microblock:stoneRod").func_111206_d("microblock:stoneRod")
OreDictionary.registerOre("stoneRod", stoneRod)
LangUtil.instance.addLangDir(new ResourceLocation("microblock:lang"))
MinecraftForge.EVENT_BUS.register(MicroblockEventHandler)
}
@@ -85,9 +84,17 @@ class MicroblockProxy_serverImpl
class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl
{
@SideOnly(Side.CLIENT)
override def preInit()
{
super.preInit()
LangUtil.loadBaseLangDir(new ResourceLocation("microblock:lang"))
}
@SideOnly(Side.CLIENT)
override def postInit()
{
super.postInit()
MinecraftForgeClient.registerItemRenderer(itemMicro.itemID, ItemMicroPartRenderer)
}
@@ -1,6 +1,5 @@
package codechicken.multipart
import scala.collection.mutable.ArrayBuffer
import java.util.Random
trait IRandomDisplayTick
@@ -3,7 +3,6 @@ package codechicken.multipart.scalatraits
import codechicken.multipart.TileMultipart
import codechicken.multipart.TMultiPart
import codechicken.multipart.TSlottedPart
import codechicken.multipart.TSlottedPart
trait TSlottedTile extends TileMultipart
{