Browse Source

Added Rams!

merge-requests/4/head
Brandon Pearce 4 years ago
parent
commit
d4737b411e
10 changed files with 571 additions and 8 deletions
  1. +328
    -0
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelRam.java
  2. +133
    -0
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelRamWool.java
  3. +2
    -4
      src/main/java/com/gildedgames/aether/client/renderer/AetherRenderers.java
  4. +30
    -0
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderRam.java
  5. +52
    -0
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerRamWool.java
  6. +3
    -4
      src/main/java/com/gildedgames/aether/common/entities/EntitiesAether.java
  7. +22
    -0
      src/main/java/com/gildedgames/aether/common/entities/living/EntityRam.java
  8. +1
    -0
      src/main/resources/assets/aether/lang/en_US.lang
  9. BIN
      src/main/resources/assets/aether/textures/entities/ram/ram.png
  10. BIN
      src/main/resources/assets/aether/textures/entities/ram/ram_wool.png

+ 328
- 0
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelRam.java View File

@@ -0,0 +1,328 @@
package com.gildedgames.aether.client.models.entities.living;

import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.MathHelper;

public class ModelRam extends ModelBase
{
//fields
ModelRenderer BodyMain;
ModelRenderer BodyBack;
ModelRenderer BodyBottom;
ModelRenderer LegFrontLeft1;
ModelRenderer LegFrontLeft2;
ModelRenderer LegFrontLeft3;
ModelRenderer LegFrontRight1;
ModelRenderer LegFrontRight2;
ModelRenderer LegFrontRight3;
ModelRenderer LegBackLeft1;
ModelRenderer LegBackLeft2;
ModelRenderer LegBackLeft3;
ModelRenderer LegBackRight1;
ModelRenderer LegBackRight2;
ModelRenderer LegBackRight3;
ModelRenderer Tail;
ModelRenderer HeadNeck;
ModelRenderer HeadMain;
ModelRenderer HeadSnout;
ModelRenderer HeadCheekLeft;
ModelRenderer HeadCheekRight;
ModelRenderer HeadJaw;
ModelRenderer HeadEyeRight;
ModelRenderer HeadBrowRight;
ModelRenderer HeadEyeLeft;
ModelRenderer HeadBrowLeft;
ModelRenderer HeadPlate;
ModelRenderer HeadTop;
ModelRenderer HeadEarLeft;
ModelRenderer HeadEarRight;

public ModelRam()
{
textureWidth = 128;
textureHeight = 256;

BodyMain = new ModelRenderer(this, 36, 74);
BodyMain.addBox(-5F, 0F, -8F, 10, 13, 16);
BodyMain.setRotationPoint(0F, 0F, 0F);
BodyMain.setTextureSize(128, 256);
BodyMain.mirror = true;
setRotation(BodyMain, 0F, 0F, 0F);
BodyBack = new ModelRenderer(this, 41, 103);
BodyBack.addBox(-4F, -2F, 7F, 8, 9, 13);
BodyBack.setRotationPoint(0F, 0F, 0F);
BodyBack.setTextureSize(128, 256);
BodyBack.mirror = true;
setRotation(BodyBack, -0.3490659F, 0F, 0F);
BodyBottom = new ModelRenderer(this, 36, 125);
BodyBottom.addBox(-3F, 10F, -4F, 6, 5, 20);
BodyBottom.setRotationPoint(0F, 0F, 0F);
BodyBottom.setTextureSize(128, 256);
BodyBottom.mirror = true;
setRotation(BodyBottom, 0F, 0F, 0F);
LegFrontLeft1 = new ModelRenderer(this, 88, 63);
LegFrontLeft1.addBox(-3F, -4F, -2F, 5, 6, 5);
LegFrontLeft1.setRotationPoint(4F, 13F, -5F);
LegFrontLeft1.setTextureSize(128, 256);
LegFrontLeft1.mirror = true;
setRotation(LegFrontLeft1, 0F, 0F, 0F);
LegFrontLeft2 = new ModelRenderer(this, 91, 74);
LegFrontLeft2.addBox(-2.5F, 0F, -1F, 4, 7, 3);
LegFrontLeft2.setRotationPoint(4F, 13F, -5F);
LegFrontLeft2.setTextureSize(128, 256);
LegFrontLeft2.mirror = true;
setRotation(LegFrontLeft2, 0.0872665F, 0F, 0F);
LegFrontLeft3 = new ModelRenderer(this, 93, 84);
LegFrontLeft3.addBox(-2F, 6F, 0F, 3, 5, 2);
LegFrontLeft3.setRotationPoint(4F, 13F, -5F);
LegFrontLeft3.setTextureSize(128, 256);
LegFrontLeft3.mirror = true;
setRotation(LegFrontLeft3, 0F, 0F, 0F);
LegFrontRight1 = new ModelRenderer(this, 16, 63);
LegFrontRight1.addBox(-2F, -4F, -2F, 5, 6, 5);
LegFrontRight1.setRotationPoint(-4F, 13F, -5F);
LegFrontRight1.setTextureSize(128, 256);
LegFrontRight1.mirror = true;
setRotation(LegFrontRight1, 0F, 0F, 0F);
LegFrontRight2 = new ModelRenderer(this, 19, 74);
LegFrontRight2.addBox(-1.5F, 0F, -1F, 4, 7, 3);
LegFrontRight2.setRotationPoint(-4F, 13F, -5F);
LegFrontRight2.setTextureSize(128, 256);
LegFrontRight2.mirror = true;
setRotation(LegFrontRight2, 0.0872665F, 0F, 0F);
LegFrontRight3 = new ModelRenderer(this, 21, 84);
LegFrontRight3.addBox(-1F, 6F, 0F, 3, 5, 2);
LegFrontRight3.setRotationPoint(-4F, 13F, -5F);
LegFrontRight3.setTextureSize(128, 256);
LegFrontRight3.mirror = true;
setRotation(LegFrontRight3, 0F, 0F, 0F);
LegBackLeft1 = new ModelRenderer(this, 88, 112);
LegBackLeft1.addBox(-2F, -1F, -1F, 4, 7, 6);
LegBackLeft1.setRotationPoint(3.5F, 12F, 7F);
LegBackLeft1.setTextureSize(128, 256);
LegBackLeft1.mirror = true;
setRotation(LegBackLeft1, 0.6108652F, 0F, 0F);
LegBackLeft2 = new ModelRenderer(this, 91, 125);
LegBackLeft2.addBox(-2F, 6F, -1F, 4, 2, 3);
LegBackLeft2.setRotationPoint(3.5F, 12F, 7F);
LegBackLeft2.setTextureSize(128, 256);
LegBackLeft2.mirror = true;
setRotation(LegBackLeft2, 0.6108652F, 0F, 0F);
LegBackLeft3 = new ModelRenderer(this, 93, 130);
LegBackLeft3.addBox(-1.5F, 5F, 3.5F, 3, 7, 2);
LegBackLeft3.setRotationPoint(3.5F, 12F, 7F);
LegBackLeft3.setTextureSize(128, 256);
LegBackLeft3.mirror = true;
setRotation(LegBackLeft3, 0F, 0F, 0F);
LegBackRight1 = new ModelRenderer(this, 16, 112);
LegBackRight1.addBox(-2F, -1F, -1F, 4, 7, 6);
LegBackRight1.setRotationPoint(-3.5F, 12F, 7F);
LegBackRight1.setTextureSize(128, 256);
LegBackRight1.mirror = true;
setRotation(LegBackRight1, 0.6108652F, 0F, 0F);
LegBackRight2 = new ModelRenderer(this, 19, 125);
LegBackRight2.addBox(-2F, 6F, -1F, 4, 2, 3);
LegBackRight2.setRotationPoint(-3.5F, 12F, 7F);
LegBackRight2.setTextureSize(128, 256);
LegBackRight2.mirror = true;
setRotation(LegBackRight2, 0.6108652F, 0F, 0F);
LegBackRight3 = new ModelRenderer(this, 21, 130);
LegBackRight3.addBox(-1.5F, 5F, 3.5F, 3, 7, 2);
LegBackRight3.setRotationPoint(-3.5F, 12F, 7F);
LegBackRight3.setTextureSize(128, 256);
LegBackRight3.mirror = true;
setRotation(LegBackRight3, 0F, 0F, 0F);
Tail = new ModelRenderer(this, 58, 150);
Tail.addBox(-1.5F, 0F, 0F, 3, 8, 1);
Tail.setRotationPoint(0F, 5F, 18F);
Tail.setTextureSize(128, 256);
Tail.mirror = true;
setRotation(Tail, 0.1745329F, 0F, 0F);
HeadNeck = new ModelRenderer(this, 49, 61);
HeadNeck.addBox(-3F, -3F, -2.5F, 6, 6, 7);
HeadNeck.setRotationPoint(0F, 6F, -9F);
HeadNeck.setTextureSize(128, 256);
HeadNeck.mirror = true;
setRotation(HeadNeck, 0F, 0F, 0F);
HeadMain = new ModelRenderer(this, 49, 31);
HeadMain.addBox(-4F, -5.133333F, -6F, 8, 10, 5);
HeadMain.setRotationPoint(0F, 6F, -9F);
HeadMain.setTextureSize(128, 256);
HeadMain.mirror = true;
setRotation(HeadMain, 0F, 0F, 0F);
HeadSnout = new ModelRenderer(this, 48, 17);
HeadSnout.addBox(-2.5F, -7.5F, -11F, 5, 5, 9);
HeadSnout.setRotationPoint(0F, 6F, -9F);
HeadSnout.setTextureSize(128, 256);
HeadSnout.mirror = true;
setRotation(HeadSnout, 0.6108652F, 0F, 0F);
HeadCheekLeft = new ModelRenderer(this, 75, 36);
HeadCheekLeft.addBox(2.3F, 0.5F, -10.5F, 3, 4, 6);
HeadCheekLeft.setRotationPoint(0F, 6F, -9F);
HeadCheekLeft.setTextureSize(128, 256);
HeadCheekLeft.mirror = true;
setRotation(HeadCheekLeft, 0F, 0.2617994F, 0F);
HeadCheekRight = new ModelRenderer(this, 31, 36);
HeadCheekRight.addBox(-5.3F, 0.5F, -10.5F, 3, 4, 6);
HeadCheekRight.setRotationPoint(0F, 6F, -9F);
HeadCheekRight.setTextureSize(128, 256);
HeadCheekRight.mirror = true;
setRotation(HeadCheekRight, 0F, -0.2617994F, 0F);
HeadJaw = new ModelRenderer(this, 47, 46);
HeadJaw.addBox(-2F, 3F, -11F, 4, 4, 11);
HeadJaw.setRotationPoint(0F, 6F, -9F);
HeadJaw.setTextureSize(128, 256);
HeadJaw.mirror = true;
setRotation(HeadJaw, -0.1745329F, 0F, 0F);
HeadEyeRight = new ModelRenderer(this, 36, 30);
HeadEyeRight.addBox(-4.6F, -2F, -7.5F, 1, 3, 3);
HeadEyeRight.setRotationPoint(0F, 6F, -9F);
HeadEyeRight.setTextureSize(128, 256);
HeadEyeRight.mirror = true;
setRotation(HeadEyeRight, 0F, -0.2617994F, 0F);
HeadBrowRight = new ModelRenderer(this, 35, 26);
HeadBrowRight.addBox(-5F, -3F, -7.7F, 2, 1, 3);
HeadBrowRight.setRotationPoint(0F, 6F, -9F);
HeadBrowRight.setTextureSize(128, 256);
HeadBrowRight.mirror = true;
setRotation(HeadBrowRight, 0F, -0.2617994F, 0F);
HeadEyeLeft = new ModelRenderer(this, 80, 30);
HeadEyeLeft.addBox(3.6F, -2F, -7.5F, 1, 3, 3);
HeadEyeLeft.setRotationPoint(0F, 6F, -9F);
HeadEyeLeft.setTextureSize(128, 256);
HeadEyeLeft.mirror = true;
setRotation(HeadEyeLeft, 0F, 0.2617994F, 0F);
HeadBrowLeft = new ModelRenderer(this, 79, 26);
HeadBrowLeft.addBox(3F, -3F, -7.7F, 2, 1, 3);
HeadBrowLeft.setRotationPoint(0F, 6F, -9F);
HeadBrowLeft.setTextureSize(128, 256);
HeadBrowLeft.mirror = true;
setRotation(HeadBrowLeft, 0F, 0.2617994F, 0F);
HeadPlate = new ModelRenderer(this, 45, 2);
HeadPlate.addBox(-4.5F, -8.5F, -4F, 9, 2, 8);
HeadPlate.setRotationPoint(0F, 6F, -9F);
HeadPlate.setTextureSize(128, 256);
HeadPlate.mirror = true;
setRotation(HeadPlate, 0.6108652F, 0F, 0F);
HeadTop = new ModelRenderer(this, 52, 12);
HeadTop.addBox(-3F, -6F, -4.533333F, 6, 1, 4);
HeadTop.setRotationPoint(0F, 6F, -9F);
HeadTop.setTextureSize(128, 256);
HeadTop.mirror = true;
setRotation(HeadTop, 0.1745329F, 0F, 0F);
HeadEarLeft = new ModelRenderer(this, 93, 39);
HeadEarLeft.addBox(4F, -1F, -5F, 1, 4, 3);
HeadEarLeft.setRotationPoint(0F, 6F, -9F);
HeadEarLeft.setTextureSize(128, 256);
HeadEarLeft.mirror = true;
setRotation(HeadEarLeft, 0F, 0F, -0.4363323F);
HeadEarRight = new ModelRenderer(this, 23, 39);
HeadEarRight.addBox(-5F, -1F, -5F, 1, 4, 3);
HeadEarRight.setRotationPoint(0F, 6F, -9F);
HeadEarRight.setTextureSize(128, 256);
HeadEarRight.mirror = true;
setRotation(HeadEarRight, 0F, 0F, 0.4363323F);
}

public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
BodyMain.render(f5);
BodyBack.render(f5);
BodyBottom.render(f5);
LegFrontLeft1.render(f5);
LegFrontLeft2.render(f5);
LegFrontLeft3.render(f5);
LegFrontRight1.render(f5);
LegFrontRight2.render(f5);
LegFrontRight3.render(f5);
LegBackLeft1.render(f5);
LegBackLeft2.render(f5);
LegBackLeft3.render(f5);
LegBackRight1.render(f5);
LegBackRight2.render(f5);
LegBackRight3.render(f5);
Tail.render(f5);
HeadNeck.render(f5);
HeadMain.render(f5);
HeadSnout.render(f5);
HeadCheekLeft.render(f5);
HeadCheekRight.render(f5);
HeadJaw.render(f5);
HeadEyeRight.render(f5);
HeadBrowRight.render(f5);
HeadEyeLeft.render(f5);
HeadBrowLeft.render(f5);
HeadPlate.render(f5);
HeadTop.render(f5);
HeadEarLeft.render(f5);
HeadEarRight.render(f5);
}

private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}

public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entity)
{
super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entity);

this.Tail.rotateAngleZ = (MathHelper.cos(ageInTicks * 0.1662F) * 0.6F);

this.HeadNeck.rotateAngleX = headPitch * 0.017453292F;
this.HeadNeck.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadMain.rotateAngleX = headPitch * 0.017453292F;
this.HeadMain.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadSnout.rotateAngleX = 0.6108652F + (headPitch * 0.017453292F);
this.HeadSnout.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadCheekLeft.rotateAngleX = headPitch * 0.017453292F;
this.HeadCheekLeft.rotateAngleY = 0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadCheekRight.rotateAngleX = headPitch * 0.017453292F;
this.HeadCheekRight.rotateAngleY = -0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadJaw.rotateAngleX = -0.1745329F + (headPitch * 0.017453292F);
this.HeadJaw.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadEyeLeft.rotateAngleX = headPitch * 0.017453292F;
this.HeadEyeLeft.rotateAngleY = 0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadEyeRight.rotateAngleX = headPitch * 0.017453292F;
this.HeadEyeRight.rotateAngleY = -0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadBrowLeft.rotateAngleX = headPitch * 0.017453292F;
this.HeadBrowLeft.rotateAngleY = 0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadBrowRight.rotateAngleX = headPitch * 0.017453292F;
this.HeadBrowRight.rotateAngleY = -0.2617994F + (netHeadYaw * 0.017453292F);
this.HeadPlate.rotateAngleX = 0.6108652F + (headPitch * 0.017453292F);
this.HeadPlate.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadTop.rotateAngleX = 0.1745329F + (headPitch * 0.017453292F);
this.HeadTop.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadEarLeft.rotateAngleX = headPitch * 0.017453292F;
this.HeadEarLeft.rotateAngleY = netHeadYaw * 0.017453292F;
this.HeadEarRight.rotateAngleX = headPitch * 0.017453292F;
this.HeadEarRight.rotateAngleY = netHeadYaw * 0.017453292F;

//this.BodyBack.rotateAngleX = ((float)Math.PI / 2F);
//this.BodyBottom.rotateAngleX = ((float)Math.PI / 2F);
//this.BodyMain.rotateAngleX = ((float)Math.PI / 2F);

this.LegFrontLeft1.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
this.LegFrontLeft2.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
this.LegFrontLeft3.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount;

this.LegFrontRight1.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);
this.LegFrontRight2.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);
this.LegFrontRight3.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount;

this.LegBackLeft1.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);
this.LegBackLeft2.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);
this.LegBackLeft3.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount;

this.LegBackRight1.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
this.LegBackRight2.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
this.LegBackRight3.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount;
}

}

+ 133
- 0
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelRamWool.java View File

@@ -0,0 +1,133 @@
package com.gildedgames.aether.client.models.entities.living;

import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.MathHelper;

public class ModelRamWool extends ModelBase
{
//fields
ModelRenderer BodyMain;
ModelRenderer BodyBack;
ModelRenderer BodyBottom;
ModelRenderer LegFrontLeft1;
ModelRenderer LegFrontRight1;
ModelRenderer LegBackLeft1;
ModelRenderer LegBackLeft2;
ModelRenderer LegBackRight1;
ModelRenderer LegBackRight2;
ModelRenderer Tail;
public ModelRamWool()
{
textureWidth = 128;
textureHeight = 256;
BodyMain = new ModelRenderer(this, 28, 74);
BodyMain.addBox(-8F, -1F, -10F, 16, 16, 18);
BodyMain.setRotationPoint(0F, 0F, 0F);
BodyMain.setTextureSize(128, 256);
BodyMain.mirror = true;
setRotation(BodyMain, 0F, 0F, 0F);
BodyBack = new ModelRenderer(this, 35, 108);
BodyBack.addBox(-7F, -3F, 7F, 14, 11, 13);
BodyBack.setRotationPoint(0F, 0F, 0F);
BodyBack.setTextureSize(128, 256);
BodyBack.mirror = true;
setRotation(BodyBack, -0.3490659F, 0F, 0F);
BodyBottom = new ModelRenderer(this, 44, 132);
BodyBottom.addBox(-5F, 10F, 8F, 10, 5, 8);
BodyBottom.setRotationPoint(0F, 0F, 0F);
BodyBottom.setTextureSize(128, 256);
BodyBottom.mirror = true;
setRotation(BodyBottom, 0F, 0F, 0F);
LegFrontLeft1 = new ModelRenderer(this, 96, 61);
LegFrontLeft1.addBox(-3F, 0F, -3F, 6, 7, 6);
LegFrontLeft1.setRotationPoint(4F, 13F, -5F);
LegFrontLeft1.setTextureSize(128, 256);
LegFrontLeft1.mirror = true;
setRotation(LegFrontLeft1, 0.0872665F, 0F, 0F);
LegFrontRight1 = new ModelRenderer(this, 4, 61);
LegFrontRight1.addBox(-3F, 0F, -3F, 6, 7, 6);
LegFrontRight1.setRotationPoint(-4F, 13F, -5F);
LegFrontRight1.setTextureSize(128, 256);
LegFrontRight1.mirror = true;
setRotation(LegFrontRight1, 0.0872665F, 0F, 0F);
LegBackLeft1 = new ModelRenderer(this, 96, 108);
LegBackLeft1.addBox(-3F, -1F, -3F, 6, 7, 8);
LegBackLeft1.setRotationPoint(3.5F, 12F, 7F);
LegBackLeft1.setTextureSize(128, 256);
LegBackLeft1.mirror = true;
setRotation(LegBackLeft1, 0.6108652F, 0F, 0F);
LegBackLeft2 = new ModelRenderer(this, 99, 123);
LegBackLeft2.addBox(-3F, 6F, -3F, 6, 2, 5);
LegBackLeft2.setRotationPoint(3.5F, 12F, 7F);
LegBackLeft2.setTextureSize(128, 256);
LegBackLeft2.mirror = true;
setRotation(LegBackLeft2, 0.6108652F, 0F, 0F);
LegBackRight1 = new ModelRenderer(this, 0, 108);
LegBackRight1.addBox(-3F, -1F, -3F, 6, 7, 8);
LegBackRight1.setRotationPoint(-3.5F, 12F, 7F);
LegBackRight1.setTextureSize(128, 256);
LegBackRight1.mirror = true;
setRotation(LegBackRight1, 0.6108652F, 0F, 0F);
LegBackRight2 = new ModelRenderer(this, 3, 123);
LegBackRight2.addBox(-3F, 6F, -3F, 6, 2, 5);
LegBackRight2.setRotationPoint(-3.5F, 12F, 7F);
LegBackRight2.setTextureSize(128, 256);
LegBackRight2.mirror = true;
setRotation(LegBackRight2, 0.6108652F, 0F, 0F);
Tail = new ModelRenderer(this, 56, 145);
Tail.addBox(-2F, 0F, -1F, 4, 9, 2);
Tail.setRotationPoint(0F, 5F, 18F);
Tail.setTextureSize(128, 256);
Tail.mirror = true;
setRotation(Tail, 0.1745329F, 0F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
BodyMain.render(f5);
BodyBack.render(f5);
BodyBottom.render(f5);
LegFrontLeft1.render(f5);
LegFrontRight1.render(f5);
LegBackLeft1.render(f5);
LegBackLeft2.render(f5);
LegBackRight1.render(f5);
LegBackRight2.render(f5);
Tail.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}

public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entity)
{
super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entity);

//this.BodyBack.rotateAngleX = ((float)Math.PI / 2F);
//this.BodyBottom.rotateAngleX = ((float)Math.PI / 2F);
//this.BodyMain.rotateAngleX = ((float)Math.PI / 2F);

this.Tail.rotateAngleZ = (MathHelper.cos(ageInTicks * 0.1662F) * 0.6F);

this.LegFrontLeft1.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);

this.LegFrontRight1.rotateAngleX = 0.0872665F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);

this.LegBackLeft1.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);
this.LegBackLeft2.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount);

this.LegBackRight1.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
this.LegBackRight2.rotateAngleX = 0.6108652F + (MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount);
}

}

+ 2
- 4
src/main/java/com/gildedgames/aether/client/renderer/AetherRenderers.java View File

@@ -32,10 +32,7 @@ import com.gildedgames.aether.common.entities.companions.EntityShadeOfArkenzus;
import com.gildedgames.aether.common.entities.companions.EntityEtheralWisp;
import com.gildedgames.aether.common.entities.companions.EntitySoaringWisp;
import com.gildedgames.aether.common.entities.item.EntityPhoenixItem;
import com.gildedgames.aether.common.entities.living.EntityAechorPlant;
import com.gildedgames.aether.common.entities.living.EntityAerbunny;
import com.gildedgames.aether.common.entities.living.EntityCarrionSprout;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import com.gildedgames.aether.common.entities.living.*;
import com.gildedgames.aether.common.entities.living.enemies.EntityCockatrice;
import com.gildedgames.aether.common.entities.living.mounts.EntityFlyingCow;
import com.gildedgames.aether.common.entities.living.mounts.EntityPhyg;
@@ -99,6 +96,7 @@ public class AetherRenderers
RenderingRegistry.registerEntityRenderingHandler(EntityFangrin.class, new AetherRenderFactory<>(RenderFangrin.class));
RenderingRegistry.registerEntityRenderingHandler(EntityNexSpirit.class, new AetherRenderFactory<>(RenderNexSpirit.class));
RenderingRegistry.registerEntityRenderingHandler(EntityCockatrice.class, new AetherRenderFactory<>(RenderCockatrice.class));
RenderingRegistry.registerEntityRenderingHandler(EntityRam.class, new AetherRenderFactory<>(RenderRam.class));
}

private static void registerTESRs()


+ 30
- 0
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderRam.java View File

@@ -0,0 +1,30 @@
package com.gildedgames.aether.client.renderer.entities.living;

import com.gildedgames.aether.client.models.entities.living.ModelRam;
import com.gildedgames.aether.client.models.entities.living.ModelSheepuff;
import com.gildedgames.aether.client.renderer.entities.living.layers.LayerRamWool;
import com.gildedgames.aether.client.renderer.entities.living.layers.LayerSheepuffFur;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntityRam;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation;

public class RenderRam extends RenderLiving<EntityRam>
{
private static final ResourceLocation texture = AetherCore.getResource("textures/entities/ram/ram.png");

public RenderRam(RenderManager renderManager)
{
super(renderManager, new ModelRam(), 0.75f);

this.addLayer(new LayerRamWool(this));
}

@Override
protected ResourceLocation getEntityTexture(EntityRam entity)
{
return texture;
}
}

+ 52
- 0
src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerRamWool.java View File

@@ -0,0 +1,52 @@
package com.gildedgames.aether.client.renderer.entities.living.layers;

import com.gildedgames.aether.client.models.entities.living.ModelRamWool;
import com.gildedgames.aether.client.renderer.entities.living.RenderRam;
import com.gildedgames.aether.client.renderer.entities.living.RenderSheepuff;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntityRam;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.util.ResourceLocation;

public class LayerRamWool implements LayerRenderer
{
private static final ResourceLocation texture = AetherCore.getResource("textures/entities/ram/ram_wool.png");

private final ModelRamWool woolModel = new ModelRamWool();

private final RenderRam render;

public LayerRamWool(RenderRam render)
{
this.render = render;
}

@Override
public void doRenderLayer(EntityLivingBase entity, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
{
EntityRam ram = (EntityRam) entity;

if (!ram.getSheared() && !ram.isInvisible())
{
float[] colors = EntitySheep.getDyeRgb(ram.getFleeceColor());
GlStateManager.color(colors[0], colors[1], colors[2]);
GlStateManager.scale(1.01F, 1.01F, 1.01F);

this.render.bindTexture(texture);

this.woolModel.setModelAttributes(this.render.getMainModel());
this.woolModel.setLivingAnimations(ram, p_177141_2_, p_177141_3_, p_177141_4_);
this.woolModel.render(ram, p_177141_2_, p_177141_3_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
}
}

@Override
public boolean shouldCombineTextures()
{
return true;
}
}

+ 3
- 4
src/main/java/com/gildedgames/aether/common/entities/EntitiesAether.java View File

@@ -12,10 +12,7 @@ import com.gildedgames.aether.common.entities.companions.EntityShadeOfArkenzus;
import com.gildedgames.aether.common.entities.companions.EntityEtheralWisp;
import com.gildedgames.aether.common.entities.companions.EntitySoaringWisp;
import com.gildedgames.aether.common.entities.item.EntityPhoenixItem;
import com.gildedgames.aether.common.entities.living.EntityAechorPlant;
import com.gildedgames.aether.common.entities.living.EntityAerbunny;
import com.gildedgames.aether.common.entities.living.EntityCarrionSprout;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import com.gildedgames.aether.common.entities.living.*;
import com.gildedgames.aether.common.entities.living.enemies.EntityCockatrice;
import com.gildedgames.aether.common.entities.living.mounts.EntityFlyingCow;
import com.gildedgames.aether.common.entities.living.mounts.EntityPhyg;
@@ -41,6 +38,7 @@ public class EntitiesAether
registerLivingEntity(EntityAerbunny.class, "aerbunny", 0xCCFFFF, 0x0066CC);
registerLivingEntity(EntityCarrionSprout.class, "carrion_sprout", 0xCCFFFF, 0x5D8BBB);
registerLivingEntity(EntityCockatrice.class, "cockatrice", 0xCCFFFF, 0x6b519c);
registerLivingEntity(EntityRam.class, "ram", 0xCCFFFF, 0xCCCCFF);

registerLivingEntity(EntityFrostpineTotem.class, "frostpine_totem");
registerLivingEntity(EntityKraisith.class, "kraisith");
@@ -64,6 +62,7 @@ public class EntitiesAether
manager.registerPerTickEntry(new SpawnEntry(EntityPhyg.class, 1, 4, 0.35f));
manager.registerPerTickEntry(new SpawnEntry(EntityCarrionSprout.class, 2, 3, 0.4f));
manager.registerPerTickEntry(new SpawnEntry(EntitySheepuff.class, 3, 5, 0.5f));
manager.registerPerTickEntry(new SpawnEntry(EntityRam.class, 3, 5, 0.5f));

manager.registerPerTickEntry(new SpawnEntry(EntityAechorPlant.class, 2, 4, 0.4f));
manager.registerPerTickEntry(new SpawnEntry(EntityCockatrice.class, 3, 5, 0.5f));


+ 22
- 0
src/main/java/com/gildedgames/aether/common/entities/living/EntityRam.java View File

@@ -0,0 +1,22 @@
package com.gildedgames.aether.common.entities.living;

import com.gildedgames.aether.common.blocks.BlocksAether;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.world.World;

public class EntityRam extends EntitySheep
{
public EntityRam(World world)
{
super(world);

this.spawnableBlock = BlocksAether.aether_grass;
}

@Override
public EntityRam createChild(EntityAgeable ageable)
{
return new EntityRam(this.worldObj);
}
}

+ 1
- 0
src/main/resources/assets/aether/lang/en_US.lang View File

@@ -351,6 +351,7 @@ entity.aether.aechor_plant.name=Aechor Plant
entity.aether.aerbunny.name=Aerbunny
entity.aether.carrion_sprout.name=Carrion Sprout
entity.aether.cockatrice.name=Cockatrice
entity.aether.ram.name=Ram

# Creative Tabs
itemGroup.aether.blocks=Aether Blocks


BIN
src/main/resources/assets/aether/textures/entities/ram/ram.png View File

Before After
Width: 128  |  Height: 256  |  Size: 6.1 KiB

BIN
src/main/resources/assets/aether/textures/entities/ram/ram_wool.png View File

Before After
Width: 128  |  Height: 256  |  Size: 8.5 KiB

Loading…
Cancel
Save