From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../renders/TileEntityDisplayerRender.java | 174 +++++---------------- .../renders/TileEntityHandPedestalRender.java | 21 +-- .../TileEntityJewelrsCraftingTableRender.java | 109 +++---------- .../renders/TileEntityMidasTouchRender.java | 20 +-- .../tileentity/renders/TileEntityMolderRender.java | 98 +++--------- .../renders/TileEntityShadowEyeRender.java | 62 +++----- .../renders/TileEntityShadowHandRender.java | 6 +- .../renders/TileEntitySmelterRender.java | 73 +++------ 8 files changed, 141 insertions(+), 422 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/tileentity/renders') diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java index aaf4613..360c027 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java @@ -26,8 +26,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; public class TileEntityDisplayerRender extends TileEntitySpecialRenderer { - private final class ChatColorMap - extends HashMap { + private final class ChatColorMap extends HashMap { private static final long serialVersionUID = -6532830760345687407L; { put(EnumChatFormatting.AQUA, 5636095); @@ -49,155 +48,84 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer { } } - ModelDisplayer displayer = new ModelDisplayer(); - String texture = "textures/tileentities/Displayer.png"; - HashMap colors = new ChatColorMap(); + ModelDisplayer displayer = new ModelDisplayer(); + String texture = "textures/tileentities/Displayer.png"; + HashMap colors = new ChatColorMap(); @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, - (float) z + 0.5F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); TileEntityDisplayer disp = (TileEntityDisplayer) te; - ResourceLocation blockTexture = new ResourceLocation( - Variables.MODID, texture); - Minecraft.getMinecraft().renderEngine - .bindTexture(blockTexture); + ResourceLocation blockTexture = new ResourceLocation(Variables.MODID, texture); + Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - displayer.render((Entity) null, disp.ringTranslation1, - disp.ringTranslation2, - disp.ringTranslation3, 0.0F, 0.0F, + displayer.render((Entity) null, disp.ringTranslation1, disp.ringTranslation2, disp.ringTranslation3, 0.0F, 0.0F, 0.0625F); try { int block = disp.getBlockMetadata(); - if (disp != null && disp.hasObject - && disp.object != null - && disp.object.getItem() != null - && disp.object != new ItemStack( - Item.getItemById( - 0), - 0, 0)) { + if (disp != null && disp.hasObject && disp.object != null && disp.object.getItem() != null + && disp.object != new ItemStack(Item.getItemById(0), 0, 0)) { int ind = -3; GL11.glPushMatrix(); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, disp.object); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, disp.object); entityitem.hoverStart = 0.0F; disp.object.stackSize = 1; GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(0.0F, -0.6F - + disp.ringTranslation1 - / 5, - 0F); + GL11.glTranslatef(0.0F, -0.6F + disp.ringTranslation1 / 5, 0F); GL11.glRotatef(disp.rotAngle, 0F, 1F, 0F); GL11.glColor4f(1F, 1F, 1F, 1F); if (RenderManager.instance.options.fancyGraphics) - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); else { GL11.glRotatef(180F, 0F, 1F, 0F); RenderManager.instance.options.fancyGraphics = true; int i = 15728880; int j = i % 65536; int k = i / 65536; - OpenGlHelper.setLightmapTextureCoords( - OpenGlHelper.lightmapTexUnit, - j / 1.0F, - k / 1.0F); - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderManager.instance.options.fancyGraphics = false; } - EntityPlayer player = te.getWorldObj() - .getClosestPlayer( - te.xCoord, - te.yCoord, - te.zCoord, - 5D); + EntityPlayer player = te.getWorldObj().getClosestPlayer(te.xCoord, te.yCoord, te.zCoord, 5D); GL11.glPopMatrix(); GL11.glPushMatrix(); if (player != null) - renderLabel(disp.object - .getDisplayName(), - 0F, -0.171F * ind, - 0F, block, disp, - colors.get(disp.object - .getRarity().rarityColor)); + renderLabel(disp.object.getDisplayName(), 0F, -0.171F * ind, 0F, block, disp, + colors.get(disp.object.getRarity().rarityColor)); GL11.glPopMatrix(); ind++; if (player != null && disp.quantity > 1) { GL11.glPushMatrix(); - renderLabel("x" + Integer.toString( - disp.quantity), 0F, - -0.171F * ind, 0F, - block, disp, + renderLabel("x" + Integer.toString(disp.quantity), 0F, -0.171F * ind, 0F, block, disp, Color.GRAY.getRGB()); GL11.glPopMatrix(); ind++; } - if (disp.object.getItem() != Items.map - && player != null - && disp.object.getTooltip( - player, - true) != null) { - List tooltips = disp.object - .getTooltip(player, - true); - if (disp.infoIndex + 5 > tooltips - .size()) + if (disp.object.getItem() != Items.map && player != null + && disp.object.getTooltip(player, true) != null) { + List tooltips = disp.object.getTooltip(player, true); + if (disp.infoIndex + 5 > tooltips.size()) disp.infoIndex = 1; if (tooltips.size() < 5) - for (int i = 1; i < tooltips - .size(); i++) { - String tooltip = tooltips - .get(i) - .toString(); - RenderManager.instance - .getFontRenderer(); + for (int i = 1; i < tooltips.size(); i++) { + String tooltip = tooltips.get(i).toString(); + RenderManager.instance.getFontRenderer(); if (tooltip != "") { GL11.glPushMatrix(); - renderLabel(tooltip, - 0F, - -0.171F * ind, - 0F, - block, - disp, - Color.GRAY.getRGB()); + renderLabel(tooltip, 0F, -0.171F * ind, 0F, block, disp, Color.GRAY.getRGB()); GL11.glPopMatrix(); ind++; } } else - for (int i = disp.infoIndex; i < disp.infoIndex - + 5; i++) { - String tooltip = tooltips - .get(i) - .toString(); - RenderManager.instance - .getFontRenderer(); + for (int i = disp.infoIndex; i < disp.infoIndex + 5; i++) { + String tooltip = tooltips.get(i).toString(); + RenderManager.instance.getFontRenderer(); if (tooltip != "") { GL11.glPushMatrix(); - renderLabel(tooltip, - 0F, - -0.171F * ind, - 0F, - block, - disp, - Color.GRAY.getRGB()); + renderLabel(tooltip, 0F, -0.171F * ind, 0F, block, disp, Color.GRAY.getRGB()); GL11.glPopMatrix(); ind++; } @@ -210,10 +138,8 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } - protected void renderLabel(String text, double x, double y, - double z, int metadata, TileEntity te, int color) { - FontRenderer fontrenderer = RenderManager.instance - .getFontRenderer(); + protected void renderLabel(String text, double x, double y, double z, int metadata, TileEntity te, int color) { + FontRenderer fontrenderer = RenderManager.instance.getFontRenderer(); float width = 0.015F, height = 1F; GL11.glRotatef(180F, 0F, 0F, 1F); GL11.glRotatef(360 - metadata * 90F, 0F, 1F, 0F); @@ -233,35 +159,19 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer { tessellator.draw(); if (fontrenderer.getStringWidth(text) / 2 > 20) { width = 0.9F / fontrenderer.getStringWidth(text); - height = 1F - fontrenderer.getStringWidth(text) - / 20 * 0.06F; + height = 1F - fontrenderer.getStringWidth(text) / 20 * 0.06F; } - GL11.glTranslatef((float) x + 1f, (float) y + 1f, - (float) z); + GL11.glTranslatef((float) x + 1f, (float) y + 1f, (float) z); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glScalef(width * 70F, height, 0F); - fontrenderer.drawString( - text.replaceFirst("�0", "�r") - .replaceFirst("�1", "�r") - .replaceFirst("�2", "�r") - .replaceFirst("�3", "�r") - .replaceFirst("�4", "�r") - .replaceFirst("�5", "�r") - .replaceFirst("�6", "�r") - .replaceFirst("�7", "�r") - .replaceFirst("�8", "�r") - .replaceFirst("�9", "�r") - .replaceFirst("�a", "�r") - .replaceFirst("�b", "�r") - .replaceFirst("�c", "�r") - .replaceFirst("�d", "�r") - .replaceFirst("�e", "�r") - .replaceFirst("�f", "�r"), - -j, 0, 1973790); + fontrenderer.drawString(text.replaceFirst("�0", "�r").replaceFirst("�1", "�r").replaceFirst("�2", "�r") + .replaceFirst("�3", "�r").replaceFirst("�4", "�r").replaceFirst("�5", "�r").replaceFirst("�6", "�r") + .replaceFirst("�7", "�r").replaceFirst("�8", "�r").replaceFirst("�9", "�r").replaceFirst("�a", "�r") + .replaceFirst("�b", "�r").replaceFirst("�c", "�r").replaceFirst("�d", "�r").replaceFirst("�e", "�r") + .replaceFirst("�f", "�r"), -j, 0, 1973790); GL11.glPopMatrix(); - GL11.glTranslatef((float) x - 0.5f, (float) y - 0.5f, - (float) z - 0.5F); + GL11.glTranslatef((float) x - 0.5f, (float) y - 0.5f, (float) z - 0.5F); GL11.glScalef(width * 70F, height, 0F); fontrenderer.drawString(text, -j, 0, color); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java index da8fa58..d3ff955 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java @@ -11,17 +11,15 @@ import net.minecraft.util.ResourceLocation; /** * @author Paul Fulham (pau101) */ -public class TileEntityHandPedestalRender - extends TileEntitySpecialRenderer { - private ModelHandPedestal model; - private ResourceLocation texture; +public class TileEntityHandPedestalRender extends TileEntitySpecialRenderer { + private ModelHandPedestal model; + private ResourceLocation texture; /** * @param model * @param texture */ - public TileEntityHandPedestalRender(ModelHandPedestal model, - ResourceLocation texture) { + public TileEntityHandPedestalRender(ModelHandPedestal model, ResourceLocation texture) { this.model = model; this.texture = texture; } @@ -34,18 +32,13 @@ public class TileEntityHandPedestalRender * @param partialRenderTicks */ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float partialRenderTicks) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialRenderTicks) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, - (float) z + 0.5F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); TileEntityHandPedestal pedestal = (TileEntityHandPedestal) te; bindTexture(texture); GL11.glRotatef(180, 0, 0, 1); - GL11.glRotatef(pedestal.getWorldObj() == null ? 180 - : pedestal.getBlockMetadata() % 8 / 8F - * 360, - 0, 1, 0); + GL11.glRotatef(pedestal.getWorldObj() == null ? 180 : pedestal.getBlockMetadata() % 8 / 8F * 360, 0, 1, 0); model.render(pedestal, partialRenderTicks, 0.0625F); GL11.glPopMatrix(); } diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java index fbe3db6..8612eb7 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java @@ -17,10 +17,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -public class TileEntityJewelrsCraftingTableRender - extends TileEntitySpecialRenderer { - ModelJewlersCraftingBench modelTable = new ModelJewlersCraftingBench(); - String texture = "textures/tileentities/JewelrsCraftingBench.png"; +public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRenderer { + ModelJewlersCraftingBench modelTable = new ModelJewlersCraftingBench(); + String texture = "textures/tileentities/JewelrsCraftingBench.png"; /** * @param te @@ -30,15 +29,11 @@ public class TileEntityJewelrsCraftingTableRender * @param scale */ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, - (float) z + 0.5F); - ResourceLocation blockTexture = new ResourceLocation( - Variables.MODID, texture); - Minecraft.getMinecraft().renderEngine - .bindTexture(blockTexture); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + ResourceLocation blockTexture = new ResourceLocation(Variables.MODID, texture); + Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture); TileEntityJewelrsCraftingTable jt = (TileEntityJewelrsCraftingTable) te; GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); @@ -55,18 +50,12 @@ public class TileEntityJewelrsCraftingTableRender } } catch (Exception e) { } - modelTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, - 0.0F, 0.0625F); + modelTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); if (jt != null) { - if (jt.hasJewelry && jt.jewelry - .getIconIndex() != null - && jt.jewelry.getIconIndex() - .getIconName() != "") { + if (jt.hasJewelry && jt.jewelry.getIconIndex() != null && jt.jewelry.getIconIndex().getIconName() != "") { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, jt.jewelry); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, jt.jewelry); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glRotatef(180F, 1F, 0F, 0F); @@ -74,37 +63,20 @@ public class TileEntityJewelrsCraftingTableRender GL11.glTranslatef(0.55F, -1.5F, -0.45F); GL11.glRotatef(jt.angle, 0F, 1F, 0F); if (RenderManager.instance.options.fancyGraphics) - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); else { GL11.glRotatef(180F, 0F, 1F, 0F); RenderManager.instance.options.fancyGraphics = true; - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderManager.instance.options.fancyGraphics = false; } GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if (jt.hasEndItem && jt.endItem.getIconIndex() - .getIconName() != "") { + if (jt.hasEndItem && jt.endItem.getIconIndex().getIconName() != "") { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, jt.endItem); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, jt.endItem); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glRotatef(180F, 1F, 0F, 0F); @@ -112,37 +84,20 @@ public class TileEntityJewelrsCraftingTableRender GL11.glTranslatef(0.0F, -1.6F, 0.6F); GL11.glRotatef(jt.angle, 0F, 1F, 0F); if (RenderManager.instance.options.fancyGraphics) - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); else { GL11.glRotatef(180F, 0F, 1F, 0F); RenderManager.instance.options.fancyGraphics = true; - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderManager.instance.options.fancyGraphics = false; } GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if (jt.hasGem && jt.gem.getIconIndex() - .getIconName() != "") { + if (jt.hasGem && jt.gem.getIconIndex().getIconName() != "") { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, jt.gem); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, jt.gem); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glRotatef(180F, 1F, 0F, 0F); @@ -150,25 +105,11 @@ public class TileEntityJewelrsCraftingTableRender GL11.glTranslatef(-0.55F, -1.5F, -0.45F); GL11.glRotatef(jt.angle, 0F, 1F, 0F); if (RenderManager.instance.options.fancyGraphics) - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); else { GL11.glRotatef(180F, 0F, 1F, 0F); RenderManager.instance.options.fancyGraphics = true; - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderManager.instance.options.fancyGraphics = false; } GL11.glEnable(GL11.GL_LIGHTING); @@ -186,17 +127,13 @@ public class TileEntityJewelrsCraftingTableRender * @param k * @param block */ - public void adjustLightFixture(World world, int i, int j, int k, - Block block) { + public void adjustLightFixture(World world, int i, int j, int k, Block block) { Tessellator tess = Tessellator.instance; float brightness = block.getLightOpacity(world, i, j, k); - int skyLight = world.getLightBrightnessForSkyBlocks(i, j, - k, 0); + int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0); int modulousModifier = skyLight % 65536; int divModifier = skyLight / 65536; tess.setColorOpaque_F(brightness, brightness, brightness); - OpenGlHelper.setLightmapTextureCoords( - OpenGlHelper.lightmapTexUnit, - modulousModifier, divModifier); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, modulousModifier, divModifier); } } diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java index f423bc8..e4b1a93 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java @@ -11,8 +11,7 @@ import net.minecraft.tileentity.TileEntity; public class TileEntityMidasTouchRender extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); TileEntityMidasTouch midas = (TileEntityMidasTouch) te; if (midas.target != null) { @@ -20,21 +19,14 @@ public class TileEntityMidasTouchRender extends TileEntitySpecialRenderer { target.hurtTime = 0; GL11.glTranslatef(0.5F, 0.0F, 0.5F); GL11.glColor3f(1.0F, 1.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw( - target, - midas.xCoord - RenderManager.renderPosX, - midas.yCoord - RenderManager.renderPosY, - midas.zCoord - RenderManager.renderPosZ, - 0F, 1F); + RenderManager.instance.renderEntityWithPosYaw(target, midas.xCoord - RenderManager.renderPosX, + midas.yCoord - RenderManager.renderPosY, midas.zCoord - RenderManager.renderPosZ, 0F, 1F); } else { GL11.glTranslatef(0.5F, 0.0F, 0.5F); GL11.glColor3f(1.0F, 1.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw( - new EntityPig(te.getWorldObj()), - midas.xCoord - RenderManager.renderPosX, - midas.yCoord - RenderManager.renderPosY, - midas.zCoord - RenderManager.renderPosZ, - 0F, 1F); + RenderManager.instance.renderEntityWithPosYaw(new EntityPig(te.getWorldObj()), + midas.xCoord - RenderManager.renderPosX, midas.yCoord - RenderManager.renderPosY, + midas.zCoord - RenderManager.renderPosZ, 0F, 1F); } GL11.glPopMatrix(); } diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java index c93a09b..269d475 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java @@ -35,17 +35,13 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer { * @param scale */ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, - (float) z + 0.5F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); TileEntityMolder me = (TileEntityMolder) te; String texture = "textures/tileentities/Molder.png"; - ResourceLocation blockTexture = new ResourceLocation( - Variables.MODID, texture); - Minecraft.getMinecraft().renderEngine - .bindTexture(blockTexture); + ResourceLocation blockTexture = new ResourceLocation(Variables.MODID, texture); + Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); try { @@ -61,16 +57,12 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer { } } catch (Exception e) { } - modelMolder.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, - 0.0F, 0.0625F); - boolean fancyGraphics = Minecraft - .getMinecraft().gameSettings.fancyGraphics; + modelMolder.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + boolean fancyGraphics = Minecraft.getMinecraft().gameSettings.fancyGraphics; if (me != null) { if (me.hasMold) { GL11.glPushMatrix(); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, me.mold); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, me.mold); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glTranslatef(0F, 1.43F, -0.28F); @@ -78,37 +70,16 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer { GL11.glRotatef(90F, 1F, 0F, 0f); Minecraft.getMinecraft().gameSettings.fancyGraphics = true; if (entityitem != null) { - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.0D, - 0.0F, - 0.0F); - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.03D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.03D, 0.0F, 0.0F); } Minecraft.getMinecraft().gameSettings.fancyGraphics = fancyGraphics; GL11.glPopMatrix(); } - if (me.hasJewelBase && me.jewelBase != null - && me.jewelBase.getItem() != Item - .getItemFromBlock( - Blocks.air) - && me.jewelBase.getIconIndex() != null - && me.jewelBase.getIconIndex() - .getIconName() != "") { + if (me.hasJewelBase && me.jewelBase != null && me.jewelBase.getItem() != Item.getItemFromBlock(Blocks.air) + && me.jewelBase.getIconIndex() != null && me.jewelBase.getIconIndex().getIconName() != "") { GL11.glPushMatrix(); - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, me.jewelBase); + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, me.jewelBase); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glTranslatef(0F, 1.4F, -0.28F); @@ -116,51 +87,30 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer { GL11.glRotatef(90F, 1F, 0F, 0f); Minecraft.getMinecraft().gameSettings.fancyGraphics = true; if (entityitem != null) - RenderManager.instance - .renderEntityWithPosYaw( - entityitem, - 0.0D, - 0.0D, - 0.01D, - 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.01D, 0.0F, 0.0F); Minecraft.getMinecraft().gameSettings.fancyGraphics = fancyGraphics; GL11.glColor4f(1, 1F, 1F, 1.0F); GL11.glPopMatrix(); } if (me.hasMoltenMetal && me.moltenMetal != null - && me.moltenMetal != new ItemStack( - Item.getItemById( - 0), - 0, 0)) { + && me.moltenMetal != new ItemStack(Item.getItemById(0), 0, 0)) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); if (JewelrycraftMod.fancyRender) { GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(1, 1, 0, - 0); + OpenGlHelper.glBlendFunc(1, 1, 0, 0); } - ItemStack metal = new ItemStack( - ItemList.metal); + ItemStack metal = new ItemStack(ItemList.metal); ItemStack ingot = me.moltenMetal.copy(); JewelryNBT.addMetal(metal, ingot); - EntityItem moltenMetal = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, metal); + EntityItem moltenMetal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, metal); moltenMetal.getEntityItem().stackSize = 1; moltenMetal.hoverStart = 0.0F; - GL11.glTranslatef(-0F, 1.4f - - 0.005f * me.quantity, - -0.29F); + GL11.glTranslatef(-0F, 1.4f - 0.005f * me.quantity, -0.29F); GL11.glScalef(1.2F, 1.0F, 1.4F); GL11.glRotatef(90F, 1F, 0F, 0f); RenderItem.renderInFrame = true; - RenderManager.instance - .renderEntityWithPosYaw( - moltenMetal, - 0.0D, 0.0D, - 0.0D, 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; if (JewelrycraftMod.fancyRender) GL11.glDisable(GL11.GL_BLEND); @@ -179,17 +129,13 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer { * @param k * @param block */ - public void adjustLightFixture(World world, int i, int j, int k, - Block block) { + public void adjustLightFixture(World world, int i, int j, int k, Block block) { Tessellator tess = Tessellator.instance; float brightness = block.getLightOpacity(world, i, j, k); - int skyLight = world.getLightBrightnessForSkyBlocks(i, j, - k, 0); + int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0); int modulousModifier = skyLight % 65536; int divModifier = skyLight / 65536; tess.setColorOpaque_F(brightness, brightness, brightness); - OpenGlHelper.setLightmapTextureCoords( - OpenGlHelper.lightmapTexUnit, - modulousModifier, divModifier); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, modulousModifier, divModifier); } } diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java index 5e191ec..67e20a5 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java @@ -19,8 +19,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class TileEntityShadowEyeRender extends TileEntitySpecialRenderer { - ModelShadowEye eye = new ModelShadowEye(); - Sphere shadow = new Sphere(); + ModelShadowEye eye = new ModelShadowEye(); + Sphere shadow = new Sphere(); /** * @param te @@ -30,18 +30,13 @@ public class TileEntityShadowEyeRender extends TileEntitySpecialRenderer { * @param scale */ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.6F, - (float) z + 0.5F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.6F, (float) z + 0.5F); TileEntityShadowEye eyeS = (TileEntityShadowEye) te; - String texture = "textures/tileentities/ShadowEye" - + eyeS.opening + ".png"; - ResourceLocation blockTexture = new ResourceLocation( - Variables.MODID, texture); - Minecraft.getMinecraft().renderEngine - .bindTexture(blockTexture); + String texture = "textures/tileentities/ShadowEye" + eyeS.opening + ".png"; + ResourceLocation blockTexture = new ResourceLocation(Variables.MODID, texture); + Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); try { @@ -55,39 +50,24 @@ public class TileEntityShadowEyeRender extends TileEntitySpecialRenderer { } catch (Exception e) { } if (te != null && te.getWorldObj() != null) { - EntityPlayer player = te.getWorldObj() - .getClosestPlayer(te.xCoord, - te.yCoord, - te.zCoord, 16D); + EntityPlayer player = te.getWorldObj().getClosestPlayer(te.xCoord, te.yCoord, te.zCoord, 16D); if (player != null) { - float x1 = (float) (te.xCoord - - player.posX) + 0.5F; - float y1 = (float) (te.yCoord - - player.posY) + 0.5F; - float z1 = (float) (te.zCoord - - player.posZ) + 0.5F; - eyeS.model.render(player, 0, - (float) (x1 >= 0 ? Math - .atan(z1 / x1) - : Math.PI + Math.atan( - z1 / x1)), - (float) (y1 >= 0 ? Math - .atan(y1 / x1) - : Math.atan(y1 / x1)), - te.blockMetadata, - eyeS.opening, 0.0625F); + float x1 = (float) (te.xCoord - player.posX) + 0.5F; + float y1 = (float) (te.yCoord - player.posY) + 0.5F; + float z1 = (float) (te.zCoord - player.posZ) + 0.5F; + eyeS.model.render(player, 0, (float) (x1 >= 0 ? Math.atan(z1 / x1) : Math.PI + Math.atan(z1 / x1)), + (float) (y1 >= 0 ? Math.atan(y1 / x1) : Math.atan(y1 / x1)), te.blockMetadata, eyeS.opening, + 0.0625F); } } else - eyeS.model.render((Entity) null, 0.0F, 0.0F, 0.0F, - 0.0F, 0.0F, 0.0625F); + eyeS.model.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if (eyeS.opening == 4) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_ONE_MINUS_SRC_ALPHA, - GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glBlendFunc(GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(0.0F, 0.0F, 0.0F, 1F); GL11.glRotatef(eyeS.timer * 10F, 0, 1, 0); GL11.glRotatef(90.0F, 1, 0, 0); @@ -110,17 +90,13 @@ public class TileEntityShadowEyeRender extends TileEntitySpecialRenderer { * @param k * @param block */ - public void adjustLightFixture(World world, int i, int j, int k, - Block block) { + public void adjustLightFixture(World world, int i, int j, int k, Block block) { Tessellator tess = Tessellator.instance; float brightness = block.getLightOpacity(world, i, j, k); - int skyLight = world.getLightBrightnessForSkyBlocks(i, j, - k, 0); + int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0); int modulousModifier = skyLight % 65536; int divModifier = skyLight / 65536; tess.setColorOpaque_F(brightness, brightness, brightness); - OpenGlHelper.setLightmapTextureCoords( - OpenGlHelper.lightmapTexUnit, - modulousModifier, divModifier); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, modulousModifier, divModifier); } } diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java index dd960d0..e4d73e9 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java @@ -6,15 +6,13 @@ import net.minecraft.util.ResourceLocation; /** * @author Paul Fulham (pau101) */ -public class TileEntityShadowHandRender - extends TileEntityHandPedestalRender { +public class TileEntityShadowHandRender extends TileEntityHandPedestalRender { /** * @param model * @param texture */ - public TileEntityShadowHandRender(ModelHandPedestal model, - ResourceLocation texture) { + public TileEntityShadowHandRender(ModelHandPedestal model, ResourceLocation texture) { super(model, texture); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java index b694afa..bc49008 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java @@ -21,9 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; public class TileEntitySmelterRender extends TileEntitySpecialRenderer { - ModelSmelter modelSmelter = new ModelSmelter(); - public static final float p = 1 / 16, - p3 = 3 * p, p13 = 13 * p, p15 = 15 * p; + ModelSmelter modelSmelter = new ModelSmelter(); + public static final float p = 1 / 16, p3 = 3 * p, p13 = 13 * p, p15 = 15 * p; /** * @param te @@ -33,16 +32,12 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { * @param scale */ @Override - public void renderTileEntityAt(TileEntity te, double x, double y, - double z, float scale) { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, - (float) z + 0.5F); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); String texture = "textures/tileentities/Smelter.png"; - ResourceLocation blockTexture = new ResourceLocation( - Variables.MODID, texture); - Minecraft.getMinecraft().renderEngine - .bindTexture(blockTexture); + ResourceLocation blockTexture = new ResourceLocation(Variables.MODID, texture); + Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture); TileEntitySmelter st = (TileEntitySmelter) te; GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); try { @@ -58,10 +53,8 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { } } catch (Exception e) { } - boolean fancyGraphics = Minecraft - .getMinecraft().gameSettings.fancyGraphics; - modelSmelter.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, - 0.0F, 0.0625F); + boolean fancyGraphics = Minecraft.getMinecraft().gameSettings.fancyGraphics; + modelSmelter.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); if (scale != 0) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); @@ -69,8 +62,7 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); OpenGlHelper.glBlendFunc(1, 1, 0, 0); } - EntityItem entityitem = new EntityItem( - te.getWorldObj(), 0.0D, 0.0D, 0.0D, + EntityItem entityitem = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, new ItemStack(Blocks.lava, 1, 1)); entityitem.hoverStart = 0.0F; GL11.glTranslatef(-0F, 1.25F, -0.345F); @@ -80,12 +72,8 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { int i = 15728880; int j = i % 65536; int k = i / 65536; - OpenGlHelper.setLightmapTextureCoords( - OpenGlHelper.lightmapTexUnit, - j / 1.0F, k / 1.0F); - RenderManager.instance.renderEntityWithPosYaw( - entityitem, 0.0D, 0.0D, 0.0D, 0.0F, - 0.0F); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; if (JewelrycraftMod.fancyRender) GL11.glDisable(GL11.GL_BLEND); @@ -93,12 +81,9 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } if (st != null) { - if (st.hasMetal && st.metal != null - && st.metal.getItem() != null) { + if (st.hasMetal && st.metal != null && st.metal.getItem() != null) { GL11.glPushMatrix(); - EntityItem metal = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, st.metal); + EntityItem metal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, st.metal); metal.getEntityItem().stackSize = 1; metal.hoverStart = 0.0F; GL11.glRotatef(-50F, 1F, 0F, 0F); @@ -107,46 +92,28 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer { GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glTranslatef(-0.9F, -0.9F, -1.6F); Minecraft.getMinecraft().gameSettings.fancyGraphics = true; - RenderManager.instance - .renderEntityWithPosYaw( - metal, - 0.0D, 0.0D, - 0.0D, 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(metal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); Minecraft.getMinecraft().gameSettings.fancyGraphics = fancyGraphics; GL11.glPopMatrix(); } - if (st.hasMoltenMetal && st.moltenMetal != null - && st.moltenMetal - .getItem() != null) { + if (st.hasMoltenMetal && st.moltenMetal != null && st.moltenMetal.getItem() != null) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); if (JewelrycraftMod.fancyRender) { GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(1, 1, 0, - 0); + OpenGlHelper.glBlendFunc(1, 1, 0, 0); } - ItemStack metal = new ItemStack( - ItemList.metal); + ItemStack metal = new ItemStack(ItemList.metal); ItemStack ingot = st.moltenMetal.copy(); JewelryNBT.addMetal(metal, ingot); - EntityItem moltenMetal = new EntityItem( - te.getWorldObj(), 0.0D, - 0.0D, 0.0D, metal); + EntityItem moltenMetal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, metal); moltenMetal.getEntityItem().stackSize = 1; moltenMetal.hoverStart = 0.0F; - GL11.glTranslatef(-0F, - 1.00f - .4F * st.quantity, - -0.14F); + GL11.glTranslatef(-0F, 1.00f - .4F * st.quantity, -0.14F); GL11.glScalef(0.71F, 1F, 0.84F); GL11.glRotatef(90F, 1F, 0F, 0f); RenderItem.renderInFrame = true; - RenderManager.instance - .renderEntityWithPosYaw( - moltenMetal, - 0.0D, 0.0D, - 0.0D, 0.0F, - 0.0F); + RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; if (JewelrycraftMod.fancyRender) GL11.glDisable(GL11.GL_BLEND); -- cgit v1.2.3