Update to 1.20.4

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.3-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.matthewprenger.cursegradle' version '1.4.+'
 	id "com.modrinth.minotaur" version "2.+"
@@ -15,6 +15,7 @@ repositories {
 	maven { url "https://maven.shedaniel.me/" }
 	maven { url "https://maven.terraformersmc.com/releases/" }
 	maven { url "https://maven.quiltmc.org/repository/release" }
+	maven { url "https://maven.nucleoid.xyz" } // ModMenu depends on eu.pb4.placeholder-api
 }
 
 dependencies {
@@ -126,7 +127,7 @@ if(keysExists) {
 		projectId = "gxpkKtVH"
 		versionNumber = "${project.mod_version}"
 		versionName = "${project.mod_version}"
-		gameVersions = ['1.20.1']
+		gameVersions = ['1.20.4']
 		changelog = changes
 		loaders = ["fabric", "quilt"]
 		uploadFile = remapJar
@@ -140,7 +141,7 @@ if(keysExists) {
 			changelog = changes
 			releaseType = project.cfType
 
-			addGameVersion "1.20.1"
+			addGameVersion "1.20.4"
 			addGameVersion "Fabric"
 
 			relations {

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.2
-loader_version=0.14.22
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.16.2
 
-#Fabric api
-fabric_version=0.83.1+1.20.1
+# Fabric API
+fabric_version=0.97.1+1.20.4
 
 # Mod Properties
-mod_version = 1.1.4
+mod_version = 1.1.5
 maven_group = io.github.blanketmc
 archives_base_name = blanket-client-tweaks
 
 quilt_loader = 0.19.2
 
 # Dependencies
-modmenu_version = 7.1.0
-cloth_config_version = 11.0.99
+modmenu_version = 9.2.0
+cloth_config_version = 13.0.121

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/blanketmc/blanket/config/screen/BlanketConfigScreen.java

@@ -104,7 +104,7 @@ protected void init() {
         }).dimensions(this.width / 2 - buttonWidths - 3, this.height - 26, buttonWidths, 20).build());
 
         this.addDrawableChild(this.saveButton = new ButtonWidget(this.width / 2 + 3, this.height - 26, buttonWidths, 20, NarratorManager.EMPTY, (button) -> this.saveAll(true), Supplier::get) {
-            public void render(DrawContext graphics, int mouseX, int mouseY, float delta) {
+            public void renderWidget(DrawContext graphics, int mouseX, int mouseY, float delta) {
                 boolean hasErrors = false;
 
                 for (List<AbstractConfigEntry<?>> abstractConfigEntries : Lists.newArrayList(BlanketConfigScreen.this.getCategorizedEntries().values())) {
@@ -123,7 +123,7 @@ public void render(DrawContext graphics, int mouseX, int mouseY, float delta) {
 
                 this.active = BlanketConfigScreen.this.isEdited() && !hasErrors;
                 this.setMessage(hasErrors ? Text.translatable("text.cloth-config.error_cannot_save") : Text.translatable("text.cloth-config.save_and_done"));
-                super.render(graphics, mouseX, mouseY, delta);
+                super.renderWidget(graphics, mouseX, mouseY, delta);
             }
         });
         this.drawables.add(saveButton);
@@ -237,7 +237,7 @@ public Map<Text, List<AbstractConfigEntry<?>>> getCategorizedEntries() {
 
     @Override
     public void render(DrawContext graphics, int mouseX, int mouseY, float delta) {
-        this.renderBackground(graphics);
+        this.renderBackground(graphics, mouseX, mouseY, delta);
 
         this.entryList.render(graphics, mouseX, mouseY, delta);
 

src/main/java/io/github/blanketmc/blanket/config/screen/BulkActionScreen.java

@@ -59,7 +59,7 @@ protected void init() {
 
     @Override
     public void render(DrawContext graphics, int mouseX, int mouseY, float delta) {
-        this.renderBackground(graphics);
+        this.renderBackground(graphics, mouseX, mouseY, delta);
 
         entryList.render(graphics, mouseX, mouseY, delta);
         for (Drawable drawable : drawables) {

src/main/java/io/github/blanketmc/blanket/config/screen/FilterScreen.java

@@ -62,7 +62,7 @@ protected void init() {
 
     @Override
     public void render(DrawContext graphics, int mouseX, int mouseY, float delta) {
-        this.renderBackground(graphics);
+        this.renderBackground(graphics, mouseX, mouseY, delta);
 
         entries.render(graphics, mouseX, mouseY, delta);
 

src/main/java/io/github/blanketmc/blanket/config/screen/util/ScreenHelper.java

@@ -6,7 +6,6 @@
 import io.github.blanketmc.blanket.config.ConfigHelper;
 import io.github.blanketmc.blanket.config.ExtraProperty;
 import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;

src/main/java/io/github/blanketmc/blanket/config/screen/widget/FirstElementAlwaysDisplaySubCategoryEntry.java

@@ -131,8 +131,8 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return super.mouseScrolled(mouseX, mouseY, amount);
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 
     @Override

src/main/java/io/github/blanketmc/blanket/mixin/fixes/YggdrasilUserApiService_syncBlockListMixin.java

@@ -31,12 +31,12 @@ private Set<UUID> isBlockedPlayerFetchAsync(YggdrasilUserApiService instance) {
         return this.fetchBlockList();
     }
 
-    @Redirect(method = "forceFetchBlockList", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/yggdrasil/response/BlockListResponse;getBlockedProfiles()Ljava/util/Set;"))
+    @Redirect(method = "forceFetchBlockList", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/yggdrasil/response/BlockListResponse;blockedProfiles()Ljava/util/Set;"))
     private Set<UUID> forceFetchDontReturnNull(BlockListResponse instance) {
         if (Config.chatLagFix) {
-            Set<UUID> uuids = instance.getBlockedProfiles();
+            Set<UUID> uuids = instance.blockedProfiles();
             return uuids == null ? new HashSet<>() : uuids;
         }
-        return instance.getBlockedProfiles();
+        return instance.blockedProfiles();
     }
 }