From 2cfdd91fea70762c80c061058f844e8387b8b598 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sat, 22 Nov 2014 23:11:56 +0800
Subject: [PATCH] New motor model and render

---
 .../resonantinduction/models/generator.png    | Bin 643 -> 0 bytes
 .../resonantinduction/models/generator.tcn    | Bin 1742 -> 0 bytes
 .../assets/resonantinduction/models/motor.png | Bin 0 -> 4309 bytes
 .../assets/resonantinduction/models/motor.tcn | Bin 0 -> 5321 bytes
 .../resonantinduction/core/ClientProxy.scala  |   2 -
 .../electrical/generator/RenderMotor.scala    |  48 ------------------
 .../electrical/generator/TileMotor.scala      |  28 +++++++++-
 7 files changed, 27 insertions(+), 51 deletions(-)
 delete mode 100644 src/main/resources/assets/resonantinduction/models/generator.png
 delete mode 100644 src/main/resources/assets/resonantinduction/models/generator.tcn
 create mode 100644 src/main/resources/assets/resonantinduction/models/motor.png
 create mode 100644 src/main/resources/assets/resonantinduction/models/motor.tcn
 delete mode 100644 src/main/scala/resonantinduction/electrical/generator/RenderMotor.scala

diff --git a/src/main/resources/assets/resonantinduction/models/generator.png b/src/main/resources/assets/resonantinduction/models/generator.png
deleted file mode 100644
index 32a3ae904c3efc7942b89d8d03c0ef83ae1afabc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 643
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!JQ9qGMtlCBy2!x5#O&$f7*cWT
z?cM0SCI<<&fMYv^7yIXKzqI6~(QLIm){09zrhPkkY=uIAL)x=B?jMC7eoogjXj4+0
z|6blc_xAp8_Y>Egud1%x`#Ul<wspq0n_APG?|-%28F`bHsewU(frH^^<nm9he9IRv
zUdbeKG;gzR+3dH6k9(|P+7iliRk4|&<ZtWr(x)qyOEeg^S8in#U|?ZjR4Bb^HfPqe
z&+~KNz2*#ISPpbK!>2^Hw});tI~(3n+4OE#^1A1@`Ijd@mf5rNX2qJfO)uM8&%fXO
z#Os14!|t=+o^8^)ej_!EQRc%L<^@bCG7Z(d`?k3$Oe|wwK2JG5D_P_E``Tc}W&d1v
zt5iQ^yik9g?MLz6S;r<6^n8@_IW6j_#jsKL%@QV%>y<ftv!9nrzO<gx=NcKlF!%4?
zZQm{PFIxvdT<XBUFe6=NL1yz!hg^`$9T)@{g5I*u;0=MvgFJM?c{$^Zef7KTQWBQG
zl>58w_O`Y?Y|9x~8a6M#CwnI~bK2?WQ%XhK_8dzL18S3-$MkF4x8L8Se17ZMF#Jok
z{><=a`@tn2StoKP|GD*i!J-$eAeTXd7eQSJo>3i^pO+>W%CO+0$b~Hjy%zd0Le(v~
n#l0bD1s5bnm_XqP2S*-=t8G5}^>4`H`yeq-S3j3^P6<r_b5j2>

diff --git a/src/main/resources/assets/resonantinduction/models/generator.tcn b/src/main/resources/assets/resonantinduction/models/generator.tcn
deleted file mode 100644
index fa7c383af3f44546915562d150c6c784e69cba41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1742
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

diff --git a/src/main/resources/assets/resonantinduction/models/motor.png b/src/main/resources/assets/resonantinduction/models/motor.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eecc8f77c7d40f63f1f2c965c609dcf6cffd82f
GIT binary patch
literal 4309
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/resonantinduction/models/motor.tcn b/src/main/resources/assets/resonantinduction/models/motor.tcn
new file mode 100644
index 0000000000000000000000000000000000000000..dbaa78bca1dbad0cd516369fb74349aa3740c7b4
GIT binary patch
literal 5321
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

literal 0
HcmV?d00001

diff --git a/src/main/scala/resonantinduction/core/ClientProxy.scala b/src/main/scala/resonantinduction/core/ClientProxy.scala
index 076964664..0922781ab 100644
--- a/src/main/scala/resonantinduction/core/ClientProxy.scala
+++ b/src/main/scala/resonantinduction/core/ClientProxy.scala
@@ -28,7 +28,6 @@ import resonantinduction.atomic.machine.quantum.{GuiQuantumAssembler, RenderQuan
 import resonantinduction.atomic.machine.reactor.{GuiReactorCell, RenderReactorCell, TileReactorCell}
 import resonantinduction.atomic.machine.thermometer.{RenderThermometer, TileThermometer}
 import resonantinduction.electrical.ElectricalContent
-import resonantinduction.electrical.generator.{RenderMotor, TileMotor}
 import resonantinduction.electrical.laser.fx.{EntityBlockParticleFX, EntityLaserFX, EntityScorchFX}
 import resonantinduction.electrical.multimeter.{GuiMultimeter, PartMultimeter, RenderMultimeter}
 import resonantinduction.electrical.tesla.{RenderTesla, TileTesla}
@@ -67,7 +66,6 @@ import resonantinduction.mechanical.mech.turbine._
     ItemRenderHandler.register(ElectricalContent.itemMultimeter, RenderMultimeter)
     ItemRenderHandler.register(ElectricalContent.itemQuantumGlyph, RenderQuantumGlyph)
 
-    ClientRegistry.bindTileEntitySpecialRenderer(classOf[TileMotor], new RenderMotor)
     ClientRegistry.bindTileEntitySpecialRenderer(classOf[TileTesla], new RenderTesla)
 
     //Atomic content
diff --git a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.scala b/src/main/scala/resonantinduction/electrical/generator/RenderMotor.scala
deleted file mode 100644
index 6287cf5c6..000000000
--- a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package resonantinduction.electrical.generator
-
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
-import net.minecraft.item.ItemStack
-import net.minecraft.tileentity.TileEntity
-import net.minecraft.util.ResourceLocation
-import net.minecraftforge.client.IItemRenderer
-import net.minecraftforge.client.model.AdvancedModelLoader
-import net.minecraftforge.client.model.IModelCustom
-import net.minecraftforge.common.util.ForgeDirection
-import org.lwjgl.opengl.GL11
-import resonant.content.prefab.scal.render.ISimpleItemRenderer
-import resonant.lib.render.RenderUtility
-import resonantinduction.core.Reference
-
-/**
- * @author Calclavia
- *
- */
-object RenderMotor
-{
-    final val MODEL: IModelCustom = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "generator.tcn"))
-    final val TEXTURE: ResourceLocation = new ResourceLocation(Reference.domain, Reference.modelPath + "generator.png")
-}
-
-class RenderMotor extends TileEntitySpecialRenderer with ISimpleItemRenderer
-{
-    def renderTileEntityAt(t: TileEntity, x: Double, y: Double, z: Double, f: Float)
-    {
-        doRender(t.getBlockMetadata, x, y, z, f)
-    }
-
-    private def doRender(facingDirection: Int, x: Double, y: Double, z: Double, f: Float)
-    {
-        GL11.glPushMatrix
-        GL11.glTranslatef(x.asInstanceOf[Float] + 0.5f, y.asInstanceOf[Float] + 0.5f, z.asInstanceOf[Float] + 0.5f)
-        GL11.glRotatef(90, 0, 1, 0)
-        RenderUtility.rotateBlockBasedOnDirection(ForgeDirection.getOrientation(facingDirection))
-        bindTexture(RenderMotor.TEXTURE)
-        RenderMotor.MODEL.renderAll
-        GL11.glPopMatrix
-    }
-
-    def renderInventoryItem(`type`: IItemRenderer.ItemRenderType, itemStack: ItemStack, data: AnyRef*)
-    {
-        doRender(2, 0, 0, 0, 0)
-    }
-}
\ No newline at end of file
diff --git a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala
index 507ebdef9..d7a8487ed 100644
--- a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala
+++ b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala
@@ -1,14 +1,20 @@
 package resonantinduction.electrical.generator
 
+import cpw.mods.fml.relauncher.{Side, SideOnly}
 import net.minecraft.block.material.Material
 import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.util.ChatComponentText
+import net.minecraft.util.{ChatComponentText, ResourceLocation}
+import net.minecraftforge.client.model.AdvancedModelLoader
+import org.lwjgl.opengl.GL11
 import resonant.api.IRotatable
 import resonant.content.prefab.java.TileAdvanced
 import resonant.lib.content.prefab.TElectric
 import resonant.lib.grid.node.TSpatialNodeProvider
+import resonant.lib.render.RenderUtility
 import resonant.lib.transform.vector.Vector3
+import resonantinduction.core.Reference
 import resonantinduction.mechanical.mech.grid.NodeMechanical
 
 /**
@@ -16,6 +22,14 @@ import resonantinduction.mechanical.mech.grid.NodeMechanical
  *
  * @author Calclavia
  */
+object TileMotor
+{
+  @SideOnly(Side.CLIENT)
+  val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "motor.tcn"))
+  @SideOnly(Side.CLIENT)
+  val texture = new ResourceLocation(Reference.domain, Reference.modelPath + "motor.png")
+}
+
 class TileMotor extends TileAdvanced(Material.iron) with TElectric with TSpatialNodeProvider with IRotatable
 {
   var mechNode = new NodeMechanical(this)
@@ -66,6 +80,18 @@ class TileMotor extends TileAdvanced(Material.iron) with TElectric with TSpatial
     return false
   }
 
+  @SideOnly(Side.CLIENT)
+  override def renderDynamic(pos: Vector3, frame: Float, pass: Int): Unit =
+  {
+    GL11.glPushMatrix()
+    GL11.glTranslatef(pos.x.toFloat + 0.5f, pos.y.toFloat + 0.5f, pos.z.toFloat + 0.5f)
+    GL11.glRotatef(90, 0, 1, 0)
+    RenderUtility.rotateBlockBasedOnDirection(getDirection)
+    RenderUtility.bind(TileMotor.texture)
+    TileMotor.model.renderAll()
+    GL11.glPopMatrix()
+  }
+
   override def readFromNBT(nbt: NBTTagCompound)
   {
     super.readFromNBT(nbt)