From c11982baa869f724b69fa61909067eefc3fb5190 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 28 Sep 2015 20:12:09 +0100 Subject: [PATCH] New teru teru bozu model. --- .../client/model/ModelTeruTeruBozu.java | 48 ++++++++--------- .../textures/model/unused/teruTeruBozu.java | 53 ------------------- 2 files changed, 24 insertions(+), 77 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/model/unused/teruTeruBozu.java diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index f291340ac..3c3a06745 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -16,37 +16,37 @@ import net.minecraft.entity.Entity; public class ModelTeruTeruBozu extends ModelBase { - public ModelRenderer shape1; - public ModelRenderer shape1_1; - public ModelRenderer shape1_2; - public ModelRenderer shape1_3; + public ModelRenderer thread; + public ModelRenderer cloth; + public ModelRenderer happyFace; + public ModelRenderer sadFace; public ModelTeruTeruBozu() { - this.textureWidth = 48; + this.textureWidth = 64; this.textureHeight = 32; - this.shape1_3 = new ModelRenderer(this, 0, 12); - this.shape1_3.setRotationPoint(0.0F, 14.5F, 0.0F); - this.shape1_3.addBox(0.0F, 0.0F, 0.0F, 6, 6, 6, 0.0F); - this.setRotateAngle(shape1_3, -2.1816615649929116F, -0.9599310885968813F, 1.3962634015954636F); - this.shape1_1 = new ModelRenderer(this, 0, 24); - this.shape1_1.setRotationPoint(0.0F, 14.0F, 0.0F); - this.shape1_1.addBox(-1.0F, 0.0F, -1.0F, 2, 1, 2, 0.0F); - this.shape1 = new ModelRenderer(this, 0, 0); - this.shape1.setRotationPoint(0.0F, 14.5F, 0.0F); - this.shape1.addBox(-3.0F, -6.0F, -3.0F, 6, 6, 6, 0.0F); - this.setRotateAngle(shape1, -0.17453292519943295F, 0.0F, 0.0F); - this.shape1_2 = new ModelRenderer(this, 0, 0); - this.shape1_2.setRotationPoint(0.0F, 14.5F, 0.0F); - this.shape1_2.addBox(-3.0F, -6.0F, -3.0F, 6, 6, 6, 0.0F); - this.setRotateAngle(shape1_2, -0.17453292519943295F, 0.0F, 0.0F); + this.sadFace = new ModelRenderer(this, 32, 0); + this.sadFace.setRotationPoint(0.0F, 14.5F, 0.0F); + this.sadFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + this.setRotateAngle(sadFace, 0.17453292519943295F, 0.0F, 0.0F); + this.happyFace = new ModelRenderer(this, 0, 0); + this.happyFace.setRotationPoint(0.0F, 14.5F, 0.0F); + this.happyFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + this.setRotateAngle(happyFace, -0.17453292519943295F, 0.0F, 0.0F); + this.thread = new ModelRenderer(this, 32, 16); + this.thread.setRotationPoint(0.0F, 14.0F, 0.0F); + this.thread.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); + this.cloth = new ModelRenderer(this, 0, 16); + this.cloth.setRotationPoint(0.0F, 21.5F, -1.0F); + this.cloth.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); + this.setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.shape1_3.render(f5); - this.shape1_1.render(f5); - this.shape1.render(f5); - this.shape1_2.render(f5); + this.sadFace.render(f5); + this.happyFace.render(f5); + this.thread.render(f5); + this.cloth.render(f5); } public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { diff --git a/src/main/resources/assets/botania/textures/model/unused/teruTeruBozu.java b/src/main/resources/assets/botania/textures/model/unused/teruTeruBozu.java deleted file mode 100644 index 51709f0bb..000000000 --- a/src/main/resources/assets/botania/textures/model/unused/teruTeruBozu.java +++ /dev/null @@ -1,53 +0,0 @@ -package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * teruTeruBozu - wiiv - * Created using Tabula 4.1.1 - */ -public class teruTeruBozu extends ModelBase { - public ModelRenderer thread; - public ModelRenderer cloth; - public ModelRenderer happyFace; - public ModelRenderer sadFace; - - public teruTeruBozu() { - this.textureWidth = 64; - this.textureHeight = 32; - this.sadFace = new ModelRenderer(this, 32, 0); - this.sadFace.setRotationPoint(0.0F, 14.5F, 0.0F); - this.sadFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(sadFace, 0.17453292519943295F, 0.0F, 0.0F); - this.happyFace = new ModelRenderer(this, 0, 0); - this.happyFace.setRotationPoint(0.0F, 14.5F, 0.0F); - this.happyFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(happyFace, -0.17453292519943295F, 0.0F, 0.0F); - this.thread = new ModelRenderer(this, 32, 16); - this.thread.setRotationPoint(0.0F, 14.0F, 0.0F); - this.thread.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); - this.cloth = new ModelRenderer(this, 0, 16); - this.cloth.setRotationPoint(0.0F, 21.5F, -1.0F); - this.cloth.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.sadFace.render(f5); - this.happyFace.render(f5); - this.thread.render(f5); - this.cloth.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -}