Skip to content

Commit

Permalink
Added Ranger set
Browse files Browse the repository at this point in the history
New aesthetic set added
Some minor nerfs to robes and knight armour to bring them closer in line to their vanilla TC counterparts. Can't powercreep too hard
  • Loading branch information
KryptonCaptain committed Nov 20, 2016
2 parents 4f8a3e3 + 8f48266 commit 10a5654
Show file tree
Hide file tree
Showing 19 changed files with 1,157 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ README.txt

##API
/src/api
/models
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
#Sat Sep 26 08:25:20 EDT 2015
version=1.3
version=1.3.5
dir_output=../Build Output/TD/
mc_version=1.7.10
forge_version=10.13.4.1614
dir_repo=./
build_number=4
build_number=2
mod_name=Thaumic-Dyes-[1.7.10]
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ public ModelIronFortress(float f) {
super.bipedHead.addChild(this.Mask[0]);
super.bipedHead.addChild(this.Mask[1]);
super.bipedHead.addChild(this.Mask[2]);

super.bipedBody.cubeList.clear();
//TODO removed
if(f < 1.0F) {
Expand Down
15 changes: 13 additions & 2 deletions src/main/java/thaumicdyes/client/models/ModelKnight.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,18 @@ public ModelKnight(float f)
this.GauntletstrapR2.setTextureSize(128, 64);
this.GauntletstrapR2.mirror = true;
setRotation(this.GauntletstrapR2, 0.0F, 0.0F, 0.0F);

/*
this.ShoulderR = new ModelRenderer(this, 56, 35);
this.ShoulderR.addBox(-3.5F, -2.5F, -2.5F, 5, 5, 5);
this.ShoulderR.setTextureSize(128, 64);
this.ShoulderR.mirror = true; //TODO
setRotation(this.ShoulderR, 0.0F, 0.0F, 0.0F);
*/
//
this.ShoulderR = new ModelRenderer(this, 56, 35);
//this.ShoulderR.setRotationPoint(-5.0F, 2.0F, 0.0F);
this.ShoulderR.addBox(-3.5F, -2.5F, -2.5F, 5, 5, 5, 0.0F);

this.ShoulderR0 = new ModelRenderer(this, 0, 0);
this.ShoulderR0.addBox(-4.3F, -1.5F, -3.0F, 3, 5, 6);
Expand Down Expand Up @@ -203,12 +208,18 @@ public ModelKnight(float f)

this.GauntletstrapL2.setTextureSize(128, 64);
setRotation(this.GauntletstrapL2, 0.0F, 0.0F, 0.0F);

/*
this.ShoulderL = new ModelRenderer(this, 56, 35);
this.ShoulderL.addBox(-1.5F, -2.5F, -2.5F, 5, 5, 5);
this.ShoulderL.mirror = false; //TODO
this.ShoulderL.setTextureSize(128, 64);
setRotation(this.ShoulderL, 0.0F, 0.0F, 0.0F);
*/
//
this.ShoulderL = new ModelRenderer(this, 56, 35);
this.ShoulderL.mirror = true;
//this.ShoulderL.setRotationPoint(5.0F, 2.0F, 0.0F);
this.ShoulderL.addBox(-1.5F, -2.5F, -2.5F, 5, 5, 5, 0.0F);

this.ShoulderL0 = new ModelRenderer(this, 0, 0);
this.ShoulderL0.addBox(1.3F, -1.5F, -3.0F, 3, 5, 6);
Expand Down
14 changes: 12 additions & 2 deletions src/main/java/thaumicdyes/client/models/ModelPraetor.java
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,10 @@ public ModelPraetor(float f) {
this.GauntletL2 = new ModelRenderer(this, 102, 37);
this.GauntletL2.addBox(4.0F, 3.5F, -2.0F, 1, 5, 4);
this.setRotation(this.GauntletL2, 0.0F, 0.0F, 0.1675516F);

this.ShoulderR = new ModelRenderer(this, 56, 35);
this.ShoulderR.addBox(-3.5F, -2.5F, -2.5F, 5, 5, 5);
this.ShoulderR.addBox(-3.5F, -2.5F, -2.5F, 5, 5, 5, 0.0F);

this.ShoulderR1 = new ModelRenderer(this, 0, 0);
this.ShoulderR1.addBox(-4.3F, -1.5F, -3.0F, 3, 5, 6);
this.setRotation(this.ShoulderR1, 0.0F, 0.0F, 0.7853982F);
Expand All @@ -164,8 +166,11 @@ public ModelPraetor(float f) {
this.ShoulderR4 = new ModelRenderer(this, 18, 4);
this.ShoulderR4.addBox(-2.3F, -1.5F, -4.0F, 1, 6, 1);
this.setRotation(this.ShoulderR4, 0.0F, 0.0F, 0.7853982F);

this.ShoulderL = new ModelRenderer(this, 56, 35);
this.ShoulderL.addBox(-1.5F, -2.5F, -2.5F, 5, 5, 5);
this.ShoulderL.mirror = true;
this.ShoulderL.addBox(-1.5F, -2.5F, -2.5F, 5, 5, 5, 0.0F);

this.ShoulderL1 = new ModelRenderer(this, 0, 0);
this.ShoulderL1.addBox(1.3F, -1.5F, -3.0F, 3, 5, 6);
this.setRotation(this.ShoulderL1, 0.0F, 0.0F, -0.7853982F);
Expand Down Expand Up @@ -217,6 +222,7 @@ public ModelPraetor(float f) {
this.BackpanelL3 = new ModelRenderer(this, 116, 13);
this.BackpanelL3.addBox(2.0F, 2.5F, -2.5F, 1, 4, 5);
this.setRotation(this.BackpanelL3, 0.0F, 0.0F, -0.1396263F);

super.bipedHeadwear.cubeList.clear();
super.bipedHead.cubeList.clear();
super.bipedHead.addChild(this.Helmet);
Expand All @@ -226,6 +232,7 @@ public ModelPraetor(float f) {
super.bipedBody.addChild(this.Mbelt);
super.bipedBody.addChild(this.MbeltL);
super.bipedBody.addChild(this.MbeltR);

if(f >= 1.0F) {
super.bipedBody.addChild(this.BeltL);
super.bipedBody.addChild(this.BeltR);
Expand Down Expand Up @@ -258,6 +265,7 @@ public ModelPraetor(float f) {
super.bipedRightArm.addChild(this.GauntletR2);
super.bipedRightArm.addChild(this.GauntletstrapR1);
super.bipedRightArm.addChild(this.GauntletstrapR2);

super.bipedLeftArm.cubeList.clear();
super.bipedLeftArm.addChild(this.ShoulderL);
super.bipedLeftArm.addChild(this.ShoulderL1);
Expand All @@ -269,10 +277,12 @@ public ModelPraetor(float f) {
super.bipedLeftArm.addChild(this.GauntletL2);
super.bipedLeftArm.addChild(this.GauntletstrapL1);
super.bipedLeftArm.addChild(this.GauntletstrapL2);

super.bipedRightLeg.addChild(this.BackpanelR1);
super.bipedRightLeg.addChild(this.BackpanelR2);
super.bipedRightLeg.addChild(this.BackpanelR3);
super.bipedRightLeg.addChild(this.BackpanelR4);

super.bipedLeftLeg.addChild(this.BackpanelL1);
super.bipedLeftLeg.addChild(this.BackpanelL2);
super.bipedLeftLeg.addChild(this.BackpanelL3);
Expand Down
Loading

0 comments on commit 10a5654

Please sign in to comment.