diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 19c5e6f58..5b68c7055 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -583,7 +583,7 @@ tile.botania:livingrock0.name=Livingrock tile.botania:livingrock1.name=Livingrock Brick tile.botania:livingrock2.name=Mossy Livingrock Brick tile.botania:livingrock3.name=Cracked Livingrock Brick -tile.botania:livingrock4.name=Framed Livingrock Brick +tile.botania:livingrock4.name=Chiseled Livingrock Brick tile.botania:livingwood0.name=Livingwood tile.botania:livingwood1.name=Livingwood Planks tile.botania:livingwood2.name=Mossy Livingwood Planks diff --git a/src/main/resources/assets/botania/textures/blocks/livingrock1.png b/src/main/resources/assets/botania/textures/blocks/livingrock1.png index 6bc22da7c..96c765992 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingrock1.png and b/src/main/resources/assets/botania/textures/blocks/livingrock1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/livingrock2.png b/src/main/resources/assets/botania/textures/blocks/livingrock2.png index bcb2af1de..601e74da8 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingrock2.png and b/src/main/resources/assets/botania/textures/blocks/livingrock2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/livingrock3.png b/src/main/resources/assets/botania/textures/blocks/livingrock3.png index 236152680..a04fa8b60 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingrock3.png and b/src/main/resources/assets/botania/textures/blocks/livingrock3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/livingrock4.png b/src/main/resources/assets/botania/textures/blocks/livingrock4.png index bda44497a..d1b55ca87 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/livingrock4.png and b/src/main/resources/assets/botania/textures/blocks/livingrock4.png differ diff --git a/src/main/resources/assets/botania/textures/model/teruTeruBozu.java b/src/main/resources/assets/botania/textures/model/teruTeruBozu.java new file mode 100644 index 000000000..655b8bc16 --- /dev/null +++ b/src/main/resources/assets/botania/textures/model/teruTeruBozu.java @@ -0,0 +1,53 @@ +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 shape1; + public ModelRenderer shape1_1; + public ModelRenderer shape1_2; + public ModelRenderer shape1_3; + + public teruTeruBozu() { + this.textureWidth = 48; + this.textureHeight = 32; + 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_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.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_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); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + this.shape1_1.render(f5); + this.shape1_2.render(f5); + this.shape1.render(f5); + this.shape1_3.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; + } +} diff --git a/src/main/resources/assets/botania/textures/model/teruTeruBozu.png b/src/main/resources/assets/botania/textures/model/teruTeruBozu.png new file mode 100644 index 000000000..38b46b60c Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/teruTeruBozu.png differ