nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For Comparison only #13

Closed
kitsu wants to merge 8 commits from armortest into master-1.12
pull from: armortest
merge into: nmd:master-1.12
Conversation 0 Commits 8 Files Changed 13 +45 -70
2 changed files with 45 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf008d8bda - Show all commits

2
kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java
View File

@@ -260,7 +260,7 @@ public class ModItems {
/********** /**********
ARMOR ARMOR
**********/ **********/
testleggings=new CustomLeggings(PrimalMaterials.ARMOR_HIDE, 3, EntityEquipmentSlot.HEAD, "testleggings"); testleggings=new CustomLeggings(PrimalMaterials.ARMOR_HIDE, 0, EntityEquipmentSlot.HEAD, "testleggings");
//registerItem(312, "diamond_leggings", (new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, EntityEquipmentSlot.LEGS)).setUnlocalizedName("leggingsDiamond")); //registerItem(312, "diamond_leggings", (new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, EntityEquipmentSlot.LEGS)).setUnlocalizedName("leggingsDiamond"));
} }

113
kfc/src/main/java/nmd/primal/forgecraft/models/ModelPlateHelmet.java
View File

@@ -85,150 +85,152 @@ public class ModelPlateHelmet extends ModelBiped
Shape1.addBox(-4.5F, -7F, -5F, 4, 7, 1); Shape1.addBox(-4.5F, -7F, -5F, 4, 7, 1);
Shape1.setRotationPoint(0F, 0F, 0F); Shape1.setRotationPoint(0F, 0F, 0F);
Shape1.setTextureSize(64, 64); Shape1.setTextureSize(64, 64);
Shape1.mirror = true; Shape1.mirror = false;
setRotation(Shape1, 0F, 1.570796F, 0F); setRotation(Shape1, 0F, 1.570796F, 0F);
Shape2 = new ModelRenderer(this, 52, 37); Shape2 = new ModelRenderer(this, 52, 37);
Shape2.addBox(-4.5F, -7F, -5F, 4, 2, 1); Shape2.addBox(-4.5F, -7F, -5F, 4, 2, 1);
Shape2.setRotationPoint(0F, 0F, 0F); Shape2.setRotationPoint(0F, 0F, 0F);
Shape2.setTextureSize(64, 64); Shape2.setTextureSize(64, 64);
Shape2.mirror = true; Shape2.mirror = false;
setRotation(Shape2, 0F, 0F, 0F); setRotation(Shape2, 0F, 0F, 0F);
Shape3 = new ModelRenderer(this, 52, 40); Shape3 = new ModelRenderer(this, 52, 40);
Shape3.addBox(-2F, -7F, -5.5F, 4, 2, 1); Shape3.addBox(-2F, -7F, -5.5F, 4, 2, 1);
Shape3.setRotationPoint(0F, 0F, 0F); Shape3.setRotationPoint(0F, 0F, 0F);
Shape3.setTextureSize(64, 64); Shape3.setTextureSize(64, 64);
Shape3.mirror = true; Shape3.mirror = false;
setRotation(Shape3, 0F, 0F, 0F); setRotation(Shape3, 0F, 0F, 0F);
Shape4 = new ModelRenderer(this, 52, 52); Shape4 = new ModelRenderer(this, 52, 52);
Shape4.addBox(0.5F, -7F, -5F, 4, 2, 1); Shape4.addBox(0.5F, -7F, -5F, 4, 2, 1);
Shape4.setRotationPoint(0F, 0F, 0F); Shape4.setRotationPoint(0F, 0F, 0F);
Shape4.setTextureSize(64, 64); Shape4.setTextureSize(64, 64);
Shape4.mirror = true; Shape4.mirror = false;
setRotation(Shape4, 0F, 0F, 0F); setRotation(Shape4, 0F, 0F, 0F);
Shape5 = new ModelRenderer(this, 0, 37); Shape5 = new ModelRenderer(this, 0, 37);
Shape5.addBox(0.5F, -7F, -5F, 4, 5, 1); Shape5.addBox(0.5F, -7F, -5F, 4, 5, 1);
Shape5.setRotationPoint(0F, 0F, 0F); Shape5.setRotationPoint(0F, 0F, 0F);
Shape5.setTextureSize(64, 64); Shape5.setTextureSize(64, 64);
Shape5.mirror = true; Shape5.mirror = false;
setRotation(Shape5, 0F, 1.570796F, 0F); setRotation(Shape5, 0F, 1.570796F, 0F);
Shape7 = new ModelRenderer(this, 5, 37); Shape7 = new ModelRenderer(this, 5, 37);
Shape7.addBox(-2F, -7F, -5.5F, 4, 6, 1); Shape7.addBox(-2F, -7F, -5.5F, 4, 6, 1);
Shape7.setRotationPoint(0F, 0F, 0F); Shape7.setRotationPoint(0F, 0F, 0F);
Shape7.setTextureSize(64, 64); Shape7.setTextureSize(64, 64);
Shape7.mirror = true; Shape7.mirror = false;
setRotation(Shape7, 0F, 1.570796F, 0F); setRotation(Shape7, 0F, 1.570796F, 0F);
Shape8 = new ModelRenderer(this, 2, 37); Shape8 = new ModelRenderer(this, 2, 37);
Shape8.addBox(-2F, -7F, -5.5F, 4, 8, 1); Shape8.addBox(-2F, -7F, -5.5F, 4, 8, 1);
Shape8.setRotationPoint(0F, 0F, 0F); Shape8.setRotationPoint(0F, 0F, 0F);
Shape8.setTextureSize(64, 64); Shape8.setTextureSize(64, 64);
Shape8.mirror = true; Shape8.mirror = false;
setRotation(Shape8, 0F, 3.141593F, 0F); setRotation(Shape8, 0F, 3.141593F, 0F);
Shape9 = new ModelRenderer(this, 5, 37); Shape9 = new ModelRenderer(this, 5, 37);
Shape9.addBox(0.5F, -7F, -5F, 4, 7, 1); Shape9.addBox(0.5F, -7F, -5F, 4, 7, 1);
Shape9.setRotationPoint(0F, 0F, 0F); Shape9.setRotationPoint(0F, 0F, 0F);
Shape9.setTextureSize(64, 64); Shape9.setTextureSize(64, 64);
Shape9.mirror = true; Shape9.mirror = false;
setRotation(Shape9, 0F, 3.141593F, 0F); setRotation(Shape9, 0F, 3.141593F, 0F);
Shape10 = new ModelRenderer(this, 20, 37); Shape10 = new ModelRenderer(this, 20, 37);
Shape10.addBox(-4.5F, -7F, -5F, 4, 5, 1); Shape10.addBox(-4.5F, -7F, -5F, 4, 5, 1);
Shape10.setRotationPoint(0F, 0F, 0F); Shape10.setRotationPoint(0F, 0F, 0F);
Shape10.setTextureSize(64, 64); Shape10.setTextureSize(64, 64);
Shape10.mirror = true; Shape10.mirror = false;
setRotation(Shape10, 0F, -1.570796F, 0F); setRotation(Shape10, 0F, -1.570796F, 0F);
Shape11 = new ModelRenderer(this, 25, 37); Shape11 = new ModelRenderer(this, 25, 37);
Shape11.addBox(-2F, -7F, -5.5F, 4, 6, 1); Shape11.addBox(-2F, -7F, -5.5F, 4, 6, 1);
Shape11.setRotationPoint(0F, 0F, 0F); Shape11.setRotationPoint(0F, 0F, 0F);
Shape11.setTextureSize(64, 64); Shape11.setTextureSize(64, 64);
Shape11.mirror = true; Shape11.mirror = false;
setRotation(Shape11, 0F, -1.570796F, 0F); setRotation(Shape11, 0F, -1.570796F, 0F);
Shape12 = new ModelRenderer(this, 30, 37); Shape12 = new ModelRenderer(this, 30, 37);
Shape12.addBox(0.5F, -7F, -5F, 4, 7, 1); Shape12.addBox(0.5F, -7F, -5F, 4, 7, 1);
Shape12.setRotationPoint(0F, 0F, 0F); Shape12.setRotationPoint(0F, 0F, 0F);
Shape12.setTextureSize(64, 64); Shape12.setTextureSize(64, 64);
Shape12.mirror = true; Shape12.mirror = false;
setRotation(Shape12, 0F, -1.570796F, 0F); setRotation(Shape12, 0F, -1.570796F, 0F);
Shape13 = new ModelRenderer(this, 10, 55); Shape13 = new ModelRenderer(this, 10, 55);
Shape13.addBox(-2F, -11F, -2F, 4, 1, 4); Shape13.addBox(-2F, -11F, -2F, 4, 1, 4);
Shape13.setRotationPoint(0F, 0F, 0F); Shape13.setRotationPoint(0F, 0F, 0F);
Shape13.setTextureSize(64, 64); Shape13.setTextureSize(64, 64);
Shape13.mirror = true; Shape13.mirror = false;
setRotation(Shape13, 0F, 0F, 0F); setRotation(Shape13, 0F, 0F, 0F);
Shape14 = new ModelRenderer(this, 0, 46); Shape14 = new ModelRenderer(this, 0, 46);
Shape14.addBox(-4.5F, -8F, -4.5F, 9, 1, 9); Shape14.addBox(-4.5F, -8F, -4.5F, 9, 1, 9);
Shape14.setRotationPoint(0F, 0F, 0F); Shape14.setRotationPoint(0F, 0F, 0F);
Shape14.setTextureSize(64, 64); Shape14.setTextureSize(64, 64);
Shape14.mirror = true; Shape14.mirror = false;
setRotation(Shape14, 0F, 0F, 0F); setRotation(Shape14, 0F, 0F, 0F);
Shape15 = new ModelRenderer(this, 0, 46); Shape15 = new ModelRenderer(this, 0, 46);
Shape15.addBox(-3.5F, -10F, -3.5F, 7, 1, 7); Shape15.addBox(-3.5F, -10F, -3.5F, 7, 1, 7);
Shape15.setRotationPoint(0F, 0F, 0F); Shape15.setRotationPoint(0F, 0F, 0F);
Shape15.setTextureSize(64, 64); Shape15.setTextureSize(64, 64);
Shape15.mirror = true; Shape15.mirror = false;
setRotation(Shape15, 0F, 0F, 0F); setRotation(Shape15, 0F, 0F, 0F);
Shape16 = new ModelRenderer(this, 5, 50); Shape16 = new ModelRenderer(this, 5, 50);
Shape16.addBox(-3F, -10.5F, -3F, 6, 1, 6); Shape16.addBox(-3F, -10.5F, -3F, 6, 1, 6);
Shape16.setRotationPoint(0F, 0F, 0F); Shape16.setRotationPoint(0F, 0F, 0F);
Shape16.setTextureSize(64, 64); Shape16.setTextureSize(64, 64);
Shape16.mirror = true; Shape16.mirror = false;
setRotation(Shape16, 0F, 0F, 0F); setRotation(Shape16, 0F, 0F, 0F);
Shape17 = new ModelRenderer(this, 50, 48); Shape17 = new ModelRenderer(this, 50, 48);
Shape17.addBox(-1F, -8.5F, 3F, 2, 1, 5); Shape17.addBox(-1F, -8.5F, 3F, 2, 1, 5);
Shape17.setRotationPoint(0F, 0F, 0F); Shape17.setRotationPoint(0F, 0F, 0F);
Shape17.setTextureSize(64, 64); Shape17.setTextureSize(64, 64);
Shape17.mirror = true; Shape17.mirror = false;
setRotation(Shape17, 1.047198F, 3.141593F, 0F); setRotation(Shape17, 1.047198F, 3.141593F, 0F);
Shape18 = new ModelRenderer(this, 50, 48); Shape18 = new ModelRenderer(this, 50, 48);
Shape18.addBox(-1F, -8.5F, 3F, 2, 1, 5); Shape18.addBox(-1F, -8.5F, 3F, 2, 1, 5);
Shape18.setRotationPoint(0F, 0F, 0F); Shape18.setRotationPoint(0F, 0F, 0F);
Shape18.setTextureSize(64, 64); Shape18.setTextureSize(64, 64);
Shape18.mirror = true; Shape18.mirror = false;
setRotation(Shape18, 1.047198F, 0F, 0F); setRotation(Shape18, 1.047198F, 0F, 0F);
Shape19 = new ModelRenderer(this, 46, 51); Shape19 = new ModelRenderer(this, 46, 51);
Shape19.addBox(-1F, -11.5F, -3.5F, 2, 1, 7); Shape19.addBox(-1F, -11.5F, -3.5F, 2, 1, 7);
Shape19.setRotationPoint(0F, 0F, 0F); Shape19.setRotationPoint(0F, 0F, 0F);
Shape19.setTextureSize(64, 64); Shape19.setTextureSize(64, 64);
Shape19.mirror = true; Shape19.mirror = false;
setRotation(Shape19, 0F, 0F, 0F); setRotation(Shape19, 0F, 0F, 0F);
Shape20 = new ModelRenderer(this, 40, 48); Shape20 = new ModelRenderer(this, 40, 48);
Shape20.addBox(-1F, -5F, -5.5F, 2, 3, 1); Shape20.addBox(-1F, -5F, -5.5F, 2, 3, 1);
Shape20.setRotationPoint(0F, 0F, 0F); Shape20.setRotationPoint(0F, 0F, 0F);
Shape20.setTextureSize(64, 64); Shape20.setTextureSize(64, 64);
Shape20.mirror = true; Shape20.mirror = false;
setRotation(Shape20, 0F, 0F, 0F); setRotation(Shape20, 0F, 0F, 0F);
Shape21 = new ModelRenderer(this, 0, 45); Shape21 = new ModelRenderer(this, 0, 45);
Shape21.addBox(-4F, -9F, -4F, 8, 1, 8); Shape21.addBox(-4F, -9F, -4F, 8, 1, 8);
Shape21.setRotationPoint(0F, 0F, 0F); Shape21.setRotationPoint(0F, 0F, 0F);
Shape21.setTextureSize(64, 64); Shape21.setTextureSize(64, 64);
Shape21.mirror = true; Shape21.mirror = false;
setRotation(Shape21, 0F, 0F, 0F); setRotation(Shape21, 0F, 0F, 0F);
Shape6 = new ModelRenderer(this, 5, 37); Shape6 = new ModelRenderer(this, 36, 37);
Shape6.addBox(0.5F, -7F, -5F, 4, 7, 1); Shape6.addBox(0.5F, -7F, -5F, 4, 7, 1);
Shape6.setRotationPoint(0F, 0F, 0F); Shape6.setRotationPoint(0F, 0F, 0F);
Shape6.setTextureSize(64, 64); Shape6.setTextureSize(64, 64);
Shape6.mirror = true; Shape6.mirror = true;
setRotation(Shape6, 0F, 3.141593F, 0F); setRotation(Shape6, 0F, 3.141593F, 0F);
this.bipedHead.addChild(Shape1);
this.bipedHead.addChild(Shape2); bipedHead.addChild(Shape1);
this.bipedHead.addChild(Shape3); bipedHead.addChild(Shape2);
this.bipedHead.addChild(Shape4); bipedHead.addChild(Shape3);
this.bipedHead.addChild(Shape5); bipedHead.addChild(Shape4);
this.bipedHead.addChild(Shape7); bipedHead.addChild(Shape5);
this.bipedHead.addChild(Shape8); bipedHead.addChild(Shape7);
this.bipedHead.addChild(Shape9); bipedHead.addChild(Shape8);
this.bipedHead.addChild(Shape10); bipedHead.addChild(Shape9);
this.bipedHead.addChild(Shape11); bipedHead.addChild(Shape10);
this.bipedHead.addChild(Shape12); bipedHead.addChild(Shape11);
this.bipedHead.addChild(Shape13); bipedHead.addChild(Shape12);
this.bipedHead.addChild(Shape14); bipedHead.addChild(Shape13);
this.bipedHead.addChild(Shape15); bipedHead.addChild(Shape14);
this.bipedHead.addChild(Shape16); bipedHead.addChild(Shape15);
this.bipedHead.addChild(Shape17); bipedHead.addChild(Shape16);
this.bipedHead.addChild(Shape18); bipedHead.addChild(Shape17);
this.bipedHead.addChild(Shape19); bipedHead.addChild(Shape18);
this.bipedHead.addChild(Shape20); bipedHead.addChild(Shape19);
this.bipedHead.addChild(Shape21); bipedHead.addChild(Shape20);
this.bipedHead.addChild(Shape6); bipedHead.addChild(Shape21);
bipedHead.addChild(Shape6);
} }
@@ -236,33 +238,6 @@ public class ModelPlateHelmet extends ModelBiped
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity); setRotationAngles(f, f1, f2, f3, f4, f5, entity);
//head.render(f5);
//body.render(f5);
//rightarm.render(f5);
//leftarm.render(f5);
//rightleg.render(f5);
//leftleg.render(f5);
Shape1.render(f5);
Shape2.render(f5);
Shape3.render(f5);
Shape4.render(f5);
Shape5.render(f5);
Shape7.render(f5);
Shape8.render(f5);
Shape9.render(f5);
Shape10.render(f5);
Shape11.render(f5);
Shape12.render(f5);
Shape13.render(f5);
Shape14.render(f5);
Shape15.render(f5);
Shape16.render(f5);
Shape17.render(f5);
Shape18.render(f5);
Shape19.render(f5);
Shape20.render(f5);
Shape21.render(f5);
Shape6.render(f5);
} }
private void setRotation(ModelRenderer model, float x, float y, float z) private void setRotation(ModelRenderer model, float x, float y, float z)