diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 20:01:40 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 20:01:40 -0400 |
| commit | 20bef6e26d948698398bd16aeab8c9e6b89110e4 (patch) | |
| tree | 8a21e17f78b330435f4ce2d4355d72b773230aa7 /src/main/java/darkknight/jewelrycraft/entities/renders | |
| parent | 26fb28edd1ebb6390f8803fed3876d222cb8fdba (diff) | |
Format/import cleanup
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/entities/renders')
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java | 39 | ||||
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java | 4 |
2 files changed, 13 insertions, 30 deletions
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 |