mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 20:22:36 +00:00
more fixes
This commit is contained in:
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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user