update to 1.21.9 (fixes #19)

update to 1.21.9 by making a separate version folder, also updated loom to 1.11, and Gradle to 8.14

Author: DerpDerpling

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 # Fabric Properties

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -13,7 +13,7 @@ plugins {
 }
 stonecutter {
 	create(rootProject) {
-		versions "1.20.1", "1.21.1", "1.21.2", "1.21.5", "1.21.6"
+		versions "1.20.1", "1.21.1", "1.21.2", "1.21.5", "1.21.6", "1.21.9"
 		vcsVersion = "1.21.1"
 	}
 }

stonecutter.gradle

@@ -2,7 +2,7 @@ plugins {
     id "dev.kikugie.stonecutter"
 }
 
-stonecutter.active "1.21.5" /* [SC] DO NOT EDIT */
+stonecutter.active "1.21.9" /* [SC] DO NOT EDIT */
 
 stonecutter.registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) { 
     setGroup "project"

versions/1.21.6/gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
+minecraft_version=1.21.7
+yarn_mappings=1.21.7+build.1
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.0.4-1.21.6
+mod_version=1.0.4-1.21.6-1.21.7
 maven_group=derp.immersive-hotbar
 archives_base_name=immersive-hotbar
 
 # Dependencies
-fabric_version=0.128.1+1.21.6
+fabric_version=0.128.1+1.21.7
 yacl_version=3.7.1+1.21.6-fabric
 modmenu_version=15.0.0-beta.3

versions/1.21.9/gradle.properties

@@ -0,0 +1,19 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx3G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
+
+# Mod Properties
+mod_version=1.0.4-1.21.9
+maven_group=derp.immersive-hotbar
+archives_base_name=immersive-hotbar
+
+# Dependencies
+fabric_version=0.133.14+1.21.9
+yacl_version=3.8.0+1.21.9-fabric
+modmenu_version=15.0.0-beta.3

versions/1.21.9/src/client/java/derp/immersivehotbar/ImmersiveHotbarClient.java

@@ -0,0 +1,99 @@
+package derp.immersivehotbar;
+
+import derp.immersivehotbar.config.ImmersiveHotbarConfigHandler;
+import derp.immersivehotbar.util.TooltipAnimationState;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.item.*;
+
+import java.util.Arrays;
+
+import static derp.immersivehotbar.config.ImmersiveHotbarConfig.*;
+import static derp.immersivehotbar.util.ItemChecker.isTool;
+import static derp.immersivehotbar.util.SlotAnimationState.*;
+
+public class ImmersiveHotbarClient implements ClientModInitializer {
+	private boolean wasUsingItem = false;
+	private ItemStack lastUsedItem = ItemStack.EMPTY;
+	private boolean wasCrossbowChargedMainhand = false;
+	private boolean wasCrossbowChargedOffhand = false;
+	public static final boolean IS_DOUBLEHOTBAR_LOADED = FabricLoader.getInstance().isModLoaded("double_hotbar");
+
+	@Override
+	public void onInitializeClient() {
+		ImmersiveHotbarConfigHandler.load();
+		ClientPlayConnectionEvents.DISCONNECT.register((client, world) -> Arrays.fill(lastSlotStacks, ItemStack.EMPTY));
+		ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> TooltipAnimationState.reset());
+
+		ClientTickEvents.END_CLIENT_TICK.register(client -> {
+			if (client.player == null) return;
+
+			boolean isUsing = client.player.isUsingItem();
+
+			// track bow usage
+			if (isUsing) {
+				lastUsedItem = client.player.getActiveItem();
+			} else if (wasUsingItem && !lastUsedItem.isEmpty()) {
+				Item item = lastUsedItem.getItem();
+
+				if (weaponAnimates && (item instanceof BowItem || item instanceof CrossbowItem)) {
+					int slot = client.player.getMainHandStack() == lastUsedItem ? client.player.getInventory().getSelectedSlot() : 9;
+					triggerShrink(slot);
+				}
+				lastUsedItem = ItemStack.EMPTY;
+			}
+
+			wasUsingItem = isUsing;
+
+			// crossbow mainhand
+			ItemStack mainHandStack = client.player.getMainHandStack();
+			if (mainHandStack.getItem() instanceof CrossbowItem) {
+				boolean isCharged = CrossbowItem.isCharged(mainHandStack);
+				if (wasCrossbowChargedMainhand && !isCharged && weaponAnimates) {
+					int slot = client.player.getInventory().getSelectedSlot();
+					triggerShrink(slot);
+				}
+				wasCrossbowChargedMainhand = isCharged;
+			} else {
+				wasCrossbowChargedMainhand = false;
+			}
+
+			// crossbow offhand
+			ItemStack offHandStack = client.player.getOffHandStack();
+			if (offHandStack.getItem() instanceof CrossbowItem) {
+				boolean isCharged = CrossbowItem.isCharged(offHandStack);
+				if (wasCrossbowChargedOffhand && !isCharged && weaponAnimates) {
+					triggerShrink(9);
+				}
+				wasCrossbowChargedOffhand = isCharged;
+			} else {
+				wasCrossbowChargedOffhand = false;
+			}
+		});
+
+		// tool break animation
+		ClientPlayerBlockBreakEvents.AFTER.register((world, player, pos, state) -> {
+			ItemStack stack = player.getMainHandStack();
+			if (isTool(stack) && toolAnimates) {
+				int slot = player.getInventory().getSelectedSlot();
+				triggerShrink(slot);
+			}
+		});
+	}
+
+	private void triggerShrink(int slot) {
+		if (slot >= 0 && slot < 9) {
+			wasUsed[slot] = true;
+			slotScales[slot] = nonSelectedItemSize - (shouldItemGrowWhenSelected ? 0.03f : 0.2f);
+		} else if (slot == 9) {
+			wasUsed[slot] = true;
+			slotScales[slot] = nonSelectedItemSize - 0.2f;
+		}
+	}
+
+
+
+}

versions/1.21.9/src/client/java/derp/immersivehotbar/ImmersiveHotbarDataGenerator.java

@@ -0,0 +1,11 @@
+package derp.immersivehotbar;
+
+import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
+
+public class ImmersiveHotbarDataGenerator implements DataGeneratorEntrypoint {
+	@Override
+	public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
+
+	}
+}

versions/1.21.9/src/client/java/derp/immersivehotbar/InGameHudAnimationHandler.java

@@ -0,0 +1,5 @@
+package derp.immersivehotbar;
+
+public interface InGameHudAnimationHandler {
+    void immersive_hotbar$triggerSlotAnimation(int slotIndex);
+}