Merge remote-tracking branch 'origin/7.3' into 7.3

Author: MartinSVK12

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10.0-bta'
+	id 'fabric-loom' version '1.7.bta'
 	id 'java'
 }
 

gradle.properties

@@ -15,7 +15,6 @@ mod_menu_version=3.0.0
 halplibe_version=5.2.2
 
 # Mod
-
-mod_version=1.7.0-alpha.3
+mod_version=1.7.0-alpha.4
 mod_group=useless
 mod_name=dragonfly

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -18,7 +18,4 @@ pluginManagement {
 			url = 'https://maven.thesignalumproject.net/infrastructure'
 		}
 	}
-    plugins {
-        id 'org.jetbrains.kotlin.jvm' version '2.1.20'
-    }
 }

src/main/java/org/useless/util/AnimationHelper.java

@@ -6,13 +6,11 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.data.DataLoader;
 import net.minecraft.core.util.helper.MathHelper;
-import org.jetbrains.annotations.NotNull;
 import org.lwjgl.util.vector.Vector3f;
 import org.useless.DragonFly;
 import org.useless.dragonfly.animation.Animation;
 import org.useless.dragonfly.animation.AnimationData;
 import org.useless.dragonfly.animation.KeyFrameData;
-import org.useless.dragonfly.data.entity.mojang.Bone;
 import org.useless.dragonfly.data.entity.mojang.MojangAnimationDeserializer;
 import org.useless.dragonfly.models.entity.BoneTransform;
 import org.useless.dragonfly.models.entity.mojang.StaticEntityModelMojang;
@@ -87,8 +85,7 @@ public static void animate(StaticEntityModelMojang entityModel, Animation animat
 		float seconds = getElapsedSeconds(animationData, time);
 
 		for (AnimationData animationData1 : animationData.getAnimations()) {
-			for (@NotNull Bone bone : entityModel.bones) {
-				if (animationData1.getBone().equals(bone.name) && animationData1.getKeyFrames() != null) {
+			if (animationData1.getKeyFrames() != null) {
 					List<KeyFrameData> positionFrame = animationData1.getKeyFrames().stream().sorted(Comparator.comparing(KeyFrameData::getTimestamp)).collect(Collectors.toList());
 
 					int i = Math.max(0, binarySearch(0, positionFrame.size(), p_232315_ -> seconds <= positionFrame.get(p_232315_).getTimestamp()) - 1);
@@ -195,7 +192,6 @@ public static void animate(StaticEntityModelMojang entityModel, Animation animat
 							}
 							break;
 					}
-				}
 			}
 		}
 	}