diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/modAccessor/ImmersivePortalsAccessorCommon.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/modAccessor/ImmersivePortalsAccessorCommon.java index 28a0cc67e..adb8cbcf0 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/modAccessor/ImmersivePortalsAccessorCommon.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/modAccessor/ImmersivePortalsAccessorCommon.java @@ -40,6 +40,7 @@ public abstract class ImmersivePortalsAccessorCommon extends ImmersivePortalsAbs return Minecraft.getInstance().level.entitiesForRendering(); } + #if MC_VER < MC_1_21_6 private static Matrix4f getProjectionMatrix() { #if MC_VER > MC_1_16_5 return RenderSystem.getProjectionMatrix(); @@ -53,6 +54,7 @@ public abstract class ImmersivePortalsAccessorCommon extends ImmersivePortalsAbs } #endif } + #endif #if MC_VER <= MC_1_19_2 protected abstract Matrix4f convert(Mat4f matrix); @@ -61,6 +63,7 @@ public abstract class ImmersivePortalsAccessorCommon extends ImmersivePortalsAbs @Override protected Supplier getFrustumSupplier() { + #if MC_VER < MC_1_21_6 // TODO Fix this for 1.21.6+ when a more modern version of Immersive Portals is available. return Suppliers.memoize(() -> { Frustum frustum = new Frustum( #if MC_VER > MC_1_19_2 @@ -76,6 +79,9 @@ public abstract class ImmersivePortalsAccessorCommon extends ImmersivePortalsAbs return frustum; }); + #else + return null; + #endif } } diff --git a/coreSubProjects b/coreSubProjects index ea51b9135..dcb049d4c 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit ea51b9135d6b1d559398f961b24e662fde190451 +Subproject commit dcb049d4c2cf0e46b1949982f3404b489b95f171 diff --git a/gradle.properties b/gradle.properties index 98cafaa56..e640f3d00 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=1.21.1 +mcVer=1.21.6 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment minecraftMemoryJavaArg=-Xmx6G