Update to 1.21

Author: Gaider10

build.gradle

@@ -1,13 +1,13 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = "${project.mod_version}-${project.minecraft_version}"
 
+base {
+	archivesBaseName = project.archives_base_name
+}
+
 repositories {
 
 }
@@ -29,11 +29,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.1
-loader_version=0.14.21
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.15.11
 
 # Mod Properties
 mod_version = 1.1.0
 archives_base_name = PlayerHealthIndicators
 
 # Dependencies
-fabric_version=0.83.1+1.20.1
+fabric_version=0.100.7+1.21

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/me/andrew/healthindicators/HeartType.java

@@ -1,17 +1,17 @@
 package me.andrew.healthindicators;
 
+import net.minecraft.util.Identifier;
+
 public enum HeartType {
-    EMPTY(16 + 0 * 9, 0),
-    RED_FULL(16 + 4 * 9, 0),
-    RED_HALF(16 + 5 * 9, 0),
-    YELLOW_FULL(16 + 16 * 9, 0),
-    YELLOW_HALF(16 + 17 * 9, 0);
+    EMPTY(Identifier.ofVanilla("hud/heart/container")),
+    RED_FULL(Identifier.ofVanilla("hud/heart/full")),
+    RED_HALF(Identifier.ofVanilla("hud/heart/half")),
+    YELLOW_FULL(Identifier.ofVanilla("hud/heart/absorbing_full")),
+    YELLOW_HALF(Identifier.ofVanilla("hud/heart/absorbing_half"));
 
-    public final int u;
-    public final int v;
+    public final Identifier texture;
 
-    HeartType(int u, int v) {
-        this.u = u;
-        this.v = v;
+    HeartType(Identifier texture) {
+        this.texture = texture;
     }
 }

src/main/java/me/andrew/healthindicators/mixin/PlayerEntityRendererMixin.java

@@ -10,20 +10,21 @@
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
+import net.minecraft.client.texture.GuiAtlasManager;
+import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Identifier;
+import net.minecraft.scoreboard.ScoreboardDisplaySlot;
 import net.minecraft.util.math.MathHelper;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PlayerEntityRenderer.class)
 public abstract class PlayerEntityRendererMixin extends LivingEntityRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
-    private static final Identifier ICONS = new Identifier("textures/gui/icons.png");
-
     public PlayerEntityRendererMixin(EntityRendererFactory.Context ctx, PlayerEntityModel<AbstractClientPlayerEntity> model, float shadowRadius) {
         super(ctx, model, shadowRadius);
     }
@@ -44,7 +45,7 @@ public void renderHealth(AbstractClientPlayerEntity abstractClientPlayerEntity,
         matrixStack.translate(0, abstractClientPlayerEntity.getHeight() + 0.5f, 0);
         if (this.hasLabel(abstractClientPlayerEntity) && d <= 4096.0) {
             matrixStack.translate(0.0D, 9.0F * 1.15F * 0.025F, 0.0D);
-            if (d < 100.0 && abstractClientPlayerEntity.getScoreboard().getObjectiveForSlot(2) != null) {
+            if (d < 100.0 && abstractClientPlayerEntity.getScoreboard().getObjectiveForSlot(ScoreboardDisplaySlot.BELOW_NAME) != null) {
                 matrixStack.translate(0.0D, 9.0F * 1.15F * 0.025F, 0.0D);
             }
         }
@@ -56,13 +57,12 @@ public void renderHealth(AbstractClientPlayerEntity abstractClientPlayerEntity,
         matrixStack.scale(pixelSize, pixelSize, pixelSize);
         matrixStack.translate(0, Config.getHeartOffset(), 0);
 
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder vertexConsumer = tessellator.getBuffer();
+        GuiAtlasManager guiAtlasManager = MinecraftClient.getInstance().getGuiAtlasManager();
 
-        vertexConsumer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
         RenderSystem.setShader(GameRenderer::getPositionTexProgram);
-        RenderSystem.setShaderTexture(0, ICONS);
+        RenderSystem.setShaderTexture(0, guiAtlasManager.getSprite(HeartType.EMPTY.texture).getAtlasId());
         RenderSystem.enableDepthTest();
+        BufferBuilder vertexConsumer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
 
         Matrix4f model = matrixStack.peek().getPositionMatrix();
 
@@ -90,7 +90,7 @@ public void renderHealth(AbstractClientPlayerEntity abstractClientPlayerEntity,
             float x = maxX - col * 8;
             float y = row * rowOffset;
             float z = row * 0.01F;
-            drawHeart(model, vertexConsumer, x, y, z, HeartType.EMPTY);
+            drawHeart(model, vertexConsumer, x, y, z, HeartType.EMPTY, guiAtlasManager);
 
             HeartType type;
             if (heart < heartsRed) {
@@ -107,15 +107,16 @@ public void renderHealth(AbstractClientPlayerEntity abstractClientPlayerEntity,
                 }
             }
             if (type != HeartType.EMPTY) {
-                drawHeart(model, vertexConsumer, x, y, z, type);
+                drawHeart(model, vertexConsumer, x, y, z, type, guiAtlasManager);
             }
         }
 
-        tessellator.draw();
+        BufferRenderer.drawWithGlobalProgram(vertexConsumer.end());
 
         matrixStack.pop();
     }
 
+    @Unique
     private static boolean shouldRenderHeartsForEntity(Entity entity) {
         if (entity instanceof AbstractClientPlayerEntity abstractClientPlayerEntity) {
             return !abstractClientPlayerEntity.isMainPlayer() && !abstractClientPlayerEntity.isInvisibleTo(MinecraftClient.getInstance().player);
@@ -124,21 +125,25 @@ private static boolean shouldRenderHeartsForEntity(Entity entity) {
         return false;
     }
 
-    private static void drawHeart(Matrix4f model, VertexConsumer vertexConsumer, float x, float y, float z, HeartType type){
-        float minU = type.u / 256F;
-        float maxU = minU + 9F / 256F;
-        float minV = type.v / 256F;
-        float maxV = minV + 9F / 256F;
+    @Unique
+    private static void drawHeart(Matrix4f model, VertexConsumer vertexConsumer, float x, float y, float z, HeartType type, GuiAtlasManager guiAtlasManager){
+        Sprite sprite = guiAtlasManager.getSprite(type.texture);
+
+        float minU = sprite.getMinU();
+        float maxU = sprite.getMaxU();
+        float minV = sprite.getMinV();
+        float maxV = sprite.getMaxV();
 
         float heartSize = 9F;
 
         drawVertex(model, vertexConsumer, x, y - heartSize, z, minU, maxV);
-        drawVertex(model, vertexConsumer, x - heartSize, y - heartSize, z, maxU, maxV);
-        drawVertex(model, vertexConsumer, x - heartSize, y, z, maxU, minV);
         drawVertex(model, vertexConsumer, x, y, z, minU, minV);
+        drawVertex(model, vertexConsumer, x - heartSize, y, z, maxU, minV);
+        drawVertex(model, vertexConsumer, x - heartSize, y - heartSize, z, maxU, maxV);
     }
 
+    @Unique
     private static void drawVertex(Matrix4f model, VertexConsumer vertices, float x, float y, float z, float u, float v) {
-        vertices.vertex(model, x, y, z).texture(u, v).next();
+        vertices.vertex(model, x, y, z).texture(u, v);
     }
 }

src/main/resources/fabric.mod.json

@@ -22,9 +22,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.11.3",
-    "fabric": "*",
-    "minecraft": "1.20.x",
-    "java": ">=17"
+    "fabricloader": ">=0.15.11",
+    "minecraft": "~1.21",
+    "java": ">=21",
+    "fabric-api": "*"
   }
 }

src/main/resources/healthindicators.mixins.json

@@ -1,8 +1,7 @@
 {
   "required": true,
-  "minVersion": "0.8",
   "package": "me.andrew.healthindicators.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "PlayerEntityRendererMixin"
   ],