From 5db5737b9dc9ab2f1f97ba42237c034579586d74 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 1 Jul 2021 23:06:46 +0300
Subject: Update to 1.17.1-rc1, bump to 4.1.1

---
 build.gradle                                                   |  3 ++-
 gradle.properties                                              | 10 +++++-----
 settings.gradle                                                |  4 ++++
 .../cottonmc/cotton/gui/client/CottonInventoryScreen.java      |  4 ++--
 src/main/resources/fabric.mod.json                             |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index b73c0d9..49e7d30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'io.github.juuxel.loom-quiltflower' version '1.1.1'
 	id 'maven-publish'
 	id 'checkstyle'
 }
diff --git a/gradle.properties b/gradle.properties
index 06a7a37..5ca4a0e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17
-	yarn_mappings=1.17+build.5
-	loader_version=0.11.3
+	minecraft_version=1.17.1-rc1
+	yarn_mappings=1.17.1-rc1+build.1
+	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 4.1.0
+	mod_version = 4.1.1
 	maven_group = io.github.cottonmc
 	archives_base_name = LibGui
 
 # Dependencies
-	fabric_version=0.34.9+1.17
+	fabric_version=0.36.0+1.17
 	jankson_version=3.0.1+j1.2.0
 	modmenu_version=2.0.0-beta.7
 	libninepatch_version=1.1.0
diff --git a/settings.gradle b/settings.gradle
index ecd1298..1dfe6ed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,10 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'Cotton'
+            url = 'https://server.bbkr.space/artifactory/libs-release'
+        }
         gradlePluginPortal()
     }
 }
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
index 824cbc2..87d9453 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
@@ -281,8 +281,8 @@ public class CottonInventoryScreen<T extends SyncedGuiDescription> extends Handl
 	}
 
 	@Override
-	public void tick() {
-		super.tick();
+	protected void handledScreenTick() {
+		super.handledScreenTick();
 		if (description!=null) {
 			WPanel root = description.getRootPanel();
 			if (root!=null) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index be927dd..4aac69a 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
 	"depends": {
 		"fabricloader": ">=0.11.0",
 		"fabric": "*",
-		"minecraft": ">=1.17.0",
+		"minecraft": ">=1.17.1-",
 		"jankson": "^3.0.0",
 		"fabric-networking-api-v1": "^1.0.0",
 		"libninepatch": "^1.1.0"
-- 
cgit