djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

Merge branch 'update/1.20.3' into 1.20.x/dev

Browse Source
This commit is contained in:
isXander
2023-12-05 21:21:14 +00:00
parent 406ed3eddb b1989cbdef
commit 5b44b3e019
6 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build.gradle.kts
View File

@ -11,7 +11,7 @@ plugins {
} }
group = "dev.isxander" group = "dev.isxander"
version = "1.7.0+1.20.2" version = "1.7.0+1.20.3"
val isAlpha = "alpha" in version.toString() val isAlpha = "alpha" in version.toString()
val isBeta = "beta" in version.toString() val isBeta = "beta" in version.toString()
if (isAlpha) println("Controlify alpha version detected.") if (isAlpha) println("Controlify alpha version detected.")
@ -61,7 +61,9 @@ val minecraftVersion = libs.versions.minecraft.get()
dependencies { dependencies {
minecraft(libs.minecraft) minecraft(libs.minecraft)
mappings(loom.layered { 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() officialMojangMappings()
}) })
modImplementation(libs.fabric.loader) modImplementation(libs.fabric.loader)
@ -106,17 +108,17 @@ dependencies {
include(libs.quilt.json5) include(libs.quilt.json5)
// sodium compat // sodium compat
modImplementation(libs.sodium) modCompileOnly(libs.sodium)
// iris compat // iris compat
modImplementation(libs.iris) modCompileOnly(libs.iris)
modRuntimeOnly("org.anarres:jcpp:1.4.14") // modRuntimeOnly("org.anarres:jcpp:1.4.14")
modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre13") // modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre13")
// immediately-fast compat // immediately-fast compat
modImplementation(libs.immediately.fast) modCompileOnly(libs.immediately.fast)
modRuntimeOnly("net.lenni0451:Reflect:1.1.0") //modRuntimeOnly("net.lenni0451:Reflect:1.1.0")
// simple-voice-chat compat // simple-voice-chat compat
modImplementation(libs.simple.voice.chat) modCompileOnly(libs.simple.voice.chat)
// testmod // testmod
"testmodImplementation"(sourceSets.main.get().output) "testmodImplementation"(sourceSets.main.get().output)

12
gradle/libs.versions.toml
View File

@ -5,13 +5,13 @@ machete = "2.+"
grgit = "5.0.+" grgit = "5.0.+"
blossom = "1.3.+" blossom = "1.3.+"
minecraft = "1.20.2" minecraft = "1.20.3"
quilt_mappings = "2" quilt_mappings = "0"
fabric_loader = "0.14.22" fabric_loader = "0.14.25"
fabric_api = "0.90.4+1.20.2" fabric_api = "0.91.1+1.20.3"
mixin_extras = "0.2.0" mixin_extras = "0.2.0"
yet_another_config_lib = "3.2.1+1.20.2" yet_another_config_lib = "3.3.0-beta.1+1.20.3"
mod_menu = "8.0.0" mod_menu = "9.0.0-pre.1"
hid4java = "0.7.0" hid4java = "0.7.0"
quilt_json5 = "1.0.3" quilt_json5 = "1.0.3"
sodium = "mc1.20.2-0.5.3" sodium = "mc1.20.2-0.5.3"

12
src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java
View File

@ -76,14 +76,10 @@ public class SubmitUnknownControllerScreen extends Screen implements DontInterup
var operationalText = Component.translatable("controlify.controller_submission.operational_checkbox") var operationalText = Component.translatable("controlify.controller_submission.operational_checkbox")
.withStyle(ChatFormatting.BOLD); .withStyle(ChatFormatting.BOLD);
this.operationalCheckbox = this.addRenderableWidget( this.operationalCheckbox = this.addRenderableWidget(
new Checkbox( Checkbox.builder(operationalText, font)
this.width / 2 - font.width(operationalText) / 2 - 8, .pos(this.width / 2 - font.width(operationalText) / 2 - 8, y)
y, .selected(true)
150, .build()
checkboxHeight,
operationalText,
true
)
); );
y += checkboxHeight + checkboxPadding; y += checkboxHeight + checkboxPadding;

2
src/main/java/dev/isxander/controlify/utils/ToastUtils.java
View File

@ -22,7 +22,7 @@ public class ToastUtils {
private boolean removed; private boolean removed;
private ControlifyToast(Component title, List<FormattedCharSequence> description, int maxWidth, boolean longer) { private ControlifyToast(Component title, List<FormattedCharSequence> 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 @Override

2
src/main/resources/controlify.accesswidener
View File

@ -2,4 +2,4 @@ accessWidener v2 named
accessible class net/minecraft/client/gui/screens/LanguageSelectScreen$LanguageSelectionList accessible class net/minecraft/client/gui/screens/LanguageSelectScreen$LanguageSelectionList
accessible class net/minecraft/client/gui/components/toasts/ToastComponent$ToastInstance accessible class net/minecraft/client/gui/components/toasts/ToastComponent$ToastInstance
accessible method net/minecraft/client/gui/components/toasts/SystemToast <init> (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 <init> (Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Ljava/util/List;I)V

2
src/main/resources/fabric.mod.json
View File

@ -38,7 +38,7 @@
"accessWidener": "controlify.accesswidener", "accessWidener": "controlify.accesswidener",
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"minecraft": "~1.20.2", "minecraft": "1.20.3",
"java": ">=17", "java": ">=17",
"yet_another_config_lib_v3": ">=3.0.0-", "yet_another_config_lib_v3": ">=3.0.0-",
"fabric-api": "*" "fabric-api": "*"