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 281493952..742aad75c 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,17 +20,17 @@ package com.seibel.distanthorizons.fabric.wrappers.config; import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; +//import com.terraformersmc.modmenu.api.ConfigScreenFactory; +//import com.terraformersmc.modmenu.api.ModMenuApi; /** For making the config show up in modmenu */ -public class ModMenuIntegration implements ModMenuApi +public class ModMenuIntegration //implements ModMenuApi { // For the custom config code - @Override - public ConfigScreenFactory getModConfigScreenFactory() - { - return parent -> GetConfigScreen.getScreen(parent); - } + //@Override + //public ConfigScreenFactory getModConfigScreenFactory() + //{ + // return parent -> GetConfigScreen.getScreen(parent); + //} } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java index 40790483d..c20d9cc0c 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java @@ -27,20 +27,20 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccess import net.coderbot.iris.Iris; import net.irisshaders.iris.api.v0.IrisApi; #else -import net.irisshaders.iris.Iris; -import net.irisshaders.iris.api.v0.IrisApi; +//import net.irisshaders.iris.Iris; +//import net.irisshaders.iris.api.v0.IrisApi; #endif public class IrisAccessor implements IIrisAccessor { @Override - public String getModName() { return Iris.MODID; } + public String getModName() { return /*Iris.MODID;*/ ""; } @Override - public boolean isShaderPackInUse() { return IrisApi.getInstance().isShaderPackInUse(); } + public boolean isShaderPackInUse() { return false;/*IrisApi.getInstance().isShaderPackInUse();*/ } @Override - public boolean isRenderingShadowPass() { return IrisApi.getInstance().isRenderingShadowPass(); } + public boolean isRenderingShadowPass() { return false;/*IrisApi.getInstance().isRenderingShadowPass();*/ } } diff --git a/gradle.properties b/gradle.properties index 770bc07d9..0b6a751e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,7 +47,7 @@ versionStr= # This defines what MC version Intellij will use for the preprocessor # and what version is used automatically by build and run commands -mcVer=26.1.2 +mcVer=26.2.0 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment minecraftMemoryJavaArg=-Xmx6G diff --git a/versionProperties/26.2.0.properties b/versionProperties/26.2.0.properties new file mode 100644 index 000000000..b177059e3 --- /dev/null +++ b/versionProperties/26.2.0.properties @@ -0,0 +1,60 @@ +# 26.2.0 version +java_version=25 +minecraft_version=26.2-snapshot-5 +parchment_version=1.21:2024.07.28 +# version range should be used instead of individual versions due to how NeoForge handles version loading +compatible_minecraft_versions=["26.2.0","26.2-alpha.5"] +accessWidenerVersion=26_1 +builds_for=fabric +#,neoforge +# forge is broken due to gradle/build script issues + +# Netty +netty_version=4.1.97.Final + +# LWJGL +lwjgl_version=3.4.1 + +# Fabric loader +fabric_loader_version=0.18.5 +fabric_api_version=0.147.1+26.2 +modmenu_version= +starlight_version_fabric= +phosphor_version_fabric= +lithium_version= +sodium_version= +iris_version= +bclib_version= +immersive_portals_version= +canvas_version= + +fabric_incompatibility_list={ } +fabric_recommend_list={} + +# Fabric 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 +enable_mod_menu=0 +enable_starlight=0 +enable_phosphor=0 +enable_sodium=0 +enable_lithium=0 +enable_iris=0 +enable_bclib=0 +enable_immersive_portals=0 +enable_canvas=0 + +# NeoForge loader +forge_version= +neoforge_version=15-beta +neoforge_version_range=[*,) + +# NeoForge mod versions +neo_iris_version= + +# (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