WIP

src/main/java/com/trainguy9512/animationoverhaul/AnimationOverhaulMain.java

@@ -1,14 +1,12 @@
 package com.trainguy9512.animationoverhaul;
 
 
-import com.trainguy9512.animationoverhaul.animation.entity.PlayerPartAnimator;
-import com.trainguy9512.animationoverhaul.util.data.LivingEntityAnimatorRegistry;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupDataLoader;
+import com.trainguy9512.animationoverhaul.animation.data.LivingEntityAnimatorRegistry;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupDataLoader;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/com/trainguy9512/animationoverhaul/animation/AnimatorDispatcher.java

@@ -5,7 +5,7 @@
 import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
 import com.trainguy9512.animationoverhaul.animation.entity.LivingEntityAnimator;
 import com.trainguy9512.animationoverhaul.animation.pose.BakedAnimationPose;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;

src/main/java/com/trainguy9512/animationoverhaul/util/data/AnimationDataContainer.java → src/main/java/com/trainguy9512/animationoverhaul/animation/data/AnimationDataContainer.java

@@ -1,4 +1,4 @@
-package com.trainguy9512.animationoverhaul.util.data;
+package com.trainguy9512.animationoverhaul.animation.data;
 
 import com.google.common.collect.Maps;
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
@@ -12,9 +12,9 @@
 
 public class AnimationDataContainer {
 
-    private final HashMap<DataKey<?>, Variable<?>> entityAnimationVariables;
+    private final HashMap<DataKey<?>, AnimationVariable<?>> entityAnimationVariables;
     private final HashMap<String, SampleableAnimationState> entitySampleableAnimationStates;
-    private CachedPoseContainer cachedPoseContainer = new CachedPoseContainer();
+    private final CachedPoseContainer cachedPoseContainer = new CachedPoseContainer();
 
     public AnimationDataContainer(){
         this.entityAnimationVariables = Maps.newHashMap();
@@ -83,17 +83,17 @@ public AnimationPose<?> getCachedPose(String identifier, LocatorSkeleton<?> loca
         }
     }
 
-    public <D> Variable<D> get(DataKey<D> dataKey){
+    public <D> AnimationVariable<D> get(DataKey<D> dataKey){
         if(!entityAnimationVariables.containsKey(dataKey)){
-            entityAnimationVariables.put(dataKey, new Variable<>(dataKey));
+            entityAnimationVariables.put(dataKey, new AnimationVariable<>(dataKey));
         }
-        return (Variable<D>) entityAnimationVariables.get(dataKey);
+        return (AnimationVariable<D>) entityAnimationVariables.get(dataKey);
     }
 
-    public TreeMap<String, Variable<?>> getDebugData(){
-        TreeMap<String, Variable<?>> finalList = Maps.newTreeMap();
+    public TreeMap<String, AnimationVariable<?>> getDebugData(){
+        TreeMap<String, AnimationVariable<?>> finalList = Maps.newTreeMap();
         for(DataKey<?> dataKey : this.entityAnimationVariables.keySet()){
-            Variable<?> data = entityAnimationVariables.get(dataKey);
+            AnimationVariable<?> data = entityAnimationVariables.get(dataKey);
 
             String[] typeSplitted = data.get().getClass().toString().split("\\.");
             String type = typeSplitted[typeSplitted.length - 1];
@@ -161,7 +161,7 @@ public float getDataValueEasedCondition(AnimationDataContainer.DataKey<Float> da
     public void incrementInTicksFromCondition(DataKey<Float> dataKey, boolean condition, float ticksToIncrement, float ticksToDecrement){
         ticksToIncrement = Math.max(1, ticksToIncrement);
         ticksToDecrement = Math.max(1, ticksToDecrement);
-        Variable<Float> data = this.get(dataKey);
+        AnimationVariable<Float> data = this.get(dataKey);
         data.set(Mth.clamp((data.get()) + (condition ? 1/ticksToIncrement : -1/ticksToDecrement), 0, 1));
     }
 
@@ -186,7 +186,7 @@ public void incrementInFramesFromCondition(DataKey<Float> dataKey, boolean condi
      * @param ticksToIncrement  Time in ticks to increment from 0 to 1
      */
     public void incrementInTicksOrResetFromCondition(DataKey<Float> dataKey, boolean condition, float ticksToIncrement){
-        Variable<Float> data = this.get(dataKey);
+        AnimationVariable<Float> data = this.get(dataKey);
         if(condition){
             data.set(0F);
             data.set(0F);
@@ -218,8 +218,8 @@ public void incrementInFramesOrResetFromCondition(DataKey<Float> dataKey, boolea
      * @param random                Java random object used to pick a random index within numberOfAnimations
      */
     public void incrementInTicksOrResetRandomFromCondition(DataKey<Float> dataKeyMain, DataKey<Integer> dataKeyIndex, int numberOfAnimations, boolean condition, float ticksToIncrement, Random random){
-        Variable<Float> dataMain = this.get(dataKeyMain);
-        Variable<Integer> dataIndex = this.get(dataKeyIndex);
+        AnimationVariable<Float> dataMain = this.get(dataKeyMain);
+        AnimationVariable<Integer> dataIndex = this.get(dataKeyIndex);
         if(condition){
             dataMain.set(0F);
             dataMain.set(0F);
@@ -258,13 +258,13 @@ public String getIdentifier(){
         }
     }
 
-    public static class Variable<D>{
+    public static class AnimationVariable<D>{
 
         private D value;
         private D valueOld;
         private final D defaultValue;
 
-        public Variable(DataKey<D> dataKey){
+        public AnimationVariable(DataKey<D> dataKey){
             this.value = dataKey.defaultValue;
             this.valueOld = dataKey.defaultValue;
             this.defaultValue = dataKey.defaultValue;

src/main/java/com/trainguy9512/animationoverhaul/animation/data/AnimationDataKey.java

@@ -0,0 +1,12 @@
+package com.trainguy9512.animationoverhaul.animation.data;
+
+import java.util.function.Supplier;
+
+public class AnimationDataKey<D> {
+
+    private final Supplier<D> defaultValue;
+
+    public AnimationDataKey(Supplier<D> defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+}

src/main/java/com/trainguy9512/animationoverhaul/util/data/LivingEntityAnimatorRegistry.java → src/main/java/com/trainguy9512/animationoverhaul/animation/data/LivingEntityAnimatorRegistry.java

@@ -1,4 +1,4 @@
-package com.trainguy9512.animationoverhaul.util.data;
+package com.trainguy9512.animationoverhaul.animation.data;
 
 import com.google.common.collect.Maps;
 import com.trainguy9512.animationoverhaul.animation.entity.LivingEntityAnimator;

src/main/java/com/trainguy9512/animationoverhaul/util/data/TimelineGroupData.java → src/main/java/com/trainguy9512/animationoverhaul/animation/data/TimelineGroupData.java

@@ -1,4 +1,4 @@
-package com.trainguy9512.animationoverhaul.util.data;
+package com.trainguy9512.animationoverhaul.animation.data;
 
 import com.google.common.collect.Maps;
 import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;

src/main/java/com/trainguy9512/animationoverhaul/util/data/TimelineGroupDataLoader.java → src/main/java/com/trainguy9512/animationoverhaul/animation/data/TimelineGroupDataLoader.java

@@ -1,4 +1,4 @@
-package com.trainguy9512.animationoverhaul.util.data;
+package com.trainguy9512.animationoverhaul.animation.data;
 
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;

src/main/java/com/trainguy9512/animationoverhaul/util/data/TransformChannel.java → src/main/java/com/trainguy9512/animationoverhaul/animation/data/TransformChannel.java

@@ -1,4 +1,4 @@
-package com.trainguy9512.animationoverhaul.util.data;
+package com.trainguy9512.animationoverhaul.animation.data;
 
 import java.util.List;
 

src/main/java/com/trainguy9512/animationoverhaul/animation/entity/FirstPersonPlayerAnimator.java

@@ -1,19 +1,17 @@
 package com.trainguy9512.animationoverhaul.animation.entity;
 
-import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.animation.pose.BakedAnimationPose;
 import com.trainguy9512.animationoverhaul.animation.pose.sample.*;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.AnimationState;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Vector3f;
@@ -328,9 +326,12 @@ private AnimationPose<FPPlayerLocators> getStaticMainBasicItemPose(){
 
      */
 
+
     public void tick(LivingEntity livingEntity, AnimationDataContainer entityAnimationData){
 
 
+
+
         this.setEntityAnimationVariable(TIME_TEST, this.getEntityAnimationVariable(TIME_TEST) + 1);
 
 

src/main/java/com/trainguy9512/animationoverhaul/animation/entity/LivingEntityAnimator.java

@@ -7,7 +7,7 @@
 import com.trainguy9512.animationoverhaul.animation.pose.BakedAnimationPose;
 import com.trainguy9512.animationoverhaul.animation.pose.sample.*;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.world.entity.LivingEntity;
@@ -54,7 +54,7 @@ protected AnimationDataContainer getEntityAnimationData(){
         return this.entityAnimationData;
     }
 
-    protected <D> AnimationDataContainer.Variable<D> getEntityAnimationVariableObject(AnimationDataContainer.DataKey<D> dataKey){
+    protected <D> AnimationDataContainer.AnimationVariable<D> getEntityAnimationVariableObject(AnimationDataContainer.DataKey<D> dataKey){
         return getEntityAnimationData().get(dataKey);
     }
 
@@ -90,7 +90,12 @@ protected float getWalkAnimationSpeed(){
     }
 
     protected float getWalkAnimationPosition(){
+
+
+
+
         return this.livingEntity.walkAnimation.position();
+
     }
 
     public void tick(LivingEntity livingEntity){

src/main/java/com/trainguy9512/animationoverhaul/animation/entity/PlayerPartAnimator.java

@@ -1,24 +1,15 @@
 package com.trainguy9512.animationoverhaul.animation.entity;
 
-import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
-import com.trainguy9512.animationoverhaul.animation.pose.sample.AnimationBlendSpacePlayer;
-import com.trainguy9512.animationoverhaul.animation.pose.sample.AnimationSequencePlayer;
-import com.trainguy9512.animationoverhaul.animation.pose.sample.AnimationStateMachine;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
-import com.trainguy9512.animationoverhaul.util.time.TickTimeUtils;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 
-import java.util.List;
-
 public class PlayerPartAnimator extends LivingEntityAnimator<Player, PlayerModel<Player>, PlayerPartAnimator.ModelPartLocators> {
 
     private static final String MODEL_PART_ROOT = "root";

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/JointPose.java

@@ -1,8 +1,8 @@
 package com.trainguy9512.animationoverhaul.animation.pose;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
-import com.trainguy9512.animationoverhaul.util.data.TransformChannel;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
+import com.trainguy9512.animationoverhaul.animation.data.TransformChannel;
 import com.trainguy9512.animationoverhaul.util.time.ChannelTimeline;
 import com.trainguy9512.animationoverhaul.util.time.Easing;
 import net.minecraft.client.model.geom.ModelPart;

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/AnimationBlendSpacePlayer.java

@@ -2,8 +2,8 @@
 
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/AnimationMontage.java

@@ -2,7 +2,7 @@
 
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
 import com.trainguy9512.animationoverhaul.util.time.Easing;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/AnimationMontageTrack.java

@@ -2,7 +2,7 @@
 
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 import net.minecraft.util.Mth;
 import java.util.ArrayList;
 

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/AnimationSequencePlayer.java

@@ -3,14 +3,12 @@
 import com.google.common.collect.Maps;
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
-import com.trainguy9512.animationoverhaul.util.time.TickTimeUtils;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 import java.util.HashMap;
-import java.util.List;
 
 public class AnimationSequencePlayer extends TimeBasedAnimationState {
 

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/AnimationStateMachine.java

@@ -4,7 +4,7 @@
 import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 import com.trainguy9512.animationoverhaul.util.time.Easing;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.Nullable;

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/SampleableAnimationState.java

@@ -2,7 +2,7 @@
 
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 
 public class SampleableAnimationState {
 

src/main/java/com/trainguy9512/animationoverhaul/animation/pose/sample/TestReferenceSampler.java

@@ -2,7 +2,7 @@
 
 import com.trainguy9512.animationoverhaul.animation.pose.AnimationPose;
 import com.trainguy9512.animationoverhaul.util.animation.LocatorSkeleton;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
+import com.trainguy9512.animationoverhaul.animation.data.AnimationDataContainer;
 
 public class TestReferenceSampler extends SampleableAnimationState {
 

src/main/java/com/trainguy9512/animationoverhaul/mixin/debug/MixinDebugScreenOverlay.java

@@ -1,25 +1,5 @@
 package com.trainguy9512.animationoverhaul.mixin.debug;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.trainguy9512.animationoverhaul.AnimationOverhaulMain;
-import com.trainguy9512.animationoverhaul.animation.AnimatorDispatcher;
-import com.trainguy9512.animationoverhaul.util.data.AnimationDataContainer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.DebugScreenOverlay;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.phys.HitResult;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.text.DecimalFormat;
-import java.util.*;
-
 //TODO: will have to clean this mess up later, dunno what changed with 1.20 and i don't really care toooo much about the debug gui right now so meh
 /*
 @Mixin(DebugScreenOverlay.class)

src/main/java/com/trainguy9512/animationoverhaul/util/math/RotationMatrix.java

@@ -4,6 +4,7 @@
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
+@Deprecated
 public class RotationMatrix {
     public float[][] matrixGrid;
 

src/main/java/com/trainguy9512/animationoverhaul/util/time/ChannelTimeline.java

@@ -1,6 +1,6 @@
 package com.trainguy9512.animationoverhaul.util.time;
 
-import com.trainguy9512.animationoverhaul.util.data.TransformChannel;
+import com.trainguy9512.animationoverhaul.animation.data.TransformChannel;
 import net.minecraft.util.Mth;
 import org.joml.Quaternionf;
 

src/main/java/com/trainguy9512/animationoverhaul/util/time/TimerProcessor.java

@@ -1,6 +1,6 @@
 package com.trainguy9512.animationoverhaul.util.time;
 
-import com.trainguy9512.animationoverhaul.util.data.TimelineGroupData;
+import com.trainguy9512.animationoverhaul.animation.data.TimelineGroupData;
 import net.minecraft.util.Mth;
 
 @Deprecated