diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/client')
11 files changed, 739 insertions, 588 deletions
diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java index 15574f66ed..ce4d9a0320 100644 --- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java +++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java @@ -14,7 +14,9 @@ public class CustomTextureSet extends TextureSet { private final CustomTextureSet A; private TextureSets() { - A = new CustomTextureSet(this.name().toUpperCase()); + A = new CustomTextureSet( + this.name() + .toUpperCase()); } public CustomTextureSet get() { diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index f5c255e420..3b5922444d 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -36,7 +36,7 @@ public class ModelSickBlaze extends ModelBlaze { */ @Override public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, - float p_78088_6_, float p_78088_7_) { + float p_78088_6_, float p_78088_7_) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.blazeHead.render(p_78088_7_); @@ -52,7 +52,7 @@ public class ModelSickBlaze extends ModelBlaze { */ @Override public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, - float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { + float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { float f6 = p_78087_3_ * (float) Math.PI * -0.1F; int i; diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java index d93bca90c6..457bc7a377 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java @@ -25,24 +25,32 @@ public class ModelStaballoyConstruct extends ModelIronGolem { short short2 = 128; this.ironGolemHead = (new ModelRenderer(this)).setTextureSize(short1, short2); this.ironGolemHead.setRotationPoint(0.0F, 0.0F + p_i1162_2_, -2.0F); - this.ironGolemHead.setTextureOffset(0, 0).addBox(-4.0F, -12.0F, -5.5F, 8, 10, 8, p_i1162_1_); - this.ironGolemHead.setTextureOffset(24, 0).addBox(-1.0F, -5.0F, -7.5F, 2, 4, 2, p_i1162_1_); + this.ironGolemHead.setTextureOffset(0, 0) + .addBox(-4.0F, -12.0F, -5.5F, 8, 10, 8, p_i1162_1_); + this.ironGolemHead.setTextureOffset(24, 0) + .addBox(-1.0F, -5.0F, -7.5F, 2, 4, 2, p_i1162_1_); this.ironGolemBody = (new ModelRenderer(this)).setTextureSize(short1, short2); this.ironGolemBody.setRotationPoint(0.0F, 0.0F + p_i1162_2_, 0.0F); - this.ironGolemBody.setTextureOffset(0, 40).addBox(-9.0F, -2.0F, -6.0F, 18, 12, 11, p_i1162_1_); - this.ironGolemBody.setTextureOffset(0, 70).addBox(-4.5F, 10.0F, -3.0F, 9, 5, 6, p_i1162_1_ + 0.5F); + this.ironGolemBody.setTextureOffset(0, 40) + .addBox(-9.0F, -2.0F, -6.0F, 18, 12, 11, p_i1162_1_); + this.ironGolemBody.setTextureOffset(0, 70) + .addBox(-4.5F, 10.0F, -3.0F, 9, 5, 6, p_i1162_1_ + 0.5F); this.ironGolemRightArm = (new ModelRenderer(this)).setTextureSize(short1, short2); this.ironGolemRightArm.setRotationPoint(0.0F, -7.0F, 0.0F); - this.ironGolemRightArm.setTextureOffset(60, 21).addBox(-13.0F, -2.5F, -3.0F, 4, 30, 6, p_i1162_1_); + this.ironGolemRightArm.setTextureOffset(60, 21) + .addBox(-13.0F, -2.5F, -3.0F, 4, 30, 6, p_i1162_1_); this.ironGolemLeftArm = (new ModelRenderer(this)).setTextureSize(short1, short2); this.ironGolemLeftArm.setRotationPoint(0.0F, -7.0F, 0.0F); - this.ironGolemLeftArm.setTextureOffset(60, 58).addBox(9.0F, -2.5F, -3.0F, 4, 30, 6, p_i1162_1_); + this.ironGolemLeftArm.setTextureOffset(60, 58) + .addBox(9.0F, -2.5F, -3.0F, 4, 30, 6, p_i1162_1_); this.ironGolemLeftLeg = (new ModelRenderer(this, 0, 22)).setTextureSize(short1, short2); this.ironGolemLeftLeg.setRotationPoint(-4.0F, 18.0F + p_i1162_2_, 0.0F); - this.ironGolemLeftLeg.setTextureOffset(37, 0).addBox(-3.5F, -3.0F, -3.0F, 6, 16, 5, p_i1162_1_); + this.ironGolemLeftLeg.setTextureOffset(37, 0) + .addBox(-3.5F, -3.0F, -3.0F, 6, 16, 5, p_i1162_1_); this.ironGolemRightLeg = (new ModelRenderer(this, 0, 22)).setTextureSize(short1, short2); this.ironGolemRightLeg.mirror = true; - this.ironGolemRightLeg.setTextureOffset(60, 0).setRotationPoint(5.0F, 18.0F + p_i1162_2_, 0.0F); + this.ironGolemRightLeg.setTextureOffset(60, 0) + .setRotationPoint(5.0F, 18.0F + p_i1162_2_, 0.0F); this.ironGolemRightLeg.addBox(-3.5F, -3.0F, -3.0F, 6, 16, 5, p_i1162_1_); } @@ -51,7 +59,7 @@ public class ModelStaballoyConstruct extends ModelIronGolem { */ @Override public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, - float p_78088_6_, float p_78088_7_) { + float p_78088_6_, float p_78088_7_) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.ironGolemHead.render(p_78088_7_); this.ironGolemBody.render(p_78088_7_); @@ -68,7 +76,7 @@ public class ModelStaballoyConstruct extends ModelIronGolem { */ @Override public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, - float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { + float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI); this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI); this.ironGolemLeftLeg.rotateAngleX = -1.5F * this.func_78172_a(p_78087_1_, 13.0F) * p_78087_2_; @@ -97,7 +105,7 @@ public class ModelStaballoyConstruct extends ModelIronGolem { this.ironGolemLeftArm.rotateAngleX = 0.0F; } else { this.ironGolemRightArm.rotateAngleX = (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) - * p_78086_3_; + * p_78086_3_; this.ironGolemLeftArm.rotateAngleX = (-0.2F - 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_; } } diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java index 88244473e4..f83844f3e3 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java @@ -43,13 +43,13 @@ public class CustomItemBlockRenderer implements IItemRenderer { } public static void renderItemAsBlock(RenderBlocks renderer, ItemStack item, double translateX, double translateY, - double translateZ) { + double translateZ) { renderTextureAsBlock(renderer, item.getIconIndex(), translateX, translateY, translateZ); } public static void renderTextureAsBlock(RenderBlocks renderer, IIcon texture, double translateX, double translateY, - double translateZ) { + double translateZ) { Tessellator tessellator = Tessellator.instance; Block block = Blocks.stone; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index 03295d0cb1..689f075703 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -30,28 +30,28 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer) { + RenderBlocks aRenderer) { Block tTileEntity = aBlock; if ((tTileEntity instanceof ITexturedBlock)) { return renderStandardBlock( - aWorld, - aX, - aY, - aZ, - aBlock, - aRenderer, - new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.DOWN), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.UP), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.NORTH), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.SOUTH), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.WEST), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.EAST) }); + aWorld, + aX, + aY, + aZ, + aBlock, + aRenderer, + new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.DOWN), + ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.UP), + ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.NORTH), + ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.SOUTH), + ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.WEST), + ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.EAST) }); } return false; } public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer, ITexture[][] aTextures) { + RenderBlocks aRenderer, ITexture[][] aTextures) { aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); aRenderer.setRenderBoundsFromBlock(aBlock); int l = aBlock.colorMultiplier(aWorld, aX, aY, aZ); @@ -62,28 +62,28 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { if (Minecraft.isAmbientOcclusionEnabled() && aBlock.getLightValue() == 0) { if (RenderBlocks.getInstance().partialRenderBounds) { return INSTANCE.renderStandardBlockWithAmbientOcclusionPartial( - aWorld, - aRenderer, - aTextures, - aBlock, - aX, - aY, - aZ, - RED, - GREEN, - BLUE); + aWorld, + aRenderer, + aTextures, + aBlock, + aX, + aY, + aZ, + RED, + GREEN, + BLUE); } else { return INSTANCE.renderStandardBlockWithAmbientOcclusion( - aWorld, - aRenderer, - aTextures, - aBlock, - aX, - aY, - aZ, - RED, - GREEN, - BLUE); + aWorld, + aRenderer, + aTextures, + aBlock, + aX, + aY, + aZ, + RED, + GREEN, + BLUE); } } else { renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aTextures[0], true); @@ -97,43 +97,43 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderFaceYNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[0], true); } public static void renderFaceYPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[1], true); } public static void renderFaceZNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[2], true); } public static void renderFaceZPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[3], true); } public static void renderFaceXNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[4], true); } public static void renderFaceXPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, - ITexture[][] aIcon) { + ITexture[][] aIcon) { renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[5], true); } public static void renderNegativeYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY - 1, aZ, 0))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon != null) { for (ITexture iTexture : aIcon) { @@ -146,13 +146,13 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderPositiveYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY + 1, aZ, 1))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon != null) { for (ITexture iTexture : aIcon) { @@ -165,13 +165,13 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderNegativeZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ - 1, 2))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { @@ -185,13 +185,13 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderPositiveZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ + 1, 3))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon != null) { for (ITexture iTexture : aIcon) { @@ -204,13 +204,13 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderNegativeXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX - 1, aY, aZ, 4))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon != null) { for (ITexture iTexture : aIcon) { @@ -223,13 +223,13 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public static void renderPositiveXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX + 1, aY, aZ, 5))) { return; } Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { @@ -251,74 +251,74 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(0.0F, -1.0F, 0.0F); renderNegativeYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.DOWN), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.DOWN), + true); Tessellator.instance.draw(); Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(0.0F, 1.0F, 0.0F); renderPositiveYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.UP), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.UP), + true); Tessellator.instance.draw(); Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(0.0F, 0.0F, -1.0F); renderNegativeZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.NORTH), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.NORTH), + true); Tessellator.instance.draw(); Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(0.0F, 0.0F, 1.0F); renderPositiveZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.SOUTH), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.SOUTH), + true); Tessellator.instance.draw(); Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(-1.0F, 0.0F, 0.0F); renderNegativeXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.WEST), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.WEST), + true); Tessellator.instance.draw(); Tessellator.instance.startDrawingQuads(); Tessellator.instance.setNormal(1.0F, 0.0F, 0.0F); renderPositiveXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - ((ITexturedBlock) aBlock).getTexture(ForgeDirection.EAST), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.EAST), + true); Tessellator.instance.draw(); aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -327,7 +327,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, - RenderBlocks aRenderer) { + RenderBlocks aRenderer) { blockAccess = aWorld; return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer); } @@ -343,7 +343,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } public void setRenderBounds(double p_147782_1_, double p_147782_3_, double p_147782_5_, double p_147782_7_, - double p_147782_9_, double p_147782_11_) { + double p_147782_9_, double p_147782_11_) { if (!this.lockBlockBounds) { this.renderMinX = p_147782_1_; this.renderMaxX = p_147782_7_; @@ -352,11 +352,11 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.renderMinZ = p_147782_5_; this.renderMaxZ = p_147782_11_; this.partialRenderBounds = this.minecraftRB.gameSettings.ambientOcclusion >= 2 - && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D - || this.renderMinY > 0.0D - || this.renderMaxY < 1.0D - || this.renderMinZ > 0.0D - || this.renderMaxZ < 1.0D); + && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D + || this.renderMinY > 0.0D + || this.renderMaxY < 1.0D + || this.renderMinZ > 0.0D + || this.renderMaxZ < 1.0D); } } @@ -372,11 +372,11 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.renderMinZ = block.getBlockBoundsMinZ(); this.renderMaxZ = block.getBlockBoundsMaxZ(); this.partialRenderBounds = this.minecraftRB.gameSettings.ambientOcclusion >= 2 - && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D - || this.renderMinY > 0.0D - || this.renderMaxY < 1.0D - || this.renderMinZ > 0.0D - || this.renderMaxZ < 1.0D); + && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D + || this.renderMinY > 0.0D + || this.renderMaxY < 1.0D + || this.renderMinZ > 0.0D + || this.renderMaxZ < 1.0D); } } @@ -552,8 +552,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { public IIcon getIconSafe(IIcon iicon) { if (iicon == null) { - iicon = ((TextureMap) Minecraft.getMinecraft().getTextureManager() - .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); + iicon = ((TextureMap) Minecraft.getMinecraft() + .getTextureManager() + .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); } return (IIcon) iicon; @@ -562,7 +563,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { IBlockAccess blockAccess = RenderBlocks.getInstance().blockAccess; public boolean renderStandardBlockWithAmbientOcclusion(IBlockAccess aWorld, RenderBlocks aRenderer, - ITexture[][] aTextures, Block block, int xPos, int yPos, int zPos, float R, float G, float B) { + ITexture[][] aTextures, Block block, int xPos, int yPos, int zPos, float R, float G, float B) { this.enableAO = true; boolean flag = false; float f3 = 0.0F; @@ -574,7 +575,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (this.getBlockIcon(block).getIconName().equals("grass_top")) { + if (this.getBlockIcon(block) + .getIconName() + .equals("grass_top")) { flag1 = false; } else if (this.hasOverrideBlockTexture()) { flag1 = false; @@ -588,7 +591,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { float f7; if (RenderBlocks.getInstance().renderAllFaces - || block.shouldSideBeRendered(blockAccess, xPos, yPos - 1, zPos, 0)) { + || block.shouldSideBeRendered(blockAccess, xPos, yPos - 1, zPos, 0)) { if (this.renderMinY <= 0.0D) { --yPos; } @@ -597,21 +600,29 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.aoBrightnessYZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1); this.aoBrightnessYZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1); this.aoBrightnessXYPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos); - this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue(); - this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue(); - this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue(); - this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue(); - flag2 = blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); - flag3 = blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); - flag4 = blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); - flag5 = blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); + this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos - 1, yPos, zPos) + .getAmbientOcclusionLightValue(); + this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos, zPos - 1) + .getAmbientOcclusionLightValue(); + this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos, zPos + 1) + .getAmbientOcclusionLightValue(); + this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos + 1, yPos, zPos) + .getAmbientOcclusionLightValue(); + flag2 = blockAccess.getBlock(xPos + 1, yPos - 1, zPos) + .getCanBlockGrass(); + flag3 = blockAccess.getBlock(xPos - 1, yPos - 1, zPos) + .getCanBlockGrass(); + flag4 = blockAccess.getBlock(xPos, yPos - 1, zPos + 1) + .getCanBlockGrass(); + flag5 = blockAccess.getBlock(xPos, yPos - 1, zPos - 1) + .getCanBlockGrass(); if (!flag5 && !flag3) { this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXYNN; this.aoBrightnessXYZNNN = this.aoBrightnessXYNN; } else { this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos - 1, yPos, zPos - 1) - .getAmbientOcclusionLightValue(); + .getAmbientOcclusionLightValue(); this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos - 1); } @@ -620,7 +631,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.aoBrightnessXYZNNP = this.aoBrightnessXYNN; } else { this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos - 1, yPos, zPos + 1) - .getAmbientOcclusionLightValue(); + .getAmbientOcclusionLightValue(); this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos + 1); } @@ -629,7 +640,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.aoBrightnessXYZPNN = this.aoBrightnessXYPN; } else { this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos + 1, yPos, zPos - 1) - .getAmbientOcclusionLightValue(); + .getAmbientOcclusionLightValue(); this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos - 1); } @@ -638,7 +649,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.aoBrightnessXYZPNP = this.aoBrightnessXYPN; } else { this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos + 1, yPos, zPos + 1) - .getAmbientOcclusionLightValue(); + .getAmbientOcclusionLightValue(); this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos + 1); } @@ -648,35 +659,37 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { i1 = l; - if (this.renderMinY <= 0.0D || !blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { + if (this.renderMinY <= 0.0D || !blockAccess.getBlock(xPos, yPos - 1, zPos) + .isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos); } - f7 = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue(); + f7 = blockAccess.getBlock(xPos, yPos - 1, zPos) + .getAmbientOcclusionLightValue(); f3 = (this.aoLightValueScratchXYZNNP + this.aoLightValueScratchXYNN + this.aoLightValueScratchYZNP + f7) - / 4.0F; + / 4.0F; f6 = (this.aoLightValueScratchYZNP + f7 + this.aoLightValueScratchXYZPNP + this.aoLightValueScratchXYPN) - / 4.0F; + / 4.0F; f5 = (f7 + this.aoLightValueScratchYZNN + this.aoLightValueScratchXYPN + this.aoLightValueScratchXYZPNN) - / 4.0F; + / 4.0F; f4 = (this.aoLightValueScratchXYNN + this.aoLightValueScratchXYZNNN + f7 + this.aoLightValueScratchYZNN) - / 4.0F; + / 4.0F; this.brightnessTopLeft = RenderBlocks.getInstance() - .getAoBrightness(this.aoBrightnessXYZNNP, this.aoBrightnessXYNN, this.aoBrightnessYZNP, i1); + .getAoBrightness(this.aoBrightnessXYZNNP, this.aoBrightnessXYNN, this.aoBrightnessYZNP, i1); this.brightnessTopRight = RenderBlocks.getInstance() - .getAoBrightness(this.aoBrightnessYZNP, this.aoBrightnessXYZPNP, this.aoBrightnessXYPN, i1); + .getAoBrightness(this.aoBrightnessYZNP, this.aoBrightnessXYZPNP, this.aoBrightnessXYPN, i1); this.brightnessBottomRight = RenderBlocks.getInstance() - .getAoBrightness(this.aoBrightnessYZNN, this.aoBrightnessXYPN, this.aoBrightnessXYZPNN, i1); + .getAoBrightness(this.aoBrightnessYZNN, this.aoBrightnessXYPN, this.aoBrightnessXYZPNN, i1); this.brightnessBottomLeft = RenderBlocks.getInstance() - .getAoBrightness(this.aoBrightnessXYNN, this.aoBrightnessXYZNNN, this.aoBrightnessYZNN, i1); + .getAoBrightness(this.aoBrightnessXYNN, this.aoBrightnessXYZNNN, this.aoBrightnessYZNN, i1); if (flag1) { this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R - * 0.5F; + * 0.5F; this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G - * 0.5F; + * 0.5F; this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B - * 0.5F; + * 0.5F; } else { this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.5F; this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.5F; @@ -700,7 +713,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } if (RenderBlocks.getInstance().renderAllFaces - || block.shouldSideBeRendered(blockAccess, xPos, yPos + 1, zPos, 1)) { + || block.shouldSideBeRendered(blockAccess, xPos, yPos + 1, zPos, 1)) { if (this.renderMaxY >= 1.0D) { ++yPos; } @@ -709,21 +722,29 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { this.aoBrightnessXYPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos); this.aoBrightnessYZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1); this.aoBrightnessYZPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1); - this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue(); - this.aoLightValueScratchXYPP = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue(); - this.aoLightValueScratchYZPN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue(); - this.aoLightValueScratchYZPP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue(); - flag2 = blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); - flag3 = blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); - flag4 = blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); - flag5 = blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); + this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos - 1, yPos, zPos) + .getAmbientOcclusionLightValue(); |