From 8e6c475664db11de2331bd64921e5451237ab0c9 Mon Sep 17 00:00:00 2001 From: NotCoded <66999075+not-coded@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:36:09 +0200 Subject: [PATCH] update stonecutter + switch to 1.20.6 --- settings.gradle | 2 +- .../notcoded/wayfix/mixin/WindowMixin.java | 28 +++++++++---------- stonecutter.gradle | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/settings.gradle b/settings.gradle index 8a2a33a..a5700ed 100755 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { } plugins { - id "dev.kikugie.stonecutter" version "0.5-beta.1" + id "dev.kikugie.stonecutter" version "0.5-beta.3" } stonecutter { diff --git a/src/main/java/net/notcoded/wayfix/mixin/WindowMixin.java b/src/main/java/net/notcoded/wayfix/mixin/WindowMixin.java index 4309c27..f799f7f 100644 --- a/src/main/java/net/notcoded/wayfix/mixin/WindowMixin.java +++ b/src/main/java/net/notcoded/wayfix/mixin/WindowMixin.java @@ -20,18 +20,18 @@ //? if >=1.20 { -/*import net.minecraft.client.util.Icons; +import net.minecraft.client.util.Icons; import net.minecraft.resource.ResourcePack; import java.io.IOException; -*///?} elif 1.19.3 { -import java.util.ArrayList; +//?} elif 1.19.3 { +/*import java.util.ArrayList; import java.util.Arrays; import net.minecraft.resource.InputSupplier; -//?} +*///?} //? if <1.20 { -import java.io.InputStream; -//?} +/*import java.io.InputStream; +*///?} /* - Credits to moehreag for most of the code @@ -73,21 +73,21 @@ private Monitor getMonitor(MonitorTracker instance) { @Inject(method = "setIcon", at = @At("HEAD"), cancellable = true) //? if >=1.20 { - /*private void injectIcon(ResourcePack resourcePack, Icons icons, CallbackInfo ci) { - *///?} elif 1.19.3 { - private void injectIcon(InputSupplier smallIconSupplier, InputSupplier bigIconSupplier, CallbackInfo ci) { - //?} elif <1.19.3 { + private void injectIcon(ResourcePack resourcePack, Icons icons, CallbackInfo ci) { + //?} elif 1.19.3 { + /*private void injectIcon(InputSupplier smallIconSupplier, InputSupplier bigIconSupplier, CallbackInfo ci) { + *///?} elif <1.19.3 { /*private void injectIcon(InputStream icon16, InputStream icon32, CallbackInfo ci) { *///?} if (isWayland()) { //? if >=1.20 { - /*try { + try { DesktopFileInjector.setIcon(icons.getIcons(resourcePack)); } catch (IOException ignored) { } - *///?} elif 1.19.3 { - DesktopFileInjector.setIcon(new ArrayList<>(Arrays.asList(smallIconSupplier, bigIconSupplier))); - //?} elif <1.19.3 { + //?} elif 1.19.3 { + /*DesktopFileInjector.setIcon(new ArrayList<>(Arrays.asList(smallIconSupplier, bigIconSupplier))); + *///?} elif <1.19.3 { /*DesktopFileInjector.setIcon(icon16, icon32); *///?} diff --git a/stonecutter.gradle b/stonecutter.gradle index b00c637..0238171 100644 --- a/stonecutter.gradle +++ b/stonecutter.gradle @@ -1,7 +1,7 @@ plugins { id "dev.kikugie.stonecutter" } -stonecutter.active "1.19.3" /* [SC] DO NOT EDIT */ +stonecutter.active "1.20.6" /* [SC] DO NOT EDIT */ stonecutter.registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) { setGroup "project"