Skip to content

Commit

Permalink
Renamed timeline_groups directory to sequences
Browse files Browse the repository at this point in the history
  • Loading branch information
Trainguy9512 committed Feb 19, 2025
1 parent dd9cea6 commit de050f0
Show file tree
Hide file tree
Showing 84 changed files with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.trainguy9512.animationoverhaul.animation.pose.sampler.*;
import com.trainguy9512.animationoverhaul.animation.joint.JointSkeleton;
import com.trainguy9512.animationoverhaul.animation.pose.sampler.notify.NotifyListeners;
import com.trainguy9512.animationoverhaul.util.time.Easing;
import com.trainguy9512.animationoverhaul.util.Easing;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.player.LocalPlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.google.common.collect.Maps;
import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
import com.trainguy9512.animationoverhaul.animation.joint.JointTransform;
import com.trainguy9512.animationoverhaul.util.time.Timeline;
import com.trainguy9512.animationoverhaul.util.Timeline;
import net.minecraft.resources.ResourceLocation;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.google.gson.JsonObject;
import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
import com.trainguy9512.animationoverhaul.animation.joint.JointTransform;
import com.trainguy9512.animationoverhaul.util.time.Timeline;
import com.trainguy9512.animationoverhaul.util.Timeline;
import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.Resource;
Expand Down Expand Up @@ -37,7 +37,7 @@ public class AnimationSequenceDataLoader implements SimpleResourceReloadListener
public CompletableFuture<Map<ResourceLocation, JsonElement>> load(ResourceManager resourceManager, Executor executor) {
Gson gson = new Gson();

Map<ResourceLocation, Resource> passedFiles = resourceManager.listResources("timelinegroups", (string) -> {
Map<ResourceLocation, Resource> passedFiles = resourceManager.listResources("sequences", (string) -> {
return string.toString().endsWith(".json");
});

Expand Down Expand Up @@ -177,7 +177,7 @@ public CompletableFuture<Void> apply(Map<ResourceLocation, JsonElement> resource


String resourceNamespace = resourceLocationKey.toString().split(":")[0];
String resourceBody = resourceLocationKey.toString().split(":")[1].split("\\.")[0].replace("timelinegroups/", "");
String resourceBody = resourceLocationKey.toString().split(":")[1].split("\\.")[0].replace("sequences/", "");
ResourceLocation finalResourceLocation = ResourceLocation.fromNamespaceAndPath(resourceNamespace, resourceBody);

//String entityKey = resourceLocationKey.toString().split("/")[1];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.trainguy9512.animationoverhaul.animation.data.AnimationSequenceData;
import com.trainguy9512.animationoverhaul.util.time.Timeline;
import com.trainguy9512.animationoverhaul.util.Timeline;
import net.minecraft.client.model.geom.PartPose;
import net.minecraft.resources.ResourceLocation;
import org.joml.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.trainguy9512.animationoverhaul.animation.joint.JointSkeleton;
import com.trainguy9512.animationoverhaul.animation.joint.JointTransform;
import com.trainguy9512.animationoverhaul.util.time.Easing;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.NotNull;
import org.joml.*;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.trainguy9512.animationoverhaul.animation.data.PoseSamplerStateContainer;
import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
import com.trainguy9512.animationoverhaul.animation.joint.JointSkeleton;
import com.trainguy9512.animationoverhaul.util.time.Easing;
import com.trainguy9512.animationoverhaul.util.Easing;
import net.minecraft.resources.ResourceLocation;

import java.util.LinkedHashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
import com.trainguy9512.animationoverhaul.animation.joint.JointSkeleton;
import com.trainguy9512.animationoverhaul.animation.pose.sampler.notify.NotifyListener;
import com.trainguy9512.animationoverhaul.util.time.Easing;
import com.trainguy9512.animationoverhaul.util.Easing;
import net.minecraft.util.Mth;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.trainguy9512.animationoverhaul.util.time;
package com.trainguy9512.animationoverhaul.util;

import net.minecraft.util.Mth;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.trainguy9512.animationoverhaul.util.time;
package com.trainguy9512.animationoverhaul.util;

/**
* @author Marvin Schürz
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.trainguy9512.animationoverhaul.util.time;
package com.trainguy9512.animationoverhaul.util;

import com.trainguy9512.animationoverhaul.animation.joint.JointTransform;

Expand Down
Binary file not shown.

0 comments on commit de050f0

Please sign in to comment.