Merge branch '1.16' into 1.17

.github/workflows/ci.yaml

@@ -0,0 +1,25 @@
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Set Gradle execution rights
+        run: chmod +x ./gradlew
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assemble
+      - name: Check
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check

.github/workflows/push-main.yaml

@@ -0,0 +1,27 @@
+on:
+  push:
+    branches:
+      - "1.16"
+
+
+jobs:
+  auto-fix:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Fix language file names
+        run: |
+          for lang in src/main/resources/assets/*/lang/*.json
+          do
+            rename=$(echo "$lang" | sed -e 's/\b\w\+\.json$/\L\0/' -e 's/\b\([a-z]\+\)\.json$/\/\1_\1.json/')
+            mv "$lang" "$rename" || true
+          done
+
+      - name: Commit
+        uses: EndBug/add-and-commit@v9
+        with:
+          add: 'src/main/resources/assets'
+          default_author: github_actions
+          message: Fix language file names

.giup

@@ -2,7 +2,7 @@
 	"merge-paths": [
 		"1.16",
 		"1.16->1.15->1.14",
-		"1.16->1.17->1.18.2->1.19->1.19.3->unstable"
+		"1.16->1.17->1.18.2->1.19->1.19.3->1.19.4->unstable"
 	],
 	"commands": [
 		{

build.gradle

@@ -35,6 +35,9 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_build}"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
+	compileOnly(annotationProcessor("org.projectlombok:lombok:$lombok_version"))
+	testCompileOnly(testAnnotationProcessor("org.projectlombok:lombok:$lombok_version"))
+
 	def fabric_deps = [
 	        'fabric-api-base',
             'fabric-events-interaction-v0',
@@ -44,12 +47,13 @@ dependencies {
             'fabric-networking-api-v1',
 			'fabric-tag-extensions-v0',
 			'fabric-tool-attribute-api-v1',
+			'fabric-mining-level-api-v1',
 			'fabric-resource-loader-v0'
 	]
 	fabric_deps.forEach { include(modImplementation(fabricApi.module(it, fabric_api_version)))}
 	modImplementation(fabricApi.module("fabric-item-groups-v0", fabric_api_version))
 
-	modImplementation("com.terraformersmc:modmenu:2.0.14")
+	modCompileOnly "com.terraformersmc:modmenu:2.0.14"
 
 	include(modApi(platform("de.siphalor.tweed4:tweed4-bom-$minecraft_major_version:$tweed_version")))
 	def tweed_deps = [

gradle.properties

@@ -8,14 +8,16 @@ yarn_build=64:v2
 loader_version=0.14.11
 # Mod Properties
 mod_id=mousewheelie
-mod_version=1.11.1
+mod_version=1.12.0
 mod_release=release
 mod_mc_version_specifier=1.17.1
 mod_mc_versions=1.17.1
 maven_group=de.siphalor
 archives_base_name=mousewheelie
 # Dependencies
-amecs_version=1.4.0+mc1.17.1
+lombok_version=1.18.28
+# Mod Dependencies
+amecs_version=1.5.0+mc1.17.1
 coat_version=1.0.0-beta.20+mc1.17
 fabric_api_version=0.46.1+1.17
 tweed_version=1.3.0+mc1.17

src/lombok.config

@@ -0,0 +1 @@
+lombok.log.custom.declaration = org.apache.logging.log4j.Logger org.apache.logging.log4j.LogManager.getLogger(TYPE)

src/main/java/de/siphalor/mousewheelie/MWConfig.java

@@ -99,6 +99,7 @@ public static class Sort {
 		public SortMode primarySort = SortMode.RAW_ID;
 		public SortMode shiftSort = SortMode.QUANTITY;
 		public SortMode controlSort = SortMode.ALPHABET;
+		public boolean serverAcceleratedSorting = true;
 	}
 
 	public static Refill refill = new Refill();
@@ -110,6 +111,8 @@ public static class Refill {
 		public boolean offHand = true;
 		public boolean restoreSelectedSlot = false;
 
+		public boolean itemChanges = true;
+
 		public boolean eat = true;
 		public boolean drop = true;
 		public boolean use = true;

src/main/java/de/siphalor/mousewheelie/MouseWheelie.java

@@ -17,33 +17,42 @@
 
 package de.siphalor.mousewheelie;
 
+import de.siphalor.mousewheelie.common.network.MWLogicalServerNetworking;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
+import net.minecraft.world.World;
 
 public class MouseWheelie implements ModInitializer {
 	public static final String MOD_ID = "mousewheelie";
+	public static final String MOD_NAME = "Mouse Wheelie";
 
 	@Override
 	public void onInitialize() {
-		UseItemCallback.EVENT.register((player, world, hand) -> {
-			ItemStack stack = player.getStackInHand(hand);
-			if (MWConfig.general.enableQuickArmorSwapping && !world.isClient()) {
-				EquipmentSlot equipmentSlot = MobEntity.getPreferredEquipmentSlot(stack);
-				if (equipmentSlot.getType() == EquipmentSlot.Type.ARMOR) {
-					ItemStack equipmentStack = player.getEquippedStack(equipmentSlot);
-					int index = 5 + (3 - equipmentSlot.getEntitySlotId());
-					if (!equipmentStack.isEmpty() && player.playerScreenHandler.getSlot(index).canTakeItems(player)) {
-						player.setStackInHand(hand, equipmentStack);
-						player.equipStack(equipmentSlot, stack);
-						return TypedActionResult.consume(equipmentStack);
-					}
+		UseItemCallback.EVENT.register(this::onPlayerUseItem);
+
+		MWLogicalServerNetworking.setup();
+	}
+
+	private TypedActionResult<ItemStack> onPlayerUseItem(PlayerEntity player, World world, Hand hand) {
+		ItemStack stack = player.getStackInHand(hand);
+		if (MWConfig.general.enableQuickArmorSwapping && !world.isClient()) {
+			EquipmentSlot equipmentSlot = MobEntity.getPreferredEquipmentSlot(stack);
+			if (equipmentSlot.getType() == EquipmentSlot.Type.ARMOR) {
+				ItemStack equipmentStack = player.getEquippedStack(equipmentSlot);
+				int index = 5 + (3 - equipmentSlot.getEntitySlotId());
+				if (!equipmentStack.isEmpty() && player.playerScreenHandler.getSlot(index).canTakeItems(player)) {
+					player.setStackInHand(hand, equipmentStack);
+					player.equipStack(equipmentSlot, stack);
+					return TypedActionResult.consume(equipmentStack);
 				}
 			}
-			return TypedActionResult.pass(stack);
-		});
+		}
+		return TypedActionResult.pass(stack);
 	}
 }

src/main/java/de/siphalor/mousewheelie/client/MWClient.java

@@ -101,9 +101,35 @@ public void onInitializeClient() {
 		});
 	}
 
-	public static void scheduleRefill(Hand hand, PlayerInventory inventory, ItemStack stack) {
+	/**
+	 * Schedules a refill if a refill scenario is encountered.
+	 * @param hand the hand to potentially refill
+	 * @param inventory the player inventory
+	 * @param oldStack the old stack in the hand
+	 * @param newStack the new stack in the hand
+	 * @return whether a refill has been scheduled
+	 */
+	public static boolean scheduleRefillChecked(Hand hand, PlayerInventory inventory, ItemStack oldStack, ItemStack newStack) {
+		if (MinecraftClient.getInstance().currentScreen != null) {
+			return false;
+		}
+
+		if (!oldStack.isEmpty() && (newStack.isEmpty() || (MWConfig.refill.itemChanges && oldStack.getItem() != newStack.getItem()))) {
+			scheduleRefillUnchecked(hand, inventory, oldStack.copy());
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Unconditionally schedules a refill.
+	 * @param hand the hand to refill
+	 * @param inventory the player inventory
+	 * @param referenceStack the stack to decide the refilling by
+	 */
+	public static void scheduleRefillUnchecked(Hand hand, PlayerInventory inventory, ItemStack referenceStack) {
 		refillHand = hand;
-		SlotRefiller.set(inventory, stack);
+		SlotRefiller.set(inventory, referenceStack);
 	}
 
 	public static boolean performRefill() {

src/main/java/de/siphalor/mousewheelie/client/inventory/ContainerScreenHelper.java

@@ -233,12 +233,9 @@ public int getScope(Slot slot, boolean preferSmallerScopes) {
 		} else {
 			if (slot.inventory instanceof PlayerInventory) {
 				if (isHotbarSlot(slot)) {
-					if (MWConfig.general.hotbarScoping == MWConfig.General.HotbarScoping.HARD) {
+					if (MWConfig.general.hotbarScoping == MWConfig.General.HotbarScoping.HARD
+							|| MWConfig.general.hotbarScoping == MWConfig.General.HotbarScoping.SOFT && preferSmallerScopes) {
 						return -1;
-					} else if (MWConfig.general.hotbarScoping == MWConfig.General.HotbarScoping.SOFT) {
-						if (preferSmallerScopes) {
-							return -1;
-						}
 					}
 				}
 				return 0;
@@ -338,10 +335,9 @@ public void depositAllFrom(int scope) {
 		});
 
 		runInScope(scope, slot -> {
-			if (slot.hasStack()) {
-				if (itemKinds.contains(ItemKind.of(slot.getStack()))) {
-					sendStackLocked(slot);
-				}
+			if (slot.hasStack() && itemKinds.contains(ItemKind.of(slot.getStack()))) {
+				sendStackLocked(slot);
+
 			}
 		});
 	}
@@ -424,7 +420,7 @@ public void restockAll(int scope) {
 		int complementaryScope = getComplementaryScope(scope);
 
 		slotsByItemKind.asMap().forEach((itemKind, slots) ->
-			restockAllOfAKind(slots.iterator(), complementaryScope)
+				restockAllOfAKind(slots.iterator(), complementaryScope)
 		);
 	}