Finish 1.20.1 port

Author: Jamalam360

.github/workflows/build.yml

@@ -27,10 +27,10 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Setup JDK 21
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 17
 
       - name: Build
         run: ./gradlew clean neoforge:build fabric:build

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "com.github.breadmoirai.github-release" version "2.4.1"
 }
@@ -105,7 +105,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 21
+        options.release = 17
     }
 
     tasks.create("prepareWorkspace") {}

common/src/client/java/io/github/jamalam360/utility_belt/client/mixin/MinecraftMixin.java

@@ -40,7 +40,7 @@ public class MinecraftMixin {
 					ordinal = 2
 			)
 	)
-	private boolean utilitybelt$useHotbarKeysInBelt(boolean pressed, @Local(name = "i") int i) {
+	private boolean utilitybelt$useHotbarKeysInBelt(boolean pressed, @Local int i) {
 		StateManager stateManager = StateManager.getStateManager(true);
 		if (stateManager.isInBelt(this.player) && pressed) {
 			switch (UtilityBeltClient.CLIENT_CONFIG.get().hotbarKeyBehaviour) {

common/src/main/java/io/github/jamalam360/utility_belt/mixin/LivingEntityMixin.java

@@ -1,11 +1,15 @@
 package io.github.jamalam360.utility_belt.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.jamalam360.utility_belt.util.Duck;
 import io.github.jamalam360.utility_belt.util.UtilityBeltInventory;
 import io.github.jamalam360.utility_belt.state.StateManager;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -25,18 +29,23 @@ public abstract class LivingEntityMixin implements Duck.LivingEntity {
     }
 
 	@SuppressWarnings("ConstantValue")
-	@Inject(
+	@WrapOperation(
 			method = "setItemInHand",
-			at = @At("HEAD")
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/minecraft/world/entity/LivingEntity;setItemSlot(Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;)V"
+			)
 	)
-	private void utilitybelt$setItemInHand(InteractionHand hand, ItemStack stack, CallbackInfo ci) {
-		if (hand == InteractionHand.MAIN_HAND && (Object) this instanceof ServerPlayer player) {
+	private void utilitybelt$setItemInHand(LivingEntity instance, EquipmentSlot equipmentSlot, ItemStack itemStack, Operation<Void> original) {
+		if ((Object) this instanceof Player player) {
 			StateManager stateManager = StateManager.getStateManager(player);
 			if (stateManager.isInBelt(player)) {
 				UtilityBeltInventory.Mutable inv = stateManager.getMutableInventory(player);
-				inv.setItem(stateManager.getSelectedBeltSlot(player), stack);
+				inv.setItem(stateManager.getSelectedBeltSlot(player), itemStack);
 				stateManager.setInventory(player, inv);
 			}
+		} else {
+			original.call(instance, equipmentSlot, itemStack);
 		}
 	}
 }

common/src/main/java/io/github/jamalam360/utility_belt/mixin/SmithingMenuMixin.java

@@ -36,7 +36,7 @@ public SmithingMenuMixin(MenuType<?> type, int containerId, Inventory playerInve
 	)
 	private List<SmithingRecipe> utilitybelt$capBeltSize(List<SmithingRecipe> original) {
 		if (!original.isEmpty()) {
-			SmithingRecipe recipe = original.getFirst();
+			SmithingRecipe recipe = original.get(0);
 
 			if (recipe.getId().equals(UPGRADE_RECIPE_LOCATION)) {
 				ItemStack inputStack = this.getSlot(1).getItem();
@@ -63,8 +63,8 @@ public SmithingMenuMixin(MenuType<?> type, int containerId, Inventory playerInve
 					ordinal = 1
 			)
 	)
-	private void utilitybelt$upgradeBeltSlots(ResultContainer instance, int slot, ItemStack resultStack, Operation<Void> original, @Local(name = "list") List<SmithingRecipe> list) {
-		SmithingRecipe recipe = list.getFirst();
+	private void utilitybelt$upgradeBeltSlots(ResultContainer instance, int slot, ItemStack resultStack, Operation<Void> original, @Local List<SmithingRecipe> list) {
+		SmithingRecipe recipe = list.get(0);
 		if (recipe.getId().equals(UPGRADE_RECIPE_LOCATION)) {
 			ItemStack inputStack = this.getSlot(1).getItem();
 

common/src/main/java/io/github/jamalam360/utility_belt/util/UtilityBeltInventory.java

@@ -118,8 +118,8 @@ public boolean isEmpty() {
 
         @Override
         public boolean equals(Object obj) {
-            if (obj instanceof Mutable(List<ItemStack> items1)) {
-                return listMatches(this.items, items1);
+            if (obj instanceof Mutable other) {
+                return listMatches(this.items, other.items);
             }
 
             return false;