Skip to content

Commit 7970659

Browse files
committed
Update to mc1.21.11
1 parent 53d00d5 commit 7970659

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +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;
22+
import net.minecraft.resources.Identifier;
2323

2424
import java.util.List;
2525

@@ -36,7 +36,7 @@ public class Framework {
3636
.append(Component.literal("] ").withStyle(ChatFormatting.DARK_GRAY))
3737
.withStyle(ChatFormatting.GRAY);
3838
public static final KeyMapping.Category KEY_CATEGORY =
39-
KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(MOD_ID, "group"));
39+
KeyMapping.Category.register(Identifier.fromNamespaceAndPath(MOD_ID, "group"));
4040
public static final KeyMapping EXAMPLE_KEY = new KeyMapping(
4141
translationKey("key", "group.example"),
4242
InputConstants.Type.KEYSYM,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.minecraft.client.input.KeyEvent;
2424
import net.minecraft.core.registries.BuiltInRegistries;
2525
import net.minecraft.network.chat.Component;
26-
import net.minecraft.resources.ResourceLocation;
26+
import net.minecraft.resources.Identifier;
2727

2828
import java.util.HashSet;
2929
import java.util.List;
@@ -261,7 +261,7 @@ static Screen getConfigScreen(Screen parent) {
261261
// Cloth Config does not have a dedicated item option like YACL
262262
Set<String> items = new HashSet<>(BuiltInRegistries.ITEM.keySet()
263263
.stream()
264-
.map(ResourceLocation::toString)
264+
.map(Identifier::toString)
265265
.toList());
266266
thirdCatFirstGroup.add(eb.startStringDropdownMenu(
267267
localized("option", "cat3.group1.itemOption"),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
package dev.terminalmc.framework.gui.screen;
1313

14-
import net.minecraft.Util;
1514
import net.minecraft.client.Minecraft;
1615
import net.minecraft.client.gui.components.Button;
1716
import net.minecraft.client.gui.components.MultiLineTextWidget;
1817
import net.minecraft.client.gui.screens.ConfirmLinkScreen;
1918
import net.minecraft.client.gui.screens.Screen;
2019
import net.minecraft.network.chat.CommonComponents;
20+
import net.minecraft.util.Util;
2121

2222
import static dev.terminalmc.framework.util.Localization.localized;
2323

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.minecraft.core.Holder.Reference;
2424
import net.minecraft.core.registries.BuiltInRegistries;
2525
import net.minecraft.network.chat.Component;
26-
import net.minecraft.resources.ResourceLocation;
26+
import net.minecraft.resources.Identifier;
2727
import net.minecraft.world.item.Item;
2828
import net.minecraft.world.item.Items;
2929

@@ -422,7 +422,7 @@ static Screen getConfigScreen(Screen parent) {
422422
// Special option utils
423423
private static Item asItem(String s) {
424424
Optional<Reference<Item>> item =
425-
BuiltInRegistries.ITEM.get(ResourceLocation.parse(s));
425+
BuiltInRegistries.ITEM.get(Identifier.parse(s));
426426
return item.map(Holder.Reference::value).orElse(Items.AIR);
427427
}
428428

@@ -463,7 +463,7 @@ private static void reload(YACLScreen screen, Screen parent) {
463463
screen.finishOrSave();
464464
screen.onClose(); // In case finishOrSave doesn't close it.
465465
YACLScreen newScreen = (YACLScreen) ConfigScreenProvider.getConfigScreen(parent);
466-
newScreen.init(Minecraft.getInstance(), screen.width, screen.height);
466+
newScreen.init(screen.width, screen.height);
467467
try {
468468
newScreen.tabNavigationBar.selectTab(tab, false);
469469
} catch (IndexOutOfBoundsException e) {

gradle.properties

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ 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.9,1.21.10
58+
mc_versions_fabric=1.21.11
5959
mod_loaders_neoforge=neoforge
60-
mc_versions_neoforge=1.21.10
60+
mc_versions_neoforge=1.21.11
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.10
69-
minecraft_versions_fabric=>1.21.8
70-
minecraft_versions_neoforge=[1.21.10,)
68+
minecraft_version=1.21.11
69+
minecraft_versions_fabric=>1.21.10
70+
minecraft_versions_neoforge=[1.21.11,)
7171

7272
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
7373
parchment_minecraft_version=1.21.10
@@ -77,15 +77,15 @@ parchment_version=2025.10.12
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.138.3+1.21.10
80+
fabric_api_version=0.140.2+1.21.11
8181
fabric_api_versions=*
8282

8383
# NeoForge https://projects.neoforged.net/neoforged/neoforge
8484
# -> See also 'mixinextras_jij_neoforge'
85-
neoforge_version=21.10.64
86-
neoforge_versions=[21.10.0-beta,)
85+
neoforge_version=21.11.14-beta
86+
neoforge_versions=[21.11.0-beta,)
8787
# NeoForm https://projects.neoforged.net/neoforged/neoform
88-
neoform_version=1.21.10-20251010.172816
88+
neoform_version=1.21.11-20251209.172050
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-fabric:$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=20.0.149
116-
vr_fabric_clothconfig=>=20
117-
vr_neoforge_clothconfig=[20,)
115+
v_clothconfig=21.11.153
116+
vr_fabric_clothconfig=>=21
117+
vr_neoforge_clothconfig=[21,)
118118

119119
# YACL https://modrinth.com/project/1eAoo2KR/versions
120120
d_common_yacl=-:-:imp:dev.isxander:yet-another-config-lib:$v-fabric: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.8.0+1.21.9
124-
vr_fabric_yacl=>=3.8.0
125-
vr_neoforge_yacl=[3.8.0,)
123+
v_yacl=3.8.1+1.21.11
124+
vr_fabric_yacl=>=3.8.1
125+
vr_neoforge_yacl=[3.8.1,)
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=16.0.0-rc.1
130-
vr_fabric_modmenu=>=16.0.0-rc.1
129+
v_modmenu=17.0.0-beta.1
130+
vr_fabric_modmenu=>=17.0.0-alpha.1
131131

132132
# Dependency Version Extensions
133133
# -> Intended for addon mods to show which version they were compiled against.
@@ -164,11 +164,11 @@ mixinextras_jij_fabric=false
164164
mixinextras_jij_neoforge=false
165165

166166
# Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
167-
loom_version=1.11.8
167+
loom_version=1.14.7
168168
# ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
169-
moddev_version=2.0.112
169+
moddev_version=2.0.134
170170
# Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
171-
mpp_version=1.0.0
171+
mpp_version=1.1.0
172172
# grgit-service https://github.com/ajoberstar/grgit/releases
173173
grgitservice_version=5.3.2
174174
# licenser https://maven.neoforged.net/#/releases/net/neoforged/licenser/net.neoforged.licenser.gradle.plugin

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
# Gradle https://gradle.org/releases
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)