Skip to content

Commit 684611d

Browse files
committed
Update to mc1.21.3
1 parent 17f8979 commit 684611d

3 files changed

Lines changed: 27 additions & 26 deletions

File tree

common/src/main/java/dev/terminalmc/framework/command/Commands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void register(CommandDispatcher<S> dispatcher, CommandBuildContext buildC
5959
Item item = ItemArgument.getItem(ctx, "item").getItem();
6060

6161
MutableComponent msg = Framework.PREFIX.copy();
62-
msg.append(item.getDescription());
62+
msg.append(item.getName());
6363

6464
mc.gui.getChat().addMessage(msg);
6565
return Command.SINGLE_SUCCESS;

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@
1717
import dev.terminalmc.framework.Framework;
1818
import dev.terminalmc.framework.config.Config;
1919
import net.minecraft.ChatFormatting;
20-
import net.minecraft.ResourceLocationException;
2120
import net.minecraft.client.Minecraft;
2221
import net.minecraft.client.gui.screens.Screen;
22+
import net.minecraft.core.Holder;
23+
import net.minecraft.core.Holder.Reference;
2324
import net.minecraft.core.registries.BuiltInRegistries;
2425
import net.minecraft.network.chat.Component;
2526
import net.minecraft.resources.ResourceLocation;
2627
import net.minecraft.world.item.Item;
28+
import net.minecraft.world.item.Items;
2729

2830
import java.awt.*;
2931
import java.util.List;
32+
import java.util.Optional;
3033

3134
import static dev.terminalmc.framework.util.Localization.localized;
3235

@@ -418,11 +421,9 @@ static Screen getConfigScreen(Screen parent) {
418421

419422
// Special option utils
420423
private static Item asItem(String s) {
421-
try {
422-
return BuiltInRegistries.ITEM.get(ResourceLocation.parse(s));
423-
} catch (ResourceLocationException e) {
424-
return BuiltInRegistries.ITEM.get(BuiltInRegistries.ITEM.getDefaultKey());
425-
}
424+
Optional<Reference<Item>> item =
425+
BuiltInRegistries.ITEM.get(ResourceLocation.parse(s));
426+
return item.map(Holder.Reference::value).orElse(Items.AIR);
426427
}
427428

428429
private static String asString(Item i) {

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,1.21.1
58+
mc_versions_fabric=1.21.2,1.21.3
5959
mod_loaders_neoforge=neoforge
60-
mc_versions_neoforge=1.21.1
60+
mc_versions_neoforge=1.21.3
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.1
69-
minecraft_versions_fabric=>1.20.6
70-
minecraft_versions_neoforge=[1.21.1,)
68+
minecraft_version=1.21.3
69+
minecraft_versions_fabric=>1.21.1
70+
minecraft_versions_neoforge=[1.21.3,)
7171

7272
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
73-
parchment_minecraft_version=1.21.1
74-
parchment_version=2024.11.17
73+
parchment_minecraft_version=1.21.3
74+
parchment_version=2024.12.07
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.116.6+1.21.1
80+
fabric_api_version=0.114.1+1.21.3
8181
fabric_api_versions=*
8282

8383
# NeoForge https://projects.neoforged.net/neoforged/neoforge
8484
# -> See also 'mixinextras_jij_neoforge'
85-
neoforge_version=21.1.209
86-
neoforge_versions=[21.1.195,)
85+
neoforge_version=21.3.93
86+
neoforge_versions=[21.3.88,)
8787
# NeoForm https://projects.neoforged.net/neoforged/neoform
88-
neoform_version=1.21.1-20240808.144430
88+
neoform_version=1.21.3-20241023.131943
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=15.0.140
116-
vr_fabric_clothconfig=>=15
117-
vr_neoforge_clothconfig=[15,)
115+
v_clothconfig=16.0.143
116+
vr_fabric_clothconfig=>=16
117+
vr_neoforge_clothconfig=[16,)
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.8.0+1.21.1
124-
vr_fabric_yacl=>=3.5.0
125-
vr_neoforge_yacl=[3.5.0,)
123+
v_yacl=3.8.0+1.21.3
124+
vr_fabric_yacl=>=3.6.1
125+
vr_neoforge_yacl=[3.6.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=11.0.3
130-
vr_fabric_modmenu=>=11.0.0-beta.1
129+
v_modmenu=12.0.0
130+
vr_fabric_modmenu=>=12.0.0-beta.1
131131

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

0 commit comments

Comments
 (0)