diff --git a/build.gradle.kts b/build.gradle.kts index 7f5467f..6d0ea3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "dev.isxander" -version = "1.7.0+1.20.2" +version = "1.7.0+1.20.3" val isAlpha = "alpha" in version.toString() val isBeta = "beta" in version.toString() if (isAlpha) println("Controlify alpha version detected.") @@ -61,7 +61,9 @@ val minecraftVersion = libs.versions.minecraft.get() dependencies { minecraft(libs.minecraft) mappings(loom.layered { - mappings("org.quiltmc:quilt-mappings:$minecraftVersion+build.${libs.versions.quilt.mappings.get()}:intermediary-v2") + libs.versions.quilt.mappings.orNull?.takeIf { it != "0" }?.let { + mappings("org.quiltmc:quilt-mappings:$minecraftVersion+build.$it:intermediary-v2") + } officialMojangMappings() }) modImplementation(libs.fabric.loader) @@ -106,17 +108,17 @@ dependencies { include(libs.quilt.json5) // sodium compat - modImplementation(libs.sodium) + modCompileOnly(libs.sodium) // iris compat - modImplementation(libs.iris) - modRuntimeOnly("org.anarres:jcpp:1.4.14") - modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre13") + modCompileOnly(libs.iris) +// modRuntimeOnly("org.anarres:jcpp:1.4.14") +// modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre13") // immediately-fast compat - modImplementation(libs.immediately.fast) - modRuntimeOnly("net.lenni0451:Reflect:1.1.0") + modCompileOnly(libs.immediately.fast) + //modRuntimeOnly("net.lenni0451:Reflect:1.1.0") // simple-voice-chat compat - modImplementation(libs.simple.voice.chat) + modCompileOnly(libs.simple.voice.chat) // testmod "testmodImplementation"(sourceSets.main.get().output) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6eb1ce9..4bb1966 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,13 +5,13 @@ machete = "2.+" grgit = "5.0.+" blossom = "1.3.+" -minecraft = "1.20.2" -quilt_mappings = "2" -fabric_loader = "0.14.22" -fabric_api = "0.90.4+1.20.2" +minecraft = "1.20.3-pre2" +quilt_mappings = "0" +fabric_loader = "0.14.23" +fabric_api = "0.90.11+1.20.3" mixin_extras = "0.2.0" -yet_another_config_lib = "3.2.1+1.20.2" -mod_menu = "8.0.0" +yet_another_config_lib = "3.3.0+1.20.3+update.1.20.3-SNAPSHOT+update.1.20.3-SNAPSHOT" +mod_menu = "9.0.0-alpha.3" hid4java = "0.7.0" quilt_json5 = "1.0.3" sodium = "mc1.20.2-0.5.3" diff --git a/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java b/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java index 399137d..fe509cb 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java @@ -76,14 +76,10 @@ public class SubmitUnknownControllerScreen extends Screen implements DontInterup var operationalText = Component.translatable("controlify.controller_submission.operational_checkbox") .withStyle(ChatFormatting.BOLD); this.operationalCheckbox = this.addRenderableWidget( - new Checkbox( - this.width / 2 - font.width(operationalText) / 2 - 8, - y, - 150, - checkboxHeight, - operationalText, - true - ) + Checkbox.builder(operationalText, font) + .pos(this.width / 2 - font.width(operationalText) / 2 - 8, y) + .selected(false) + .build() ); y += checkboxHeight + checkboxPadding; diff --git a/src/main/java/dev/isxander/controlify/utils/ToastUtils.java b/src/main/java/dev/isxander/controlify/utils/ToastUtils.java index b7609fb..ed8def1 100644 --- a/src/main/java/dev/isxander/controlify/utils/ToastUtils.java +++ b/src/main/java/dev/isxander/controlify/utils/ToastUtils.java @@ -22,7 +22,7 @@ public class ToastUtils { private boolean removed; private ControlifyToast(Component title, List description, int maxWidth, boolean longer) { - super(longer ? SystemToastIds.UNSECURE_SERVER_WARNING : SystemToastIds.PERIODIC_NOTIFICATION, title, description, maxWidth); + super(longer ? SystemToastId.UNSECURE_SERVER_WARNING : SystemToastId.PERIODIC_NOTIFICATION, title, description, maxWidth); } @Override diff --git a/src/main/resources/controlify.accesswidener b/src/main/resources/controlify.accesswidener index ac7ae6f..9c535d8 100644 --- a/src/main/resources/controlify.accesswidener +++ b/src/main/resources/controlify.accesswidener @@ -2,4 +2,4 @@ accessWidener v2 named accessible class net/minecraft/client/gui/screens/LanguageSelectScreen$LanguageSelectionList accessible class net/minecraft/client/gui/components/toasts/ToastComponent$ToastInstance -accessible method net/minecraft/client/gui/components/toasts/SystemToast (Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastIds;Lnet/minecraft/network/chat/Component;Ljava/util/List;I)V +accessible method net/minecraft/client/gui/components/toasts/SystemToast (Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Ljava/util/List;I)V