Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@ jar {
}
}

// Temporary fix for resources not being available during testing
// Comment this out upon publishing
// sourceSets {main { output.resourcesDir = output.classesDir }}
// Only apply this config when running the project from IntelliJ IDEA
// This fixes resources being stale during development
if (System.getProperty("idea.active") == "true") {
sourceSets {main { output.resourcesDir = output.classesDir }}
}

// Example configuration to allow publishing using the maven-publish task
// This is the preferred method to reobfuscate your jar file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class WolfSittingAnimationBit extends KeyframeAnimationBit<WolfData>
{

private static final String[] ACTIONS = new String[] { "sitting" };
private static final ResourceLocation SITTING_ANIMATION = new ResourceLocation(ModStatics.MODID, "animations/wolf_sitting_down.json");
private static final ResourceLocation SITTING_ANIMATION = new ResourceLocation(ModStatics.MODID, "bends/animations/wolf_sitting_down.json");

public WolfSittingAnimationBit(float animationSpeed)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
public class WolfController implements IAnimationController<WolfData>
{
protected static final ResourceLocation WOLF_ANIMATOR = new ResourceLocation(ModStatics.MODID, "animators/wolf.json");
protected static final ResourceLocation WOLF_ANIMATOR = new ResourceLocation(ModStatics.MODID, "bends/animators/wolf.json");
protected AnimatorTemplate animatorTemplate;
protected KumoAnimatorState<WolfData> kumoAnimatorState;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"comment": "NODE 0 - Idle",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_idle.bendsanim",
"animationKey": "mobends:bends/animations/wolf_idle.bendsanim",
"playbackSpeed": 1,
"looping": true,
"connections": [
Expand All @@ -32,7 +32,7 @@
{
"comment": "NODE 1 - Walking",
"type": "core:movement",
"animationKey": "mobends:animations/wolf_walking.bendsanim",
"animationKey": "mobends:bends/animations/wolf_walking.bendsanim",
"playbackSpeed": 4,
"connections": [
{
Expand All @@ -56,7 +56,7 @@
{
"comment": "NODE 2 - Sitting Down",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_sitting_down.bendsanim",
"animationKey": "mobends:bends/animations/wolf_sitting_down.bendsanim",
"playbackSpeed": 2,
"startFrame": 6,
"connections": [
Expand All @@ -70,7 +70,7 @@
{
"comment": "NODE 3 - Sitting",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_sitting.bendsanim",
"animationKey": "mobends:bends/animations/wolf_sitting.bendsanim",
"playbackSpeed": 1,
"startFrame": 0,
"looping": true,
Expand All @@ -91,7 +91,7 @@
{
"comment": "NODE 4 - Standing Up",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_standing_up.bendsanim",
"animationKey": "mobends:bends/animations/wolf_standing_up.bendsanim",
"playbackSpeed": 2,
"startFrame": 4,
"connections": [
Expand All @@ -110,16 +110,13 @@
"additive": true,
"mask": {
"mode": "INCLUDE_ONLY",
"includedParts": [
"tongue",
"mouth"
]
"includedParts": ["tongue", "mouth"]
},
"nodes": [
{
"comment": "NODE 0 - Idle",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_idle.bendsanim",
"animationKey": "mobends:bends/animations/wolf_idle.bendsanim",
"playbackSpeed": 1,
"looping": true,
"connections": [
Expand All @@ -136,7 +133,7 @@
{
"comment": "NODE 1 - Breathing",
"type": "core:standard",
"animationKey": "mobends:animations/wolf_breathing.bendsanim",
"animationKey": "mobends:bends/animations/wolf_breathing.bendsanim",
"playbackSpeed": 1.2,
"looping": true,
"connections": [
Expand All @@ -153,4 +150,4 @@
]
}
]
}
}