From 0aa2c99082428850f7a8e451d92dfd6a07a1bdfd Mon Sep 17 00:00:00 2001
From: Hendrix-Shen <HendrixShen@hendrixshen.top>
Date: Mon, 21 Aug 2023 10:47:48 +0800
Subject: [PATCH] Support Minecraft 23w33a

- Update Fabric Loom to 1.3
- Update Gradle to 8.3

Signed-off-by: Hendrix-Shen <HendrixShen@hendrixshen.top>
---
 build.gradle                                       |  2 +-
 gradle.properties                                  | 14 +++++++-------
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 .../itemscroller/mixin/MixinMerchantScreen.java    |  2 +-
 src/main/resources/fabric.mod.json                 |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 114ddd5d..e18b905c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.3-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
diff --git a/gradle.properties b/gradle.properties
index 74577d7c..4e123df5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,15 +9,15 @@ author = masa
 mod_file_name = itemscroller-fabric
 
 # Current mod version
-mod_version = 0.20.0
+mod_version = 0.20.0-nyan.1
 
 # Required malilib version
-malilib_version = 0.16.0
+malilib_version = 0.16.1-nyan.1
 
 # Minecraft, Fabric and mappings versions
-minecraft_version_out = 1.20.1
-minecraft_version = 1.20.1
-mappings_version = 1.20.1+build.2
+minecraft_version_out = 23w33a
+minecraft_version = 23w33a
+mappings_version = 23w33a+build.3
 
-fabric_loader_version = 0.14.21
-mod_menu_version = 7.0.1
\ No newline at end of file
+fabric_loader_version = 0.14.22
+mod_menu_version = 7.2.1
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae08049..db9a6b82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/fi/dy/masa/itemscroller/mixin/MixinMerchantScreen.java b/src/main/java/fi/dy/masa/itemscroller/mixin/MixinMerchantScreen.java
index da93092f..8a9237f9 100644
--- a/src/main/java/fi/dy/masa/itemscroller/mixin/MixinMerchantScreen.java
+++ b/src/main/java/fi/dy/masa/itemscroller/mixin/MixinMerchantScreen.java
@@ -60,7 +60,7 @@ private void initTradeListWidget(CallbackInfo ci)
     }
 
     @Inject(method = "mouseScrolled", at = @At("RETURN"))
-    private void onMouseScrollPost(double mouseX, double mouseY, double amount, CallbackInfoReturnable<Boolean> cir)
+    private void onMouseScrollPost(double mouseX, double mouseY, double horizontalAmount, double verticalAmount, CallbackInfoReturnable<Boolean> cir)
     {
         if (Configs.Toggles.VILLAGER_TRADE_FEATURES.getBooleanValue() &&
             Configs.Generic.VILLAGER_TRADE_LIST_REMEMBER_SCROLL.getBooleanValue() &&
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 71238741..90dc8b85 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -33,7 +33,7 @@
 	],
 
 	"depends": {
-		"minecraft": "1.20.x",
-		"malilib": "0.16.x"
+		"minecraft": ">=1.20.2-alpha.23.33.a",
+		"malilib": ">=0.16.1-nyan.1"
 	}
 }