diff --git a/build.gradle b/build.gradle index ffa0ca5..5accd60 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { - id("fabric-loom") version "1.11-SNAPSHOT" + id("fabric-loom") version "1.14-SNAPSHOT" id("com.matthewprenger.cursegradle") version "1.4.0" - id("com.modrinth.minotaur") version "2.8.7" + id("com.modrinth.minotaur") version "2.8.10" } group = "me.ramidzkh" version = System.getenv("FABRISHOT_VERSION") ?: "0.0.0" -String minecraft_version = "1.21.9" +String minecraft_version = "1.21.11" repositories { maven { @@ -32,11 +32,11 @@ repositories { dependencies { minecraft("net.minecraft:minecraft:${minecraft_version}") mappings(loom.officialMojangMappings()) - modImplementation("net.fabricmc:fabric-loader:0.17.2") + modImplementation("net.fabricmc:fabric-loader:0.18.4") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.134.0+1.21.9") - modImplementation("com.terraformersmc:modmenu:16.0.0-rc.1") - modImplementation("me.shedaniel.cloth:cloth-config-fabric:19.0.147") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.140.2+1.21.11") + modImplementation("com.terraformersmc:modmenu:17.0.0-beta.1") + modImplementation("me.shedaniel.cloth:cloth-config-fabric:21.11.153") } java { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..23449a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..adff685 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/me/ramidzkh/fabrishot/Fabrishot.java b/src/main/java/me/ramidzkh/fabrishot/Fabrishot.java index 919a480..3f34c8e 100644 --- a/src/main/java/me/ramidzkh/fabrishot/Fabrishot.java +++ b/src/main/java/me/ramidzkh/fabrishot/Fabrishot.java @@ -31,7 +31,7 @@ import me.ramidzkh.fabrishot.event.ScreenshotSaveCallback; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.ChatFormatting; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.ClickEvent; diff --git a/src/main/java/me/ramidzkh/fabrishot/capture/CaptureTask.java b/src/main/java/me/ramidzkh/fabrishot/capture/CaptureTask.java index aca7480..7733799 100644 --- a/src/main/java/me/ramidzkh/fabrishot/capture/CaptureTask.java +++ b/src/main/java/me/ramidzkh/fabrishot/capture/CaptureTask.java @@ -26,7 +26,7 @@ import me.ramidzkh.fabrishot.config.Config; import me.ramidzkh.fabrishot.event.FramebufferCaptureCallback; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.Screenshot; diff --git a/src/main/java/me/ramidzkh/fabrishot/config/ScalingPresetEntry.java b/src/main/java/me/ramidzkh/fabrishot/config/ScalingPresetEntry.java index 785e756..aa70aca 100644 --- a/src/main/java/me/ramidzkh/fabrishot/config/ScalingPresetEntry.java +++ b/src/main/java/me/ramidzkh/fabrishot/config/ScalingPresetEntry.java @@ -47,7 +47,7 @@ public ScalingPresetEntry(int myWidth, IntegerListEntry widthConfig, IntegerList super(Component.empty(), false); this.children = IntStream.rangeClosed(1, 4) - .mapToObj(scaleFactor -> (Button) new Button(0, 0, 0, 20, Component.literal(scaleFactor + "x"), button -> { + .mapToObj(scaleFactor -> (Button) new Button.Plain(0, 0, 0, 20, Component.literal(scaleFactor + "x"), button -> { int width = Minecraft.getInstance().getWindow().getWidth() * scaleFactor; int height = Minecraft.getInstance().getWindow().getHeight() * scaleFactor;