Port to 1.21.4

Author: Ambossmann

common/src/main/java/de/ambossmann/anvilclient/gui/config/ConfigScreen.java

@@ -19,7 +19,6 @@
 import de.ambossmann.anvilclient.settings.IgnoreAsOption;
 import de.ambossmann.anvilclient.settings.Setting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.OptionsList;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.options.OptionsSubScreen;
 import net.minecraft.network.chat.Component;
@@ -30,13 +29,6 @@ public ConfigScreen(String nameTranslationKey, Screen lastScreen) {
 		super(lastScreen, Minecraft.getInstance().options, Component.translatable(nameTranslationKey));
 	}
 
-	@Override
-	protected void init() {
-		this.list = this.addRenderableWidget(new OptionsList(this.minecraft, this.width, this));
-
-		super.init();
-	}
-
 	@Setting @IgnoreAsOption
 	public static EnumSetting<SortType> sortType =
 			new EnumSetting<>("anvilclient.sortType", "", SortType.CATEGORY);

common/src/main/java/de/ambossmann/anvilclient/util/utils/SettingUtils.java

@@ -45,46 +45,45 @@ private SettingUtils() {}
 	public static <T> OptionInstance<T> getOptionForSetting(ISetting<T> setting) {
 		OptionInstance<T> option = null;
 		String translationKey = "anvilclient.feature." + setting.getKey();
-		if (setting instanceof BooleanSetting booleanSetting) {
-			option =
-					(OptionInstance<T>)
-							OptionInstance.createBoolean(
-									translationKey, booleanSetting.getValue(), booleanSetting::setValue);
-
-		} else if (setting instanceof EnumSetting<?> enumSetting) {
-			option = (OptionInstance<T>) optionInstanceForEnum(enumSetting, translationKey);
-
-		} else if (setting instanceof IntegerSetting integerSetting) {
-			option =
-					(OptionInstance<T>)
-							new OptionInstance<Integer>(
-									translationKey,
-									OptionInstance.noTooltip(),
-									(component, integer) ->
-											Options.genericValueLabel(component, integerSetting.getIntValue()),
-									new OptionInstance.IntRange(
-											integerSetting.getMinValue(), integerSetting.getMaxValue()),
-									integerSetting.getValue(),
-									integerSetting::setValue);
-
-		} else if (setting instanceof DoubleSetting doubleSetting) {
-			option =
-					(OptionInstance<T>)
-							new OptionInstance<Double>(
-									translationKey,
-									OptionInstance.noTooltip(),
-									(component, doubleValue) ->
-											Options.genericValueLabel(
-													component,
-													Component.literal(
-															MathUtils.formatDouble(
-																	doubleValue, doubleSetting.getDecimalCount()))),
-									new DoubleRange(
-											doubleSetting.getMinValue(),
-											doubleSetting.getMaxValue(),
-											doubleSetting.getDecimalCount()),
-									doubleSetting.getValue(),
-									doubleSetting::setValue);
+		switch (setting) {
+			case BooleanSetting booleanSetting ->
+					option =
+							(OptionInstance<T>)
+									OptionInstance.createBoolean(
+											translationKey, booleanSetting.getValue(), booleanSetting::setValue);
+			case EnumSetting<?> enumSetting ->
+					option = (OptionInstance<T>) optionInstanceForEnum(enumSetting, translationKey);
+			case IntegerSetting integerSetting ->
+					option =
+							(OptionInstance<T>)
+									new OptionInstance<Integer>(
+											translationKey,
+											OptionInstance.noTooltip(),
+											(component, integer) ->
+													Options.genericValueLabel(component, integerSetting.getIntValue()),
+											new OptionInstance.IntRange(
+													integerSetting.getMinValue(), integerSetting.getMaxValue()),
+											integerSetting.getValue(),
+											integerSetting::setValue);
+			case DoubleSetting doubleSetting ->
+					option =
+							(OptionInstance<T>)
+									new OptionInstance<Double>(
+											translationKey,
+											OptionInstance.noTooltip(),
+											(component, doubleValue) ->
+													Options.genericValueLabel(
+															component,
+															Component.literal(
+																	MathUtils.formatDouble(
+																			doubleValue, doubleSetting.getDecimalCount()))),
+											new DoubleRange(
+													doubleSetting.getMinValue(),
+													doubleSetting.getMaxValue(),
+													doubleSetting.getDecimalCount()),
+											doubleSetting.getValue(),
+											doubleSetting::setValue);
+			default -> {}
 		}
 		return option;
 	}

gradle.properties

@@ -1,23 +1,23 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.21.3
-minecraft_version_range=[1.21.3,1.21.4)
+minecraft_version=1.21.4
+minecraft_version_range=[1.21.4,1.21.5)
 enabled_platforms=fabric,neoforge
 
 archives_base_name=anvilclient
 mod_version=2.0.0
 maven_group=anvilclient
 
-architectury_version=14.0.4
+architectury_version=15.0.3
 
 fabric_loader_version=0.17.2
-fabric_api_version=0.114.1+1.21.3
+fabric_api_version=0.119.4+1.21.4
 
-parchment_minecraft_version=1.21.3
-parchment_version=2024.12.07
+parchment_minecraft_version=1.21.4
+parchment_version=2025.03.23
 
-neo_version=21.3.91
-neo_version_range=[21.3,)
+neo_version=21.4.152
+neo_version_range=[21.4,)
 loader_version_range=[2,)
 
-modmenu_version=12.0.0
+modmenu_version=13.0.3