run repo through formatter

This commit is contained in:
Progwml6 committed 2014-02-05 09:11:06 -05:00
1 parent 5585d680a3
commit ffaea7d4b7
140 files changed
+1050 -892

No files matched your search

@@ -49,12 +49,12 @@ public class TClientEvents
initSounds = true;
try
{
/* SoundManager soundmanager = event.manager;
soundmanager.addSound("tinker:frypan_hit.ogg");
soundmanager.addSound("tinker:little_saw.ogg");
soundmanager.addSound("tinker:launcher_clank.ogg");
TConstruct.logger.info("Successfully loaded sounds.");
*/
/* SoundManager soundmanager = event.manager;
soundmanager.addSound("tinker:frypan_hit.ogg");
soundmanager.addSound("tinker:little_saw.ogg");
soundmanager.addSound("tinker:launcher_clank.ogg");
TConstruct.logger.info("Successfully loaded sounds.");
*/
}
catch (Exception e)
{
@@ -243,7 +243,7 @@ public class TClientEvents
}
double zLevel = 0;
/*@SubscribeEvent
public void fovModifier(FOVUpdateEvent event)
{
@@ -947,11 +947,12 @@ public class TProxyClient extends TProxyCommon
{
//MinecraftForgeClient.registerItemRenderer(TRepo.armorPattern.itemID, new RenderArmorCast());
}
private static IIcon getIcon(IIcon icon)
private static IIcon getIcon (IIcon icon)
{
if (icon != null) return icon;
return ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
if (icon != null)
return icon;
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
}
}
@@ -154,5 +154,4 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler
return model;
}
}
@@ -63,7 +63,7 @@ public class BlockSkinRenderHelper
float f7;
int i1;
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
{
if (render.renderMinY <= 0.0D)
{
@@ -178,7 +178,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
{
if (render.renderMaxY >= 1.0D)
{
@@ -284,7 +284,7 @@ public class BlockSkinRenderHelper
IIcon icon;
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
{
if (render.renderMinZ <= 0.0D)
{
@@ -401,7 +401,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
{
if (render.renderMaxZ >= 1.0D)
{
@@ -518,7 +518,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
{
if (render.renderMinX <= 0.0D)
{
@@ -635,7 +635,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
{
if (render.renderMaxX >= 1.0D)
{
@@ -794,7 +794,7 @@ public class BlockSkinRenderHelper
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
tessellator.setColorOpaque_F(f10, f13, f16);
@@ -802,7 +802,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
tessellator.setColorOpaque_F(f7, f8, f9);
@@ -812,7 +812,7 @@ public class BlockSkinRenderHelper
IIcon icon;
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -821,7 +821,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -830,7 +830,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -839,7 +839,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -904,7 +904,7 @@ public class BlockSkinRenderHelper
float f7;
int i1;
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
{
if (render.renderMinY <= 0.0D)
{
@@ -1019,7 +1019,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
{
if (render.renderMaxY >= 1.0D)
{
@@ -1123,7 +1123,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
{
if (render.renderMinZ <= 0.0D)
{
@@ -1239,7 +1239,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
{
if (render.renderMaxZ >= 1.0D)
{
@@ -1355,7 +1355,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
{
if (render.renderMinX <= 0.0D)
{
@@ -1471,7 +1471,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
{
if (render.renderMaxX >= 1.0D)
{
@@ -1630,7 +1630,7 @@ public class BlockSkinRenderHelper
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
tessellator.setColorOpaque_F(f10, f13, f16);
@@ -1638,7 +1638,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
tessellator.setColorOpaque_F(f7, f8, f9);
@@ -1648,7 +1648,7 @@ public class BlockSkinRenderHelper
IIcon icon;
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -1657,7 +1657,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -1666,7 +1666,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -1675,7 +1675,7 @@ public class BlockSkinRenderHelper
flag = true;
}
if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -1686,7 +1686,9 @@ public class BlockSkinRenderHelper
return flag;
}
public static float getAmbientOcclusionLightValue(IBlockAccess access, int x, int y, int z){
public static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z)
{
return access.getBlock(x, y, z).getAmbientOcclusionLightValue();
}
}
@@ -84,6 +84,6 @@ public class DryingRackSpecialRender extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8)
{
this.render((DryingRackLogic) logic, var2, var4, var6, var8);
this.render((DryingRackLogic) logic, var2, var4, var6, var8);
}
}
@@ -59,7 +59,7 @@ public class RenderLiquid
flag1 = false;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
{
if (render.renderMinY <= 0.0D)
{
@@ -174,7 +174,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
{
if (render.renderMaxY >= 1.0D)
{
@@ -278,7 +278,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
{
if (render.renderMinZ <= 0.0D)
{
@@ -395,7 +395,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
{
if (render.renderMaxZ >= 1.0D)
{
@@ -512,7 +512,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
{
if (render.renderMinX <= 0.0D)
{
@@ -629,7 +629,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
{
if (render.renderMaxX >= 1.0D)
{
@@ -793,7 +793,7 @@ public class RenderLiquid
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
tessellator.setColorOpaque_F(f10, f13, f16);
@@ -801,7 +801,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
tessellator.setColorOpaque_F(f7, f8, f9);
@@ -809,7 +809,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -818,7 +818,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -827,7 +827,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -836,7 +836,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -893,7 +893,7 @@ public class RenderLiquid
flag1 = false;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
{
if (render.renderMinY <= 0.0D)
{
@@ -1008,7 +1008,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
{
if (render.renderMaxY >= 1.0D)
{
@@ -1023,10 +1023,10 @@ public class RenderLiquid
render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
if ((!flag4) && (!flag2))
{
@@ -1112,7 +1112,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
{
if (render.renderMinZ <= 0.0D)
{
@@ -1127,10 +1127,10 @@ public class RenderLiquid
render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass();
if ((!flag2) && (!flag4))
{
@@ -1228,7 +1228,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
{
if (render.renderMaxZ >= 1.0D)
{
@@ -1243,10 +1243,10 @@ public class RenderLiquid
render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass();
if ((!flag2) && (!flag4))
{
@@ -1344,7 +1344,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
{
if (render.renderMinX <= 0.0D)
{
@@ -1359,10 +1359,10 @@ public class RenderLiquid
render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
if ((!flag5) && (!flag2))
{
@@ -1460,7 +1460,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
{
if (render.renderMaxX >= 1.0D)
{
@@ -1476,9 +1476,9 @@ public class RenderLiquid
render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass();
boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass();
boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass();
if ((!flag2) && (!flag4))
{
@@ -1618,7 +1618,7 @@ public class RenderLiquid
int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
{
tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
tessellator.setColorOpaque_F(f10, f13, f16);
@@ -1626,7 +1626,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
{
tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
tessellator.setColorOpaque_F(f7, f8, f9);
@@ -1634,7 +1634,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
{
tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -1643,7 +1643,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
{
tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
tessellator.setColorOpaque_F(f11, f14, f17);
@@ -1652,7 +1652,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
{
tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -1661,7 +1661,7 @@ public class RenderLiquid
flag = true;
}
if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
{
tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
tessellator.setColorOpaque_F(f12, f15, f18);
@@ -250,21 +250,21 @@ public class SearedRender implements ISimpleBlockRenderingHandler
}
float yMin = 0F;
Block uBlock= world.getBlock(x, y - 1, z);
Block uBlock = world.getBlock(x, y - 1, z);
int uMeta = world.getBlockMetadata(x, y - 1, z);
if (uBlock== TRepo.searedBlock && uMeta == 0)
if (uBlock == TRepo.searedBlock && uMeta == 0)
{
yMin = -0.125F;
}
else if (uBlock== TRepo.searedBlock && uMeta == 2)
else if (uBlock == TRepo.searedBlock && uMeta == 2)
{
yMin = -0.75F;
}
else if (uBlock== TRepo.lavaTank)
else if (uBlock == TRepo.lavaTank)
{
yMin = -1F;
}
else if (uBlock== TRepo.castingChannel)
else if (uBlock == TRepo.castingChannel)
{
yMin = -0.5F;
}
@@ -20,7 +20,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
public static int smelteryModel = RenderingRegistry.getNextAvailableRenderId();
@Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
{
if (modelID == smelteryModel)
{
@@ -146,9 +146,9 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
//TODO is this needed???
//if (blockToRender.itemID < 4096) //Block
// {
Block liquidBlock = BlockUtils.getBlockFromItemStack(blockToRender);
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
// {
Block liquidBlock = BlockUtils.getBlockFromItemStack(blockToRender);
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
//}
/*else //No items, only blocks
@@ -74,7 +74,7 @@ public class FancyItemRender extends Render
block = BlockUtils.getBlockFromItem(itemstack.getItem());
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c,1))
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1))
{
;
}
@@ -71,7 +71,7 @@ public class ArrowRender extends Render
int i;
Block block = null;
block = BlockUtils.getBlockFromItem(itemstack.getItem());
block = BlockUtils.getBlockFromItem(itemstack.getItem());
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
{
@@ -141,7 +141,7 @@ public class ArrowRender extends Render
if (this.renderWithColor)
{
int l =itemstack.getItem().getColorFromItemStack(itemstack, 0);
int l = itemstack.getItem().getColorFromItemStack(itemstack, 0);
f8 = (float) (l >> 16 & 255) / 255.0F;
float f9 = (float) (l >> 8 & 255) / 255.0F;
f5 = (float) (l & 255) / 255.0F;
@@ -54,7 +54,7 @@ public class DaggerRenderCustom extends Render
GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f);
float scale = 1.35f;
GL11.glScalef(scale, scale, scale);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c,1);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c, 1);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPopMatrix();
}
@@ -289,7 +289,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1")));
list.add("\u00A7f" + (StatCollector.translateToLocal("gui.smeltery1")));
list.add("mB: " + liquid.amount);
}
else
@@ -143,7 +143,6 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
}
/*protected void keyTyped(char par1, int par2)
{
if (par2 == TControls.armorKey.keyCode)
@@ -217,8 +217,8 @@ public class CraftingStationGui extends GuiContainer
offset++;
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset
* 10, 0xffffff);
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10,
0xffffff);
offset++;
offset++;
}
@@ -245,7 +245,7 @@ public abstract class NewContainerGui extends GuiScreen
{
if (k == 0)
{
list.set(k, par1ItemStack.getRarity().rarityColor + (String)list.get(k));
list.set(k, par1ItemStack.getRarity().rarityColor + (String) list.get(k));
}
else
{
@@ -34,7 +34,7 @@ public class PartCrafterGui extends NewContainerGui
logic = partlogic;
drawChestPart = container instanceof PartCrafterChestContainer;
title = "\u00A7n"+(StatCollector.translateToLocal("gui.partcrafter1"));
title = "\u00A7n" + (StatCollector.translateToLocal("gui.partcrafter1"));
}
protected void drawGuiContainerForegroundLayer (int par1, int par2)
@@ -266,7 +266,7 @@ public class SmelteryGui extends NewContainerGui
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7f"+StatCollector.translateToLocal("gui.smeltery1"));
list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery1"));
list.add("mB: " + liquid.amount);
}
else
@@ -441,7 +441,7 @@ public class SmelteryGui extends NewContainerGui
int sizeY = liquidSize;
if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY)
{
//TODO Update fluid stuff
//TODO Update fluid stuff
fluidToBeBroughtUp = liquid.fluidID;
/*Packet250CustomPayload packet = new Packet250CustomPayload();
@@ -472,7 +472,7 @@ public class SmelteryGui extends NewContainerGui
packet.length = bos.size();
PacketDispatcher.sendPacketToServer(packet);*/
TConstruct.packetPipeline.sendToServer(new PacketSmeltery(logic.getWorld().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp));
}
}
@@ -137,7 +137,7 @@ public class StencilTableGui extends GuiContainer
packet.length = bos.size();
PacketDispatcher.sendPacketToServer(packet);*/
TConstruct.packetPipeline.sendToServer(new PacketStencilTable(logic.xCoord, logic.yCoord, logic.zCoord, stack));
}
}
@@ -85,7 +85,7 @@ public class ToolForgeGui extends ToolStationGui
setSlotType(0);
iconX = new int[] { 0, 1, 2, 13 };
iconY = new int[] { 13, 13, 13, 13 };
title = "\u00A7n"+StatCollector.translateToLocal("gui.toolforge1");
title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1");
body = StatCollector.translateToLocal("gui.toolforge2");
}
@@ -296,8 +296,8 @@ public class ToolStationGui extends NewContainerGui
offset++;
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
fontRendererObj
.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff);
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10,
0xffffff);
offset++;
offset++;
}
@@ -492,7 +492,7 @@ public class ToolStationGui extends NewContainerGui
packet.length = bos.size();
PacketDispatcher.sendPacketToServer(packet);*/
TConstruct.packetPipeline.sendToServer(new PacketToolStation(logic.xCoord, logic.yCoord, logic.zCoord, name));
}
@@ -59,7 +59,7 @@ public class BlockCastPage extends BookPage
String ingr = new String("Ingredients");
if (isTranslatable)
ingr = StatCollector.translateToLocal(ingr);
manual.fonts.drawString( ingr + ":", localWidth + 120, localHeight + 32, 0);
manual.fonts.drawString(ingr + ":", localWidth + 120, localHeight + 32, 0);
manual.fonts.drawString("- " + icons[1].getDisplayName(), localWidth + 120, localHeight + 42, 0);
if (icons[2] != null)
manual.fonts.drawString("- " + icons[2].getDisplayName(), localWidth + 120, localHeight + 50, 0);
@@ -140,7 +140,7 @@ public class MaterialPage extends BookPage
manual.fonts.drawString(durability + ": " + material.durability(), localWidth, localHeight + 40, 0);
manual.fonts.drawString(handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0);
manual.fonts.drawString(fullToolDurability+ ": " + (int) (material.durability() * material.handleDurability()), localWidth, localHeight + 60, 0);
manual.fonts.drawString(fullToolDurability + ": " + (int) (material.durability() * material.handleDurability()), localWidth, localHeight + 60, 0);
manual.fonts.drawString(miningSpeed + ": " + material.toolSpeed() / 100f, localWidth, localHeight + 80, 0);
manual.fonts.drawString(miningLevel + ": " + material.harvestLevel() + " (" + PartCrafterGui.getHarvestLevelName(material.harvestLevel()) + ")", localWidth, localHeight + 90, 0);