Skip to content

Commit b17c76b

Browse files
committed
Update to mc1.21.10
1 parent 25a5f9a commit b17c76b

5 files changed

Lines changed: 29 additions & 28 deletions

File tree

common/src/main/java/dev/terminalmc/framework/Framework.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import net.minecraft.client.KeyMapping;
2020
import net.minecraft.client.Minecraft;
2121
import net.minecraft.network.chat.Component;
22+
import net.minecraft.resources.ResourceLocation;
2223

2324
import java.util.List;
2425

@@ -34,11 +35,13 @@ public class Framework {
3435
.append(Component.literal(MOD_NAME).withStyle(ChatFormatting.GOLD))
3536
.append(Component.literal("] ").withStyle(ChatFormatting.DARK_GRAY))
3637
.withStyle(ChatFormatting.GRAY);
38+
public static final KeyMapping.Category KEY_CATEGORY =
39+
KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(MOD_ID, "group"));
3740
public static final KeyMapping EXAMPLE_KEY = new KeyMapping(
3841
translationKey("key", "group.example"),
3942
InputConstants.Type.KEYSYM,
4043
InputConstants.UNKNOWN.getValue(),
41-
translationKey("key", "group")
44+
KEY_CATEGORY
4245
);
4346
public static final List<KeyMapping> KEYBINDS = List.of(
4447
EXAMPLE_KEY

common/src/main/java/dev/terminalmc/framework/gui/screen/ClothScreenProvider.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
2121
import net.minecraft.ChatFormatting;
2222
import net.minecraft.client.gui.screens.Screen;
23+
import net.minecraft.client.input.KeyEvent;
2324
import net.minecraft.core.registries.BuiltInRegistries;
2425
import net.minecraft.network.chat.Component;
2526
import net.minecraft.resources.ResourceLocation;
@@ -246,13 +247,11 @@ static Screen getConfigScreen(Screen parent) {
246247

247248
thirdCatFirstGroup.add(eb.startKeyCodeField(
248249
localized("option", "cat3.group1.keyOption"),
249-
InputConstants.getKey(options.keyOption, options.keyOption)
250+
InputConstants.getKey(new KeyEvent(options.keyOption, 0, 0))
250251
)
251252
.setTooltip(localized("option", "cat3.group1.keyOption.tooltip"))
252253
.setDefaultValue(InputConstants.getKey(
253-
Config.Options.keyExampleDefault,
254-
Config.Options.keyExampleDefault
255-
))
254+
new KeyEvent(Config.Options.keyExampleDefault, 0, 0)))
256255
.setKeySaveConsumer(val -> options.keyOption = val.getValue())
257256
.setAllowKey(true) // op, default true
258257
.setAllowMouse(true) // op, default true

common/src/main/resources/assets/framework/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"modmenu.descriptionTranslation.framework": "A custom template mod.\nBased on Jaredlll08's MultiLoader Template",
44
"fml.menu.mods.info.description.framework": "A custom template mod.\nBased on Jaredlll08's MultiLoader Template",
55

6-
"key.framework.group": "Framework",
6+
"key.category.framework.group": "Framework",
77
"key.framework.group.example": "Example Key",
88

99
"message.framework.viewModrinth": "View on Modrinth",

gradle.properties

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,37 @@ mod_curseforge_slug=tmc-framework
5555
# Subproject Build Compatibility
5656
# -> Comment out or unset to disable publishing of a subproject.
5757
mod_loaders_fabric=fabric
58-
mc_versions_fabric=1.21.6,1.21.7,1.21.8
58+
mc_versions_fabric=1.21.9,1.21.10
5959
mod_loaders_neoforge=neoforge
60-
mc_versions_neoforge=1.21.8
60+
mc_versions_neoforge=1.21.10
6161

6262
# Java
6363
java_version=21
6464
java_versions_fabric=>=21
6565
java_versions_neoforge=[21,)
6666

6767
# Minecraft
68-
minecraft_version=1.21.8
69-
minecraft_versions_fabric=>1.21.5
70-
minecraft_versions_neoforge=[1.21.8,)
68+
minecraft_version=1.21.10
69+
minecraft_versions_fabric=>1.21.8
70+
minecraft_versions_neoforge=[1.21.10,)
7171

7272
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
73-
parchment_minecraft_version=1.21.8
74-
parchment_version=2025.09.14
73+
parchment_minecraft_version=1.21.9
74+
parchment_version=2025.10.05
7575

7676
# Fabric https://fabricmc.net/develop
7777
# -> See also 'mixinextras_jij_fabric'
7878
fabric_loader_version=0.17.2
7979
fabric_loader_versions=>=0.17.0
80-
fabric_api_version=0.134.0+1.21.8
80+
fabric_api_version=0.134.1+1.21.10
8181
fabric_api_versions=*
8282

8383
# NeoForge https://projects.neoforged.net/neoforged/neoforge
8484
# -> See also 'mixinextras_jij_neoforge'
85-
neoforge_version=21.8.47
86-
neoforge_versions=[21.8.18,)
85+
neoforge_version=21.10.1-beta
86+
neoforge_versions=[21.10.0-beta,)
8787
# NeoForm https://projects.neoforged.net/neoforged/neoform
88-
neoform_version=1.21.8-20250717.133445
88+
neoform_version=1.21.10-20251007.142004
8989

9090
# Dependency Property Identifiers
9191
# -> These values point to other properties with full dependency specification.
@@ -112,22 +112,22 @@ neoforge_deps=clothconfig,yacl
112112
d_common_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v
113113
d_fabric_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-fabric:$v:-,recommends:cloth-config,req:9s6osm5g,req:cloth-config
114114
d_neoforge_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v:-,optional:cloth-config,req:9s6osm5g,req:cloth-config
115-
v_clothconfig=19.0.147
116-
vr_fabric_clothconfig=>=19
117-
vr_neoforge_clothconfig=[19,)
115+
v_clothconfig=20.0.148
116+
vr_fabric_clothconfig=>=20
117+
vr_neoforge_clothconfig=[20,)
118118

119119
# YACL https://modrinth.com/project/1eAoo2KR/versions
120120
d_common_yacl=-:-:imp:dev.isxander:yet-another-config-lib:$v-neoforge:v_yacl
121121
d_fabric_yacl=-:-:imp:dev.isxander:yet-another-config-lib:$v-fabric:v_yacl,recommends:yet_another_config_lib_v3,req:1eAoo2KR,req:yacl
122122
d_neoforge_yacl=-:-:imp:dev.isxander:yet-another-config-lib:$v-neoforge:v_yacl,optional:yet_another_config_lib_v3,req:1eAoo2KR,req:yacl
123-
v_yacl=3.7.1+1.21.6
124-
vr_fabric_yacl=>=3.7.1
125-
vr_neoforge_yacl=[3.7.1,)
123+
v_yacl=3.8.0+1.21.9
124+
vr_fabric_yacl=>=3.8.0
125+
vr_neoforge_yacl=[3.8.0,)
126126

127127
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
128128
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
129-
v_modmenu=15.0.0
130-
vr_fabric_modmenu=>=15.0.0-beta.1
129+
v_modmenu=16.0.0-rc.1
130+
vr_fabric_modmenu=>=16.0.0-rc.1
131131

132132
# Dependency Version Extensions
133133
# -> Intended for addon mods to show which version they were compiled against.

neoforge/src/main/java/dev/terminalmc/framework/platform/NeoForgeServices.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
import dev.terminalmc.framework.platform.services.IPlatformServices;
1515
import net.neoforged.fml.loading.FMLLoader;
1616
import net.neoforged.fml.loading.FMLPaths;
17-
import net.neoforged.fml.loading.LoadingModList;
1817

1918
import java.nio.file.Path;
2019

2120
public class NeoForgeServices implements IPlatformServices {
2221

2322
@Override
2423
public boolean isDevEnv() {
25-
return !FMLLoader.isProduction();
24+
return !FMLLoader.getCurrent().isProduction();
2625
}
2726

2827
@Override
2928
public boolean isModLoaded(String modId) {
30-
return LoadingModList.get().getModFileById(modId) != null;
29+
return FMLLoader.getCurrent().getLoadingModList().getModFileById(modId) != null;
3130
}
3231

3332
@Override

0 commit comments

Comments
 (0)