From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/entities/renders/HeartRender.java | 39 +++++++--------------- .../entities/renders/RenderHelper.java | 4 +-- 2 files changed, 13 insertions(+), 30 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/entities/renders') diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java index b5419a4..4e181c1 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java @@ -16,61 +16,46 @@ import net.minecraft.util.ResourceLocation; * @author Sorin */ public class HeartRender extends RenderLiving { - protected ResourceLocation texture; - Random rnd = new Random(); + protected ResourceLocation texture; + Random rnd = new Random(); public HeartRender(ModelBase modelBase, float shadowSize) { super(modelBase, shadowSize); } @Override - protected void renderModel(EntityLivingBase entity, float x, - float y, float z, float rot1, float rot2, - float rot3) { + protected void renderModel(EntityLivingBase entity, float x, float y, float z, float rot1, float rot2, float rot3) { super.renderModel(entity, x, y, z, rot1, rot2, rot3); rnd.setSeed(1542372345); if (((EntityHeart) entity).getQuantity() > 2f) { - for (int i = 0; i < ((EntityHeart) entity) - .getQuantity() / 10f; i++) { - float posX = rnd.nextFloat() * 0.2f - * (rnd.nextBoolean() ? 1 - : -1); - float posY = rnd.nextFloat() * 0.2f - * (rnd.nextBoolean() ? 1 - : -1); - float rotY = rnd.nextFloat() * 35f - * (rnd.nextBoolean() ? 1 - : -1); - float rotZ = rnd.nextFloat() * 35f - * (rnd.nextBoolean() ? 1 - : -1); + for (int i = 0; i < ((EntityHeart) entity).getQuantity() / 10f; i++) { + float posX = rnd.nextFloat() * 0.2f * (rnd.nextBoolean() ? 1 : -1); + float posY = rnd.nextFloat() * 0.2f * (rnd.nextBoolean() ? 1 : -1); + float rotY = rnd.nextFloat() * 35f * (rnd.nextBoolean() ? 1 : -1); + float rotZ = rnd.nextFloat() * 35f * (rnd.nextBoolean() ? 1 : -1); GL11.glTranslatef(-0.15F, 0.0F, 0.0F); GL11.glTranslatef(posX, posY, 0F); GL11.glRotatef(rotY, 0F, 1F, 0F); GL11.glRotatef(rotZ, 0F, 0F, 1F); GL11.glPushMatrix(); - this.mainModel.render(entity, x, y, z, - rot1, rot2, rot3); + this.mainModel.render(entity, x, y, z, rot1, rot2, rot3); GL11.glPopMatrix(); } } } @Override - protected void preRenderCallback(EntityLivingBase entity, - float f) { + protected void preRenderCallback(EntityLivingBase entity, float f) { preRenderCallbackHeart((EntityHeart) entity, f); } - protected void preRenderCallbackHeart(EntityHeart entity, - float f) { + protected void preRenderCallbackHeart(EntityHeart entity, float f) { GL11.glScalef(0.4F, 0.4F, 0.4F); GL11.glRotatef(55F, 1F, 0F, 0F); String type = entity.getType(); if (type == "" || type == null) type = "Red"; - texture = new ResourceLocation(Variables.MODID, - "textures/entities/" + type + "Heart.png"); + texture = new ResourceLocation(Variables.MODID, "textures/entities/" + type + "Heart.png"); } @Override diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java index cf2278a..444950b 100755 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java @@ -16,9 +16,7 @@ public class RenderHelper { } public static void translateToHeadLevel(EntityPlayer player) { - GL11.glTranslated(0, (player != Minecraft - .getMinecraft().thePlayer ? 1.62F : 0F) - - player.getDefaultEyeHeight() + GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); } } \ No newline at end of file -- cgit v1.2.3