Add QuiltMC Compatibility

Author: FirstMegaGame4

README.md

@@ -12,7 +12,7 @@ MModding-Library is a custom library mainly used in the MModdingTeam's mods.
 ![Java CI with Gradle](https://github.com/MModding/MModding-Library/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=main)
 
 ## Usage
-MModding-Library provides detailed documentation in the form of a [Wiki](https://docs.mmodding.com). MModding-Library is avalaible for QuiltMC with Minecraft 1.18.2 & FabricMC with Minecraft 1.19.2.
+MModding-Library provides detailed documentation in the form of a [Wiki](https://docs.mmodding.com). MModding-Library is available for QuiltMC with Minecraft 1.18.2 & FabricMC with Minecraft 1.19.2.
 
 Badge for Modders:
 

build.gradle

@@ -32,6 +32,9 @@ dependencies {
 	modImplementation libs.fabric.api
 
 	modImplementation libs.modmenu
+
+	// Quilt Compatibility
+	modImplementation libs.compat.qsl
 }
 
 loom {

gradle/libs.versions.toml

@@ -7,6 +7,9 @@ fabric_loader = "0.16.4"
 fabric_api = "0.77.0+1.19.2"
 modmenu = "4.0.6"
 
+# Compatibility
+compat_qsl = "3.0.0-beta.19+1.19.2"
+
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" }
@@ -15,6 +18,9 @@ fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_l
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
 
+# Compatibility
+compat_qsl = { module = "org.quiltmc.qsl:entity", version.ref = "compat_qsl" }
+
 # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 # [bundles]
 # example = ["example-a", "example-b", "example-c"]

src/main/java/com/mmodding/mmodding_lib/ducks/FabricOrQuiltEntityTypeBuilderDuckInterface.java

@@ -4,7 +4,7 @@
 import com.mmodding.mmodding_lib.library.utils.InternalOf;
 import net.minecraft.entity.Entity;
 
-@InternalOf( CustomEntityType.class)
+@InternalOf(CustomEntityType.class)
 public interface FabricOrQuiltEntityTypeBuilderDuckInterface<T extends Entity> {
 
     CustomEntityType<T> mmodding_lib$buildCustom();

src/main/java/com/mmodding/mmodding_lib/mixin/injectors/QuiltEntityTypeBuilderMixin.java

@@ -11,12 +11,13 @@
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.world.Heightmap;
 import org.jetbrains.annotations.NotNull;
+import org.quiltmc.qsl.entity.api.QuiltEntityTypeBuilder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Pseudo
-@Mixin(targets = "org.quiltmc.qsl.entity.api.QuiltEntityTypeBuilder", remap = false)
+@Mixin(value = QuiltEntityTypeBuilder.class, remap = false)
 public class QuiltEntityTypeBuilderMixin<T extends Entity> implements FabricOrQuiltEntityTypeBuilderDuckInterface<T> {
 
 	@Shadow
@@ -66,7 +67,7 @@ public class QuiltEntityTypeBuilderMixin<T extends Entity> implements FabricOrQu
 			this.dimensions,
 			this.maxTrackingRange,
 			this.trackingTickInterval,
-			this.alwaysUpdateVelocity
+			this.alwaysUpdateVelocity != null ? this.alwaysUpdateVelocity : false
 		);
 	}
 
@@ -76,16 +77,18 @@ public class QuiltEntityTypeBuilderMixin<T extends Entity> implements FabricOrQu
 	public static class FabricBuilder<T extends LivingEntity> implements FabricOrQuiltEntityTypeBuilderDuckInterface<T> {
 
 		@Shadow
-		private FabricOrQuiltEntityTypeBuilderDuckInterface<T> quiltBuilder;
+		@SuppressWarnings("rawtypes")
+		private QuiltEntityTypeBuilder quiltBuilder;
 
 		@Override
+		@SuppressWarnings("unchecked")
 		public CustomEntityType<T> mmodding_lib$buildCustom() {
-			return this.quiltBuilder.mmodding_lib$buildCustom();
+			return ((FabricOrQuiltEntityTypeBuilderDuckInterface<T>) this.quiltBuilder).mmodding_lib$buildCustom();
 		}
 	}
 
 	@Pseudo
-	@Mixin(targets = "org.quiltmc.qsl.entity.api.QuiltEntityTypeBuilder$Living", remap = false)
+	@Mixin(value = QuiltEntityTypeBuilder.Living.class, remap = false)
 	public static class Living<T extends LivingEntity> extends QuiltEntityTypeBuilderMixin<T> {
 
 		@Shadow
@@ -104,7 +107,7 @@ public static class Living<T extends LivingEntity> extends QuiltEntityTypeBuilde
 	}
 
 	@Pseudo
-	@Mixin(targets = "org.quiltmc.qsl.entity.api.QuiltEntityTypeBuilder$Mob", remap = false)
+	@Mixin(value = QuiltEntityTypeBuilder.Mob.class, remap = false)
 	public static class Mob<T extends MobEntity> extends Living<T> {
 
 		@Shadow
@@ -134,11 +137,13 @@ public static class Mob<T extends MobEntity> extends Living<T> {
 	public static class FabricLiving<T extends LivingEntity> implements FabricOrQuiltEntityTypeBuilderDuckInterface<T> {
 
 		@Shadow
-		private FabricOrQuiltEntityTypeBuilderDuckInterface<T> quiltBuilder;
+		@SuppressWarnings("rawtypes")
+		private QuiltEntityTypeBuilder.Living quiltBuilder;
 
 		@Override
+		@SuppressWarnings("unchecked")
 		public CustomEntityType<T> mmodding_lib$buildCustom() {
-			return this.quiltBuilder.mmodding_lib$buildCustom();
+			return ((FabricOrQuiltEntityTypeBuilderDuckInterface<T>) this.quiltBuilder).mmodding_lib$buildCustom();
 		}
 	}
 
@@ -147,11 +152,13 @@ public static class FabricLiving<T extends LivingEntity> implements FabricOrQuil
 	public static class FabricMob<T extends LivingEntity> implements FabricOrQuiltEntityTypeBuilderDuckInterface<T> {
 
 		@Shadow
-		private FabricOrQuiltEntityTypeBuilderDuckInterface<T> quiltBuilder;
+		@SuppressWarnings("rawtypes")
+		private QuiltEntityTypeBuilder.Mob quiltBuilder;
 
 		@Override
+		@SuppressWarnings("unchecked")
 		public CustomEntityType<T> mmodding_lib$buildCustom() {
-			return this.quiltBuilder.mmodding_lib$buildCustom();
+			return ((FabricOrQuiltEntityTypeBuilderDuckInterface<T>) this.quiltBuilder).mmodding_lib$buildCustom();
 		}
 	}
 }