Merge remote-tracking branch 'upstream/main' into offset-21

# Conflicts:
#	.github/workflows/build.yml
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/com/daniking/backtools/BackToolFeatureRenderer.java
#	src/main/java/com/daniking/backtools/BackTools.java
#	src/main/java/com/daniking/backtools/ConfigHandler.java
#	src/main/java/com/daniking/backtools/HeldItemContext.java
#	src/main/resources/fabric.mod.json

Author: FireInstall

.github/workflows/build.yml

@@ -15,25 +15,28 @@ jobs:
           21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
-        os: [ubuntu-20.04, windows-2022]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
+          cache: 'gradle'
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew build
+        # For the reason on `--no-daemon` see https://github.com/actions/cache/issues/454
+        run: ./gradlew build --no-daemon
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
-	id 'maven-publish'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
+    id 'maven-publish'
 }
 
 sourceCompatibility = JavaVersion.VERSION_21
@@ -11,69 +11,69 @@ version = project.mod_version
 group = project.maven_group
 
 repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
-	maven {
-		name "cloth config"
-		url "https://maven.shedaniel.me"
-	}
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
+    maven {
+        name "cloth config"
+        url "https://maven.shedaniel.me"
+    }
 }
 
 dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    // To change the versions see the gradle.properties file
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
-		exclude(group: "net.fabricmc.fabric-api")
-	}
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property "version", project.version
 
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.20.5 upwards uses Java 21.
-	it.options.release = 21
+    // Minecraft 1.20.5 upwards uses Java 21.
+    it.options.release = 21
 }
 
 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
 }
 
 // configure the maven publication
 publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-		}
-	}
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
 
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
+    }
 }

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.7
-loader_version=0.15.9
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.9
 # Mod Properties
-mod_version = 1.21.0-0
+mod_version = 1.21.3-0
 maven_group = com.daniking.backtools
 archives_base_name = backtools
 # Dependencies
-fabric_version=0.100.4+1.21
+fabric_version=0.107.0+1.21.3
 cloth_config_version=15.0.127

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/daniking/backtools/BackToolFeatureRenderer.java

@@ -3,55 +3,52 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.feature.HeldItemFeatureRenderer;
+import net.minecraft.client.render.entity.feature.PlayerHeldItemFeatureRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import net.minecraft.client.render.item.HeldItemRenderer;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
+import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
+import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.EntityPose;
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.entity.player.PlayerModelPart;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ModelTransformationMode;
 import net.minecraft.item.ShieldItem;
 import net.minecraft.util.Arm;
 import net.minecraft.util.math.RotationAxis;
 
 @Environment(EnvType.CLIENT)
-public class BackToolFeatureRenderer<T extends AbstractClientPlayerEntity, M extends PlayerEntityModel<T>> extends HeldItemFeatureRenderer<T, M> {
-
+public class BackToolFeatureRenderer<M extends PlayerEntityModel> extends PlayerHeldItemFeatureRenderer<PlayerEntityRenderState, M> {
     public ItemStack mainStack = ItemStack.EMPTY;
     public ItemStack offStack = ItemStack.EMPTY;
     public Arm mainArm = Arm.RIGHT;
 
-    public BackToolFeatureRenderer(FeatureRendererContext<T, M> context, HeldItemRenderer heldItemRenderer) {
+    public BackToolFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, M> context, ItemRenderer heldItemRenderer) {
         super(context, heldItemRenderer);
     }
 
-
     @Override
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T player, float f, float g, float h, float j, float k, float l) {
+    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, PlayerEntityRenderState playerRenderState, float limbAngle, float limbDistance) {
+        if (!(playerRenderState.capeVisible && playerRenderState.skinTextures.capeTexture() != null && !ConfigHandler.isRenderWithCapesTrue()) &&
+            !playerRenderState.invisible && playerRenderState.sleepingDirection == null &&
+            ClientSetup.HELD_TOOLS.containsKey(playerRenderState.name)) {
 
-        if (!(player.isPartVisible(PlayerModelPart.CAPE) && player.getSkinTextures().capeTexture() != null) && !player.isInvisible() && !player.isSleeping() && ClientSetup.HELD_TOOLS.containsKey(player)) {
-            final HeldItemContext ctx = ClientSetup.HELD_TOOLS.get(player);
+            final HeldItemContext ctx = ClientSetup.HELD_TOOLS.get(playerRenderState.name);
 
             if (ctx.droppedEntity != null) {
                 return;
             }
-            this.setRenders(ctx.previousMain, ctx.previousOff, player.getMainArm());
+            this.setRenders(ctx.previousMain, ctx.previousOff, playerRenderState.mainArm);
             matrixStack.push();
             this.getContextModel().body.rotate(matrixStack);
-            boolean bl = ConfigHandler.isHelicopterModeOn() && (player.getPose().equals(EntityPose.SWIMMING) || player.isFallFlying());
-            this.renderItem(!player.getEquippedStack(EquipmentSlot.CHEST).isEmpty() ? 1.0F : player.isPartVisible(PlayerModelPart.JACKET) ? 0.5F : 0F,
-                    matrixStack, vertexConsumerProvider, i, bl ? player.age : 0, h);
+            boolean isHelicopterMode = ConfigHandler.isHelicopterModeOn() && (playerRenderState.isSwimming || playerRenderState.isGliding);
+            this.renderItem(!playerRenderState.equippedChestStack.isEmpty() ? 1.0F : playerRenderState.jacketVisible ? 0.5F : 0F,
+                    matrixStack, vertexConsumerProvider, light, isHelicopterMode ? playerRenderState.age : 0);
             matrixStack.pop();
         }
     }
 
-    private void renderItem(float offset, MatrixStack matrices, VertexConsumerProvider provider, int light, final int ticks, final float partialTicks) {
+    private void renderItem(float offset, MatrixStack matrices, VertexConsumerProvider provider, int light, final float age) {
         matrices.translate(0F, 4F / 16F, 1.91F / 16F + (offset / 16F));
         matrices.translate(0F, 0F, 0.025F);
 
@@ -95,8 +92,8 @@ private void renderItem(float offset, MatrixStack matrices, VertexConsumerProvid
                 matrices.translate(config.getX(), config.getY(), -config.getZ());
             }
 
-            if (ticks > 0) {
-                matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees((ticks + partialTicks) * 40F));
+            if (age > 0) {
+                matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(age * 40F));
             }
             MinecraftClient.getInstance().getItemRenderer().renderItem(this.mainStack, ModelTransformationMode.FIXED, light, OverlayTexture.DEFAULT_UV, matrices, provider, null, 0);
         }
@@ -122,8 +119,8 @@ private void renderItem(float offset, MatrixStack matrices, VertexConsumerProvid
                 matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(config.getZ()));
             }
 
-            if (ticks > 0) {
-                matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees((ticks + partialTicks) * 40F));
+            if (age > 0) {
+                matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(age * 40F));
             }
             MinecraftClient.getInstance().getItemRenderer().renderItem(this.offStack, ModelTransformationMode.FIXED, light, OverlayTexture.DEFAULT_UV, matrices, provider, null, 0);
         }

src/main/java/com/daniking/backtools/BackTools.java

@@ -10,7 +10,7 @@
 
 public class BackTools implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger(BackTools.class);
-	public static final String VERSION = "1.21-0";
+	public static final String VERSION = "1.21.3-0";
 
 	@Override
 	public void onInitialize() {

src/main/java/com/daniking/backtools/BackToolsConfig.java

@@ -27,4 +27,6 @@ public class BackToolsConfig implements ConfigData {
     public List<String> toolOffset = Arrays.asList("net.minecraft.item.HoeItem" + "{\"minecraft:custom_name\": '\"translation test1\"'}" + ":0.3:0:0.3", "net.minecraft.item.HoeItem" + "{\"minecraft:custom_name\": '\"translation test2\"'}" + ":0.3");
     @Comment(value = "Get in swimming position and your tools go \"Weeee\"")
     public boolean helicopterMode = false;
+    @Comment(value = "If true, tools render with capes")
+    public boolean renderWithCapes = false;
 }

src/main/java/com/daniking/backtools/ClientSetup.java

@@ -5,16 +5,14 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
 
 import java.util.Map;
 import java.util.WeakHashMap;
 
 @Environment(EnvType.CLIENT)
 public class ClientSetup implements ClientModInitializer {
-
     public static BackToolsConfig config;
-    public static final Map<AbstractClientPlayerEntity, HeldItemContext> HELD_TOOLS = new WeakHashMap<>();
+    public static final Map<String, HeldItemContext> HELD_TOOLS = new WeakHashMap<>();
 
     @Override
     public void onInitializeClient() {

src/main/java/com/daniking/backtools/ConfigHandler.java

@@ -29,6 +29,7 @@ public class ConfigHandler {
     private static final HashSet<Identifier> ENABLED_TOOLS = new HashSet<>();
     private static final Set<Identifier> DISABLED_TOOLS = new HashSet<>();
     private static boolean HELICOPTER_MODE = false;
+    private static boolean RENDER_WITH_CAPES = true;
 
     public static TransformationSetting getToolOrientation(@NotNull ItemStack itemStack) {
         return getToolOrientation(itemStack.getComponents(), itemStack.getItem().getClass());
@@ -118,6 +119,8 @@ public static void init() {
 
         // load easter egg setting
         HELICOPTER_MODE = ClientSetup.config.helicopterMode;
+        //render with capes setting
+        RENDER_WITH_CAPES = ClientSetup.config.renderWithCapes;
     }
 
     /**
@@ -242,4 +245,5 @@ private static void parseOffset() {
     public static boolean isHelicopterModeOn() {
         return HELICOPTER_MODE;
     }
+    public static boolean isRenderWithCapesTrue() { return RENDER_WITH_CAPES; }
 }

src/main/java/com/daniking/backtools/HeldItemContext.java

@@ -72,8 +72,8 @@ private void reset(ItemStack entityStack) {
 
     public static boolean areStacksEqual(final ItemStack a, final ItemStack b) {
         return !a.isEmpty() && !b.isEmpty() &&
-                (a.getComponents().isEmpty() || !b.getComponents().isEmpty()) &&
-                (!a.getComponents().isEmpty() || b.getComponents().isEmpty()) &&
-                a.getItem() == b.getItem();
+            (a.getComponents().isEmpty() || !b.getComponents().isEmpty()) &&
+            (!a.getComponents().isEmpty() || b.getComponents().isEmpty()) &&
+            a.getItem() == b.getItem();
     }
 }