tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed workbench render coloring

Browse source
This commit is contained in:
Calclavia 2015-01-08 22:03:35 +08:00
parent 549d4655ae
commit 4ef91cc130
4 changed files with 238 additions and 2492 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2718
src/main/resources/assets/resonantinduction/models/workbench.obj
View file

File diff suppressed because it is too large Load diff

BIN
src/main/resources/assets/resonantinduction/models/workbench.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/resonantinduction/textures/items/hammer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 888 B

After

Width:  |  Height:  |  Size: 1.4 KiB

12
src/main/scala/resonantinduction/archaic/process/TileWorkbench.scala
View file

@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraft.util.ResourceLocation import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.AdvancedModelLoader
import net.minecraftforge.client.model.obj.WavefrontObject
import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.oredict.OreDictionary
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import resonant.api.recipe.MachineRecipes import resonant.api.recipe.MachineRecipes
@ -35,14 +36,14 @@ import resonantinduction.core.{Reference, ResonantInduction}
*/ */
object TileWorkbench object TileWorkbench
{ {
val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "workbench.obj")) val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "workbench.obj")).asInstanceOf[WavefrontObject]
} }
class TileWorkbench extends TileInventory(Material.rock) with TPacketSender with TPacketReceiver class TileWorkbench extends TileInventory(Material.rock) with TPacketSender with TPacketReceiver
{ {
//Constructor //Constructor
maxSlots = 1 maxSlots = 1
setTextureName(Reference.prefix + "material_wood_side") setTextureName(Reference.prefix + "material_wood_surface")
normalRender = false normalRender = false
isOpaqueCube = false isOpaqueCube = false
@ -132,10 +133,11 @@ class TileWorkbench extends TileInventory(Material.rock) with TPacketSender with
override def renderDynamic(pos: Vector3, frame: Float, pass: Int) override def renderDynamic(pos: Vector3, frame: Float, pass: Int)
{ {
GL11.glPushMatrix() GL11.glPushMatrix()
RenderItemOverlayUtility.renderTopOverlay(this, Array[ItemStack](getStackInSlot(0)), getDirection, 1, 1, pos.x, pos.y - 0.1, pos.z, 0.7f) RenderItemOverlayUtility.renderTopOverlay(this, Array[ItemStack](getStackInSlot(0)), getDirection, 1, 1, pos.x, pos.y - 0.2, pos.z, 0.7f)
GL11.glColor4f(1, 1, 1, 1)
GL11.glTranslated(pos.x, pos.y, pos.z)
RenderUtility.bind(Reference.domain, Reference.modelPath + "workbench.png") RenderUtility.bind(Reference.domain, Reference.modelPath + "workbench.png")
// TileWorkbench.model.renderAll() TileWorkbench.model.renderAll()
GL11.glPopMatrix() GL11.glPopMatrix()
} }
} }