From ad84dcd16b83834c7066d2b0190bea3445382401 Mon Sep 17 00:00:00 2001
From: Michael Pfaff <michael@pfaff.dev>
Date: Wed, 24 Mar 2021 03:52:49 -0400
Subject: [PATCH] Port to 1.17

---
 gradle.properties                                       | 8 ++++----
 src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java | 6 +++---
 src/main/resources/fabric.mod.json                      | 2 +-
 version.properties                                      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3cac24c..13038db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,11 +2,11 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.4
-yarn_mappings=1.16.4+build.9
-loader_version=0.10.8
+minecraft_version=21w11a
+yarn_mappings=21w11a+build.16
+loader_version=0.11.3
+loomVersion=0.6-SNAPSHOT
 # Mod Properties
 mod_version=1.1.0
 maven_group=dev.pfaff
 archives_base_name=thinksame
-
diff --git a/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java b/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java
index bbfead9..54abd6d 100644
--- a/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java
+++ b/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java
@@ -3,7 +3,7 @@ package dev.pfaff.thinksame.mixin;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.GlfwUtil;
 import net.minecraft.client.util.InputUtil;
 import org.spongepowered.asm.mixin.Final;
@@ -73,7 +73,7 @@ public abstract class MouseMixin {
             }
 
             boolean[] bls = new boolean[]{false};
-            if (this.client.overlay == null) {
+            if (this.client.getOverlay() == null) {
                 if (this.client.currentScreen == null) {
                     if (!this.cursorLocked && bl) {
                         this.lockCursor();
@@ -93,7 +93,7 @@ public abstract class MouseMixin {
                 }
             }
 
-            if (!bls[0] && (this.client.currentScreen == null || this.client.currentScreen.passEvents) && this.client.overlay == null) {
+            if (!bls[0] && (this.client.currentScreen == null || this.client.currentScreen.passEvents) && this.client.getOverlay() == null) {
                 if (button == 0) {
                     this.leftButtonClicked = bl;
                 } else if (button == 2) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 02ce668..1f0d6c2 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -26,6 +26,6 @@
   ],
   "depends": {
     "fabricloader": ">=0.10.8",
-    "minecraft": "1.16.4"
+    "minecraft": "1.17.x"
   }
 }
diff --git a/version.properties b/version.properties
index e006ca4..0e57916 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-#Fri Mar 05 21:09:08 EST 2021
-VERSION_BUILD=7
+#Mon Mar 22 23:55:52 EDT 2021
+VERSION_BUILD=8