Skip to content

Commit

Permalink
Make Stained Clear Glass Panes use the code of vanilla glass panes. A…
Browse files Browse the repository at this point in the history 
…lso uses the vanilla stained glass pane renderer now.
  • Loading branch information
@bonii-xx
bonii-xx committed Aug 21, 2014
1 parent 8a8beaf commit de44385
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 460 deletions.
141 changes: 19 additions & 122 deletions src/main/java/tconstruct/smeltery/blocks/PaneBase.java
View file
Expand Up @@ -4,6 +4,7 @@

import net.minecraft.block.Block;
import net.minecraft.block.BlockPane;
import net.minecraft.block.BlockStainedGlassPane;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
Expand All @@ -20,7 +21,7 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class PaneBase extends Block
public class PaneBase extends BlockStainedGlassPane
{
public String[] textureNames;
public String folder;
Expand All @@ -29,27 +30,11 @@ public class PaneBase extends Block

public PaneBase(Material material, String folder, String[] blockTextures)
{
super(material);
super();
textureNames = blockTextures;
this.folder = folder;
}

public final boolean canPaneConnectToBlock (Block p_150098_1_)
{
return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane
|| p_150098_1_ instanceof BlockPane;
}

public boolean canConnectTo (IBlockAccess world, int x, int y, int z, ForgeDirection dir)
{
return canPaneConnectToBlock(world.getBlock(x, y, z)) || world.isSideSolid(x, y, z, dir.getOpposite(), false);
}

public IIcon getSideTextureIndex (int meta)
{
return sideIcons[meta];
}

@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons (IIconRegister iconRegister)
Expand All @@ -66,12 +51,25 @@ public void registerBlockIcons (IIconRegister iconRegister)

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta)
public IIcon func_149735_b(int p_149735_1_, int p_149735_2_)
{
return icons[p_149735_2_];
}

@Override
@SideOnly(Side.CLIENT)
public IIcon func_150104_b(int p_150104_1_)
{
return icons[meta];
return sideIcons[p_150104_1_];
}

@Override
public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
return icons[p_149691_2_];
}

@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < textureNames.length; iter++)
Expand All @@ -93,108 +91,7 @@ public boolean renderAsNormalBlock ()
}

@Override
public int getRenderType ()
{
public int getRenderType() {
return PaneRender.model;
}

@Override
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
{
Block b = iblockaccess.getBlock(i, j, k);
if (b instanceof PaneBase || b instanceof BlockPane)
{
return false;
}
else
{
return super.shouldSideBeRendered(iblockaccess, i, j, k, l);
}
}

@Override
public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity)
{
boolean south = canConnectTo(world, x, y, z - 1, ForgeDirection.NORTH);
boolean north = canConnectTo(world, x, y, z + 1, ForgeDirection.SOUTH);
boolean east = canConnectTo(world, x - 1, y, z, ForgeDirection.EAST);
boolean west = canConnectTo(world, x + 1, y, z, ForgeDirection.WEST);
if (east && west || !east && !west && !south && !north)
{
setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
else if (east && !west)
{
setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
else if (!east && west)
{
setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
if (south && north || !east && !west && !south && !north)
{
setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
else if (south && !north)
{
setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
else if (!south && north)
{
setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
}
}

@Override
public void setBlockBoundsForItemRender ()
{
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}

@Override
public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int i, int j, int k)
{
float f = 0.4375F;
float f1 = 0.5625F;
float f2 = 0.4375F;
float f3 = 0.5625F;
boolean flag = canConnectTo(iblockaccess, i, j, k - 1, ForgeDirection.NORTH);
boolean flag1 = canConnectTo(iblockaccess, i, j, k + 1, ForgeDirection.SOUTH);
boolean flag2 = canConnectTo(iblockaccess, i - 1, j, k, ForgeDirection.EAST);
boolean flag3 = canConnectTo(iblockaccess, i + 1, j, k, ForgeDirection.WEST);
if (flag2 && flag3 || !flag2 && !flag3 && !flag && !flag1)
{
f = 0.0F;
f1 = 1.0F;
}
else if (flag2 && !flag3)
{
f = 0.0F;
}
else if (!flag2 && flag3)
{
f1 = 1.0F;
}
if (flag && flag1 || !flag2 && !flag3 && !flag && !flag1)
{
f2 = 0.0F;
f3 = 1.0F;
}
else if (flag && !flag1)
{
f2 = 0.0F;
}
else if (!flag && flag1)
{
f3 = 1.0F;
}
setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3);
}

}

0 comments on commit de44385

Please sign in to comment.