Skip to content

Commit

Permalink
feat: add new foliot trader models - thank @FeellianSinger
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jan 22, 2024

Verified

This commit was signed with the committer’s verified signature.
sergio-costas Sergio Costas
1 parent a6ed2cb commit 160c929
Showing 7 changed files with 720 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -39,6 +39,8 @@ public class FoliotModel extends DefaultedEntityGeoModel<FoliotEntity> {
public final ModelData transporter;
public final ModelData janitor;
public final ModelData lumberjack;
public final ModelData saplingTrader;
public final ModelData otherstoneTrader;

public FoliotModel() {
super(new ResourceLocation(Occultism.MODID, ASSET_SUBPATH), false);
@@ -47,6 +49,8 @@ public FoliotModel() {
this.transporter = this.buildModelData("transporter");
this.janitor = this.buildModelData("janitor");
this.lumberjack = this.buildModelData("lumberjack");
this.otherstoneTrader = this.buildModelData("otherstone_trader");
this.saplingTrader = this.buildModelData("sapling_trader");
}

public ModelData getModelData(FoliotEntity animatable) {
@@ -64,6 +68,14 @@ public ModelData getModelData(FoliotEntity animatable) {
return this.lumberjack;
}

if (Objects.equals(job, OccultismSpiritJobs.TRADE_OTHERSTONE_T1.getId().toString())) {
return this.otherstoneTrader;
}

if (Objects.equals(job, OccultismSpiritJobs.TRADE_OTHERWORLD_SAPLINGS_T2.getId().toString())) {
return this.saplingTrader;
}

return this.crusher;
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
{
"format_version": "1.8.0",
"animations": {
"walk": {
"loop": true,
"animation_length": 2,
"bones": {
"Torso": {
"rotation": {
"0.0": {
"vector": [0, 0, -1]
},
"0.5": {
"vector": [0, 0, 2]
},
"1.0": {
"vector": [0, 0, -1]
},
"1.5": {
"vector": [0, 0, 2]
},
"2.0": {
"vector": [0, 0, -1]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"1.0": {
"vector": [0, -0.1, 0]
},
"2.0": {
"vector": [0, 0, 0]
}
}
},
"RARM": {
"rotation": {
"0.0": {
"vector": [31, 0, 0]
},
"0.25": {
"vector": [-25.75, 0, 0]
},
"0.5": {
"vector": [31, 0, 0]
},
"0.75": {
"vector": [-25.75, 0, 0]
},
"1.0": {
"vector": [31, 0, 0]
},
"1.25": {
"vector": [-25.75, 0, 0]
},
"1.5": {
"vector": [31, 0, 0]
},
"1.75": {
"vector": [-25.75, 0, 0]
},
"2.0": {
"vector": [31, 0, 0]
}
}
},
"bone2": {
"rotation": {
"0.0": {
"vector": [27.5, 0, 0]
},
"0.25": {
"vector": [-32.5, 0, 0]
},
"0.5": {
"vector": [27.5, 0, 0]
},
"0.75": {
"vector": [-32.5, 0, 0]
},
"1.0": {
"vector": [27.5, 0, 0]
},
"1.25": {
"vector": [-32.5, 0, 0]
},
"1.5": {
"vector": [27.5, 0, 0]
},
"1.75": {
"vector": [-32.5, 0, 0]
},
"2.0": {
"vector": [27.5, 0, 0]
}
}
},
"bone": {
"rotation": {
"0.0": {
"vector": [-26, 0, 0]
},
"0.25": {
"vector": [31.5, 0, 0]
},
"0.5": {
"vector": [-26, 0, 0]
},
"0.75": {
"vector": [31.5, 0, 0]
},
"1.0": {
"vector": [-26, 0, 0]
},
"1.25": {
"vector": [31.5, 0, 0]
},
"1.5": {
"vector": [-26, 0, 0]
},
"1.75": {
"vector": [31.5, 0, 0]
},
"2.0": {
"vector": [-26, 0, 0]
}
}
},
"FAT": {
"scale": {
"0.0": {
"vector": [1, 1, 1]
},
"0.25": {
"vector": [1.01, 1, 1]
},
"0.5": {
"vector": [1, 1, 1]
},
"0.75": {
"vector": [1.01, 1, 1]
},
"1.0": {
"vector": [1, 1, 1]
},
"1.25": {
"vector": [1.01, 1, 1]
},
"1.5": {
"vector": [1, 1, 1]
},
"1.75": {
"vector": [1.01, 1, 1]
},
"2.0": {
"vector": [1, 1, 1]
}
}
},
"LARM": {
"rotation": {
"0.0": {
"vector": [-22.5, 0, 0]
},
"0.25": {
"vector": [27.5, 0, 0]
},
"0.5": {
"vector": [-22.5, 0, 0]
},
"0.75": {
"vector": [27.5, 0, 0]
},
"1.0": {
"vector": [-22.5, 0, 0]
},
"1.25": {
"vector": [27.5, 0, 0]
},
"1.5": {
"vector": [-22.5, 0, 0]
},
"1.75": {
"vector": [27.5, 0, 0]
},
"2.0": {
"vector": [-22.5, 0, 0]
}
},
"position": {
"vector": [0, 0, 0]
}
}
}
},
"idle": {
"loop": true,
"animation_length": 2,
"bones": {
"Torso": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"1.0": {
"vector": [0, -0.1, 0]
},
"2.0": {
"vector": [0, 0, 0]
}
}
},
"RARM": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"1.0": {
"vector": [4, 0, 0]
},
"2.0": {
"vector": [0, 0, 0]
}
}
},
"LARM": {
"rotation": {
"0.0": {
"vector": [1, 0, 0]
},
"1.0": {
"vector": [-2, 0, 0]
},
"2.0": {
"vector": [1, 0, 0]
}
}
}
}
}
},
"geckolib_format_version": 2
}
Loading

0 comments on commit 160c929

Please sign in to comment.