From 8859e89ae0f194136835a4d04e11c8acaea2617b Mon Sep 17 00:00:00 2001 From: trafficlunar Date: Sun, 5 Oct 2025 11:29:56 +0100 Subject: [PATCH] feat: 1.21.9 --- build.gradle | 8 ++- common/build.gradle | 10 ++-- .../optionsprofiles/Keybinds.java | 5 +- .../gui/OptionsToggleList.java | 23 +++----- .../optionsprofiles/gui/ProfilesList.java | 29 +++++----- .../profiles/loaders/SodiumExtraLoader.java | 2 - .../profiles/loaders/SodiumLoader.java | 19 ++++-- .../assets/optionsprofiles/lang/en_us.json | 2 +- fabric/build.gradle | 4 +- fabric/src/main/resources/fabric.mod.json | 58 +++++++++---------- gradle.properties | 10 ++-- neoforge/build.gradle | 2 +- .../resources/META-INF/neoforge.mods.toml | 6 +- settings.gradle | 2 +- 14 files changed, 91 insertions(+), 89 deletions(-) diff --git a/build.gradle b/build.gradle index c8f90a9..4313e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false + id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false id 'architectury-plugin' version '3.4-SNAPSHOT' - id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'com.gradleup.shadow' version '8.3.6' apply false } architectury { @@ -31,6 +31,10 @@ subprojects { // for more information about repositories. } + loom { + silentMojangMappingsLicense() + } + dependencies { minecraft "net.minecraft:minecraft:$rootProject.minecraft_version" mappings loom.officialMojangMappings() diff --git a/common/build.gradle b/common/build.gradle index 3f3460e..dd2e538 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -26,9 +26,9 @@ dependencies { modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version" // Mod implementations - modImplementation "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric" // Sodium - modImplementation "maven.modrinth:sodium-extra:mc1.21.6-0.6.6+fabric" // Sodium Extra - modImplementation "maven.modrinth:iris:1.9.1+1.21.7-fabric" // Iris - modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.6" // Distant Horizons - modImplementation "maven.modrinth:controlify:2.2.1-fabric,1.21.6" // Controlify + modImplementation "maven.modrinth:sodium:mc1.21.9-0.7.0-fabric" // Sodium + modImplementation "maven.modrinth:sodium-extra:mc1.21.9-0.7.0+fabric" // Sodium Extra + modImplementation "maven.modrinth:iris:1.9.3+1.21.9-fabric" // Iris + modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.8" // Distant Horizons + modImplementation "maven.modrinth:controlify:2.4.1-fabric,1.21.9" // Controlify } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/Keybinds.java b/common/src/main/java/net/trafficlunar/optionsprofiles/Keybinds.java index f6932df..376cc49 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/Keybinds.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/Keybinds.java @@ -5,6 +5,7 @@ import dev.architectury.event.events.client.ClientTickEvent; import dev.architectury.registry.client.keymappings.KeyMappingRegistry; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; +import net.minecraft.resources.ResourceLocation; import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration; import net.trafficlunar.optionsprofiles.profiles.Profiles; @@ -17,12 +18,14 @@ public class Keybinds { private static final KeyMapping[] PROFILE_KEYMAPPINGS = new KeyMapping[3]; public static void init() { + KeyMapping.Category category = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(OptionsProfilesMod.MOD_ID, "keys")); + for (int i = 0; i < PROFILE_KEYMAPPINGS.length; i++) { PROFILE_KEYMAPPINGS[i] = new KeyMapping( "key.optionsprofiles.profile_" + (i + 1), InputConstants.Type.KEYSYM, -1, - "category.optionsprofiles.keys" + category ); KeyMappingRegistry.register(PROFILE_KEYMAPPINGS[i]); } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java index 8baf833..f5bf5bd 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java @@ -1,5 +1,8 @@ package net.trafficlunar.optionsprofiles.gui; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screens.options.controls.KeyBindsList; import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration; import net.trafficlunar.optionsprofiles.profiles.Profiles; @@ -22,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -public class OptionsToggleList extends ContainerObjectSelectionList { +public class OptionsToggleList extends ContainerObjectSelectionList { private final String profileName; private final ProfileConfiguration profileConfiguration; @@ -78,7 +81,7 @@ public class OptionsToggleList extends ContainerObjectSelectionList { private final Component optionKey; private final CycleButton toggleButton; @@ -110,17 +113,14 @@ public class OptionsToggleList extends ContainerObjectSelectionList children() { @@ -131,9 +131,4 @@ public class OptionsToggleList extends ContainerObjectSelectionList { - public Entry() { - } - } } \ No newline at end of file diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java index 427e63c..f01fc08 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java @@ -51,12 +51,12 @@ public class ProfilesList extends ContainerObjectSelectionList children() { @@ -126,8 +123,8 @@ public class ProfilesList extends ContainerObjectSelectionList=0.16.14", - "minecraft": "~1.21", - "java": ">=21", - "architectury": ">=17.0.6", - "fabric-api": "*" - } + "schemaVersion": 1, + "id": "optionsprofiles", + "version": "${version}", + "name": "Options Profiles", + "description": "Load and save your options from in-game.", + "authors": ["trafficlunar"], + "contact": { + "homepage": "https://github.com/trafficlunar/options-profiles", + "sources": "https://github.com/trafficlunar/options-profiles", + "issues": "https://github.com/trafficlunar/options-profiles/issues" + }, + "license": "GNU GPL 3.0", + "icon": "assets/optionsprofiles/icon.png", + "environment": "*", + "entrypoints": { + "main": ["net.trafficlunar.optionsprofiles.fabric.OptionsProfilesModFabric"], + "modmenu": ["net.trafficlunar.optionsprofiles.fabric.ModMenuApiImpl"] + }, + "mixins": ["optionsprofiles.mixins.json"], + "depends": { + "fabricloader": ">=0.17.2", + "minecraft": "~1.21", + "java": ">=21", + "architectury": ">=18.0.3", + "fabric-api": "*" + } } diff --git a/gradle.properties b/gradle.properties index ffb666f..de8351f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,10 +11,10 @@ archives_name=optionsprofiles enabled_platforms=fabric,neoforge # Minecraft properties -minecraft_version=1.21.6 +minecraft_version=1.21.9 # Dependencies -architectury_api_version = 17.0.6 -fabric_loader_version=0.16.14 -fabric_api_version=0.128.2+1.21.6 -neoforge_version=21.6.20-beta \ No newline at end of file +architectury_api_version = 18.0.3 +fabric_loader_version=0.17.2 +fabric_api_version=0.134.0+1.21.9 +neoforge_version=21.9.0-beta \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 25d1554..8c3c5fd 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + id 'com.gradleup.shadow' } architectury { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index c532f02..9f8bb45 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[2,)" +loaderVersion = "[10,)" issueTrackerURL = "https://github.com/trafficlunar/options-profiles/issues" license = "GNU GPL 3.0" @@ -16,7 +16,7 @@ logoFile = "icon.png" [[dependencies.optionsprofiles]] modId = "neoforge" type = "required" -versionRange = "[21.6,)" +versionRange = "[21.9.0-beta,)" ordering = "NONE" side = "BOTH" @@ -30,7 +30,7 @@ side = "BOTH" [[dependencies.optionsprofiles]] modId = "architectury" type = "required" -versionRange = "[17.0.6,)" +versionRange = "[18.0.3,)" ordering = "AFTER" side = "BOTH" diff --git a/settings.gradle b/settings.gradle index 1c9615c..bd0353d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,4 +11,4 @@ include("common") include("fabric") include("neoforge") -rootProject.name = "optionsprofiles-v1.4.2-1.21.6" +rootProject.name = "optionsprofiles-v1.4.2-1.21.9"