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 0000000..66bda90 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/models/aura_pylon.png differ 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 0000000..6d87b57 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/models/aura_pylon_base.png differ diff --git a/src/main/resources/assets/gadomancy/textures/models/aura_pylon_peak.png b/src/main/resources/assets/gadomancy/textures/models/aura_pylon_peak.png new file mode 100644 index 0000000..ec832d5 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/models/aura_pylon_peak.png differ diff --git a/src/main/resources/assets/gadomancy/textures/models/aurapylon.png b/src/main/resources/assets/gadomancy/textures/models/aurapylon.png deleted file mode 100644 index 8c39145..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/models/aurapylon.png and /dev/null differ