diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java index 0c4f80155..281493952 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java @@ -20,21 +20,17 @@ package com.seibel.distanthorizons.fabric.wrappers.config; import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; -#if MC_VER != MC_1_21_11 import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -#endif /** For making the config show up in modmenu */ -public class ModMenuIntegration #if MC_VER != MC_1_21_11 implements ModMenuApi #endif +public class ModMenuIntegration implements ModMenuApi { - #if MC_VER != MC_1_21_11 // For the custom config code @Override public ConfigScreenFactory getModConfigScreenFactory() { return parent -> GetConfigScreen.getScreen(parent); } - #endif } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/IrisAccessor.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/IrisAccessor.java index 96cfe0fef..aa59e3699 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/IrisAccessor.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/IrisAccessor.java @@ -24,7 +24,7 @@ package com.seibel.distanthorizons.neoforge.wrappers.modAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor; -#if MC_VER != MC_1_21_9 && MC_VER != MC_1_21_11 +#if MC_VER != MC_1_21_9 import net.irisshaders.iris.Iris; import net.irisshaders.iris.api.v0.IrisApi; #endif @@ -53,7 +53,7 @@ public class IrisAccessor implements IIrisAccessor @Override public boolean isShaderPackInUse() { - #if MC_VER == MC_1_21_9 || MC_VER == MC_1_21_11 + #if MC_VER == MC_1_21_9 return true; // Iris doesn't support this MC version #else return IrisApi.getInstance().isShaderPackInUse(); @@ -63,7 +63,7 @@ public class IrisAccessor implements IIrisAccessor @Override public boolean isRenderingShadowPass() { - #if MC_VER == MC_1_21_9 || MC_VER == MC_1_21_11 + #if MC_VER == MC_1_21_9 return false; // Iris doesn't support this MC version #else return IrisApi.getInstance().isRenderingShadowPass(); diff --git a/versionProperties/1.21.11.properties b/versionProperties/1.21.11.properties index 0741b2682..d46e55fa1 100644 --- a/versionProperties/1.21.11.properties +++ b/versionProperties/1.21.11.properties @@ -13,7 +13,7 @@ netty_version=4.1.97.Final # Fabric loader fabric_loader_version=0.17.3 fabric_api_version=0.139.4+1.21.11 - modmenu_version= + modmenu_version=17.0.0-alpha.1 starlight_version_fabric= phosphor_version_fabric= lithium_version= @@ -30,7 +30,7 @@ fabric_api_version=0.139.4+1.21.11 # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run # 2 = Can be referenced in code and runs in client - enable_mod_menu=0 + enable_mod_menu=2 enable_starlight=0 enable_phosphor=0 enable_sodium=1 @@ -46,10 +46,10 @@ neoforge_version=21.11.0-beta neoforge_version_range=[*,) # NeoForge mod versions - neo_iris_version= + neo_iris_version=1.10.2+1.21.11-neoforge # (Neo)Forge mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run # 2 = Can be referenced in code and runs in client - neo_enable_iris=0 + neo_enable_iris=1