more fixes

This commit is contained in:
Progwml6 committed 2014-01-01 09:30:55 -05:00
1 parent 0ee7ac1718
commit 2cb0bb34fb
5 files changed
+21 -23

No files matched your search

@@ -1,5 +1,6 @@
package tconstruct.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
@@ -32,8 +33,8 @@ public class GlassBlockStained extends TConstructBlock
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
{
int blockID = world.getBlockId(x, y, z);
return blockID == this.blockID ? false : super.shouldSideBeRendered(world, x, y, z, side);
Block block = world.getBlock(x, y, z);
return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side);
}
@Override
@@ -5,10 +5,10 @@ import tconstruct.util.config.PHConstruct;
import java.util.List;
import tconstruct.client.block.PaneConnectedRender;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
@@ -669,7 +669,7 @@ public class GlassPaneConnected extends GlassBlockConnected
public final boolean canThisPaneConnectToThisBlockID (int par1)
{
return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Block.glass.blockID;
return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Blocks.glass.blockID;
}
public void registerIcons (IIconRegister par1IconRegister)
@@ -680,7 +680,7 @@ public class GlassPaneConnected extends GlassBlockConnected
public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir)
{
return canThisPaneConnectToThisBlockID(access.getBlockId(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ))
return canThisPaneConnectToThisBlockID(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ))
|| access.isBlockSolidOnSide(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false);
}
@@ -7,11 +7,11 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.Ifield_147845_a;
import net.minecraft.world.IBlockAccess;
public class BlockSkinRenderHelper
{
public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, Ifield_147845_a world)
public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
{
int var5 = block.colorMultiplier(world, x, y, z);
float var6 = (float) (var5 >> 16 & 255) / 255.0F;
@@ -33,7 +33,7 @@ public class BlockSkinRenderHelper
}
static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
render.enableAO = true;
boolean flag = false;
@@ -756,7 +756,7 @@ public class BlockSkinRenderHelper
}
static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
render.enableAO = false;
Tessellator tessellator = Tessellator.instance;
@@ -850,7 +850,7 @@ public class BlockSkinRenderHelper
return flag;
}
public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, Ifield_147845_a world)
public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
{
Block block = Blocks.stone;
int var5 = block.colorMultiplier(world, x, y, z);
@@ -873,7 +873,7 @@ public class BlockSkinRenderHelper
}
static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
Block block = Blocks.stone;
render.enableAO = true;
@@ -1591,7 +1591,7 @@ public class BlockSkinRenderHelper
}
static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
Block block = Blocks.stone;
render.enableAO = false;
@@ -7,7 +7,7 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.Ifield_147845_a;
import net.minecraft.world.IBlockAccess;
/**
* @author BluSunrize
@@ -15,7 +15,7 @@ import net.minecraft.world.Ifield_147845_a;
public class RenderLiquid
{
public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, Ifield_147845_a world)
public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
{
int var5 = block.colorMultiplier(world, x, y, z);
float var6 = (var5 >> 16 & 0xFF) / 255.0F;
@@ -37,7 +37,7 @@ public class RenderLiquid
}
static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
render.enableAO = true;
boolean flag = false;
@@ -751,7 +751,7 @@ public class RenderLiquid
}
static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render,
Ifield_147845_a world)
IBlockAccess world)
{
render.enableAO = false;
Tessellator tessellator = Tessellator.instance;
@@ -843,7 +843,7 @@ public class RenderLiquid
return flag;
}
public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, Ifield_147845_a world)
public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
{
Block block = Blocks.stone;
int var5 = block.colorMultiplier(world, x, y, z);
@@ -865,7 +865,7 @@ public class RenderLiquid
var6, var7, var8, renderer, world);
}
static boolean renderFakeBlockWithAmbientOcclusion (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, Ifield_147845_a world)
static boolean renderFakeBlockWithAmbientOcclusion (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
{
Block block = Blocks.stone;
render.enableAO = true;
@@ -1575,7 +1575,7 @@ public class RenderLiquid
return flag;
}
static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, Ifield_147845_a world)
static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
{
Block block = Blocks.stone;
render.enableAO = false;
@@ -529,10 +529,7 @@ public class TConstructRegistry
drawbridgeState[Blocks.waterStill] = 1;
interchangableBlockMapping[Blocks.waterStill] = Block.waterMoving;
interchangableBlockMapping[Blocks.waterMoving] = Block.waterStill;
drawbridgeState[Blocks.lavaMoving] = 1;
drawbridgeState[Blocks.lavaStill] = 1;
interchangableBlockMapping[Blocks.lavaStill] = Block.lavaMoving;
interchangableBlockMapping[Blocks.lavaMoving] = Block.lavaStill;
drawbridgeState[Blocks.lava] = 1;
drawbridgeState[Blocks.sand] = 1;
drawbridgeState[Blocks.gravel] = 1;
drawbridgeState[Blocks.gold_ore] = 1;