feat: Launch on 1.21.7

10 files changed, 163 insertions, 160 deletions

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
index 8a2bde5..f731982 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
@@ -85,7 +85,9 @@ object CustomGlobalArmorOverrides {
 			false,
 			false,
 			false,
-			false
+			false,
+			false,
+			null
 		)
 	}
 
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
index 4785e90..69a1c7e 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import net.minecraft.client.font.TextRenderer
+import net.minecraft.client.gl.RenderPipelines
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.screen.ingame.HandledScreen
@@ -82,7 +83,7 @@ object CustomScreenLayouts : SinglePreparationResourceReloader<List<CustomScreen
 			val textureWidth = this.width
 			val textureHeight = this.height
 			context.drawTexture(
-				RenderLayer::getGuiTextured,
+				RenderPipelines.GUI_TEXTURED,
 				this.texture,
 				modifiedX,
 				modifiedY,
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
index dd28d9f..7de84d2 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
@@ -1,4 +1,3 @@
-
 package moe.nea.firmament.features.texturepack
 
 import com.google.gson.JsonArray
@@ -13,148 +12,148 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlin.jvm.optionals.getOrNull
 import net.minecraft.nbt.NbtString
 import net.minecraft.text.Text
-import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.removeColorCodes
 
 @Serializable(with = StringMatcher.Serializer::class)
 interface StringMatcher {
-    fun matches(string: String): Boolean
-    fun matches(text: Text): Boolean {
-        return matches(text.string)
-    }
-
-    fun matches(nbt: NbtString): Boolean {
-        val string = nbt.value
-        val jsonStart = string.indexOf('{')
-        val stringStart = string.indexOf('"')
-        val isString = stringStart >= 0 && string.subSequence(0, stringStart).isBlank()
-        val isJson = jsonStart >= 0 && string.subSequence(0, jsonStart).isBlank()
-        if (isString || isJson)
-            return matches(Text.Serialization.fromJson(string, MC.defaultRegistries) ?: return false)
-        return matches(string)
-    }
-
-    class Equals(input: String, val stripColorCodes: Boolean) : StringMatcher {
-        private val expected = if (stripColorCodes) input.removeColorCodes() else input
-        override fun matches(string: String): Boolean {
-            return expected == (if (stripColorCodes) string.removeColorCodes() else string)
-        }
-
-        override fun toString(): String {
-            return "Equals($expected, stripColorCodes = $stripColorCodes)"
-        }
-    }
-
-    class Pattern(val patternWithColorCodes: String, val stripColorCodes: Boolean) : StringMatcher {
-        private val regex: Predicate<String> = patternWithColorCodes.toPattern().asMatchPredicate()
-        override fun matches(string: String): Boolean {
-            return regex.test(if (stripColorCodes) string.removeColorCodes() else string)
-        }
-
-        override fun toString(): String {
-            return "Pattern($patternWithColorCodes, stripColorCodes = $stripColorCodes)"
-        }
-    }
-
-    object Serializer : KSerializer<StringMatcher> {
-        val delegateSerializer = kotlinx.serialization.json.JsonElement.serializer()
-        override val descriptor: SerialDescriptor
-            get() = SerialDescriptor("StringMatcher", delegateSerializer.descriptor)
-
-        override fun deserialize(decoder: Decoder): StringMatcher {
-            val delegate = decoder.decodeSerializableValue(delegateSerializer)
-            val gsonDelegate = delegate.intoGson()
-            return parse(gsonDelegate)
-        }
-
-        override fun serialize(encoder: Encoder, value: StringMatcher) {
-            encoder.encodeSerializableValue(delegateSerializer, serialize(value).intoKotlinJson())
-        }
-
-    }
-
-    companion object {
-        fun serialize(stringMatcher: StringMatcher): JsonElement {
-            TODO("Cannot serialize string matchers rn")
-        }
-
-        fun parse(jsonElement: JsonElement): StringMatcher {
-            if (jsonElement is JsonPrimitive) {
-                return Equals(jsonElement.asString, true)
-            }
-            if (jsonElement is JsonObject) {
-                val regex = jsonElement["regex"] as JsonPrimitive?
-                val text = jsonElement["equals"] as JsonPrimitive?
-                val shouldStripColor = when (val color = (jsonElement["color"] as JsonPrimitive?)?.asString) {
-                    "preserve" -> false
-                    "strip", null -> true
-                    else -> error("Unknown color preservation mode: $color")
-                }
-                if ((regex == null) == (text == null)) error("Could not parse $jsonElement as string matcher")
-                if (regex != null)
-                    return Pattern(regex.asString, shouldStripColor)
-                if (text != null)
-                    return Equals(text.asString, shouldStripColor)
-            }
-            error("Could not parse $jsonElement as a string matcher")
-        }
-    }
+	fun matches(string: String): Boolean
+	fun matches(text: Text): Boolean {
+		return matches(text.string)
+	}
+
+	fun matches(nbt: NbtString): Boolean {
+		val string = nbt.value
+		val jsonStart = string.indexOf('{')
+		val stringStart = string.indexOf('"')
+		val isString = stringStart >= 0 && string.subSequence(0, stringStart).isBlank()
+		val isJson = jsonStart >= 0 && string.subSequence(0, jsonStart).isBlank()
+		if (isString || isJson) {
+			// TODO: return matches(TextCodecs.CODEC.parse(MC.defaultRegistryNbtOps, string) ?: return false)
+		}
+		return matches(string)
+	}
+
+	class Equals(input: String, val stripColorCodes: Boolean) : StringMatcher {
+		private val expected = if (stripColorCodes) input.removeColorCodes() else input
+		override fun matches(string: String): Boolean {
+			return expected == (if (stripColorCodes) string.removeColorCodes() else string)
+		}
+
+		override fun toString(): String {
+			return "Equals($expected, stripColorCodes = $stripColorCodes)"
+		}
+	}
+
+	class Pattern(val patternWithColorCodes: String, val stripColorCodes: Boolean) : StringMatcher {
+		private val regex: Predicate<String> = patternWithColorCodes.toPattern().asMatchPredicate()
+		override fun matches(string: String): Boolean {
+			return regex.test(if (stripColorCodes) string.removeColorCodes() else string)
+		}
+
+		override fun toString(): String {
+			return "Pattern($patternWithColorCodes, stripColorCodes = $stripColorCodes)"
+		}
+	}
+
+	object Serializer : KSerializer<StringMatcher> {
+		val delegateSerializer = kotlinx.serialization.json.JsonElement.serializer()
+		override val descriptor: SerialDescriptor
+			get() = SerialDescriptor("StringMatcher", delegateSerializer.descriptor)
+
+		override fun deserialize(decoder: Decoder): StringMatcher {
+			val delegate = decoder.decodeSerializableValue(delegateSerializer)
+			val gsonDelegate = delegate.intoGson()
+			return parse(gsonDelegate)
+		}
+
+		override fun serialize(encoder: Encoder, value: StringMatcher) {
+			encoder.encodeSerializableValue(delegateSerializer, serialize(value).intoKotlinJson())
+		}
+
+	}
+
+	companion object {
+		fun serialize(stringMatcher: StringMatcher): JsonElement {
+			TODO("Cannot serialize string matchers rn")
+		}
+
+		fun parse(jsonElement: JsonElement): StringMatcher {
+			if (jsonElement is JsonPrimitive) {
+				return Equals(jsonElement.asString, true)
+			}
+			if (jsonElement is JsonObject) {
+				val regex = jsonElement["regex"] as JsonPrimitive?
+				val text = jsonElement["equals"] as JsonPrimitive?
+				val shouldStripColor = when (val color = (jsonElement["color"] as JsonPrimitive?)?.asString) {
+					"preserve" -> false
+					"strip", null -> true
+					else -> error("Unknown color preservation mode: $color")
+				}
+				if ((regex == null) == (text == null)) error("Could not parse $jsonElement as string matcher")
+				if (regex != null)
+					return Pattern(regex.asString, shouldStripColor)
+				if (text != null)
+					return Equals(text.asString, shouldStripColor)
+			}
+			error("Could not parse $jsonElement as a string matcher")
+		}
+	}
 }
 
 fun JsonElement.intoKotlinJson(): kotlinx.serialization.json.JsonElement {
-    when (this) {
-        is JsonNull -> return kotlinx.serialization.json.JsonNull
-        is JsonObject -> {
-            return kotlinx.serialization.json.JsonObject(this.entrySet()
-                                                             .associate { it.key to it.value.intoKotlinJson() })
-        }
-
-        is JsonArray -> {
-            return kotlinx.serialization.json.JsonArray(this.map { it.intoKotlinJson() })
-        }
-
-        is JsonPrimitive -> {
-            if (this.isString)
-                return kotlinx.serialization.json.JsonPrimitive(this.asString)
-            if (this.isBoolean)
-                return kotlinx.serialization.json.JsonPrimitive(this.asBoolean)
-            return kotlinx.serialization.json.JsonPrimitive(this.asNumber)
-        }
-
-        else -> error("Unknown json variant $this")
-    }
+	when (this) {
+		is JsonNull -> return kotlinx.serialization.json.JsonNull
+		is JsonObject -> {
+			return kotlinx.serialization.json.JsonObject(
+				this.entrySet()
+					.associate { it.key to it.value.intoKotlinJson() })
+		}
+
+		is JsonArray -> {
+			return kotlinx.serialization.json.JsonArray(this.map { it.intoKotlinJson() })
+		}
+
+		is JsonPrimitive -> {
+			if (this.isString)
+				return kotlinx.serialization.json.JsonPrimitive(this.asString)
+			if (this.isBoolean)
+				return kotlinx.serialization.json.JsonPrimitive(this.asBoolean)
+			return kotlinx.serialization.json.JsonPrimitive(this.asNumber)
+		}
+
+		else -> error("Unknown json variant $this")
+	}
 }
 
 fun kotlinx.serialization.json.JsonElement.intoGson(): JsonElement {
-    when (this) {
-        is kotlinx.serialization.json.JsonNull -> return JsonNull.INSTANCE
-        is kotlinx.serialization.json.JsonPrimitive -> {
-            if (this.isString)
-                return JsonPrimitive(this.content)
-            if (this.content == "true")
-                return JsonPrimitive(true)
-            if (this.content == "false")
-                return JsonPrimitive(false)
-            return JsonPrimitive(LazilyParsedNumber(this.content))
-        }
-
-        is kotlinx.serialization.json.JsonObject -> {
-            val obj = JsonObject()
-            for ((k, v) in this) {
-                obj.add(k, v.intoGson())
-            }
-            return obj
-        }
-
-        is kotlinx.serialization.json.JsonArray -> {
-            val arr = JsonArray()
-            for (v in this) {
-                arr.add(v.intoGson())
-            }
-            return arr
-        }
-    }
+	when (this) {
+		is kotlinx.serialization.json.JsonNull -> return JsonNull.INSTANCE
+		is kotlinx.serialization.json.JsonPrimitive -> {
+			if (this.isString)
+				return JsonPrimitive(this.content)
+			if (this.content == "true")
+				return JsonPrimitive(true)
+			if (this.content == "false")
+				return JsonPrimitive(false)
+			return JsonPrimitive(LazilyParsedNumber(this.content))
+		}
+
+		is kotlinx.serialization.json.JsonObject -> {
+			val obj = JsonObject()
+			for ((k, v) in this) {
+				obj.add(k, v.intoGson())
+			}
+			return obj
+		}
+
+		is kotlinx.serialization.json.JsonArray -> {
+			val arr = JsonArray()
+			for (v in this) {
+				arr.add(v.intoGson())
+			}
+			return arr
+		}
+	}
 }
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/SkullPredicate.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/SkullPredicate.kt
index 416e86c..f17582d 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/SkullPredicate.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/SkullPredicate.kt
@@ -42,7 +42,7 @@ class SkullPredicate(
 		}
 		when {
 			profileId != null
-				&& profileId != profile.id.getOrNull() ->
+				&& profileId != profile.uuid.getOrNull() ->
 				return false
 
 			textureValue != null
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/CustomSkullTexturePatch.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/CustomSkullTexturePatch.java
index fede766..cc59d99 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/CustomSkullTexturePatch.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/CustomSkullTexturePatch.java
@@ -16,11 +16,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(SkullBlockEntityRenderer.class)
 public class CustomSkullTexturePatch {
 	@Inject(
-		method = "getRenderLayer(Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/component/type/ProfileComponent;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/RenderLayer;",
+		method = "getRenderLayer",
 		at = @At("HEAD"),
 		cancellable = true
 	)
-	private static void onGetRenderLayer(SkullBlock.SkullType type, ProfileComponent profile, Identifier texture, CallbackInfoReturnable<RenderLayer> cir) {
+	private static void onGetRenderLayer(SkullBlock.SkullType type, ProfileComponent profile, CallbackInfoReturnable<RenderLayer> cir) {
 		CustomSkyBlockTextures.INSTANCE.modifySkullTexture(type, profile, cir);
 	}
 }
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/SupplyFakeModelPatch.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/SupplyFakeModelPatch.java
index 75cedf8..8687088 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/SupplyFakeModelPatch.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/SupplyFakeModelPatch.java
@@ -17,6 +17,7 @@ import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourcePack;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
 import java.io.InputStreamReader;
@@ -44,6 +45,7 @@ public class SupplyFakeModelPatch {
 		return original.thenCompose(oldModels -> CompletableFuture.supplyAsync(() -> supplyExtraModels(resourceManager, oldModels), executor));
 	}
 
+	@Unique
 	private static ItemAssetsLoader.Result supplyExtraModels(ResourceManager resourceManager, ItemAssetsLoader.Result oldModels) {
 		if (!CustomSkyBlockTextures.TConfig.INSTANCE.getEnableLegacyMinecraftCompat()) return oldModels;
 		Map<Identifier, ItemAsset> newModels = new HashMap<>(oldModels.contents());
@@ -72,13 +74,14 @@ public class SupplyFakeModelPatch {
 			                   .orElse(true)) {
 				newModels.put(itemModelId, new ItemAsset(
 					unbakedModel,
-					new ItemAsset.Properties(true)
+					new ItemAsset.Properties(true, true)
 				));
 			}
 		}
 		return new ItemAssetsLoader.Result(newModels);
 	}
 
+	@Unique
 	private static boolean isResourcePackNewer(
 		ResourceManager manager,
 		ResourcePack null_, ResourcePack proposal) {
@@ -88,6 +91,7 @@ public class SupplyFakeModelPatch {
 		return pack.orElse(null_) != null_;
 	}
 
+	@Unique
 	private static <T> Collector<T, ?, Optional<T>> findLast() {
 		return Collectors.reducing(Optional.empty(), Optional::of,
 		                           (left, right) -> right.isPresent() ? right : left);
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceAnvilScreen.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceAnvilScreen.java
index 7c5dc45..5dbdc8e 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceAnvilScreen.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceAnvilScreen.java
@@ -42,11 +42,11 @@ public abstract class ReplaceAnvilScreen extends ForgingScreen<AnvilScreenHandle
 	}
 
 	@WrapOperation(method = "drawForeground",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)I"),
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V"),
 		allow = 1)
-	private int onDrawRepairCost(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, Operation<Integer> original) {
+	private void onDrawRepairCost(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, Operation<Void> original) {
 		var textOverride = CustomScreenLayouts.getTextMover(CustomScreenLayouts.CustomScreenLayout::getRepairCostTitle);
-		return original.call(instance, textRenderer,
+		original.call(instance, textRenderer,
 			textOverride.replaceText(text),
 			textOverride.replaceX(textRenderer, text, x),
 			textOverride.replaceY(y),
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceFurnaceBackgrounds.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceFurnaceBackgrounds.java
index 6b076db..4c84143 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceFurnaceBackgrounds.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceFurnaceBackgrounds.java
@@ -1,6 +1,7 @@
 package moe.nea.firmament.mixins.custommodels.screenlayouts;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
 import moe.nea.firmament.features.texturepack.CustomScreenLayouts;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen;
@@ -21,8 +22,8 @@ public abstract class ReplaceFurnaceBackgrounds<T extends AbstractFurnaceScreenH
 		super(handler, recipeBook, inventory, title);
 	}
 
-	@WrapWithCondition(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIII)V"), allow = 1)
-	private boolean onDrawBackground(DrawContext instance, Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
+	@WrapWithCondition(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIII)V"), allow = 1)
+	private boolean onDrawBackground(DrawContext instance, RenderPipeline pipeline, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
 		final var override = CustomScreenLayouts.getActiveScreenOverride();
 		if (override == null || override.getBackground() == null) return true;
 		override.getBackground().renderGeneric(instance, this);
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplacePlayerBackgrounds.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplacePlayerBackgrounds.java
index e02a821..9ae2e2f 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplacePlayerBackgrounds.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplacePlayerBackgrounds.java
@@ -3,6 +3,7 @@ package moe.nea.firmament.mixins.custommodels.screenlayouts;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
 import moe.nea.firmament.features.texturepack.CustomScreenLayouts;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
@@ -28,10 +29,10 @@ public abstract class ReplacePlayerBackgrounds extends RecipeBookScreen<PlayerSc
 
 	@WrapOperation(method = "drawForeground",
 		allow = 1,
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)I"))
-	private int onDrawForegroundText(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Integer> original) {
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)V"))
+	private void onDrawForegroundText(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Void> original) {
 		var textOverride = CustomScreenLayouts.getTextMover(CustomScreenLayouts.CustomScreenLayout::getContainerTitle);
-		return original.call(instance, textRenderer,
+		original.call(instance, textRenderer,
 			textOverride.replaceText(text),
 			textOverride.replaceX(textRenderer, text, x),
 			textOverride.replaceY(y),
@@ -39,8 +40,8 @@ public abstract class ReplacePlayerBackgrounds extends RecipeBookScreen<PlayerSc
 			shadow);
 	}
 
-	@WrapWithCondition(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIII)V"))
-	private boolean onDrawBackground(DrawContext instance, Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
+	@WrapWithCondition(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIII)V"))
+	private boolean onDrawBackground(DrawContext instance, RenderPipeline pipeline, Identifier sprite, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
 		final var override = CustomScreenLayouts.getActiveScreenOverride();
 		if (override == null || override.getBackground() == null) return true;
 		override.getBackground().renderGeneric(instance, this);
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceTextColorInHandledScreen.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceTextColorInHandledScreen.java
index 4f0905a..392d532 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceTextColorInHandledScreen.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/screenlayouts/ReplaceTextColorInHandledScreen.java
@@ -5,12 +5,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import moe.nea.firmament.features.texturepack.CustomScreenLayouts;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.ingame.AnvilScreen;
-import net.minecraft.client.gui.screen.ingame.BeaconScreen;
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.client.gui.screen.ingame.MerchantScreen;
 import net.minecraft.text.Text;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,16 +20,16 @@ public class ReplaceTextColorInHandledScreen {
 		method = "drawForeground",
 		at = @At(
 			value = "INVOKE",
-			target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)I"),
+			target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)V"),
 		slice = @Slice(
 			from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;title:Lnet/minecraft/text/Text;", opcode = Opcodes.GETFIELD),
 			to = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;playerInventoryTitle:Lnet/minecraft/text/Text;", opcode = Opcodes.GETFIELD)
 		),
 		allow = 1,
 		require = 1)
-	private int replaceContainerTitle(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Integer> original) {
+	private void replaceContainerTitle(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Void> original) {
 		var textOverride = CustomScreenLayouts.getTextMover(CustomScreenLayouts.CustomScreenLayout::getContainerTitle);
-		return original.call(instance, textRenderer,
+		 original.call(instance, textRenderer,
 			textOverride.replaceText(text),
 			textOverride.replaceX(textRenderer, text, x),
 			textOverride.replaceY(y),
@@ -46,16 +41,16 @@ public class ReplaceTextColorInHandledScreen {
 		method = "drawForeground",
 		at = @At(
 			value = "INVOKE",
-			target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)I"),
+			target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)V"),
 		slice = @Slice(
 			from = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;playerInventoryTitle:Lnet/minecraft/text/Text;", opcode = Opcodes.GETFIELD),
 			to = @At(value = "TAIL")
 		),
 		allow = 1,
 		require = 1)
-	private int replacePlayerTitle(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Integer> original) {
+	private void replacePlayerTitle(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Void> original) {
 		var textOverride = CustomScreenLayouts.getTextMover(CustomScreenLayouts.CustomScreenLayout::getPlayerTitle);
-		return original.call(instance, textRenderer,
+		original.call(instance, textRenderer,
 			textOverride.replaceText(text),
 			textOverride.replaceX(textRenderer, text, x),
 			textOverride.replaceY(y),