diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/client')
21 files changed, 772 insertions, 1033 deletions
diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java index 687dc65fb1..15574f66ed 100644 --- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java +++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java @@ -5,6 +5,7 @@ import gregtech.api.enums.TextureSet; public class CustomTextureSet extends TextureSet { public static enum TextureSets { + REFINED(), GEM_A(), ENRICHED(), diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java index 590345e8e6..5baa5a8f49 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java @@ -1,16 +1,19 @@ package gtPlusPlus.core.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.entity.monster.EntityBatKing; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.entity.monster.EntityBatKing; + @SideOnly(Side.CLIENT) public class ModelBatKing extends ModelBase { + private ModelRenderer batHead; /** The body box of the bat model. */ private ModelRenderer batBody; @@ -68,14 +71,8 @@ public class ModelBatKing extends ModelBase { /** * Sets the models various rotation angles then renders the model. */ - 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_) { + 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_) { EntityBatKing entitybat = (EntityBatKing) p_78088_1_; float f6; diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java index 98c474a160..ef0943684c 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java @@ -1,12 +1,14 @@ package gtPlusPlus.core.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelDecayChest extends ModelBase { + /** The chest lid in the chest's model. */ public ModelRenderer chestLid = (new ModelRenderer(this, 0, 0)).setTextureSize(64, 64); /** The model of the bottom of the chest. */ diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java index a12b48c7d2..028e06f7d6 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java @@ -1,16 +1,16 @@ package gtPlusPlus.core.client.model; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; import gtPlusPlus.core.client.renderer.tabula.RenderTabulaBase; import gtPlusPlus.core.tileentities.general.TileEntityEggBox; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; /** - * ModelEggBox - Alkalus - * Created using Tabula 4.1.1 + * ModelEggBox - Alkalus Created using Tabula 4.1.1 */ public class ModelEggBox extends ModelTabulaBase { @@ -58,7 +58,9 @@ public class ModelEggBox extends ModelTabulaBase { public static RenderTabulaBase getRenderer() { if (mRendererInstance == null) { mRendererInstance = new RenderTabulaBase( - new ModelEggBox(), "textures/blocks/TileEntities/EggBox_full.png", TileEntityEggBox.class); + new ModelEggBox(), + "textures/blocks/TileEntities/EggBox_full.png", + TileEntityEggBox.class); } return mRendererInstance; } diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java index 586dfec2db..6f4a0e980b 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java @@ -1,13 +1,15 @@ package gtPlusPlus.core.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelChicken; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelGiantChicken extends ModelChicken { @@ -42,14 +44,8 @@ public class ModelGiantChicken extends ModelChicken { /** * Sets the models various rotation angles then renders the model. */ - 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_) { + 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_) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); if (this.isChild) { @@ -96,14 +92,8 @@ public class ModelGiantChicken extends ModelChicken { * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how * "far" arms and legs can swing at most. */ - 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_) { + 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_) { this.head.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI); this.head.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI); this.bill.rotateAngleX = this.head.rotateAngleX; diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 7cfb7ec2ea..961f365f69 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -1,14 +1,16 @@ package gtPlusPlus.core.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBlaze; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelSickBlaze extends ModelBlaze { + /** The sticks that fly around the Blaze. */ private ModelRenderer[] blazeSticks = new ModelRenderer[24]; @@ -33,14 +35,8 @@ public class ModelSickBlaze extends ModelBlaze { * Sets the models various rotation angles then renders the model. */ @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_) { + 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_) { 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_); @@ -55,14 +51,8 @@ public class ModelSickBlaze extends ModelBlaze { * "far" arms and legs can swing at most. */ @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_) { + 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 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 879e06516a..d93bca90c6 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelIronGolem; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityIronGolem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelStaballoyConstruct extends ModelIronGolem { @@ -49,14 +50,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem { * Sets the models various rotation angles then renders the model. */ @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_) { + 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_) { 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_); @@ -72,14 +67,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem { * "far" arms and legs can swing at most. */ @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_) { + 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_) { 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_; @@ -107,8 +96,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem { this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a(j, 70.0F); 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_; + this.ironGolemRightArm.rotateAngleX = (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) + * 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/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java index 2ec6e4f06d..3c13c83391 100644 --- a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java +++ b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java @@ -1,13 +1,13 @@ package gtPlusPlus.core.client.model.tabula; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.Pair; + /** - * ModelEggBox - Alkalus - * Created using Tabula 4.1.1 + * ModelEggBox - Alkalus Created using Tabula 4.1.1 */ public abstract class ModelTabulaBase extends ModelBase { diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java index b24bc48dbd..88244473e4 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java @@ -7,11 +7,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; /** - * Easy way of rendering an item which should look like a block. - * Borrowed. + * Easy way of rendering an item which should look like a block. Borrowed. * * @author King Lemming * @@ -42,14 +42,14 @@ public class CustomItemBlockRenderer implements IItemRenderer { renderItemAsBlock((RenderBlocks) data[0], item, offset, offset, offset); } - public static void renderItemAsBlock( - RenderBlocks renderer, ItemStack item, double translateX, double translateY, double translateZ) { + public static void renderItemAsBlock(RenderBlocks renderer, ItemStack item, double translateX, double translateY, + double translateZ) { renderTextureAsBlock(renderer, item.getIconIndex(), translateX, translateY, translateZ); } - public static void renderTextureAsBlock( - RenderBlocks renderer, IIcon texture, double translateX, double translateY, double translateZ) { + public static void renderTextureAsBlock(RenderBlocks renderer, IIcon texture, double translateX, double translateY, + 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 793e7093cb..df616a1c14 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -1,10 +1,5 @@ package gtPlusPlus.core.client.renderer; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import gregtech.api.interfaces.ITexture; -import gtPlusPlus.api.interfaces.ITexturedBlock; -import gtPlusPlus.api.objects.Logger; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -12,8 +7,15 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import gregtech.api.interfaces.ITexture; +import gtPlusPlus.api.interfaces.ITexturedBlock; +import gtPlusPlus.api.objects.Logger; + public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { public static CustomOreBlockRenderer INSTANCE; @@ -26,24 +28,29 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { Logger.INFO("Registered Custom Ore Block Renderer."); } - public boolean renderStandardBlock( - IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) { + public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + RenderBlocks aRenderer) { Block tTileEntity = aBlock; if ((tTileEntity instanceof ITexturedBlock)) { - return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer, new ITexture[][] { - ((ITexturedBlock) tTileEntity).getTexture((byte) 0), - ((ITexturedBlock) tTileEntity).getTexture((byte) 1), - ((ITexturedBlock) tTileEntity).getTexture((byte) 2), - ((ITexturedBlock) tTileEntity).getTexture((byte) 3), - ((ITexturedBlock) tTileEntity).getTexture((byte) 4), - ((ITexturedBlock) tTileEntity).getTexture((byte) 5) - }); + return renderStandardBlock( + aWorld, + aX, + aY, + aZ, + aBlock, + aRenderer, + new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture((byte) 0), + ((ITexturedBlock) tTileEntity).getTexture((byte) 1), + ((ITexturedBlock) tTileEntity).getTexture((byte) 2), + ((ITexturedBlock) tTileEntity).getTexture((byte) 3), + ((ITexturedBlock) tTileEntity).getTexture((byte) 4), + ((ITexturedBlock) tTileEntity).getTexture((byte) 5) }); } return false; } - public boolean renderStandardBlock( - IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer, ITexture[][] aTextures) { + public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, + 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); @@ -54,10 +61,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); @@ -70,51 +95,44 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { return true; } - public static void renderFaceYNeg( - IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) { + public static void renderFaceYNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderFaceYPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderFaceZNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderFaceZPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderFaceXNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderFaceXPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, + 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) { + public static void renderNegativeYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon != null) { for (int i = 0; i < aIcon.length; i++) { @@ -126,21 +144,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aRenderer.flipTexture = false; } - public static void renderPositiveYFacing( - IBlockAccess aWorld, - RenderBlocks aRenderer, - Block aBlock, - int aX, - int aY, - int aZ, - ITexture[] aIcon, - boolean aFullBlock) { + public static void renderPositiveYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon != null) { for (int i = 0; i < aIcon.length; i++) { @@ -152,21 +163,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aRenderer.flipTexture = false; } - public static void renderNegativeZFacing( - IBlockAccess aWorld, - RenderBlocks aRenderer, - Block aBlock, - int aX, - int aY, - int aZ, - ITexture[] aIcon, - boolean aFullBlock) { + public static void renderNegativeZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { @@ -179,21 +183,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aRenderer.flipTexture = false; } - public static void renderPositiveZFacing( - IBlockAccess aWorld, - RenderBlocks aRenderer, - Block aBlock, - int aX, - int aY, - int aZ, - ITexture[] aIcon, - boolean aFullBlock) { + public static void renderPositiveZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon != null) { for (int i = 0; i < aIcon.length; i++) { @@ -205,21 +202,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aRenderer.flipTexture = false; } - public static void renderNegativeXFacing( - IBlockAccess aWorld, - RenderBlocks aRenderer, - Block aBlock, - int aX, - int aY, - int aZ, - ITexture[] aIcon, - boolean aFullBlock) { + public static void renderNegativeXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon != null) { for (int i = 0; i < aIcon.length; i++) { @@ -231,21 +221,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aRenderer.flipTexture = false; } - public static void renderPositiveXFacing( - IBlockAccess aWorld, - RenderBlocks aRenderer, - Block aBlock, - int aX, - int aY, - int aZ, - ITexture[] aIcon, - boolean aFullBlock) { + public static void renderPositiveXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, + 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)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { @@ -292,8 +275,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { GL11.glTranslatef(0.5F, 0.5F, 0.5F); } - public boolean renderWorldBlock( - IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { + public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, + RenderBlocks aRenderer) { blockAccess = aWorld; return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer); } @@ -306,13 +289,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { return this.mRenderID; } - 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_) { + 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_) { if (!this.lockBlockBounds) { this.renderMinX = p_147782_1_; this.renderMaxX = p_147782_7_; @@ -321,8 +299,7 @@ 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.renderMinX > 0.0D || this.renderMaxX < 1.0D || this.renderMinY > 0.0 |