From c4abc083a69ee1a26ad5138c061743ee1d833e13 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 30 Apr 2015 13:31:49 +0100 Subject: [PATCH] Move models. --- .../client/model/ModelBlackHoleCube.java | 102 ++++++++++++++++++ .../client/model/ModelCrystalCube.java} | 23 ++-- .../botania/textures/model/blackHoleBox.java | 98 ----------------- 3 files changed, 115 insertions(+), 108 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java rename src/main/{resources/assets/botania/textures/model/crystalCube.java => java/vazkii/botania/client/model/ModelCrystalCube.java} (75%) delete mode 100644 src/main/resources/assets/botania/textures/model/blackHoleBox.java diff --git a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java new file mode 100644 index 000000000..7ec993295 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java @@ -0,0 +1,102 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +package vazkii.botania.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBlackHoleCube extends ModelBase { + public ModelRenderer shape1; + public ModelRenderer shape1_1; + public ModelRenderer shape1_2; + public ModelRenderer shape1_3; + public ModelRenderer shape1_4; + public ModelRenderer shape1_5; + public ModelRenderer shape1_6; + public ModelRenderer shape1_7; + public ModelRenderer shape1_8; + public ModelRenderer shape1_9; + public ModelRenderer shape1_10; + public ModelRenderer shape1_11; + + public ModelBlackHoleCube() { + this.textureWidth = 36; + this.textureHeight = 2; + this.shape1_3 = new ModelRenderer(this, 0, 0); + this.shape1_3.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_3.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_3, 0.0F, 1.5707963267948966F, 0.0F); + this.shape1_7 = new ModelRenderer(this, 0, 0); + this.shape1_7.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_7.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_7, 0.0F, 1.5707963267948966F, 0.0F); + this.shape1_9 = new ModelRenderer(this, 0, 0); + this.shape1_9.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_9.addBox(-7.0F, 7.0F, 7.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_9, 0.0F, 3.141592653589793F, 1.5707963267948966F); + this.shape1_11 = new ModelRenderer(this, 0, 0); + this.shape1_11.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_11.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_11, 0.0F, 3.141592653589793F, 1.5707963267948966F); + this.shape1 = new ModelRenderer(this, 0, 0); + this.shape1.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1.addBox(-8.0F, 7.0F, 7.0F, 16, 1, 1, 0.0F); + this.shape1_4 = new ModelRenderer(this, 0, 0); + this.shape1_4.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_4.addBox(-8.0F, 7.0F, -8.0F, 16, 1, 1, 0.0F); + this.shape1_8 = new ModelRenderer(this, 0, 0); + this.shape1_8.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_8.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_8, 0.0F, 3.141592653589793F, 1.5707963267948966F); + this.shape1_2 = new ModelRenderer(this, 0, 0); + this.shape1_2.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_2.addBox(-8.0F, -8.0F, -8.0F, 16, 1, 1, 0.0F); + this.shape1_1 = new ModelRenderer(this, 0, 0); + this.shape1_1.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_1.addBox(-8.0F, -8.0F, 7.0F, 16, 1, 1, 0.0F); + this.shape1_6 = new ModelRenderer(this, 0, 0); + this.shape1_6.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_6.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_6, 0.0F, -1.5707963267948966F, 0.0F); + this.shape1_10 = new ModelRenderer(this, 0, 0); + this.shape1_10.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_10.addBox(-7.0F, -8.0F, 7.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_10, 0.0F, 3.141592653589793F, 1.5707963267948966F); + this.shape1_5 = new ModelRenderer(this, 0, 0); + this.shape1_5.setRotationPoint(0.0F, 16.0F, 0.0F); + this.shape1_5.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); + this.setRotateAngle(shape1_5, 0.0F, -1.5707963267948966F, 0.0F); + } + + @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_7.render(f5); + this.shape1_9.render(f5); + this.shape1_11.render(f5); + this.shape1.render(f5); + this.shape1_4.render(f5); + this.shape1_8.render(f5); + this.shape1_2.render(f5); + this.shape1_1.render(f5); + this.shape1_6.render(f5); + this.shape1_10.render(f5); + this.shape1_5.render(f5); + } + + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/resources/assets/botania/textures/model/crystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java similarity index 75% rename from src/main/resources/assets/botania/textures/model/crystalCube.java rename to src/main/java/vazkii/botania/client/model/ModelCrystalCube.java index 61bb8ce8c..0f6525a7c 100644 --- a/src/main/resources/assets/botania/textures/model/crystalCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java @@ -1,19 +1,25 @@ -package model; +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -/** - * crystalCube - wiiv - * Created using Tabula 4.1.1 - */ -public class crystalCube extends ModelBase { +public class ModelCrystalCube extends ModelBase { public ModelRenderer cube; public ModelRenderer base1; public ModelRenderer base2; - public crystalCube() { + public ModelCrystalCube() { this.textureWidth = 48; this.textureHeight = 32; this.cube = new ModelRenderer(this, 0, 0); @@ -34,9 +40,6 @@ public class crystalCube extends ModelBase { this.base1.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; diff --git a/src/main/resources/assets/botania/textures/model/blackHoleBox.java b/src/main/resources/assets/botania/textures/model/blackHoleBox.java deleted file mode 100644 index d2b856a1e..000000000 --- a/src/main/resources/assets/botania/textures/model/blackHoleBox.java +++ /dev/null @@ -1,98 +0,0 @@ -package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * blackHoleBox - wiiv - * Created using Tabula 4.1.1 - */ -public class blackHoleBox extends ModelBase { - public ModelRenderer shape1; - public ModelRenderer shape1_1; - public ModelRenderer shape1_2; - public ModelRenderer shape1_3; - public ModelRenderer shape1_4; - public ModelRenderer shape1_5; - public ModelRenderer shape1_6; - public ModelRenderer shape1_7; - public ModelRenderer shape1_8; - public ModelRenderer shape1_9; - public ModelRenderer shape1_10; - public ModelRenderer shape1_11; - - public blackHoleBox() { - this.textureWidth = 36; - this.textureHeight = 2; - this.shape1_3 = new ModelRenderer(this, 0, 0); - this.shape1_3.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_3.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_3, 0.0F, 1.5707963267948966F, 0.0F); - this.shape1_7 = new ModelRenderer(this, 0, 0); - this.shape1_7.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_7.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_7, 0.0F, 1.5707963267948966F, 0.0F); - this.shape1_9 = new ModelRenderer(this, 0, 0); - this.shape1_9.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_9.addBox(-7.0F, 7.0F, 7.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_9, 0.0F, 3.141592653589793F, 1.5707963267948966F); - this.shape1_11 = new ModelRenderer(this, 0, 0); - this.shape1_11.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_11.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_11, 0.0F, 3.141592653589793F, 1.5707963267948966F); - this.shape1 = new ModelRenderer(this, 0, 0); - this.shape1.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1.addBox(-8.0F, 7.0F, 7.0F, 16, 1, 1, 0.0F); - this.shape1_4 = new ModelRenderer(this, 0, 0); - this.shape1_4.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_4.addBox(-8.0F, 7.0F, -8.0F, 16, 1, 1, 0.0F); - this.shape1_8 = new ModelRenderer(this, 0, 0); - this.shape1_8.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_8.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_8, 0.0F, 3.141592653589793F, 1.5707963267948966F); - this.shape1_2 = new ModelRenderer(this, 0, 0); - this.shape1_2.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_2.addBox(-8.0F, -8.0F, -8.0F, 16, 1, 1, 0.0F); - this.shape1_1 = new ModelRenderer(this, 0, 0); - this.shape1_1.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_1.addBox(-8.0F, -8.0F, 7.0F, 16, 1, 1, 0.0F); - this.shape1_6 = new ModelRenderer(this, 0, 0); - this.shape1_6.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_6.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_6, 0.0F, -1.5707963267948966F, 0.0F); - this.shape1_10 = new ModelRenderer(this, 0, 0); - this.shape1_10.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_10.addBox(-7.0F, -8.0F, 7.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_10, 0.0F, 3.141592653589793F, 1.5707963267948966F); - this.shape1_5 = new ModelRenderer(this, 0, 0); - this.shape1_5.setRotationPoint(0.0F, 16.0F, 0.0F); - this.shape1_5.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - this.setRotateAngle(shape1_5, 0.0F, -1.5707963267948966F, 0.0F); - } - - @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_7.render(f5); - this.shape1_9.render(f5); - this.shape1_11.render(f5); - this.shape1.render(f5); - this.shape1_4.render(f5); - this.shape1_8.render(f5); - this.shape1_2.render(f5); - this.shape1_1.render(f5); - this.shape1_6.render(f5); - this.shape1_10.render(f5); - this.shape1_5.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; - } -}