feat: Launch on 1.21.7

49 files changed, 386 insertions, 271 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
index c5af8b6..2a58921 100644
--- a/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/HideStatusEffectsPatch.java
@@ -1,17 +1,16 @@
 package moe.nea.firmament.mixins;
 
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import moe.nea.firmament.features.fixes.Fixes;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.screen.ingame.StatusEffectsDisplay;
 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(InventoryScreen.class)
+@Mixin(StatusEffectsDisplay.class)
 public abstract class HideStatusEffectsPatch {
 	@Shadow
 	public abstract boolean shouldHideStatusEffectHud();
@@ -21,9 +20,11 @@ public abstract class HideStatusEffectsPatch {
 		cir.setReturnValue(!Fixes.TConfig.INSTANCE.getHidePotionEffects());
 	}
 
-	@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/StatusEffectsDisplay;drawStatusEffects(Lnet/minecraft/client/gui/DrawContext;IIF)V"))
-	private boolean conditionalRenderStatuses(StatusEffectsDisplay instance, DrawContext context, int mouseX, int mouseY, float tickDelta) {
-		return shouldHideStatusEffectHud() || !Fixes.TConfig.INSTANCE.getHidePotionEffects();
+	@Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true)
+	private void conditionalRenderStatuses(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
+		if (shouldHideStatusEffectHud() || !Fixes.TConfig.INSTANCE.getHidePotionEffects()) {
+			ci.cancel();
+		}
 	}
 
 }
diff --git a/src/main/java/moe/nea/firmament/mixins/MixinHandledScreen.java b/src/main/java/moe/nea/firmament/mixins/MixinHandledScreen.java
index 43aec40..a5fec35 100644
--- a/src/main/java/moe/nea/firmament/mixins/MixinHandledScreen.java
+++ b/src/main/java/moe/nea/firmament/mixins/MixinHandledScreen.java
@@ -62,12 +62,12 @@ public abstract class MixinHandledScreen<T extends ScreenHandler> {
 		}
 	}
 
-	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawForeground(Lnet/minecraft/client/gui/DrawContext;II)V", shift = At.Shift.AFTER))
+	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;renderMain(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.AFTER))
 	public void onAfterRenderForeground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-		context.getMatrices().push();
-		context.getMatrices().translate(-x, -y, 0);
+		context.getMatrices().pushMatrix();
+		context.getMatrices().translate(-x, -y);
 		HandledScreenForegroundEvent.Companion.publish(new HandledScreenForegroundEvent((HandledScreen<?>) (Object) this, context, mouseX, mouseY, delta));
-		context.getMatrices().pop();
+		context.getMatrices().popMatrix();
 	}
 
 	@Inject(method = "onMouseClick(Lnet/minecraft/screen/slot/Slot;IILnet/minecraft/screen/slot/SlotActionType;)V", at = @At("HEAD"), cancellable = true)
diff --git a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
index f07604e..86f6806 100644
--- a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(ClientPlayerEntity.class)
 public abstract class PlayerDropEventPatch extends PlayerEntity {
 	public PlayerDropEventPatch() {
-		super(null, null, 0, null);
+		super(null, null);
 	}
 
 	@Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
diff --git a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
index 3ed8c1b..e268819 100644
--- a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
@@ -2,8 +2,10 @@
 
 package moe.nea.firmament.mixins;
 
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import moe.nea.firmament.events.WorldRenderLastEvent;
 import net.minecraft.client.render.*;
+import net.minecraft.client.render.fog.FogRenderer;
 import net.minecraft.client.util.Handle;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.profiler.Profiler;
@@ -29,7 +31,7 @@ public abstract class WorldRenderLastEventPatch {
 	protected abstract void checkEmpty(MatrixStack matrices);
 
 	@Inject(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V", shift = At.Shift.AFTER))
-	public void onWorldRenderLast(Fog fog, RenderTickCounter renderTickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Matrix4f matrix4f2, Handle handle, Handle handle2, boolean bl, Frustum frustum, Handle handle3, Handle handle4, CallbackInfo ci) {
+	public void onWorldRenderLast(GpuBufferSlice gpuBufferSlice, RenderTickCounter renderTickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Handle handle, Handle handle2, boolean bl, Frustum frustum, Handle handle3, Handle handle4, CallbackInfo ci) {
 		var imm = this.bufferBuilders.getEntityVertexConsumers();
 		var stack = new MatrixStack();
 		// TODO: pre-cancel this event if F1 is active
diff --git a/src/main/java/moe/nea/firmament/mixins/feature/devcosmetics/CustomCapeFeatureRenderer.java b/src/main/java/moe/nea/firmament/mixins/feature/devcosmetics/CustomCapeFeatureRenderer.java
index 5a92f89..e1bdd7e 100644
--- a/src/main/java/moe/nea/firmament/mixins/feature/devcosmetics/CustomCapeFeatureRenderer.java
+++ b/src/main/java/moe/nea/firmament/mixins/feature/devcosmetics/CustomCapeFeatureRenderer.java
@@ -29,7 +29,7 @@ public abstract class CustomCapeFeatureRenderer extends FeatureRenderer<PlayerEn
 		method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/PlayerEntityRenderState;FF)V",
 		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;II)V")
 	)
-	private void onRender(BipedEntityModel instance, MatrixStack matrixStack, VertexConsumer vertexConsumer, int light, int overlay, Operation<Void> original, @Local PlayerEntityRenderState playerEntityRenderState, @Local SkinTextures skinTextures, @Local VertexConsumerProvider vertexConsumerProvider) {
+	private void onRender(BipedEntityModel<PlayerEntityRenderState> instance, MatrixStack matrixStack, VertexConsumer vertexConsumer, int light, int overlay, Operation<Void> original, @Local(argsOnly = true) PlayerEntityRenderState playerEntityRenderState, @Local SkinTextures skinTextures, @Local VertexConsumerProvider vertexConsumerProvider) {
 		CustomCapes.render(
 			playerEntityRenderState,
 			vertexConsumer,
diff --git a/src/main/kotlin/features/chat/ChatLinks.kt b/src/main/kotlin/features/chat/ChatLinks.kt
index 1fb12e1..28c526f 100644
--- a/src/main/kotlin/features/chat/ChatLinks.kt
+++ b/src/main/kotlin/features/chat/ChatLinks.kt
@@ -8,6 +8,7 @@ import java.net.URL
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicInteger
 import moe.nea.jarvis.api.Point
+import org.joml.Vector2i
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
@@ -27,6 +28,7 @@ import moe.nea.firmament.events.ModifyChatEvent
 import moe.nea.firmament.events.ScreenRenderPostEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.jarvis.JarvisIntegration
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.render.drawTexture
 import moe.nea.firmament.util.transformEachRecursively
@@ -42,7 +44,7 @@ object ChatLinks : FirmamentFeature {
 		val allowAllHosts by toggle("allow-all-hosts") { false }
 		val allowedHosts by string("allowed-hosts") { "cdn.discordapp.com,media.discordapp.com,media.discordapp.net,i.imgur.com" }
 		val actualAllowedHosts get() = allowedHosts.split(",").map { it.trim() }
-		val position by position("position", 16 * 20, 9 * 20) { Point(0.0, 0.0) }
+		val position by position("position", 16 * 20, 9 * 20) { Vector2i(0, 0) }
 	}
 
 	private fun isHostAllowed(host: String) =
@@ -110,11 +112,11 @@ object ChatLinks : FirmamentFeature {
 		val imageFuture = imageCache[url] ?: return
 		if (!imageFuture.isCompleted) return
 		val image = imageFuture.getCompleted() ?: return
-		it.drawContext.matrices.push()
+		it.drawContext.matrices.pushMatrix()
 		val pos = TConfig.position
-		pos.applyTransformations(it.drawContext.matrices)
+		pos.applyTransformations(JarvisIntegration.jarvis, it.drawContext.matrices)
 		val scale = min(1F, min((9 * 20F) / image.height, (16 * 20F) / image.width))
-		it.drawContext.matrices.scale(scale, scale, 1F)
+		it.drawContext.matrices.scale(scale, scale)
 		it.drawContext.drawTexture(
 			image.texture,
 			0,
@@ -126,7 +128,7 @@ object ChatLinks : FirmamentFeature {
 			image.width,
 			image.height,
 		)
-		it.drawContext.matrices.pop()
+		it.drawContext.matrices.popMatrix()
 	}
 
 	@Subscribe
diff --git a/src/main/kotlin/features/debug/ExportedTestConstantMeta.kt b/src/main/kotlin/features/debug/ExportedTestConstantMeta.kt
index f0250dc..bdc1f9a 100644
--- a/src/main/kotlin/features/debug/ExportedTestConstantMeta.kt
+++ b/src/main/kotlin/features/debug/ExportedTestConstantMeta.kt
@@ -12,7 +12,7 @@ data class ExportedTestConstantMeta(
 ) {
 	companion object {
 		val current = ExportedTestConstantMeta(
-			SharedConstants.getGameVersion().saveVersion.id,
+			SharedConstants.getGameVersion().dataVersion().id,
 			Optional.of("Firmament ${Firmament.version.friendlyString}")
 		)
 
diff --git a/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt b/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
index bc8c618..29a85d6 100644
--- a/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
+++ b/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
@@ -1,15 +1,13 @@
 package moe.nea.firmament.features.debug.itemeditor
 
 import kotlinx.serialization.Serializable
-import kotlin.jvm.optionals.getOrNull
-import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.util.Identifier
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.ItemCache
-import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.StringUtil.camelWords
+import moe.nea.firmament.util.mc.loadItemFromNbt
 
 /**
  * Load data based on [prismarine.js' 1.8 item data](https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/1.8/items.json)
@@ -68,8 +66,7 @@ object LegacyItemData {
 				putByte("Count", 1)
 				putShort("Damage", legacyItemType.metadata)
 			})!!
-			val stack = ItemStack.fromNbt(MC.defaultRegistries, nbt).getOrNull()
-				?: error("Could not transform ${legacyItemType}")
+			val stack = loadItemFromNbt(nbt) ?: error("Could not transform $legacyItemType")
 			stack.item to legacyItemType
 		}
 	}.toMap()
diff --git a/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt b/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
index ecf3d2c..f4f23b0 100644
--- a/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
+++ b/src/main/kotlin/features/debug/itemeditor/LegacyItemExporter.kt
@@ -284,7 +284,7 @@ class LegacyItemExporter private constructor(var itemStack: ItemStack) {
 	fun copyLegacySkullNbt() {
 		val profile = itemStack.get(DataComponentTypes.PROFILE) ?: return
 		legacyNbt.put("SkullOwner", NbtCompound().apply {
-			profile.id.ifPresent {
+			profile.uuid.ifPresent {
 				putString("Id", it.toString())
 			}
 			putBoolean("hypixelPopulated", true)
diff --git a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
index ff85c00..48004e8 100644
--- a/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
+++ b/src/main/kotlin/features/diana/AncestralSpadeSolver.kt
@@ -106,13 +106,11 @@ object AncestralSpadeSolver : SubscriptionOwner {
 			nextGuess?.let {
 				tinyBlock(it, 1f, 0x80FFFFFF.toInt())
 				// TODO: replace this
-				color(1f, 1f, 0f, 1f)
-				tracer(it, lineWidth = 3f)
+				tracer(it, lineWidth = 3f, color = 0x80FFFFFF.toInt())
 			}
 			if (particlePositions.size > 2 && lastDing.passedTime() < 10.seconds && nextGuess != null) {
 				// TODO: replace this // TODO: add toggle
-				color(0f, 1f, 0f, 0.7f)
-				line(particlePositions)
+				line(particlePositions, color = 0x80FFFFFF.toInt())
 			}
 		}
 	}
diff --git a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
index 0cfaeba..0f0316a 100644
--- a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
+++ b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
@@ -4,6 +4,7 @@ package moe.nea.firmament.features.events.anniversity
 import io.github.notenoughupdates.moulconfig.observer.ObservableList
 import io.github.notenoughupdates.moulconfig.xml.Bind
 import moe.nea.jarvis.api.Point
+import org.joml.Vector2i
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.entity.passive.PigEntity
 import net.minecraft.util.math.BlockPos
@@ -31,7 +32,7 @@ object AnniversaryFeatures : FirmamentFeature {
 
     object TConfig : ManagedConfig(identifier, Category.EVENTS) {
         val enableShinyPigTracker by toggle("shiny-pigs") {true}
-        val trackPigCooldown by position("pig-hud", 200, 300) { Point(0.1, 0.2) }
+        val trackPigCooldown by position("pig-hud", 200, 300) { Vector2i(100, 200) }
     }
 
     override val config: ManagedConfig?
diff --git a/src/main/kotlin/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt
index d490cc4..8870285 100644
--- a/src/main/kotlin/features/fixes/Fixes.kt
+++ b/src/main/kotlin/features/fixes/Fixes.kt
@@ -1,6 +1,7 @@
 package moe.nea.firmament.features.fixes
 
 import moe.nea.jarvis.api.Point
+import org.joml.Vector2i
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.option.KeyBinding
@@ -22,7 +23,7 @@ object Fixes : FirmamentFeature {
 		var autoSprint by toggle("auto-sprint") { false }
 		val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
 		val autoSprintUnderWater by toggle("auto-sprint-underwater") { true }
-		val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
+		val autoSprintHud by position("auto-sprint-hud", 80, 10) { Vector2i() }
 		val peekChat by keyBindingWithDefaultUnbound("peek-chat")
 		val hidePotionEffects by toggle("hide-mob-effects") { false }
 		val hidePotionEffectsHud by toggle("hide-potion-effects-hud") { false }
@@ -49,7 +50,7 @@ object Fixes : FirmamentFeature {
 	@Subscribe
 	fun onRenderHud(it: HudRenderEvent) {
 		if (!TConfig.autoSprintKeyBinding.isBound) return
-		it.context.matrices.push()
+		it.context.matrices.pushMatrix()
 		TConfig.autoSprintHud.applyTransformations(it.context.matrices)
 		it.context.drawText(
 			MC.font, (
@@ -65,7 +66,7 @@ object Fixes : FirmamentFeature {
 				}
 				), 0, 0, -1, true
 		)
-		it.context.matrices.pop()
+		it.context.matrices.popMatrix()
 	}
 
 	@Subscribe
diff --git a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
index fdc378a..9dae118 100644
--- a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
+++ b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
@@ -1,6 +1,7 @@
 package moe.nea.firmament.features.inventory
 
 import java.awt.Color
+import net.minecraft.client.gl.RenderPipelines
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.render.RenderLayer
 import net.minecraft.item.ItemStack
@@ -38,7 +39,7 @@ object ItemRarityCosmetics : FirmamentFeature {
 		val rarity = Rarity.fromItem(item) ?: return
 		val rgb = rarityToColor[rarity] ?: 0xFF00FF80.toInt()
 		drawContext.drawGuiTexture(
-			RenderLayer::getGuiTextured,
+			RenderPipelines.GUI_TEXTURED,
 			Identifier.of("firmament:item_rarity_background"),
 			x, y,
 			16, 16,
diff --git a/src/main/kotlin/features/inventory/PetFeatures.kt b/src/main/kotlin/features/inventory/PetFeatures.kt
index 9393b03..701d30c 100644
--- a/src/main/kotlin/features/inventory/PetFeatures.kt
+++ b/src/main/kotlin/features/inventory/PetFeatures.kt
@@ -1,6 +1,6 @@
 package moe.nea.firmament.features.inventory
 
-import moe.nea.jarvis.api.Point
+import org.joml.Vector2i
 import net.minecraft.item.ItemStack
 import net.minecraft.text.Text
 import net.minecraft.util.Formatting
@@ -10,6 +10,7 @@ import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.jarvis.JarvisIntegration
 import moe.nea.firmament.util.FirmFormatters.formatPercent
 import moe.nea.firmament.util.FirmFormatters.shortFormat
 import moe.nea.firmament.util.MC
@@ -31,7 +32,9 @@ object PetFeatures : FirmamentFeature {
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val highlightEquippedPet by toggle("highlight-pet") { true }
 		var petOverlay by toggle("pet-overlay") { false }
-		val petOverlayHud by position("pet-overlay-hud", 80, 10) { Point(0.5, 1.0) }
+		val petOverlayHud by position("pet-overlay-hud", 80, 10) {
+			Vector2i()
+		}
 	}
 
 	val petMenuTitle = "Pets(?: \\([0-9]+/[0-9]+\\))?".toPattern()
@@ -43,12 +46,12 @@ object PetFeatures : FirmamentFeature {
 		val stack = event.slot.stack
 		if (stack.petData?.active == true)
 			petMenuTitle.useMatch(MC.screenName ?: return) {
-			petItemStack = stack
-			event.context.drawGuiTexture(
-				Firmament.identifier("selected_pet_background"),
-				event.slot.x, event.slot.y, 16, 16,
-			)
-		}
+				petItemStack = stack
+				event.context.drawGuiTexture(
+					Firmament.identifier("selected_pet_background"),
+					event.slot.x, event.slot.y, 16, 16,
+				)
+			}
 	}
 
 	@Subscribe
@@ -62,25 +65,48 @@ object PetFeatures : FirmamentFeature {
 		val petType = titleCase(petData.type)
 		val heldItem = petData.heldItem?.let { item -> "Held Item: ${titleCase(item)}" }
 
-		it.context.matrices.push()
-		TConfig.petOverlayHud.applyTransformations(it.context.matrices)
+		it.context.matrices.pushMatrix()
+		TConfig.petOverlayHud.applyTransformations(JarvisIntegration.jarvis, it.context.matrices)
 
 		val lines = mutableListOf<Text>()
-		it.context.matrices.push()
-		it.context.matrices.translate(-0.5, -0.5, 0.0)
-		it.context.matrices.scale(2f, 2f, 1f)
+		it.context.matrices.pushMatrix()
+		it.context.matrices.translate(-0.5F, -0.5F)
+		it.context.matrices.scale(2f, 2f)
 		it.context.drawItem(itemStack, 0, 0)
-		it.context.matrices.pop()
+		it.context.matrices.popMatrix()
 
 		lines.add(Text.literal("[Lvl ${xp.currentLevel}] ").append(Text.literal(petType).withColor(rarityCode)))
 		if (heldItem != null) lines.add(Text.literal(heldItem))
-		if (xp.currentLevel != xp.maxLevel) lines.add(Text.literal("Required L${xp.currentLevel + 1}: ${shortFormat(xp.expInCurrentLevel.toDouble())}/${shortFormat(xp.expRequiredForNextLevel.toDouble())} (${formatPercent(xp.percentageToNextLevel.toDouble())})"))
-		lines.add(Text.literal("Required L100: ${shortFormat(xp.expTotal.toDouble())}/${shortFormat(xp.expRequiredForMaxLevel.toDouble())} (${formatPercent(xp.percentageToMaxLevel.toDouble())})"))
+		if (xp.currentLevel != xp.maxLevel) lines.add(
+			Text.literal(
+				"Required L${xp.currentLevel + 1}: ${shortFormat(xp.expInCurrentLevel.toDouble())}/${
+					shortFormat(
+						xp.expRequiredForNextLevel.toDouble()
+					)
+				} (${formatPercent(xp.percentageToNextLevel.toDouble())})"
+			)
+		)
+		lines.add(
+			Text.literal(
+				"Required L100: ${shortFormat(xp.expTotal.toDouble())}/${shortFormat(xp.expRequiredForMaxLevel.toDouble())} (${
+					formatPercent(
+						xp.percentageToMaxLevel.toDouble()
+					)
+				})"
+			)
+		)
 
 		for ((index, line) in lines.withIndex()) {
-			it.context.drawText(MC.font, line.copy().withColor(Formatting.GRAY), 36, MC.font.fontHeight * index, -1, true)
+			it.context.drawText(
+				MC.font,
+				line.copy().withColor(Formatting.GRAY),
+				36,
+				MC.font.fontHeight * index,
+				-1,
+				true
+			)
 		}
 
-		it.context.matrices.pop()
+		it.context.matrices.popMatrix()
 	}
 }
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
index 476759a..6bf2928 100644
--- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt
+++ b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
@@ -31,7 +31,7 @@ object REIDependencyWarner {
 	var sentWarning = false
 
 	fun modrinthLink(slug: String) =
-		"https://modrinth.com/mod/$slug/versions?g=${SharedConstants.getGameVersion().name}&l=fabric"
+		"https://modrinth.com/mod/$slug/versions?g=${SharedConstants.getGameVersion().name()}&l=fabric"
 
 	fun downloadBu