GloopMaster/TinkersConstruct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.5.2 Update

Browse Source
This commit is contained in:
mDiyo 2013-05-13 11:42:11 -07:00
parent 34b48b29f0
commit 69630e2729
26 changed files with 202 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java
View File

@ -345,7 +345,7 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
}
@Override
public int[] getSizeInventorySide (int side)
public int[] getAccessibleSlotsFromSide (int side)
{
if (side == 0)
return new int[] { 1 };
@ -354,13 +354,13 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
}
@Override
public boolean func_102007_a (int i, ItemStack itemstack, int j)
public boolean canInsertItem (int i, ItemStack itemstack, int j)
{
return true;
}
@Override
public boolean func_102008_b (int i, ItemStack itemstack, int j)
public boolean canExtractItem (int i, ItemStack itemstack, int j)
{
return true;
}

6
mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java
View File

@ -346,7 +346,7 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank, IT
}
@Override
public int[] getSizeInventorySide (int side)
public int[] getAccessibleSlotsFromSide (int side)
{
if (side == 0)
return new int[] { 1 };
@ -355,13 +355,13 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank, IT
}
@Override
public boolean func_102007_a (int i, ItemStack itemstack, int j)
public boolean canInsertItem (int i, ItemStack itemstack, int j)
{
return true;
}
@Override
public boolean func_102008_b (int i, ItemStack itemstack, int j)
public boolean canExtractItem (int i, ItemStack itemstack, int j)
{
return true;
}

2
mods/tinker/tconstruct/blocks/logic/FrypanLogic.java
View File

@ -252,7 +252,7 @@ public class FrypanLogic extends EquipLogic
return 200;
if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD"))
return 200;
if (item instanceof ItemHoe && ((ItemHoe) item).func_77842_f().equals("WOOD"))
if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
return 200;
if (itemID == Item.stick.itemID)
return 100;

6
mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java
View File

@ -162,19 +162,19 @@ public class PartCrafterLogic extends InventoryLogic
}
@Override
public int[] getSizeInventorySide (int var1)
public int[] getAccessibleSlotsFromSide (int side)
{
return null;
}
@Override
public boolean func_102007_a (int i, ItemStack itemstack, int j)
public boolean canInsertItem (int i, ItemStack itemstack, int j)
{
return false;
}
@Override
public boolean func_102008_b (int i, ItemStack itemstack, int j)
public boolean canExtractItem (int i, ItemStack itemstack, int j)
{
return false;
}

6
mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java
View File

@ -104,19 +104,19 @@ public class PatternShaperLogic extends InventoryLogic
}
@Override
public int[] getSizeInventorySide (int var1)
public int[] getAccessibleSlotsFromSide (int side)
{
return null;
}
@Override
public boolean func_102007_a (int i, ItemStack itemstack, int j)
public boolean canInsertItem (int i, ItemStack itemstack, int j)
{
return false;
}
@Override
public boolean func_102008_b (int i, ItemStack itemstack, int j)
public boolean canExtractItem (int i, ItemStack itemstack, int j)
{
return false;
}

8
mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java
View File

@ -87,20 +87,20 @@ public class ToolStationLogic extends InventoryLogic
return false;
}
@Override
public int[] getSizeInventorySide (int var1)
@Override
public int[] getAccessibleSlotsFromSide (int side)
{
return null;
}
@Override
public boolean func_102007_a (int i, ItemStack itemstack, int j)
public boolean canInsertItem (int i, ItemStack itemstack, int j)
{
return false;
}
@Override
public boolean func_102008_b (int i, ItemStack itemstack, int j)
public boolean canExtractItem (int i, ItemStack itemstack, int j)
{
return false;
}

34
mods/tinker/tconstruct/client/TProxyClient.java
View File

@ -56,6 +56,8 @@ import net.minecraft.client.particle.EntitySnowShovelFX;
import net.minecraft.client.particle.EntitySpellParticleFX;
import net.minecraft.client.particle.EntitySplashFX;
import net.minecraft.client.particle.EntitySuspendFX;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderCreeper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.settings.GameSettings;
@ -68,6 +70,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.DimensionManager;
import org.lwjgl.opengl.GL11;
import org.w3c.dom.Document;
import com.google.common.collect.Lists;
@ -113,6 +116,37 @@ public class TProxyClient extends TProxyCommon
}
return null;
}
public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
public static void openInventoryGui ()
{

38
mods/tinker/tconstruct/client/block/AxleRender.java
View File

@ -1,12 +1,9 @@
package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.client.TProxyClient;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -17,7 +14,7 @@ public class AxleRender implements ISimpleBlockRenderingHandler
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
{
renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F);
renderDo(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
@Override
@ -39,35 +36,4 @@ public class AxleRender implements ISimpleBlockRenderingHandler
{
return axleModelID;
}
private void renderDo(RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

48
mods/tinker/tconstruct/client/block/BlockSkinRenderHelper.java
View File

@ -174,7 +174,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(0, metadata));
render.renderFaceYNeg(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(0, metadata));
flag = true;
}
@ -278,7 +278,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(1, metadata));
render.renderFaceYPos(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(1, metadata));
flag = true;
}
@ -396,7 +396,7 @@ public class BlockSkinRenderHelper
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
icon = block.getIcon(2, metadata);
render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, icon);
render.renderFaceZNeg(block, (double)xMin, (double)yMin, (double)zMin, icon);
flag = true;
}
@ -513,7 +513,7 @@ public class BlockSkinRenderHelper
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
icon = block.getIcon(3, metadata);
render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, icon);
render.renderFaceZPos(block, (double)xMin, (double)yMin, (double)zMin, icon);
flag = true;
}
@ -630,7 +630,7 @@ public class BlockSkinRenderHelper
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
icon = block.getIcon(4, metadata);
render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, icon);
render.renderFaceXNeg(block, (double)xMin, (double)yMin, (double)zMin, icon);
flag = true;
}
@ -747,7 +747,7 @@ public class BlockSkinRenderHelper
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
icon = block.getIcon(5, metadata);
render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, icon);
render.renderFaceXPos(block, (double)xMin, (double)yMin, (double)zMin, icon);
flag = true;
}
@ -797,7 +797,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin));
tessellator.setColorOpaque_F(f10, f13, f16);
render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(0, metadata));
render.renderFaceYNeg(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(0, metadata));
flag = true;
}
@ -805,7 +805,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin));
tessellator.setColorOpaque_F(f7, f8, f9);
render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(1, metadata));
render.renderFaceYPos(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(1, metadata));
flag = true;
}
@ -815,7 +815,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(2, metadata));
render.renderFaceZNeg(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(2, metadata));
flag = true;
}
@ -824,7 +824,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(3, metadata));
render.renderFaceZPos(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(3, metadata));
flag = true;
}
@ -833,7 +833,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin));
tessellator.setColorOpaque_F(f12, f15, f18);
render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(4, metadata));
render.renderFaceXNeg(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(4, metadata));
flag = true;
}
@ -842,7 +842,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin));
tessellator.setColorOpaque_F(f12, f15, f18);
render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(5, metadata));
render.renderFaceXPos(block, (double)xMin, (double)yMin, (double)zMin, block.getIcon(5, metadata));
flag = true;
}
@ -1015,7 +1015,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceYNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1119,7 +1119,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceYPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1234,7 +1234,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceZNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1350,7 +1350,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceZPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1466,7 +1466,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceXNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1582,7 +1582,7 @@ public class BlockSkinRenderHelper
render.colorRedTopRight *= f6;
render.colorGreenTopRight *= f6;
render.colorBlueTopRight *= f6;
render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceXPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1633,7 +1633,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin));
tessellator.setColorOpaque_F(f10, f13, f16);
render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceYNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1641,7 +1641,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin));
tessellator.setColorOpaque_F(f7, f8, f9);
render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceYPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1651,7 +1651,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceZNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1660,7 +1660,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceZPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1669,7 +1669,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin));
tessellator.setColorOpaque_F(f12, f15, f18);
render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceXNeg(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}
@ -1678,7 +1678,7 @@ public class BlockSkinRenderHelper
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin));
tessellator.setColorOpaque_F(f12, f15, f18);
render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, texture);
render.renderFaceXPos(block, (double)xMin, (double)yMin, (double)zMin, texture);
flag = true;
}

10
mods/tinker/tconstruct/client/block/BreakingFX.java
View File

@ -46,12 +46,12 @@ public class BreakingFX extends EntityFX
float f9 = f8 + 0.015609375F;
float f10 = 0.1F * this.particleScale;
if (this.particleTextureIndex != null)
if (this.particleIcon != null)
{
f6 = this.particleTextureIndex.getInterpolatedU((double)(this.particleTextureJitterX / 4.0F * 16.0F));
f7 = this.particleTextureIndex.getInterpolatedU((double)((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F));
f8 = this.particleTextureIndex.getInterpolatedV((double)(this.particleTextureJitterY / 4.0F * 16.0F));
f9 = this.particleTextureIndex.getInterpolatedV((double)((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F));
f6 = this.particleIcon.getInterpolatedU((double)(this.particleTextureJitterX / 4.0F * 16.0F));
f7 = this.particleIcon.getInterpolatedU((double)((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F));
f8 = this.particleIcon.getInterpolatedV((double)(this.particleTextureJitterY / 4.0F * 16.0F));
f9 = this.particleIcon.getInterpolatedV((double)((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F));
}
float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);

37
mods/tinker/tconstruct/client/block/BrickRender.java
View File

@ -1,10 +1,8 @@
package mods.tinker.tconstruct.client.block;
import org.lwjgl.opengl.GL11;
import mods.tinker.tconstruct.client.TProxyClient;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -16,7 +14,7 @@ public class BrickRender implements ISimpleBlockRenderingHandler
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
{
renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
@Override
@ -42,35 +40,4 @@ public class BrickRender implements ISimpleBlockRenderingHandler
{
return model;
}
static void renderInvBlock(RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

2
mods/tinker/tconstruct/client/block/FluidRender.java
View File

@ -135,7 +135,7 @@ public class FluidRender implements ISimpleBlockRenderingHandler
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z));
float f10 = 1.0F;
tessellator.setColorOpaque_F(f3 * f10, f3 * f10, f3 * f10);
renderer.renderBottomFace(block, (double) x, (double) y + d6, (double) z, block.getBlockTexture(world, x, y, z, 0));
renderer.renderFaceYNeg(block, (double) x, (double) y + d6, (double) z, block.getBlockTexture(world, x, y, z, 0));
flag2 = true;
}

78
mods/tinker/tconstruct/client/block/GolemCoreRender.java
View File

@ -2,6 +2,7 @@ package mods.tinker.tconstruct.client.block;
import org.lwjgl.opengl.GL11;
import mods.tinker.tconstruct.client.TProxyClient;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
@ -18,40 +19,18 @@ public class GolemCoreRender implements ISimpleBlockRenderingHandler
@Override
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
{
/*Tessellator tessellator = Tessellator.instance;
double d = 0.1875D;
World world = ModLoader.getMinecraftInstance().theWorld;
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(0));
renderblocks.renderBottomFace(block, -0.5D, 0.5D - d, -0.5D, block.getBlockTextureFromSide(0));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(1));
renderblocks.renderTopFace(block, -0.5D, -1.5D + d, -0.5D, block.getBlockTextureFromSide(1));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderEastFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(2));
renderblocks.renderEastFace(block, -0.5D, -0.5D, 0.5D - d, block.getBlockTextureFromSide(2));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 1.0F, 0.0F);
renderblocks.renderWestFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(3));
renderblocks.renderWestFace(block, -0.5D, -0.5D, -1.5D + d, block.getBlockTextureFromSide(3));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 1.0F);
renderblocks.renderNorthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(4));
renderblocks.renderNorthFace(block, 0.5D - d, -0.5D, -0.5D, block.getBlockTextureFromSide(4));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, -1F);
renderblocks.renderSouthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(5));
renderblocks.renderSouthFace(block, -1.5D + d, -0.5D, -0.5D, block.getBlockTextureFromSide(5));
tessellator.draw();*/
renderInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0F, 0.0F, 1.0F, 0.1875F, 1.0F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.8125F, 0.0F, 1.0F, 1.0F, 1.0F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.1875F, 0.0F, 0.1875F, 0.8125F, 0.1875F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8175, 0.1875F, 0.0F, 1f, 0.8125F, 0.1875F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.1875F, 0.8175, 0.1875F, 0.8125F, 1f);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8175F, 0.1875F, 0.8175, 1f, 0.8125F, 1f);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
@Override
@ -83,35 +62,4 @@ public class GolemCoreRender implements ISimpleBlockRenderingHandler
{
return model;
}
public static void renderInvBlock (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

34
mods/tinker/tconstruct/client/block/OreberryRender.java
View File

@ -1,5 +1,6 @@
package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.client.TProxyClient;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
@ -46,7 +47,7 @@ public class OreberryRender implements ISimpleBlockRenderingHandler
if (modelID == model)
{
renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
}
@ -61,35 +62,4 @@ public class OreberryRender implements ISimpleBlockRenderingHandler
{
return model;
}
private void renderInvBlock (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

112
mods/tinker/tconstruct/client/block/SearedRender.java
View File

@ -3,16 +3,13 @@ package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.blocks.logic.FaucetLogic;
import mods.tinker.tconstruct.client.TProxyClient;
import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -29,105 +26,105 @@ public class SearedRender implements ISimpleBlockRenderingHandler
{
//Top
renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
//Lip
renderer.setRenderBounds(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
//Legs
renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
else if (metadata == 1)
{
renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.25, 0.25, 0.625, 0.375, 0.625, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.625, 0.25, 0.625, 0.75, 0.625, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1);
}
else if (metadata == 2)
{
renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
//Outside
renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
//Details
renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
//Legs
renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
else
{
renderer.setRenderBounds(0, 0, 0, 1, 1, 1);
renderInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
}
}
@ -398,35 +395,4 @@ public class SearedRender implements ISimpleBlockRenderingHandler
{
return searedModel;
}
private void renderInvBlock (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

34
mods/tinker/tconstruct/client/block/SmelteryRender.java
View File

@ -1,6 +1,7 @@
package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.blocks.logic.SmelteryLogic;
import mods.tinker.tconstruct.client.TProxyClient;
import mods.tinker.tconstruct.library.crafting.Smeltery;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
@ -26,7 +27,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
{
if (modelID == smelteryModel)
{
renderStandardInvBlock(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
}
@ -166,35 +167,4 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
{
return smelteryModel;
}
private void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

68
mods/tinker/tconstruct/client/block/TableRender.java
View File

@ -22,20 +22,20 @@ public class TableRender implements ISimpleBlockRenderingHandler
if (metadata == 5)
{
renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
}
else
{
renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F);
renderInvBlock(renderer, block, metadata);
renderStandardInvBlock(renderer, block, metadata);
}
}
}
@ -80,34 +80,34 @@ public class TableRender implements ISimpleBlockRenderingHandler
return tabelModelID;
}
public static void renderInvBlock (RenderBlocks renderblocks, Block block, int meta)
public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}

46
mods/tinker/tconstruct/client/block/TankRender.java
View File

@ -1,6 +1,7 @@
package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.blocks.logic.LavaTankLogic;
import mods.tinker.tconstruct.client.TProxyClient;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
@ -23,7 +24,7 @@ public class TankRender implements ISimpleBlockRenderingHandler
{
if (modelID == tankModelID)
{
renderDo(renderer, block, metadata);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
if (metadata == 0)
{
renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125);
@ -81,64 +82,33 @@ public class TankRender implements ISimpleBlockRenderingHandler
return tankModelID;
}
private void renderDo (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
private void renderDoRe (RenderBlocks renderblocks, Block block, int meta)
{
Tessellator tessellator = Tessellator.instance;
GL11.glTranslatef(-0.5F, 0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}

2
mods/tinker/tconstruct/client/entity/CrystalRender.java
View File

@ -86,7 +86,7 @@ public class CrystalRender extends RenderLiving
{
if (par1EntityCreeper.getPowered())
{
if (par1EntityCreeper.getHasActivePotion())
if (par1EntityCreeper.isInvisible())
{
GL11.glDepthMask(false);
}

4
mods/tinker/tconstruct/client/entity/GolemRender.java
View File

@ -307,7 +307,7 @@ public class GolemRender extends RenderLiving
public void renderBlock (Block block, World world, int x, int y, int z, int side)
{
float f = 0.5F;
/*float f = 0.5F;
float f1 = 1.0F;
float f2 = 0.8F;
float f3 = 0.6F;
@ -357,7 +357,7 @@ public class GolemRender extends RenderLiving
}
tessellator.setColorOpaque_F(f3 * f5, f3 * f5, f3 * f5);
renderBlocks.renderSouthFace(block, -0.5D, -0.5D, -0.5D, block.getIcon(5, side));
tessellator.draw();
tessellator.draw();*/
}
/*public void renderFace (GolemBase entitygenericgolem, Block block, World world, int i, int j, int k, int l)

4
mods/tinker/tconstruct/client/entity/SlimeRender.java
View File

@ -24,9 +24,9 @@ public class SlimeRender extends RenderLiving
/**
* Determines whether Slime Render should pass or not.
*/
protected int shouldSlimeRenderPass(BlueSlime par1EdibleSlime, int par2, float par3)
protected int shouldSlimeRenderPass(BlueSlime blueSlime, int par2, float par3)
{
if (par1EdibleSlime.getHasActivePotion())
if (blueSlime.isInvisible())
{
return 0;
}

4
mods/tinker/tconstruct/common/TContent.java
View File

@ -358,8 +358,8 @@ public class TContent implements IFuelHandler
//lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setUnlocalizedName("tconstruct.LumberHead");
//Wearables
//heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet");
//heartContainer = new HeartContainer(PHConstruct.heartContainer).setUnlocalizedName("tconstruct.canister");
heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet");
heartContainer = new HeartContainer(PHConstruct.heartContainer).setUnlocalizedName("tconstruct.canister");
//Vanilla stack sizes
Item.doorWood.setMaxStackSize(16);

13
mods/tinker/tconstruct/items/armor/TArmorBase.java
View File

@ -1,5 +1,9 @@
package mods.tinker.tconstruct.items.armor;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -7,7 +11,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
@ -20,6 +23,8 @@ public class TArmorBase extends ItemArmor
{
Icon[] icons;
String[] iconNames = { "wood_helmet" };
static Minecraft mc = Minecraft.getMinecraft();
private ModelBiped modelArmor;
public TArmorBase(int id, int armorSlot)
{
@ -29,6 +34,7 @@ public class TArmorBase extends ItemArmor
setNoRepair();
canRepair = false;
this.setCreativeTab(CreativeTabs.tabMisc);
this.modelArmor = new ModelBiped(0.75F);
//this.setCreativeTab(TConstructRegistry.toolTab);
}
@ -50,6 +56,8 @@ public class TArmorBase extends ItemArmor
* @param layer The render layer, either 1 or 2, 2 is only used for CLOTH armor by default
* @return Path of texture to bind, or null to use default
*/
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer)
{
return "/mods/tinker/textures/armor/wood_1.png";
@ -64,8 +72,9 @@ public class TArmorBase extends ItemArmor
*
* @return A ModelBiped to render instead of the default
*/
@Override
@SideOnly(Side.CLIENT)
public ModelBiped getArmorModel(EntityLiving entityLiving, ItemStack itemStack, int armorSlot)
public ModelBiped getArmorModel(EntityLiving par1EntityLiving, ItemStack itemStack, int armorSlot)
{
return null;
}

1
mods/tinker/tconstruct/items/tools/FryingPan.java
View File

@ -97,6 +97,7 @@ public class FryingPan extends Weapon
else
{
world.setBlock(x, y, z, TContent.heldItemBlock.blockID, 0, 3);
world.playSoundEffect(x, y, z, "mods.tinker.resources.sounds.frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F);
EquipLogic logic = (EquipLogic) world.getBlockTileEntity(x, y, z);
logic.setEquipmentItem(stack);

BIN
mods/tinker/textures/armor/enderpearl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
mods/tinker/textures/armor/wood_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB