Merge pull request #6 from RappyLabyAddons/development

Release v1.0.4

Author: RappyTV

.github/workflows/build.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '21'
+          java-version: '25'
       - name: Cache Gradle dependencies
         uses: actions/cache@v4
         with:

.gitignore

@@ -74,6 +74,8 @@ run/
 # LabyGradle | Addon Plugin
 build-data.txt
 .assetsroot
+resources_index.json
+access_widener_index.json
 
 # Don't ignore libraries
 !libs/*.jar

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
 group = "org.example"
-version = providers.environmentVariable("VERSION").getOrElse("1.0.3")
+version = providers.environmentVariable("VERSION").getOrElse("1.0.4")
 
 labyMod {
     defaultPackageName = "com.rappytv.nametagresizer"
@@ -16,7 +16,7 @@ labyMod {
         displayName = "Nametag Resizer"
         author = "RappyTV"
         description = "Easily edit the render size of nametags"
-        minecraftVersion = "1.8.9<1.21.10"
+        minecraftVersion = "1.8.9<1.21.11"
         version = rootProject.version.toString()
     }
 

game-runner/src/v1_21_11/java/com/rappytv/nametagresizer/v1_21_11/RenderStateAccessor.java

@@ -0,0 +1,14 @@
+package com.rappytv.nametagresizer.v1_21_11;
+
+public class RenderStateAccessor {
+
+  private static boolean player = false;
+
+  public static boolean isPlayer() {
+    return player;
+  }
+
+  public static void setPlayer(boolean player) {
+    RenderStateAccessor.player = player;
+  }
+}

game-runner/src/v1_21_11/java/com/rappytv/nametagresizer/v1_21_11/mixins/MixinAvatarRenderer.java

@@ -0,0 +1,25 @@
+package com.rappytv.nametagresizer.v1_21_11.mixins;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.rappytv.nametagresizer.v1_21_11.RenderStateAccessor;
+import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.entity.player.AvatarRenderer;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
+import net.minecraft.client.renderer.state.CameraRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(AvatarRenderer.class)
+public class MixinAvatarRenderer {
+
+  @Inject(
+      method = "submitNameTag(Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/CameraRenderState;)V",
+      at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitNameTag(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V")
+  )
+  private void submitNameTag(AvatarRenderState $$0, PoseStack $$1, SubmitNodeCollector $$2,
+      CameraRenderState $$3, CallbackInfo ci) {
+    RenderStateAccessor.setPlayer(true);
+  }
+}

game-runner/src/v1_21_11/java/com/rappytv/nametagresizer/v1_21_11/mixins/MixinEntityRenderer.java

@@ -0,0 +1,24 @@
+package com.rappytv.nametagresizer.v1_21_11.mixins;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.rappytv.nametagresizer.v1_21_11.RenderStateAccessor;
+import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
+import net.minecraft.client.renderer.state.CameraRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityRenderer.class)
+public class MixinEntityRenderer<S extends EntityRenderState> {
+
+  @Inject(
+      method = "submitNameTag",
+      at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitNameTag(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V")
+  )
+  public void submitNameTag(S state, PoseStack $$1, SubmitNodeCollector $$2, CameraRenderState $$3, CallbackInfo ci) {
+    RenderStateAccessor.setPlayer(false);
+  }
+}

game-runner/src/v1_21_11/java/com/rappytv/nametagresizer/v1_21_11/mixins/MixinNameTagFeatureRendererStorage.java

@@ -0,0 +1,22 @@
+package com.rappytv.nametagresizer.v1_21_11.mixins;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.rappytv.nametagresizer.api.event.NametagSizeEvent;
+import com.rappytv.nametagresizer.v1_21_11.RenderStateAccessor;
+import net.labymod.api.Laby;
+import net.minecraft.client.renderer.feature.NameTagFeatureRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(NameTagFeatureRenderer.Storage.class)
+public class MixinNameTagFeatureRendererStorage {
+
+  @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;scale(FFF)V"))
+  private void modifyScale(PoseStack stack, float x, float y, float z, Operation<Void> original) {
+    NametagSizeEvent event = new NametagSizeEvent(RenderStateAccessor.isPlayer(), x, y, z);
+    Laby.fireEvent(event);
+    stack.scale(event.getX(), event.getY(), event.getZ());
+  }
+}

gradle.properties

@@ -1,2 +1,2 @@
 org.gradle.jvmargs=-Xmx4096m
-net.labymod.minecraft-versions=1.8.9;1.12.2;1.16.5;1.17.1;1.18.2;1.19.2;1.19.3;1.19.4;1.20.1;1.20.2;1.20.4;1.20.5;1.20.6;1.21;1.21.1;1.21.3;1.21.4;1.21.5;1.21.8;1.21.10
+net.labymod.minecraft-versions=1.8.9;1.12.2;1.16.5;1.17.1;1.18.2;1.19.2;1.19.3;1.19.4;1.20.1;1.20.2;1.20.4;1.20.5;1.20.6;1.21;1.21.1;1.21.3;1.21.4;1.21.5;1.21.8;1.21.10;1.21.11

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -1,7 +1,7 @@
 rootProject.name = "nametagresizer"
 
 pluginManagement {
-    val labyGradlePluginVersion = "0.5.9"
+    val labyGradlePluginVersion = "0.6.0"
     buildscript {
         repositories {
             maven("https://dist.labymod.net/api/v1/maven/release/")