Skip to content

Commit

Permalink
yaay fluids
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Jan 30, 2014
1 parent 4555947 commit 2a932bc
Show file tree
Hide file tree
Showing 29 changed files with 115 additions and 113 deletions.
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/BloodBlock.java
View file
Expand Up @@ -11,9 +11,9 @@
public class BloodBlock extends TConstructFluid
{

public BloodBlock(int id, Fluid fluid, Material material, String texture)
public BloodBlock(Fluid fluid, Material material, String texture)
{
super(id, fluid, material, texture);
super(fluid, material, texture);
}

public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/tconstruct/blocks/CastingChannelBlock.java
View file
Expand Up @@ -26,12 +26,12 @@ public CastingChannelBlock()
super(Material.field_151576_e);
this.func_149711_c(1F);
this.func_149752_b(10);
this.setStepSound(field_149769_e);
this.field_149762_H = field_149769_e;
func_149647_a(TConstructRegistry.blockTab);
}

@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
if (!world.isRemote)
{
Expand Down Expand Up @@ -82,13 +82,13 @@ public boolean func_149686_d ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}

@Override
public int getRenderType ()
public int func_149645_b ()
{
return BlockRenderCastingChannel.renderID;
}
Expand All @@ -100,7 +100,7 @@ public void func_149651_a (IIconRegister iconRegister)
}

@Override
public TileEntity createNewTileEntity (World var1)
public TileEntity func_149915_a (World var1, int var2)
{
return new CastingChannelLogic();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/CraftingSlab.java
View file
Expand Up @@ -33,7 +33,7 @@ public CraftingSlab(Material material)
super(material);
this.func_149647_a(TConstructRegistry.blockTab);
this.func_149711_c(2f);
this.setStepSound(Block.field_149766_f);
this.field_149762_H = Block.field_149766_f;
}

/* Rendering */
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/CraftingStationBlock.java
View file
Expand Up @@ -25,7 +25,7 @@ public CraftingStationBlock(Material material)
super(material);
this.func_149647_a(TConstructRegistry.blockTab);
this.func_149711_c(2f);
this.setStepSound(Block.field_149766_f);
this.field_149762_H = Block.field_149766_f;
}

//Block.hasComparatorInputOverride and Block.getComparatorInputOverride
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/DryingRack.java
View file
Expand Up @@ -30,7 +30,7 @@ public DryingRack()
super(Material.field_151575_d);
this.func_149647_a(TConstructRegistry.blockTab);
func_149711_c(2.0f);
setStepSound(field_149777_j);
field_149762_H = field_149777_j;
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/tconstruct/blocks/GlassBlockConnected.java
View file
Expand Up @@ -39,7 +39,7 @@ public IIcon[] getIcons ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
Expand All @@ -51,7 +51,7 @@ public boolean func_149686_d ()
}

@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return renderPass;
}
Expand Down Expand Up @@ -592,17 +592,17 @@ public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3
}

@Override
public IIcon getIcon (int par1, int par2)
public IIcon func_149691_a (int par1, int par2)
{
return icons[0];
}

@Override
public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2, int par3, int par4)
public AxisAlignedBB func_149633_g (World par1World, int par2, int par3, int par4)
{
if (shouldRenderSelectionBox)
{
return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4);
return super.func_149633_g(par1World, par2, par3, par4);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java
View file
Expand Up @@ -56,7 +56,7 @@ public IIcon getIcon (int par1, int par2)
}

@Override
public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List)
public void func_149666_a (Item b, CreativeTabs par2CreativeTabs, List par3List)
{
for (int i = 0; i < textures.length; i++)
{
Expand Down Expand Up @@ -89,7 +89,7 @@ public void func_149651_a (IIconRegister par1IconRegister)
}

@Override
public int damageDropped (int par1)
public int func_149692_a (int par1)
{
return par1;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/GlassBlockStained.java
View file
Expand Up @@ -20,7 +20,7 @@ public GlassBlockStained(String tex)
}

@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}
Expand All @@ -33,7 +33,7 @@ public boolean isOpaqueCube ()
@SideOnly(Side.CLIENT)
public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side)
{
Block block = world.getBlock(x, y, z);
Block block = world.func_147439_a(x, y, z);
return block == this ? false : super. func_149646_a(world, x, y, z, side);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/GlassPane.java
View file
Expand Up @@ -11,7 +11,7 @@ public GlassPane()
{
super(Material.field_151592_s, "glass/", blockTextures);
this.func_149711_c(0.3F);
this.setStepSound(field_149778_k);
this.field_149762_H = field_149778_k;
this.func_149663_c("tconstruct.glasspane");
this.func_149647_a(TConstructRegistry.blockTab);
}
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/tconstruct/blocks/GlassPaneConnected.java
View file
Expand Up @@ -26,7 +26,7 @@ public GlassPaneConnected(String location, boolean hasAlpha)
}

@Override
public int getRenderType ()
public int func_149645_b ()
{
return PaneConnectedRender.model;
// return 0;
Expand Down Expand Up @@ -561,7 +561,7 @@ else if (isOpenRight)
}

@Override
public void addCollisionBoxesToList (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity)
public void func_149743_a (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity)
{
boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH);
boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH);
Expand All @@ -573,42 +573,42 @@ public void addCollisionBoxesToList (World par1World, int par2, int par3, int pa
if (flag2 && !flag3)
{
this.func_149676_a(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}
else if (!flag2 && flag3)
{
this.func_149676_a(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}
}
else
{
this.func_149676_a(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}

if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1))
{
if (flag && !flag1)
{
this.func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}
else if (!flag && flag1)
{
this.func_149676_a(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}
}
else
{
this.func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F);
super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
}
}

@Override
public void setBlockBoundsForItemRender ()
public void func_149683_g ()
{
this.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/GlassPaneStained.java
View file
Expand Up @@ -12,7 +12,7 @@ public GlassPaneStained()
super(Material.field_151592_s, "glass/", assembleBlockTextures());
//TODO setHardness
this.func_149711_c(0.3F);
this.setStepSound(field_149778_k);
this.field_149762_H = field_149778_k;
this.func_149663_c("tconstruct.glasspanestained");
this.func_149647_a(TConstructRegistry.blockTab);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/tconstruct/blocks/GlueFluid.java
View file
Expand Up @@ -18,9 +18,9 @@ public class GlueFluid extends BlockFluidFinite {
IIcon stillIcon;
IIcon flowIcon;

public GlueFluid(int id, Fluid fluid, Material material)
public GlueFluid(Fluid fluid, Material material)
{
super(id, fluid, material);
super(fluid, material);
}

@Override
Expand All @@ -33,15 +33,15 @@ public void func_149651_a (IIconRegister iconRegister)

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
if (side == 0 || side == 1)
return stillIcon;
return flowIcon;
}

@Override
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
public void func_149670_a(World world, int x, int y, int z, Entity entity) {
entity.motionX *= 0.1;
entity.motionZ *= 0.1;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/GravelOre.java
View file
Expand Up @@ -22,7 +22,7 @@ public GravelOre()
{
super();
this.func_149647_a(TConstructRegistry.blockTab);
this.setStepSound(field_149767_g);
this.field_149762_H = field_149767_g;
this.field_149764_J = Material.field_151596_z;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/LavaTankBlock.java
View file
Expand Up @@ -39,7 +39,7 @@ public LavaTankBlock()
func_149752_b(20F);
func_149647_a(TConstructRegistry.blockTab);
func_149663_c("TConstruct.LavaTank");
setStepSound(Block.field_149778_k);
field_149762_H = Block.field_149778_k;
}

public LavaTankBlock(String prefix)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/LiquidMetalFinite.java
View file
Expand Up @@ -21,9 +21,9 @@ public class LiquidMetalFinite extends BlockFluidFinite
public IIcon stillIcon;
public IIcon flowIcon;

public LiquidMetalFinite(int id, Fluid fluid, String texture)
public LiquidMetalFinite(Fluid fluid, String texture)
{
super(id, fluid, TRepo.liquidMetal);
super(fluid, TRepo.liquidMetal);
this.texture = texture;
this.func_149647_a(TConstructRegistry.blockTab);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/tconstruct/blocks/TConstructFluid.java
View file
Expand Up @@ -14,17 +14,17 @@ public class TConstructFluid extends BlockFluidClassic
public IIcon stillIcon;
public IIcon flowIcon;

public TConstructFluid(int id, Fluid fluid, Material material, String texture)
public TConstructFluid(Fluid fluid, Material material, String texture)
{
super(id, fluid, material);
super(fluid, material);
this.texture = texture;
//TODO setCreativeTab()
this.func_149647_a(TConstructRegistry.blockTab);
}

public TConstructFluid(int id, Fluid fluid, Material material, String texture, boolean alpha)
public TConstructFluid(Fluid fluid, Material material, String texture, boolean alpha)
{
this(id, fluid, material, texture);
this(fluid, material, texture);
this.alpha = alpha;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
View file
Expand Up @@ -127,9 +127,9 @@ public List<LogicComponent> getComponents ()
/* Structure */

@Override
public void setfield_145850_b (World world)
public void func_145834_a (World world)
{
super.setfield_145850_b(world);
super.func_145834_a(world);
structure.setWorld(world);
smeltery.setWorld(world);
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/blocks/slime/SlimeFluid.java
View file
Expand Up @@ -20,9 +20,9 @@ public class SlimeFluid extends BlockFluidClassic
IIcon stillIcon;
IIcon flowIcon;

public SlimeFluid(int id, Fluid fluid, Material material)
public SlimeFluid(Fluid fluid, Material material)
{
super(id, fluid, material);
super(fluid, material);
}

@Override
Expand All @@ -35,7 +35,7 @@ public void func_149651_a (IIconRegister iconRegister)

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
if (side == 0 || side == 1)
return stillIcon;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/slime/SlimeSapling.java
View file
Expand Up @@ -32,7 +32,7 @@ public SlimeSapling()
float f = 0.4F;
func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f);
this.func_149711_c(0.0F);
this.setStepSound(Block.field_149779_h);
this.field_149762_H = Block.field_149779_h;
this.func_149647_a(TConstructRegistry.blockTab);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/traps/Punji.java
View file
Expand Up @@ -28,7 +28,7 @@ public Punji()
{
super(Material.field_151585_k);
this.func_149676_a(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f);
this.setStepSound(Block.field_149779_h);
this.field_149762_H = Block.field_149779_h;
this.func_149647_a(TConstructRegistry.blockTab);
this.func_149711_c(3.0f);
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java
View file
Expand Up @@ -16,7 +16,7 @@
public class CastingBasinSpecialRender extends TileEntitySpecialRenderer
{
@Override
public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8)
public void func_147500_a (TileEntity logic, double var2, double var4, double var6, float var8)
{
this.render((CastingBasinLogic) logic, var2, var4, var6, var8);
}
Expand Down Expand Up @@ -63,9 +63,10 @@ else if (!(stack.getItem() instanceof ItemBlocklike))
}

RenderItem.renderInFrame = true;
RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
RenderManager.instance.func_147940_a(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
RenderItem.renderInFrame = false;

GL11.glPopMatrix();
}

}

0 comments on commit 2a932bc

Please sign in to comment.