From f607b010383fe59fb95d0aa5446bd286999ab8df Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Mon, 29 Jul 2013 11:58:22 +1000 Subject: [PATCH] Refactored tile traits to fix compiler conflict. --- codechicken/microblock/handler/Proxies.scala | 9 ++++++++- codechicken/multipart/IRandomDisplayTick.scala | 1 - ...artialOcclusion.scala => TPartialOcclusionTile.scala} | 0 ...domDisplayTick.scala => TRandomDisplayTickTile.scala} | 0 .../scalatraits/{TRedstone.scala => TRedstoneTile.scala} | 0 .../scalatraits/{TSlotted.scala => TSlottedTile.scala} | 1 - .../{ITankContainer.scala => TTankContainerTile.scala} | 0 7 files changed, 8 insertions(+), 3 deletions(-) rename codechicken/multipart/scalatraits/{IPartialOcclusion.scala => TPartialOcclusionTile.scala} (100%) rename codechicken/multipart/scalatraits/{IRandomDisplayTick.scala => TRandomDisplayTickTile.scala} (100%) rename codechicken/multipart/scalatraits/{TRedstone.scala => TRedstoneTile.scala} (100%) rename codechicken/multipart/scalatraits/{TSlotted.scala => TSlottedTile.scala} (97%) rename codechicken/multipart/scalatraits/{ITankContainer.scala => TTankContainerTile.scala} (100%) diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index 588d65e..dec7f63 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -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) } diff --git a/codechicken/multipart/IRandomDisplayTick.scala b/codechicken/multipart/IRandomDisplayTick.scala index 3d36a30..1382881 100644 --- a/codechicken/multipart/IRandomDisplayTick.scala +++ b/codechicken/multipart/IRandomDisplayTick.scala @@ -1,6 +1,5 @@ package codechicken.multipart -import scala.collection.mutable.ArrayBuffer import java.util.Random trait IRandomDisplayTick diff --git a/codechicken/multipart/scalatraits/IPartialOcclusion.scala b/codechicken/multipart/scalatraits/TPartialOcclusionTile.scala similarity index 100% rename from codechicken/multipart/scalatraits/IPartialOcclusion.scala rename to codechicken/multipart/scalatraits/TPartialOcclusionTile.scala diff --git a/codechicken/multipart/scalatraits/IRandomDisplayTick.scala b/codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala similarity index 100% rename from codechicken/multipart/scalatraits/IRandomDisplayTick.scala rename to codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala diff --git a/codechicken/multipart/scalatraits/TRedstone.scala b/codechicken/multipart/scalatraits/TRedstoneTile.scala similarity index 100% rename from codechicken/multipart/scalatraits/TRedstone.scala rename to codechicken/multipart/scalatraits/TRedstoneTile.scala diff --git a/codechicken/multipart/scalatraits/TSlotted.scala b/codechicken/multipart/scalatraits/TSlottedTile.scala similarity index 97% rename from codechicken/multipart/scalatraits/TSlotted.scala rename to codechicken/multipart/scalatraits/TSlottedTile.scala index 43fdc59..dc53c2f 100644 --- a/codechicken/multipart/scalatraits/TSlotted.scala +++ b/codechicken/multipart/scalatraits/TSlottedTile.scala @@ -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 { diff --git a/codechicken/multipart/scalatraits/ITankContainer.scala b/codechicken/multipart/scalatraits/TTankContainerTile.scala similarity index 100% rename from codechicken/multipart/scalatraits/ITankContainer.scala rename to codechicken/multipart/scalatraits/TTankContainerTile.scala