From 5f097fdbedcba612cefbc8db829fc82f4ed5ef59 Mon Sep 17 00:00:00 2001
From: Ai2473 <102620545+Ai2473@users.noreply.github.com>
Date: Mon, 12 Feb 2024 23:29:49 +0100
Subject: [PATCH] Update to 1.20.4

---
 .gitignore                                    | 35 +++++++++++++++++--
 gradle.properties                             |  8 ++---
 .../alpha432/oyvey/features/gui/OyVeyGui.java |  8 ++---
 .../oyvey/mixin/MixinClientConnection.java    |  2 +-
 .../alpha432/oyvey/mixin/MixinInGameHud.java  |  2 +-
 .../alpha432/oyvey/mixin/MixinKeyboard.java   |  2 +-
 6 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b740e72..a4ff802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,32 @@
-# Project exclude paths
-/.gradle/
-/build/
\ No newline at end of file
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+/runtime/
+eclipse
+run
+*.bak
+
+# Files from Forge MDK
+forge*changelog.txt
+
+# version files
+/HeadlessMC/
+/logs/
+/plugins/
diff --git a/gradle.properties b/gradle.properties
index 1b56c6e..1020c84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	loader_version=0.14.21
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.1
+	loader_version=0.15.0
 
 # Mod Properties
 	mod_version = 1.0-SNAPSHOT
@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1G
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.90.7+1.20.1
+	fabric_version=0.91.1+1.20.4
diff --git a/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java b/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java
index 29026a8..ea47873 100644
--- a/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java
+++ b/src/main/java/me/alpha432/oyvey/features/gui/OyVeyGui.java
@@ -91,13 +91,13 @@ public class OyVeyGui extends Screen {
         return super.mouseReleased(mouseX, mouseY, releaseButton);
     }
 
-    @Override public boolean mouseScrolled(double mouseX, double mouseY, double dWheel) {
-        if (dWheel < 0) {
+    @Override public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        if (verticalAmount < 0) {
             this.components.forEach(component -> component.setY(component.getY() - 10));
-        } else if (dWheel > 0) {
+        } else if (verticalAmount > 0) {
             this.components.forEach(component -> component.setY(component.getY() + 10));
         }
-        return super.mouseScrolled(mouseX, mouseY, dWheel);
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 
     @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
diff --git a/src/main/java/me/alpha432/oyvey/mixin/MixinClientConnection.java b/src/main/java/me/alpha432/oyvey/mixin/MixinClientConnection.java
index ecb21c7..5c7afea 100644
--- a/src/main/java/me/alpha432/oyvey/mixin/MixinClientConnection.java
+++ b/src/main/java/me/alpha432/oyvey/mixin/MixinClientConnection.java
@@ -36,7 +36,7 @@ public class MixinClientConnection {
     }
 
     @Inject(method = "sendImmediately", at = @At("HEAD"), cancellable = true)
-    private void sendImmediately(Packet<?> packet, PacketCallbacks callbacks, CallbackInfo ci) {
+    private void sendImmediately(Packet<?> packet, PacketCallbacks callbacks, boolean flush, CallbackInfo ci) {
         if (this.side != NetworkSide.CLIENTBOUND) return;
         try {
             PacketEvent.Send event = new PacketEvent.Send(packet);
diff --git a/src/main/java/me/alpha432/oyvey/mixin/MixinInGameHud.java b/src/main/java/me/alpha432/oyvey/mixin/MixinInGameHud.java
index cc89898..87e7f38 100644
--- a/src/main/java/me/alpha432/oyvey/mixin/MixinInGameHud.java
+++ b/src/main/java/me/alpha432/oyvey/mixin/MixinInGameHud.java
@@ -18,7 +18,7 @@ public class MixinInGameHud {
 
     @Inject(method = "render", at = @At("RETURN"))
     public void render(DrawContext context, float tickDelta, CallbackInfo ci) {
-        if(MinecraftClient.getInstance().options.debugEnabled) return;
+        if(MinecraftClient.getInstance().options.getReducedDebugInfo().getValue()) return;
         RenderSystem.setShaderColor(1, 1, 1, 1);
 
         RenderSystem.disableDepthTest();
diff --git a/src/main/java/me/alpha432/oyvey/mixin/MixinKeyboard.java b/src/main/java/me/alpha432/oyvey/mixin/MixinKeyboard.java
index 89f23f1..7c8fe6c 100644
--- a/src/main/java/me/alpha432/oyvey/mixin/MixinKeyboard.java
+++ b/src/main/java/me/alpha432/oyvey/mixin/MixinKeyboard.java
@@ -11,7 +11,7 @@ import static me.alpha432.oyvey.util.traits.Util.EVENT_BUS;
 
 @Mixin(Keyboard.class)
 public class MixinKeyboard {
-    @Inject(method = "onKey", at = @At(value = "INVOKE", target = "net/minecraft/client/util/InputUtil.isKeyPressed(JI)Z", ordinal = 5), cancellable = true)
+    @Inject(method = "onKey", at = @At("HEAD"), cancellable = true)
     private void onKey(long windowPointer, int key, int scanCode, int action, int modifiers, CallbackInfo ci) {
         KeyEvent event = new KeyEvent(key);
         EVENT_BUS.post(event);