Update to 1.21.10

Author: PotatoPresident

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.2
 loader_version=0.17.3
 # Mod Properties
-mod_version=1.8.10
+mod_version=1.8.11
 maven_group=us.potatoboy
 archives_base_name=PetOwner
 # Dependencies
 # check this on https://fabricmc.net/develop/
-fabric_version=0.134.0+1.21.8
-modmenu_version=15.0.0
-midnightlib_version=1.7.5+1.21.6-fabric
+fabric_version=0.135.0+1.21.10
+modmenu_version=16.0.0-rc.1
+midnightlib_version=1.8.3+1.21.9-fabric

src/main/java/us/potatoboy/petowner/client/PetOwnerClient.java

@@ -18,6 +18,7 @@
 import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -43,8 +44,8 @@ public class PetOwnerClient implements ClientModInitializer {
 					CompletableFuture.runAsync(() -> {
 						GameProfile playerProfile;
 						try {
-							playerProfile = Objects.requireNonNull(MinecraftClient.getInstance().getSessionService().fetchProfile(key, false)).profile();
-							usernameCache.put(key, Optional.ofNullable(playerProfile.getName()));
+							playerProfile = Objects.requireNonNull(MinecraftClient.getInstance().getApiServices().sessionService().fetchProfile(key, false)).profile();
+							usernameCache.put(key, Optional.ofNullable(playerProfile.name()));
 						} catch (NullPointerException e) {
 							usernameCache.put(key, Optional.empty());
 						}
@@ -58,10 +59,11 @@ public class PetOwnerClient implements ClientModInitializer {
 	public void onInitializeClient() {
 		MidnightConfig.init("petowner", PetOwnerConfig.class);
 
+        var category = KeyBinding.Category.create(Identifier.of("petowner", "keys"));
 		keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
 				"key.petowner.hide",
 				InputUtil.UNKNOWN_KEY.getCode(),
-				"category.petowner.title"
+				category
 		));
 
 		var enabledText = Text.translatable("text.petowner.message.enabled").formatted(Formatting.BOLD, Formatting.GREEN);

src/main/java/us/potatoboy/petowner/mixin/OwnerNameTagRendering.java

@@ -2,26 +2,20 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAttachmentType;
 import net.minecraft.text.Text;
-import net.minecraft.util.Colors;
 import net.minecraft.util.Formatting;
-import net.minecraft.util.math.Vec3d;
-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 us.potatoboy.petowner.client.PetOwnerClient;
-import org.joml.Matrix4f;
 import us.potatoboy.petowner.client.PetRenderState;
 import us.potatoboy.petowner.client.config.PetOwnerConfig;
 
@@ -31,14 +25,9 @@
 
 @Mixin(EntityRenderer.class)
 public abstract class OwnerNameTagRendering<T extends Entity, S extends EntityRenderState> {
-	@Final
-	@Shadow
-	protected EntityRenderDispatcher dispatcher;
 
-	@Shadow public abstract TextRenderer getTextRenderer();
-
-	@Inject(method = "render", at = @At("HEAD"))
-	private void render(S state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
+    @Inject(method = "render", at = @At("HEAD"))
+	private void render(S state, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraState, CallbackInfo ci) {
 		PetRenderState petRenderState = (PetRenderState) state;
 
 		//If HUD is hidden
@@ -65,28 +54,7 @@ private void render(S state, MatrixStack matrices, VertexConsumerProvider vertex
 					PetOwnerClient.LOGGER.error("If you're trying to figure out why the mod doesn't work, it's cause you're in a dev env");
 			}
 
-			double d = state.squaredDistanceToCamera;
-			if (d <= 4096.0D) {
-				Vec3d vec3d = state.nameLabelPos;
-				if (vec3d != null) {
-					int y = 10 + (10 * i);
-					matrices.push();
-					matrices.translate(vec3d.x, vec3d.y + 0.5, vec3d.z);
-					matrices.multiply(this.dispatcher.getRotation());
-					matrices.scale(0.025F, -0.025F, 0.025F);
-					Matrix4f matrix4f = matrices.peek().getPositionMatrix();
-					TextRenderer textRenderer = this.getTextRenderer();
-					float x = (float) (-textRenderer.getWidth(text) / 2);
-
-					float backgroundOpacity = MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F);
-					int backgroundColor = (int) (backgroundOpacity * 255.0F) << 24;
-
-					textRenderer.draw(text, x, (float) y, 553648127, false, matrix4f, vertexConsumers, TextRenderer.TextLayerType.SEE_THROUGH, backgroundColor, light);
-					textRenderer.draw(text, x, (float) y, Colors.WHITE, false, matrix4f, vertexConsumers, TextRenderer.TextLayerType.NORMAL, 0, light);
-
-					matrices.pop();
-				}
-			}
+            queue.submitLabel(matrices, state.nameLabelPos, 10 + (10*i), text, !state.sneaking, state.light, state.squaredDistanceToCamera, cameraState);
 		}
 	}
 

src/main/resources/assets/petowner/lang/en_us.json

@@ -11,6 +11,6 @@
   "text.petowner.message.enabled": "Showing Pet Names",
   "text.petowner.message.disabled": "Hiding Pet Names",
 
-  "category.petowner.title": "Pet Owner",
+  "key.category.petowner.keys": "Pet Owner",
   "key.petowner.hide": "Hide Owner"
 }

src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
   "depends": {
     "midnightlib": ">=1.5.0",
     "fabric-api": "*",
-    "minecraft":">=1.21.8"
+    "minecraft":">=1.21.10"
   },
   "mixins": [
     "petowner.mixins.json"