aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-10 03:37:03 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-10 03:37:03 +1000
commitf12214dbefcee088c09f572b59b8891110258781 (patch)
tree98eaa3323f4e7c1f2c33776ca4b2af3b6804ac74 /src/Java
parentd31ca7018707fb189d138383342f67498c236067 (diff)
downloadGT5-Unofficial-f12214dbefcee088c09f572b59b8891110258781.tar.gz
GT5-Unofficial-f12214dbefcee088c09f572b59b8891110258781.tar.bz2
GT5-Unofficial-f12214dbefcee088c09f572b59b8891110258781.zip
+ Added some new Animals to Australia. (Boar, Dingo, Octopus & Spiders)
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java2
-rw-r--r--src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java148
-rw-r--r--src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java20
-rw-r--r--src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java168
-rw-r--r--src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java67
-rw-r--r--src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java84
-rw-r--r--src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java64
-rw-r--r--src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java90
-rw-r--r--src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java120
-rw-r--r--src/Java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java41
-rw-r--r--src/Java/gtPlusPlus/australia/entity/type/EntityBoar.java220
-rw-r--r--src/Java/gtPlusPlus/australia/entity/type/EntityDingo.java546
-rw-r--r--src/Java/gtPlusPlus/australia/entity/type/EntityOctopus.java228
-rw-r--r--src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java44
-rw-r--r--src/Java/gtPlusPlus/core/proxy/ClientProxy.java77
15 files changed, 1885 insertions, 34 deletions
diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java b/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java
index e657e78862..439c213ac7 100644
--- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java
+++ b/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java
@@ -44,7 +44,7 @@ public class Biome_AustralianOutback extends BiomeGenMesa
this.fillerBlock = Blocks.stained_hardened_clay;
this.theBiomeDecorator.deadBushPerChunk = 20;
this.theBiomeDecorator.reedsPerChunk = 3;
- this.theBiomeDecorator.cactiPerChunk = 8;
+ this.theBiomeDecorator.cactiPerChunk = 20;
this.theBiomeDecorator.flowersPerChunk = 0;
this.spawnableCreatureList.clear();
this.theBiomeDecorator.treesPerChunk = 5;
diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java b/src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java
new file mode 100644
index 0000000000..05b43b7558
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java
@@ -0,0 +1,148 @@
+package gtPlusPlus.australia.entity.model;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+@SideOnly(Side.CLIENT)
+public class ModelAustralianSpider extends ModelBase {
+
+ /** The spider's head box */
+ public ModelRenderer spiderHead;
+ /** The spider's neck box */
+ public ModelRenderer spiderNeck;
+ /** The spider's body box */
+ public ModelRenderer spiderBody;
+ /** Spider's first leg */
+ public ModelRenderer spiderLeg1;
+ /** Spider's second leg */
+ public ModelRenderer spiderLeg2;
+ /** Spider's third leg */
+ public ModelRenderer spiderLeg3;
+ /** Spider's fourth leg */
+ public ModelRenderer spiderLeg4;
+ /** Spider's fifth leg */
+ public ModelRenderer spiderLeg5;
+ /** Spider's sixth leg */
+ public ModelRenderer spiderLeg6;
+ /** Spider's seventh leg */
+ public ModelRenderer spiderLeg7;
+ /** Spider's eight leg */
+ public ModelRenderer spiderLeg8;
+
+ public ModelAustralianSpider() {
+ float f = 0.0F;
+ byte b0 = 15;
+ this.spiderHead = new ModelRenderer(this, 32, 4);
+ this.spiderHead.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 8, f);
+ this.spiderHead.setRotationPoint(0.0F, (float) b0, -3.0F);
+ this.spiderNeck = new ModelRenderer(this, 0, 0);
+ this.spiderNeck.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, f);
+ this.spiderNeck.setRotationPoint(0.0F, (float) b0, 0.0F);
+ this.spiderBody = new ModelRenderer(this, 0, 12);
+ this.spiderBody.addBox(-5.0F, -4.0F, -6.0F, 10, 8, 12, f);
+ this.spiderBody.setRotationPoint(0.0F, (float) b0, 9.0F);
+ this.spiderLeg1 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg1.setRotationPoint(-4.0F, (float) b0, 2.0F);
+ this.spiderLeg2 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg2.setRotationPoint(4.0F, (float) b0, 2.0F);
+ this.spiderLeg3 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg3.setRotationPoint(-4.0F, (float) b0, 1.0F);
+ this.spiderLeg4 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg4.setRotationPoint(4.0F, (float) b0, 1.0F);
+ this.spiderLeg5 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg5.setRotationPoint(-4.0F, (float) b0, 0.0F);
+ this.spiderLeg6 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg6.setRotationPoint(4.0F, (float) b0, 0.0F);
+ this.spiderLeg7 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg7.setRotationPoint(-4.0F, (float) b0, -1.0F);
+ this.spiderLeg8 = new ModelRenderer(this, 18, 0);
+ this.spiderLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, f);
+ this.spiderLeg8.setRotationPoint(4.0F, (float) b0, -1.0F);
+ }
+
+ /**
+ * Sets the models various rotation angles then renders the model.
+ */
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
+ this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+ this.spiderHead.render(p_78088_7_);
+ this.spiderNeck.render(p_78088_7_);
+ this.spiderBody.render(p_78088_7_);
+ this.spiderLeg1.render(p_78088_7_);
+ this.spiderLeg2.render(p_78088_7_);
+ this.spiderLeg3.render(p_78088_7_);
+ this.spiderLeg4.render(p_78088_7_);
+ this.spiderLeg5.render(p_78088_7_);
+ this.spiderLeg6.render(p_78088_7_);
+ this.spiderLeg7.render(p_78088_7_);
+ this.spiderLeg8.render(p_78088_7_);
+ }
+
+ /**
+ * Sets the model's various rotation angles. For bipeds, par1 and par2 are used
+ * for animating the movement of arms and legs, where par1 represents the
+ * time(so that arms and legs swing back and forth) and par2 represents how
+ * "far" arms and legs can swing at most.
+ */
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
+ this.spiderHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
+ this.spiderHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
+ float f6 = ((float) Math.PI / 4F);
+ this.spiderLeg1.rotateAngleZ = -f6;
+ this.spiderLeg2.rotateAngleZ = f6;
+ this.spiderLeg3.rotateAngleZ = -f6 * 0.74F;
+ this.spiderLeg4.rotateAngleZ = f6 * 0.74F;
+ this.spiderLeg5.rotateAngleZ = -f6 * 0.74F;
+ this.spiderLeg6.rotateAngleZ = f6 * 0.74F;
+ this.spiderLeg7.rotateAngleZ = -f6;
+ this.spiderLeg8.rotateAngleZ = f6;
+ float f7 = -0.0F;
+ float f8 = 0.3926991F;
+ this.spiderLeg1.rotateAngleY = f8 * 2.0F + f7;
+ this.spiderLeg2.rotateAngleY = -f8 * 2.0F - f7;
+ this.spiderLeg3.rotateAngleY = f8 * 1.0F + f7;
+ this.spiderLeg4.rotateAngleY = -f8 * 1.0F - f7;
+ this.spiderLeg5.rotateAngleY = -f8 * 1.0F + f7;
+ this.spiderLeg6.rotateAngleY = f8 * 1.0F - f7;
+ this.spiderLeg7.rotateAngleY = -f8 * 2.0F + f7;
+ this.spiderLeg8.rotateAngleY = f8 * 2.0F - f7;
+ float f9 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + 0.0F) * 0.4F) * p_78087_2_;
+ float f10 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + (float) Math.PI) * 0.4F) * p_78087_2_;
+ float f11 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + ((float) Math.PI / 2F)) * 0.4F) * p_78087_2_;
+ float f12 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + ((float) Math.PI * 3F / 2F)) * 0.4F) * p_78087_2_;
+ float f13 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + 0.0F) * 0.4F) * p_78087_2_;
+ float f14 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + (float) Math.PI) * 0.4F) * p_78087_2_;
+ float f15 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + ((float) Math.PI / 2F)) * 0.4F) * p_78087_2_;
+ float f16 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + ((float) Math.PI * 3F / 2F)) * 0.4F) * p_78087_2_;
+ this.spiderLeg1.rotateAngleY += f9;
+ this.spiderLeg2.rotateAngleY += -f9;
+ this.spiderLeg3.rotateAngleY += f10;
+ this.spiderLeg4.rotateAngleY += -f10;
+ this.spiderLeg5.rotateAngleY += f11;
+ this.spiderLeg6.rotateAngleY += -f11;
+ this.spiderLeg7.rotateAngleY += f12;
+ this.spiderLeg8.rotateAngleY += -f12;
+ this.spiderLeg1.rotateAngleZ += f13;
+ this.spiderLeg2.rotateAngleZ += -f13;
+ this.spiderLeg3.rotateAngleZ += f14;
+ this.spiderLeg4.rotateAngleZ += -f14;
+ this.spiderLeg5.rotateAngleZ += f15;
+ this.spiderLeg6.rotateAngleZ += -f15;
+ this.spiderLeg7.rotateAngleZ += f16;
+ this.spiderLeg8.rotateAngleZ += -f16;
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java b/src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java
new file mode 100644
index 0000000000..7d858e39f0
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java
@@ -0,0 +1,20 @@
+package gtPlusPlus.australia.entity.model;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelQuadruped;
+
+@SideOnly(Side.CLIENT)
+public class ModelBoar extends ModelQuadruped {
+
+ public ModelBoar() {
+ this(0.0F);
+ }
+
+ public ModelBoar(float p_i1151_1_) {
+ super(6, p_i1151_1_);
+ this.head.setTextureOffset(16, 16).addBox(-2.0F, 0.0F, -9.0F, 4, 3, 1, p_i1151_1_);
+ this.field_78145_g = 4.0F;
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java b/src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java
new file mode 100644
index 0000000000..2999cdf2dd
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java
@@ -0,0 +1,168 @@
+package gtPlusPlus.australia.entity.model;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.util.MathHelper;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class ModelDingo extends ModelBase {
+
+ /** main box for the dingo head */
+ public ModelRenderer dingoHeadMain;
+ /** The dingo's body */
+ public ModelRenderer dingoBody;
+ /** dingo'se first leg */
+ public ModelRenderer dingoLeg1;
+ /** dingo's second leg */
+ public ModelRenderer dingoLeg2;
+ /** dingo's third leg */
+ public ModelRenderer dingoLeg3;
+ /** dingo's fourth leg */
+ public ModelRenderer dingoLeg4;
+ /** The dingo's tail */
+ ModelRenderer dingoTail;
+ /** The dingo's mane */
+ ModelRenderer dingoMane;
+
+ public ModelDingo() {
+ float f = 0.0F;
+ float f1 = 13.5F;
+ this.dingoHeadMain = new ModelRenderer(this, 0, 0);
+ this.dingoHeadMain.addBox(-3.0F, -3.0F, -2.0F, 6, 6, 4, f);
+ this.dingoHeadMain.setRotationPoint(-1.0F, f1, -7.0F);
+ this.dingoBody = new ModelRenderer(this, 18, 14);
+ this.dingoBody.addBox(-4.0F, -2.0F, -3.0F, 6, 9, 6, f);
+ this.dingoBody.setRotationPoint(0.0F, 14.0F, 2.0F);
+ this.dingoMane = new ModelRenderer(this, 21, 0);
+ this.dingoMane.addBox(-4.0F, -3.0F, -3.0F, 8, 6, 7, f);
+ this.dingoMane.setRotationPoint(-1.0F, 14.0F, 2.0F);
+ this.dingoLeg1 = new ModelRenderer(this, 0, 18);
+ this.dingoLeg1.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, f);
+ this.dingoLeg1.setRotationPoint(-2.5F, 16.0F, 7.0F);
+ this.dingoLeg2 = new ModelRenderer(this, 0, 18);
+ this.dingoLeg2.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, f);
+ this.dingoLeg2.setRotationPoint(0.5F, 16.0F, 7.0F);
+ this.dingoLeg3 = new ModelRenderer(this, 0, 18);
+ this.dingoLeg3.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, f);
+ this.dingoLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F);
+ this.dingoLeg4 = new ModelRenderer(this, 0, 18);
+ this.dingoLeg4.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, f);
+ this.dingoLeg4.setRotationPoint(0.5F, 16.0F, -4.0F);
+ this.dingoTail = new ModelRenderer(this, 9, 18);
+ this.dingoTail.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, f);
+ this.dingoTail.setRotationPoint(-1.0F, 12.0F, 8.0F);
+ this.dingoHeadMain.setTextureOffset(16, 14).addBox(-3.0F, -5.0F, 0.0F, 2, 2, 1, f);
+ this.dingoHeadMain.setTextureOffset(16, 14).addBox(1.0F, -5.0F, 0.0F, 2, 2, 1, f);
+ this.dingoHeadMain.setTextureOffset(0, 10).addBox(-1.5F, 0.0F, -5.0F, 3, 3, 4, f);
+ }
+
+ /**
+ * Sets the models various rotation angles then renders the model.
+ */
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
+ super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+ this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+
+ if (this.isChild) {
+ float f6 = 2.0F;
+ GL11.glPushMatrix();
+ GL11.glTranslatef(0.0F, 5.0F * p_78088_7_, 2.0F * p_78088_7_);
+ this.dingoHeadMain.renderWithRotation(p_78088_7_);
+ GL11.glPopMatrix();
+ GL11.glPushMatrix();
+ GL11.glScalef(1.0F / f6, 1.0F / f6, 1.0F / f6);
+ GL11.glTranslatef(0.0F, 24.0F * p_78088_7_, 0.0F);
+ this.dingoBody.render(p_78088_7_);
+ this.dingoLeg1.render(p_78088_7_);
+ this.dingoLeg2.render(p_78088_7_);
+ this.dingoLeg3.render(p_78088_7_);
+ this.dingoLeg4.render(p_78088_7_);
+ this.dingoTail.renderWithRotation(p_78088_7_);
+ this.dingoMane.render(p_78088_7_);
+ GL11.glPopMatrix();
+ } else {
+ this.dingoHeadMain.renderWithRotation(p_78088_7_);
+ this.dingoBody.render(p_78088_7_);
+ this.dingoLeg1.render(p_78088_7_);
+ this.dingoLeg2.render(p_78088_7_);
+ this.dingoLeg3.render(p_78088_7_);
+ this.dingoLeg4.render(p_78088_7_);
+ this.dingoTail.renderWithRotation(p_78088_7_);
+ this.dingoMane.render(p_78088_7_);
+ }
+ }
+
+ /**
+ * Used for easily adding entity-dependent animations. The second and third
+ * float params here are the same second and third as in the setRotationAngles
+ * method.
+ */
+ public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) {
+ EntityWolf entitydingo = (EntityWolf) p_78086_1_;
+
+ if (entitydingo.isAngry()) {
+ this.dingoTail.rotateAngleY = 0.0F;
+ } else {
+ this.dingoTail.rotateAngleY = MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_;
+ }
+
+ if (entitydingo.isSitting()) {
+ this.dingoMane.setRotationPoint(-1.0F, 16.0F, -3.0F);
+ this.dingoMane.rotateAngleX = ((float) Math.PI * 2F / 5F);
+ this.dingoMane.rotateAngleY = 0.0F;
+ this.dingoBody.setRotationPoint(0.0F, 18.0F, 0.0F);
+ this.dingoBody.rotateAngleX = ((float) Math.PI / 4F);
+ this.dingoTail.setRotationPoint(-1.0F, 21.0F, 6.0F);
+ this.dingoLeg1.setRotationPoint(-2.5F, 22.0F, 2.0F);
+ this.dingoLeg1.rotateAngleX = ((float) Math.PI * 3F / 2F);
+ this.dingoLeg2.setRotationPoint(0.5F, 22.0F, 2.0F);
+ this.dingoLeg2.rotateAngleX = ((float) Math.PI * 3F / 2F);
+ this.dingoLeg3.rotateAngleX = 5.811947F;
+ this.dingoLeg3.setRotationPoint(-2.49F, 17.0F, -4.0F);
+ this.dingoLeg4.rotateAngleX = 5.811947F;
+ this.dingoLeg4.setRotationPoint(0.51F, 17.0F, -4.0F);
+ } else {
+ this.dingoBody.setRotationPoint(0.0F, 14.0F, 2.0F);
+ this.dingoBody.rotateAngleX = ((float) Math.PI / 2F);
+ this.dingoMane.setRotationPoint(-1.0F, 14.0F, -3.0F);
+ this.dingoMane.rotateAngleX = this.dingoBody.rotateAngleX;
+ this.dingoTail.setRotationPoint(-1.0F, 12.0F, 8.0F);
+ this.dingoLeg1.setRotationPoint(-2.5F, 16.0F, 7.0F);
+ this.dingoLeg2.setRotationPoint(0.5F, 16.0F, 7.0F);
+ this.dingoLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F);
+ this.dingoLeg4.setRotationPoint(0.5F, 16.0F, -4.0F);
+ this.dingoLeg1.rotateAngleX = MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_;
+ this.dingoLeg2.rotateAngleX = MathHelper.cos(p_78086_2_ * 0.6662F + (float) Math.PI) * 1.4F * p_78086_3_;
+ this.dingoLeg3.rotateAngleX = MathHelper.cos(p_78086_2_ * 0.6662F + (float) Math.PI) * 1.4F * p_78086_3_;
+ this.dingoLeg4.rotateAngleX = MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_;
+ }
+
+ this.dingoHeadMain.rotateAngleZ = entitydingo.getInterestedAngle(p_78086_4_)
+ + entitydingo.getShakeAngle(p_78086_4_, 0.0F);
+ this.dingoMane.rotateAngleZ = entitydingo.getShakeAngle(p_78086_4_, -0.08F);
+ this.dingoBody.rotateAngleZ = entitydingo.getShakeAngle(p_78086_4_, -0.16F);
+ this.dingoTail.rotateAngleZ = entitydingo.getShakeAngle(p_78086_4_, -0.2F);
+ }
+
+ /**
+ * Sets the model's various rotation angles. For bipeds, par1 and par2 are used
+ * for animating the movement of arms and legs, where par1 represents the
+ * time(so that arms and legs swing back and forth) and par2 represents how
+ * "far" arms and legs can swing at most.
+ */
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
+ super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+ this.dingoHeadMain.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
+ this.dingoHeadMain.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
+ this.dingoTail.rotateAngleX = p_78087_3_;
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java b/src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java
new file mode 100644
index 0000000000..f820d0ad85
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java
@@ -0,0 +1,67 @@
+package gtPlusPlus.australia.entity.model;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+@SideOnly(Side.CLIENT)
+public class ModelOctopus extends ModelBase {
+
+ /** The squid's body */
+ ModelRenderer octopusBody;
+ /** The squid's tentacles */
+ ModelRenderer[] octoTentacles = new ModelRenderer[8];
+
+ public ModelOctopus() {
+ byte b0 = -16;
+ this.octopusBody = new ModelRenderer(this, 0, 0);
+ this.octopusBody.addBox(-6.0F, -8.0F, -6.0F, 12, 16, 12);
+ this.octopusBody.rotationPointY += (float) (24 + b0);
+
+ for (int i = 0; i < this.octoTentacles.length; ++i) {
+ this.octoTentacles[i] = new ModelRenderer(this, 48, 0);
+ double d0 = (double) i * Math.PI * 2.0D / (double) this.octoTentacles.length;
+ float f = (float) Math.cos(d0) * 5.0F;
+ float f1 = (float) Math.sin(d0) * 5.0F;
+ this.octoTentacles[i].addBox(-1.0F, 0.0F, -1.0F, 2, 18, 2);
+ this.octoTentacles[i].rotationPointX = f;
+ this.octoTentacles[i].rotationPointZ = f1;
+ this.octoTentacles[i].rotationPointY = (float) (31 + b0);
+ d0 = (double) i * Math.PI * -2.0D / (double) this.octoTentacles.length + (Math.PI / 2D);
+ this.octoTentacles[i].rotateAngleY = (float) d0;
+ }
+ }
+
+ /**
+ * Sets the model's various rotation angles. For bipeds, par1 and par2 are used
+ * for animating the movement of arms and legs, where par1 represents the
+ * time(so that arms and legs swing back and forth) and par2 represents how
+ * "far" arms and legs can swing at most.
+ */
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
+ ModelRenderer[] amodelrenderer = this.octoTentacles;
+ int i = amodelrenderer.length;
+
+ for (int j = 0; j < i; ++j) {
+ ModelRenderer modelrenderer = amodelrenderer[j];
+ modelrenderer.rotateAngleX = p_78087_3_;
+ }
+ }
+
+ /**
+ * Sets the models various rotation angles then renders the model.
+ */
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
+ this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+ this.octopusBody.render(p_78088_7_);
+
+ for (int i = 0; i < this.octoTentacles.length; ++i) {
+ this.octoTentacles[i].render(p_78088_7_);
+ }
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java b/src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java
new file mode 100644
index 0000000000..af432e04b9
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java
@@ -0,0 +1,84 @@
+package gtPlusPlus.australia.entity.render;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.australia.entity.model.ModelAustralianSpider;
+import gtPlusPlus.australia.entity.type.EntityAustralianSpiderBase;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class RenderAustralianSpider extends RenderLiving {
+
+ private static final ResourceLocation spiderEyesTextures = new ResourceLocation("textures/entity/spider_eyes.png");
+ private static final ResourceLocation spiderTextures = new ResourceLocation(CORE.MODID+":"+"textures/entity/australia/bush_spider.png");
+
+ public RenderAustralianSpider() {
+ super(new ModelAustralianSpider(), 1.0F);
+ this.setRenderPassModel(new ModelAustralianSpider());
+ }
+
+ protected float getDeathMaxRotation(EntityAustralianSpiderBase p_77037_1_) {
+ return 180.0F;
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityAustralianSpiderBase p_77032_1_, int p_77032_2_, float p_77032_3_) {
+ if (p_77032_2_ != 0) {
+ return -1;
+ } else {
+ this.bindTexture(spiderEyesTextures);
+ GL11.glEnable(GL11.GL_BLEND);
+ GL11.glDisable(GL11.GL_ALPHA_TEST);
+ GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
+
+ if (p_77032_1_.isInvisible()) {
+ GL11.glDepthMask(false);
+ } else {
+ GL11.glDepthMask(true);
+ }
+
+ char c0 = 61680;
+ int j = c0 % 65536;
+ int k = c0 / 65536;
+ OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j / 1.0F, (float) k / 1.0F);
+ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+ return 1;
+ }
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless
+ * you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(EntityAustralianSpiderBase p_110775_1_) {
+ return spiderTextures;
+ }
+
+ protected float getDeathMaxRotation(EntityLivingBase p_77037_1_) {
+ return this.getDeathMaxRotation((EntityAustralianSpiderBase) p_77037_1_);
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityLivingBase p_77032_1_, int p_77032_2_, float p_77032_3_) {
+ return this.shouldRenderPass((EntityAustralianSpiderBase) p_77032_1_, p_77032_2_, p_77032_3_);
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless
+ * you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
+ return this.getEntityTexture((EntityAustralianSpiderBase) p_110775_1_);
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java b/src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java
new file mode 100644
index 0000000000..cc4bfa8906
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java
@@ -0,0 +1,64 @@
+package gtPlusPlus.australia.entity.render;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.australia.entity.type.EntityBoar;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class RenderBoar extends RenderLiving
+{
+ private static final ResourceLocation saddledBoarTextures = new ResourceLocation("textures/entity/boar/boar_saddle.png");
+ private static final ResourceLocation boarTextures = new ResourceLocation(CORE.MODID+":"+"textures/entity/australia/boar.png");
+
+ public RenderBoar(ModelBase p_i1265_1_, ModelBase p_i1265_2_, float p_i1265_3_)
+ {
+ super(p_i1265_1_, p_i1265_3_);
+ this.setRenderPassModel(p_i1265_2_);
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityBoar p_77032_1_, int p_77032_2_, float p_77032_3_)
+ {
+ if (p_77032_2_ == 0 && p_77032_1_.getSaddled())
+ {
+ this.bindTexture(saddledBoarTextures);
+ return 1;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(EntityBoar p_110775_1_)
+ {
+ return boarTextures;
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityLivingBase p_77032_1_, int p_77032_2_, float p_77032_3_)
+ {
+ return this.shouldRenderPass((EntityBoar)p_77032_1_, p_77032_2_, p_77032_3_);
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+ {
+ return this.getEntityTexture((EntityBoar)p_110775_1_);
+ }
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java b/src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java
new file mode 100644
index 0000000000..8bbf0392cd
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java
@@ -0,0 +1,90 @@
+package gtPlusPlus.australia.entity.render;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.australia.entity.type.EntityDingo;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class RenderDingo extends RenderLiving {
+
+ private static final ResourceLocation dingoTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/australia/dingo/dingo.png");
+ private static final ResourceLocation tamedDingoTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/australia/dingo/wdingo_tame.png");
+ private static final ResourceLocation anrgyDingoTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/australia/dingo/dingo_angry.png");
+ private static final ResourceLocation dingoCollarTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/australia/wdingoolf/dingo_collar.png");
+
+ public RenderDingo(ModelBase p_i1269_1_, ModelBase p_i1269_2_, float p_i1269_3_) {
+ super(p_i1269_1_, p_i1269_3_);
+ this.setRenderPassModel(p_i1269_2_);
+ }
+
+ /**
+ * Defines what float the third param in setRotationAngles of ModelBase is
+ */
+ protected float handleRotationFloat(EntityDingo p_77044_1_, float p_77044_2_) {
+ return p_77044_1_.getTailRotation();
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityDingo p_77032_1_, int p_77032_2_, float p_77032_3_) {
+ if (p_77032_2_ == 0 && p_77032_1_.getWolfShaking()) {
+ float f1 = p_77032_1_.getBrightness(p_77032_3_) * p_77032_1_.getShadingWhileShaking(p_77032_3_);
+ this.bindTexture(dingoTextures);
+ GL11.glColor3f(f1, f1, f1);
+ return 1;
+ } else if (p_77032_2_ == 1 && p_77032_1_.isTamed()) {
+ this.bindTexture(dingoCollarTextures);
+ int j = p_77032_1_.getCollarColor();
+ GL11.glColor3f(EntitySheep.fleeceColorTable[j][0], EntitySheep.fleeceColorTable[j][1],
+ EntitySheep.fleeceColorTable[j][2]);
+ return 1;
+ } else {
+ return -1;
+ }
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless
+ * you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(EntityDingo p_110775_1_) {
+ return p_110775_1_.isTamed() ? tamedDingoTextures
+ : (p_110775_1_.isAngry() ? anrgyDingoTextures : dingoTextures);
+ }
+
+ /**
+ * Queries whether should render the specified pass or not.
+ */
+ protected int shouldRenderPass(EntityLivingBase p_77032_1_, int p_77032_2_, float p_77032_3_) {
+ return this.shouldRenderPass((EntityDingo) p_77032_1_, p_77032_2_, p_77032_3_);
+ }
+
+ /**
+ * Defines what float the third param in setRotationAngles of ModelBase is
+ */
+ protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_) {
+ return this.handleRotationFloat((EntityDingo) p_77044_1_, p_77044_2_);
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless
+ * you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
+ return this.getEntityTexture((EntityDingo) p_110775_1_);
+ }
+
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java b/src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java
new file mode 100644
index 0000000000..592ef9391a
--- /dev/null
+++ b/src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java
@@ -0,0 +1,120 @@
+package gtPlusPlus.australia.entity.render;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.australia.entity.type.EntityOctopus;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class RenderOctopus extends RenderLiving {
+
+ private static final ResourceLocation octopusTextures = new ResourceLocation(CORE.MODID+":"+"textures/entity/australia/octopus.png");
+
+ public RenderOctopus(ModelBase p_i1268_1_, float p_i1268_2_) {
+ super(p_i1268_1_, p_i1268_2_);
+ }
+
+ /**
+ * Actually renders the given argument. This is a synthetic bridge method,
+ * always casting down its argument and then handing it off to a worker function
+ * which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void
+ * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
+ * But JAD is pre 1.5 so doesn't do that.
+ */
+ public void doRender(EntityOctopus p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
+ super.doRender((EntityLiving) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ }
+
+ /**
+ * Returns the location of an entity's texture. Doesn't seem to be called unless
+ * you call Render.bindEntityTexture.
+ */
+ protected ResourceLocation getEntityTexture(EntityOctopus p_110775_1_) {
+ return octopusTextures;
+ }
+
+ protected void rotateCorpse(EntityOctopus p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
+ float f3 = p_77043_1_.prevSquidPitch + (p_77043_1_.octopusPitch - p_77043_1_.prevSquidPitch) * p_77043_4_;
+ float f4 = p_77043_1_.prevSquidYaw + (p_77043_1_.octopusYaw - p_77043_1_.prevSquidYaw) * p_77043_4_;
+ GL11.glTranslatef(0.0F, 0.5F, 0.0F);
+ GL11.glRotatef(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F);
+ GL11.glRotatef(f3, 1.0F, 0.0F, 0.0F);
+ GL11.glRotatef(f4, 0.0F, 1.0F, 0.0F);
+ GL11.glTranslatef(0.0F, -1.2F, 0.0F);
+ }
+
+ /**
+ * Defines what float the third param in setRotationAngles of ModelBase is
+ */
+ protected float handleRotationFloat(EntityOctopus p_77044_1_, float p_77044_2_) {
+ return p_77044_1_.lastTentacleAngle + (p_77044_1_.tentacleAngle - p_77044_1_.lastTentacleAngle) * p_77044_2_;
+ }
+
+ /**
+ * Actually renders the given argument. This is a synthetic bridge method,
+ * always casting down its argument and then handing it off to a worker function
+ * which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void
+ * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
+ * But JAD is pre 1.5 so doesn't do that.
+ */
+ public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
+ this.doRender((EntityOctopus) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ }
+
+ /**
+ * Defines what float the third param in setRotationAngles of ModelBase is
+ */
+ protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_) {
+ return this.handleRotationFloat((EntityOctopus) p_77044_1_, p_77044_2_);
+ }
+
+ protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
+ this.rotateCorpse((EntityOctopus)