Bump Gradle, loom, malilib, etc.

Author: sakura-ryoko

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.14-SNAPSHOT'
+	id 'fabric-loom' version '1.15-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -13,7 +13,9 @@ repositories {
 	maven { url = 'https://maven.terraformersmc.com/releases/'
 		content {includeGroupAndSubgroups("com.terraformersmc")}
 	}
-	maven { url = 'https://jitpack.io' }
+	maven { url = 'https://jitpack.io'
+		content {includeGroupAndSubgroups("com.github")}
+	}
 }
 
 dependencies {
@@ -28,6 +30,7 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	//modCompile "net.fabricmc.fabric-api:fabric-api:" + project.fabric_version
+	include(implementation("me.fallenbreath:conditional-mixin-fabric:${project.conditionalmixin_version}"))
 
 	modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
 //	modRuntimeOnly 'me.fallenbreath:mixin-auditor:0.1.0'

gradle.properties

@@ -9,16 +9,17 @@ author = masa
 mod_file_name = itemscroller-fabric
 
 # Current mod version
-mod_version = 0.30.2-sakura.1
+mod_version = 0.30.2-sakura.2
 
 # Required malilib version
-malilib_version = 7b4f5c657a
+malilib_version = 059239c8ef
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21.11
 minecraft_version = 1.21.11
 mappings_version = 1.21.11+build.1
 
 fabric_loader_version = 0.18.4
-mod_menu_version = 17.0.0-beta.1
-# fabric_api_version = 0.141.1+1.21.11
+mod_menu_version = 17.0.0-beta.2
+# fabric_api_version = 0.141.3+1.21.11
+conditionalmixin_version = 0.6.4

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,34 @@
+package fi.dy.masa.itemscroller.compat.mixin;
+
+import java.util.List;
+import java.util.Set;
+
+import me.fallenbreath.conditionalmixin.api.mixin.RestrictiveMixinConfigPlugin;
+
+import fi.dy.masa.itemscroller.ItemScroller;
+
+public class ItemscrollerMixinConfigPlugin extends RestrictiveMixinConfigPlugin
+{
+	@Override
+	protected void onRestrictionCheckFailed(String mixinClassName, String reason)
+	{
+		ItemScroller.LOGGER.warn("Disabled mixin '{}' due to: '{}'", mixinClassName, reason);
+	}
+
+	@Override
+	public String getRefMapperConfig()
+	{
+		return "";
+	}
+
+	@Override
+	public void acceptTargets(Set<String> myTargets, Set<String> otherTargets)
+	{
+	}
+
+	@Override
+	public List<String> getMixins()
+	{
+		return null;
+	}
+}

src/main/java/fi/dy/masa/itemscroller/compat/mixin/ItemscrollerMixinConfigPlugin.java

@@ -38,6 +38,7 @@ public void initGui()
 
         for (ConfigGuiTab tab : ConfigGuiTab.VALUES)
         {
+            if (!this.useAllTab() && tab == ConfigGuiTab.ALL) continue;
             x += this.createButton(x, y, -1, tab);
         }
     }
@@ -126,7 +127,10 @@ public void actionPerformedWithButton(ButtonBase button, int mouseButton)
 			GuiConfigs.tab = this.tab;
 
 			this.parent.reCreateListWidget(); // apply the new config width
-			this.parent.getListWidget().resetScrollbarPosition();
+            if (this.parent.getListWidget() != null)
+            {
+                this.parent.getListWidget().resetScrollbarPosition();
+            }
 			this.parent.initGui();
 		}
 	}

src/main/java/fi/dy/masa/itemscroller/gui/GuiConfigs.java

@@ -1,6 +1,7 @@
 {
   "required": true,
   "package": "fi.dy.masa.itemscroller.mixin",
+    "plugin": "fi.dy.masa.itemscroller.compat.mixin.ItemscrollerMixinConfigPlugin",
   "compatibilityLevel": "JAVA_21",
   "minVersion": "0.8",
   "mixins": [