From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/entities/renders/HeartRender.java | 107 +++++++++++---------- 1 file changed, 56 insertions(+), 51 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java (limited to 'src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java') diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java old mode 100644 new mode 100755 index d25ecbe..41f7a85 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java @@ -1,7 +1,9 @@ package darkknight.jewelrycraft.entities.renders; import java.util.Random; + import org.lwjgl.opengl.GL11; + import darkknight.jewelrycraft.entities.EntityHeart; import darkknight.jewelrycraft.util.Variables; import net.minecraft.client.model.ModelBase; @@ -13,55 +15,58 @@ import net.minecraft.util.ResourceLocation; /** * @author Sorin */ -public class HeartRender extends RenderLiving -{ - protected ResourceLocation texture; - Random rnd = new Random(); - - public HeartRender(ModelBase modelBase, float shadowSize) - { - super(modelBase, shadowSize); - } - - 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); - 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); - GL11.glPopMatrix(); - } - } - } - - @Override - protected void preRenderCallback(EntityLivingBase entity, float f) - { - preRenderCallbackHeart((EntityHeart)entity, 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"); - } - - @Override - protected ResourceLocation getEntityTexture(Entity par1Entity) - { - return texture; - } +public class HeartRender extends RenderLiving { + 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) { + 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); + 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); + GL11.glPopMatrix(); + } + } + } + + @Override + protected void preRenderCallback(EntityLivingBase entity, float f) { + preRenderCallbackHeart((EntityHeart) entity, 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"); + } + + @Override + protected ResourceLocation getEntityTexture(Entity par1Entity) { + return texture; + } } -- cgit v1.2.3