From e18ef66e25cef3dbcd2c1f2420ae9d0cd0aca602 Mon Sep 17 00:00:00 2001 From: makeo Date: Wed, 9 Dec 2015 01:57:41 +0100 Subject: [PATCH] -Added texture for aura pylon --- .../client/models/ModelAuraPylon.java | 73 +++++----- .../client/models/ModelAuraPylonBottom.java | 131 +++++++++--------- .../client/models/ModelAuraPylonTop.java | 36 +++-- .../renderers/tile/RenderTileAuraPylon.java | 10 +- .../gadomancy/textures/models/aura_pylon.png | Bin 0 -> 1534 bytes .../textures/models/aura_pylon_base.png | Bin 0 -> 2366 bytes .../textures/models/aura_pylon_peak.png | Bin 0 -> 1584 bytes .../gadomancy/textures/models/aurapylon.png | Bin 19490 -> 0 bytes 8 files changed, 135 insertions(+), 115 deletions(-) create mode 100644 src/main/resources/assets/gadomancy/textures/models/aura_pylon.png create mode 100644 src/main/resources/assets/gadomancy/textures/models/aura_pylon_base.png create mode 100644 src/main/resources/assets/gadomancy/textures/models/aura_pylon_peak.png delete mode 100644 src/main/resources/assets/gadomancy/textures/models/aurapylon.png diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java index 176ffa4..a84be4d 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylon.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelAuraPylon extends ModelBase { - + //fields ModelRenderer outerpylon; ModelRenderer lowerconduit; ModelRenderer inlower1; @@ -22,103 +22,105 @@ public class ModelAuraPylon extends ModelBase { ModelRenderer inlowersmooth1; ModelRenderer inlowersmooth2; - public ModelAuraPylon() { + public ModelAuraPylon() + { textureWidth = 32; textureHeight = 32; outerpylon = new ModelRenderer(this, 0, 0); outerpylon.addBox(0F, 0F, 0F, 2, 16, 2); outerpylon.setRotationPoint(5F, 8F, 5F); - outerpylon.setTextureSize(64, 32); + outerpylon.setTextureSize(32, 32); outerpylon.mirror = true; setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 8, 0); + lowerconduit = new ModelRenderer(this, 9, 0); lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); lowerconduit.setRotationPoint(6F, 20F, 7F); - lowerconduit.setTextureSize(64, 32); + lowerconduit.setTextureSize(32, 32); lowerconduit.mirror = true; setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 8, 2); + inlower1 = new ModelRenderer(this, 9, 3); inlower1.addBox(0F, 0F, 0F, 1, 1, 3); inlower1.setRotationPoint(3F, 20F, 3F); - inlower1.setTextureSize(64, 32); + inlower1.setTextureSize(32, 32); inlower1.mirror = true; setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 8, 2); + inlower2 = new ModelRenderer(this, 9, 11); inlower2.addBox(0F, 0F, 0F, 3, 1, 1); inlower2.setRotationPoint(3F, 20F, 3F); - inlower2.setTextureSize(64, 32); + inlower2.setTextureSize(32, 32); inlower2.mirror = true; setRotation(inlower2, 0F, 3.141593F, 0F); - upperconduit = new ModelRenderer(this, 8, 0); + upperconduit = new ModelRenderer(this, 9, 0); upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); upperconduit.setRotationPoint(6F, 11F, 7F); - upperconduit.setTextureSize(64, 32); + upperconduit.setTextureSize(32, 32); upperconduit.mirror = true; setRotation(upperconduit, 0F, 2.356194F, 0F); - inupper2 = new ModelRenderer(this, 8, 2); + inupper2 = new ModelRenderer(this, 9, 11); inupper2.addBox(0F, 0F, 0F, 3, 1, 1); inupper2.setRotationPoint(3F, 11F, 3F); - inupper2.setTextureSize(64, 32); + inupper2.setTextureSize(32, 32); inupper2.mirror = true; setRotation(inupper2, 0F, 3.141593F, 0F); - inupper1 = new ModelRenderer(this, 8, 2); + inupper1 = new ModelRenderer(this, 9, 3); inupper1.addBox(0F, 0F, 0F, 1, 1, 3); inupper1.setRotationPoint(3F, 11F, 3F); - inupper1.setTextureSize(64, 32); + inupper1.setTextureSize(32, 32); inupper1.mirror = true; setRotation(inupper1, 0F, 3.141593F, 0F); - outuppersmooth1 = new ModelRenderer(this, 8, 6); + outuppersmooth1 = new ModelRenderer(this, 9, 8); outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); outuppersmooth1.setRotationPoint(6F, 11F, 6F); - outuppersmooth1.setTextureSize(64, 32); + outuppersmooth1.setTextureSize(32, 32); outuppersmooth1.mirror = true; setRotation(outuppersmooth1, 0F, 2.792527F, 0F); - outuppersmooth2 = new ModelRenderer(this, 8, 6); + outuppersmooth2 = new ModelRenderer(this, 9, 8); outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); outuppersmooth2.setRotationPoint(5F, 11F, 7F); - outuppersmooth2.setTextureSize(64, 32); + outuppersmooth2.setTextureSize(32, 32); outuppersmooth2.mirror = true; setRotation(outuppersmooth2, 0F, 1.919862F, 0F); - inuppersmooth1 = new ModelRenderer(this, 8, 6); + inuppersmooth1 = new ModelRenderer(this, 9, 14); inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); inuppersmooth1.setRotationPoint(2F, 11F, 2F); - inuppersmooth1.setTextureSize(64, 32); + inuppersmooth1.setTextureSize(32, 32); inuppersmooth1.mirror = true; setRotation(inuppersmooth1, 0F, 0.3490659F, 0F); - inuppersmooth2 = new ModelRenderer(this, 8, 6); + inuppersmooth2 = new ModelRenderer(this, 9, 14); inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); inuppersmooth2.setRotationPoint(1F, 11F, 3F); - inuppersmooth2.setTextureSize(64, 32); + inuppersmooth2.setTextureSize(32, 32); inuppersmooth2.mirror = true; setRotation(inuppersmooth2, 0F, 1.22173F, 0F); - outlowersmooth2 = new ModelRenderer(this, 8, 6); + outlowersmooth2 = new ModelRenderer(this, 9, 8); outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); outlowersmooth2.setRotationPoint(5F, 20F, 7F); - outlowersmooth2.setTextureSize(64, 32); + outlowersmooth2.setTextureSize(32, 32); outlowersmooth2.mirror = true; setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 8, 6); + outlowersmooth1 = new ModelRenderer(this, 9, 8); outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); outlowersmooth1.setRotationPoint(6F, 20F, 6F); - outlowersmooth1.setTextureSize(64, 32); + outlowersmooth1.setTextureSize(32, 32); outlowersmooth1.mirror = true; setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 8, 6); + inlowersmooth1 = new ModelRenderer(this, 9, 14); inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); inlowersmooth1.setRotationPoint(2F, 20F, 2F); - inlowersmooth1.setTextureSize(64, 32); + inlowersmooth1.setTextureSize(32, 32); inlowersmooth1.mirror = true; setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 8, 6); + inlowersmooth2 = new ModelRenderer(this, 9, 14); inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); inlowersmooth2.setRotationPoint(1F, 20F, 3F); - inlowersmooth2.setTextureSize(64, 32); + inlowersmooth2.setTextureSize(32, 32); inlowersmooth2.mirror = true; setRotation(inlowersmooth2, 0F, 1.22173F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + 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); outerpylon.render(f5); @@ -138,10 +140,15 @@ public class ModelAuraPylon extends ModelBase { inlowersmooth2.render(f5); } - private void setRotation(ModelRenderer model, float x, float y, float z) { + private void setRotation(ModelRenderer model, float x, float y, float z) + { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } } diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java index 722d1af..7bc0945 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonBottom.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelAuraPylonBottom extends ModelBase { - + //fields ModelRenderer outerpylon; ModelRenderer lowerconduit; ModelRenderer inlower1; @@ -21,12 +21,12 @@ public class ModelAuraPylonBottom extends ModelBase { ModelRenderer outlowersmooth1; ModelRenderer inlowersmooth1; ModelRenderer inlowersmooth2; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; + ModelRenderer base; + ModelRenderer baseornament; + ModelRenderer pylonorn1; + ModelRenderer pylonorn2; + ModelRenderer pylonorn3; + ModelRenderer pylonorn4; public ModelAuraPylonBottom() { textureWidth = 32; @@ -38,130 +38,131 @@ public class ModelAuraPylonBottom extends ModelBase { outerpylon.setTextureSize(64, 32); outerpylon.mirror = true; setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 8, 0); + lowerconduit = new ModelRenderer(this, 9, 0); lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); lowerconduit.setRotationPoint(6F, 20F, 7F); lowerconduit.setTextureSize(64, 32); lowerconduit.mirror = true; setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 8, 2); + inlower1 = new ModelRenderer(this, 9, 3); inlower1.addBox(0F, 0F, 0F, 1, 1, 3); inlower1.setRotationPoint(3F, 20F, 3F); inlower1.setTextureSize(64, 32); inlower1.mirror = true; setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 8, 2); + inlower2 = new ModelRenderer(this, 9, 11); inlower2.addBox(0F, 0F, 0F, 3, 1, 1); inlower2.setRotationPoint(3F, 20F, 3F); inlower2.setTextureSize(64, 32); inlower2.mirror = true; setRotation(inlower2, 0F, 3.141593F, 0F); - upperconduit = new ModelRenderer(this, 8, 0); + upperconduit = new ModelRenderer(this, 9, 0); upperconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); upperconduit.setRotationPoint(6F, 11F, 7F); upperconduit.setTextureSize(64, 32); upperconduit.mirror = true; setRotation(upperconduit, 0F, 2.356194F, 0F); - inupper2 = new ModelRenderer(this, 8, 2); + inupper2 = new ModelRenderer(this, 9, 11); inupper2.addBox(0F, 0F, 0F, 3, 1, 1); inupper2.setRotationPoint(3F, 11F, 3F); inupper2.setTextureSize(64, 32); inupper2.mirror = true; setRotation(inupper2, 0F, 3.141593F, 0F); - inupper1 = new ModelRenderer(this, 8, 2); + inupper1 = new ModelRenderer(this, 9, 3); inupper1.addBox(0F, 0F, 0F, 1, 1, 3); inupper1.setRotationPoint(3F, 11F, 3F); inupper1.setTextureSize(64, 32); inupper1.mirror = true; setRotation(inupper1, 0F, 3.141593F, 0F); - outuppersmooth1 = new ModelRenderer(this, 8, 6); + outuppersmooth1 = new ModelRenderer(this, 9, 8); outuppersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); outuppersmooth1.setRotationPoint(6F, 11F, 6F); outuppersmooth1.setTextureSize(64, 32); outuppersmooth1.mirror = true; setRotation(outuppersmooth1, 0F, 2.792527F, 0F); - outuppersmooth2 = new ModelRenderer(this, 8, 6); + outuppersmooth2 = new ModelRenderer(this, 9, 8); outuppersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); outuppersmooth2.setRotationPoint(5F, 11F, 7F); outuppersmooth2.setTextureSize(64, 32); outuppersmooth2.mirror = true; setRotation(outuppersmooth2, 0F, 1.919862F, 0F); - inuppersmooth1 = new ModelRenderer(this, 8, 6); + inuppersmooth1 = new ModelRenderer(this, 9, 14); inuppersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); inuppersmooth1.setRotationPoint(2F, 11F, 2F); inuppersmooth1.setTextureSize(64, 32); inuppersmooth1.mirror = true; setRotation(inuppersmooth1, 0F, 0.3490659F, 0F); - inuppersmooth2 = new ModelRenderer(this, 8, 6); + inuppersmooth2 = new ModelRenderer(this, 9, 14); inuppersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); inuppersmooth2.setRotationPoint(1F, 11F, 3F); inuppersmooth2.setTextureSize(64, 32); inuppersmooth2.mirror = true; setRotation(inuppersmooth2, 0F, 1.22173F, 0F); - outlowersmooth2 = new ModelRenderer(this, 8, 6); + outlowersmooth2 = new ModelRenderer(this, 9, 8); outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); outlowersmooth2.setRotationPoint(5F, 20F, 7F); outlowersmooth2.setTextureSize(64, 32); outlowersmooth2.mirror = true; setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 8, 6); + outlowersmooth1 = new ModelRenderer(this, 9, 8); outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); outlowersmooth1.setRotationPoint(6F, 20F, 6F); outlowersmooth1.setTextureSize(64, 32); outlowersmooth1.mirror = true; setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 8, 6); + inlowersmooth1 = new ModelRenderer(this, 9, 14); inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); inlowersmooth1.setRotationPoint(2F, 20F, 2F); inlowersmooth1.setTextureSize(64, 32); inlowersmooth1.mirror = true; setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 8, 6); + inlowersmooth2 = new ModelRenderer(this, 9, 14); inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); inlowersmooth2.setRotationPoint(1F, 20F, 3F); inlowersmooth2.setTextureSize(64, 32); inlowersmooth2.mirror = true; setRotation(inlowersmooth2, 0F, 1.22173F, 0F); - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 8, 1, 8); - Shape1.setRotationPoint(0F, 23F, 0F); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 0); - Shape2.addBox(0F, 0.3F, 0F, 2, 1, 3); - Shape2.setRotationPoint(5F, 23F, 4F); - Shape2.setTextureSize(64, 32); - Shape2.mirror = true; - setRotation(Shape2, 1.308997F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, -0.5F, 0.08F, 2, 3, 1); - Shape3.setRotationPoint(6F, 21F, 7F); - Shape3.setTextureSize(64, 32); - Shape3.mirror = true; - setRotation(Shape3, 0.2617994F, 1.570796F, 0F); - Shape4 = new ModelRenderer(this, 0, 0); - Shape4.addBox(0F, -0.3F, 0.08F, 2, 3, 1); - Shape4.setRotationPoint(5F, 21F, 6F); - Shape4.setTextureSize(64, 32); - Shape4.mirror = true; - setRotation(Shape4, 0.2617994F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 0); - Shape5.addBox(0F, -0.8F, 0.86F, 2, 3, 1); - Shape5.setRotationPoint(4F, 21F, 7F); - Shape5.setTextureSize(64, 32); - Shape5.mirror = true; - setRotation(Shape5, -0.2617994F, 1.570796F, 0F); - Shape6 = new ModelRenderer(this, 0, 0); - Shape6.addBox(0F, 0F, 0.2F, 2, 1, 6); - Shape6.setRotationPoint(-1F, 22F, 0F); - Shape6.setTextureSize(64, 32); - Shape6.mirror = true; - setRotation(Shape6, -0.1630138F, 0F, 0F); + base = new ModelRenderer(this, 0, 22); + base.addBox(0F, 0F, 0F, 8, 2, 8); + base.setRotationPoint(0F, 22F, 0F); + base.setTextureSize(64, 32); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + baseornament = new ModelRenderer(this, 16, 14); + baseornament.addBox(0F, 0F, 0.2F, 2, 1, 6); + baseornament.setRotationPoint(-1F, 21F, 0F); + baseornament.setTextureSize(64, 32); + baseornament.mirror = true; + setRotation(baseornament, -0.1630138F, 0F, 0F); + pylonorn1 = new ModelRenderer(this, 18, 3); + pylonorn1.addBox(0F, -4F, 0F, 2, 3, 1); + pylonorn1.setRotationPoint(5F, 23.5F, 7F); + pylonorn1.setTextureSize(64, 32); + pylonorn1.mirror = true; + setRotation(pylonorn1, 0.2617994F, 0F, 0F); + pylonorn2 = new ModelRenderer(this, 18, 3); + pylonorn2.addBox(0F, -4F, -1F, 2, 3, 1); + pylonorn2.setRotationPoint(5F, 23.5F, 5F); + pylonorn2.setTextureSize(64, 32); + pylonorn2.mirror = true; + setRotation(pylonorn2, -0.2617994F, 0F, 0F); + pylonorn3 = new ModelRenderer(this, 18, 3); + pylonorn3.addBox(0F, -4F, 0F, 2, 3, 1); + pylonorn3.setRotationPoint(7F, 23.5F, 7F); + pylonorn3.setTextureSize(64, 32); + pylonorn3.mirror = true; + setRotation(pylonorn3, 0.2617994F, 1.570796F, 0F); + pylonorn4 = new ModelRenderer(this, 18, 3); + pylonorn4.addBox(0F, -4F, 0F, 2, 3, 1); + pylonorn4.setRotationPoint(5F, 23.5F, 5F); + pylonorn4.setTextureSize(64, 32); + pylonorn4.mirror = true; + setRotation(pylonorn4, 0.2617994F, -1.570796F, 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); outerpylon.render(f5); lowerconduit.render(f5); inlower1.render(f5); @@ -177,12 +178,12 @@ public class ModelAuraPylonBottom extends ModelBase { outlowersmooth1.render(f5); inlowersmooth1.render(f5); inlowersmooth2.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); + base.render(f5); + baseornament.render(f5); + pylonorn1.render(f5); + pylonorn2.render(f5); + pylonorn3.render(f5); + pylonorn4.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { @@ -191,5 +192,7 @@ public class ModelAuraPylonBottom extends ModelBase { model.rotateAngleZ = z; } - + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } } diff --git a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java index 878dcb8..c2336a0 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelAuraPylonTop.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelAuraPylonTop extends ModelBase { - + //fields ModelRenderer outerpylon; ModelRenderer lowerconduit; ModelRenderer inlower1; @@ -18,7 +18,8 @@ public class ModelAuraPylonTop extends ModelBase { ModelRenderer outerpylonmiddle2; ModelRenderer outerpylonupper; - public ModelAuraPylonTop() { + public ModelAuraPylonTop() + { textureWidth = 32; textureHeight = 32; @@ -28,61 +29,61 @@ public class ModelAuraPylonTop extends ModelBase { outerpylon.setTextureSize(64, 32); outerpylon.mirror = true; setRotation(outerpylon, 0F, 0F, 0F); - lowerconduit = new ModelRenderer(this, 8, 0); + lowerconduit = new ModelRenderer(this, 9, 0); lowerconduit.addBox(0F, 0F, 0.2F, 6, 1, 1); lowerconduit.setRotationPoint(6F, 20F, 7F); lowerconduit.setTextureSize(64, 32); lowerconduit.mirror = true; setRotation(lowerconduit, 0F, 2.356194F, 0F); - inlower1 = new ModelRenderer(this, 8, 2); + inlower1 = new ModelRenderer(this, 9, 3); inlower1.addBox(0F, 0F, 0F, 1, 1, 3); inlower1.setRotationPoint(3F, 20F, 3F); inlower1.setTextureSize(64, 32); inlower1.mirror = true; setRotation(inlower1, 0F, 3.141593F, 0F); - inlower2 = new ModelRenderer(this, 8, 2); + inlower2 = new ModelRenderer(this, 9, 11); inlower2.addBox(0F, 0F, 0F, 3, 1, 1); inlower2.setRotationPoint(3F, 20F, 3F); inlower2.setTextureSize(64, 32); inlower2.mirror = true; setRotation(inlower2, 0F, 3.141593F, 0F); - outlowersmooth2 = new ModelRenderer(this, 8, 6); + outlowersmooth2 = new ModelRenderer(this, 9, 8); outlowersmooth2.addBox(0F, 0F, 0.1F, 2, 1, 1); outlowersmooth2.setRotationPoint(5F, 20F, 7F); outlowersmooth2.setTextureSize(64, 32); outlowersmooth2.mirror = true; setRotation(outlowersmooth2, 0F, 1.919862F, 0F); - outlowersmooth1 = new ModelRenderer(this, 8, 6); + outlowersmooth1 = new ModelRenderer(this, 9, 8); outlowersmooth1.addBox(-0.5F, 0F, 0.2F, 2, 1, 1); outlowersmooth1.setRotationPoint(6F, 20F, 6F); outlowersmooth1.setTextureSize(64, 32); outlowersmooth1.mirror = true; setRotation(outlowersmooth1, 0F, 2.792527F, 0F); - inlowersmooth1 = new ModelRenderer(this, 8, 6); + inlowersmooth1 = new ModelRenderer(this, 9, 14); inlowersmooth1.addBox(0.25F, 0F, -0.5F, 1, 1, 2); inlowersmooth1.setRotationPoint(2F, 20F, 2F); inlowersmooth1.setTextureSize(64, 32); inlowersmooth1.mirror = true; setRotation(inlowersmooth1, 0F, 0.3490659F, 0F); - inlowersmooth2 = new ModelRenderer(this, 8, 6); + inlowersmooth2 = new ModelRenderer(this, 9, 14); inlowersmooth2.addBox(0.15F, 0F, 0.3F, 1, 1, 2); inlowersmooth2.setRotationPoint(1F, 20F, 3F); inlowersmooth2.setTextureSize(64, 32); inlowersmooth2.mirror = true; setRotation(inlowersmooth2, 0F, 1.22173F, 0F); - outerpylonmiddle1 = new ModelRenderer(this, 0, 0); + outerpylonmiddle1 = new ModelRenderer(this, 0, 11); outerpylonmiddle1.addBox(0F, 0F, 0F, 2, 4, 1); outerpylonmiddle1.setRotationPoint(5F, 12F, 5F); outerpylonmiddle1.setTextureSize(64, 32); outerpylonmiddle1.mirror = true; setRotation(outerpylonmiddle1, 0F, 0F, 0F); - outerpylonmiddle2 = new ModelRenderer(this, 0, 0); + outerpylonmiddle2 = new ModelRenderer(this, 0, 17); outerpylonmiddle2.addBox(0F, 0F, 0F, 1, 4, 1); outerpylonmiddle2.setRotationPoint(5F, 12F, 6F); outerpylonmiddle2.setTextureSize(64, 32); outerpylonmiddle2.mirror = true; setRotation(outerpylonmiddle2, 0F, 0F, 0F); - outerpylonupper = new ModelRenderer(this, 0, 0); + outerpylonupper = new ModelRenderer(this, 5, 17); outerpylonupper.addBox(0F, 0F, 0F, 1, 4, 1); outerpylonupper.setRotationPoint(5F, 8F, 5F); outerpylonupper.setTextureSize(64, 32); @@ -90,7 +91,8 @@ public class ModelAuraPylonTop extends ModelBase { setRotation(outerpylonupper, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + 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); outerpylon.render(f5); @@ -106,11 +108,15 @@ public class ModelAuraPylonTop extends ModelBase { outerpylonupper.render(f5); } - private void setRotation(ModelRenderer model, float x, float y, float z) { + private void setRotation(ModelRenderer model, float x, float y, float z) + { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } - + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java index 213a9ae..32724ee 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXEssentiaTrail; @@ -35,20 +36,21 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { public static final ModelBase MODEL_AURA_PYLON = new ModelAuraPylon(); public static final ModelBase MODEL_AURA_PYLON_TOP = new ModelAuraPylonTop(); public static final ModelBase MODEL_AURA_PYLON_BOTTOM = new ModelAuraPylonBottom(); - public static final SimpleResourceLocation PYLON_TEXTURE = new SimpleResourceLocation("models/aurapylon.png"); + public static final SimpleResourceLocation PYLON_TEXTURE_TOP = new SimpleResourceLocation("models/aura_pylon_peak.png"); + public static final SimpleResourceLocation PYLON_TEXTURE = new SimpleResourceLocation("models/aura_pylon.png"); + public static final SimpleResourceLocation PYLON_TEXTURE_BOTTOM = new SimpleResourceLocation("models/aura_pylon_base.png"); public void renderTileEntity(TileEntity tile, double x, double y, double z, float partTicks) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y - 0.5, z + 0.5); - bindTexture(PYLON_TEXTURE); - GL11.glPushMatrix(); for(int i = 0; i < 4; i++) { if(tile instanceof TileAuraPylonTop) { GL11.glPushMatrix(); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0, -2F, 0); + bindTexture(PYLON_TEXTURE_TOP); MODEL_AURA_PYLON_TOP.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } else { @@ -56,9 +58,11 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glRotatef(180, 1, 0, 0); GL11.glTranslatef(0, -2F, 0); + bindTexture(PYLON_TEXTURE_BOTTOM); MODEL_AURA_PYLON_BOTTOM.render(null, 0, 0, 0, 0, 0, 0.0625f); GL11.glPopMatrix(); } else { + bindTexture(PYLON_TEXTURE); MODEL_AURA_PYLON.render(null, 0, 0, 0, 0, 0, 0.0625f); } } diff --git a/src/main/resources/assets/gadomancy/textures/models/aura_pylon.png b/src/main/resources/assets/gadomancy/textures/models/aura_pylon.png new file mode 100644 index 0000000000000000000000000000000000000000..66bda90573aecdcf7831765648a679ffa68fc718 GIT binary patch literal 1534 zcmb7EX;%^m6a}@w)X^!&v|P|Mm&(FrhGs06+{hhQ+>**MmsAe9=E6}%OHIuMOA5^+ zS?-liNeU?{HmHo6;F6k>p@U{_fC@5n<`>L)=id9?m-pemd){47cPFJo#|{Ai042Dy zJwmEB-vK@-<@!kUtW@OVosk#-;D_Gt0G6Nn;Wz+rpcQU!>ytdS`Y0v6d~470cW-ZaZpFEQ>24$ch@ z@VotBv$HGy_xkci4bb(rd~OFpJoMF!DdJ`xLp6m{n}a*90vp?V(FNR;6>AEblT+;| z`19f`FZGSZiYu*@M7&X6@l-b^9alDSl`pAD4up~{l42#f+wHIP*Ks{2S;M1)J1wFu z#HvIR@IG5dNGVduf`FFo4(B?&FR&?Q$I?FenuuPiNrBhvkjD^ zecm`LR&=_V?90<9z%o*D8@ohzTIO@vE17Hiv{a&t;SwT11)+=UQ#%#2`tr@2PBAgw|O4c?o~BytjgHe`8;v~{aS6A5$RicReAYO+E&S)jH4k_g7i^~ z@N?>(ss{pjPP%6dQix-{gsqV)lB;YMt2?VW3v*VI)~x5~=!N6Jl8L!2GWpreOvuSn zdACmZ<7!#8M9NNOX6F8+$iYU{0fz$Hl<0p>DdeWe*-AToID$dg`iQABI>g97+qkiy z(13}+7I4(r3Gfm*V*?}}RnRR+uPw7!|APsPtn`Dg&eL*hBLio)E!-j(@=cMm;nn1T zCQETf6|69FK|u$IQXl1Q*K^-0CeYEXtkGVV^imf0(}ylI&O&2y4Auy;pUA~aW;nb7wgO0fy)rdM1O{4PTqvF z8$}3h$v=bO=O|CS+4>bpoQLJW3c)mEqU26oaHtUwPv%vJ=pn zb$Irw?C_(|C#{E`Yo$@M5tZAU)`S-Kc(aF}$fijAJlT{rWin|1w>#1@4JtG5g2q~| zF+((NX@ZOm9=q3>V2IrL6zxLJ-@QCOaM3kRFtnExH`hwgp+hh zggyR1V*|wH9GWgGu#E*P^xg(6_UZH~|MPW~V9rc>)cbL6_KRqzLV4?x3`vVM9AY&B zE?Gdi0uU>QG;s`_4rx{UP@yXC3 znU<~>#pBg8AWing>gUHa1;2H5OoL9x$VulgR8p2r`R6uPKs2=9XL27dv~$8jbLQj0 zSPsmH1g5FX2_pDFr*(v6mutvUGj_NS@vSpKyNJVas%bB_pPylbdFglZ^Iw0_GaOjH z6?ijQdhq3Z&V%o1CVico>sD7bR&^l0Y-_V`nWoFw8TFj2JRi}l2Y`TO_@a|fIDd-lX(eQ6=t(A~Qdr~iVSFRPwj?6B3HX1D bnYRyOMY&v{LR|c%4;=t^aJO%^3(NW!x(xk& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gadomancy/textures/models/aura_pylon_base.png b/src/main/resources/assets/gadomancy/textures/models/aura_pylon_base.png new file mode 100644 index 0000000000000000000000000000000000000000..6d87b573aaa57b39db3e0e1871d0749b107cd1ae GIT binary patch literal 2366 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 i?ZGQBGMkzG;Zah