diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeVertexFormatBuilder.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeVertexFormatBuilder.java index ad9fdf774..5cf165a44 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeVertexFormatBuilder.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeVertexFormatBuilder.java @@ -1,5 +1,9 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers; +#if MC_VER <= MC_1_21_10 +public class BlazeVertexFormatBuilder {} +#else + import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.blaze3d.vertex.VertexFormatElement; import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil; @@ -51,3 +55,4 @@ public class BlazeVertexFormatBuilder } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java index 96d8150b4..2107bebe4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java @@ -1,5 +1,9 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers; +#if MC_VER <= MC_1_21_10 +public class RenderPassWrapper {} +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.systems.CommandEncoder; @@ -155,3 +159,4 @@ public class RenderPassWrapper implements AutoCloseable } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/IDhBlazeTexture.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/IDhBlazeTexture.java index 95f37c91f..506a589f2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/IDhBlazeTexture.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/IDhBlazeTexture.java @@ -1,5 +1,9 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.texture; +#if MC_VER <= MC_1_21_10 +public interface IDhBlazeTexture {} +#else + import com.mojang.blaze3d.textures.GpuSampler; import com.mojang.blaze3d.textures.GpuTextureView; @@ -10,3 +14,4 @@ public interface IDhBlazeTexture GpuSampler getTextureSampler(); } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index 9bcd0590f..f4c6c75c8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -102,7 +102,7 @@ public class DependencySetup renderingApiEnum = versionConstants.getDefaultRenderingApi(); } - LOGGER.info("Setting DH Rendering API to: ["+renderingApiEnum+"]."); + LOGGER.info("Setting DH Rendering API to: ["+renderingApiEnum+"]..."); @@ -151,6 +151,7 @@ public class DependencySetup renderDefinition.bindRenderers(); + LOGGER.info("DH Rendering successfully bound to: ["+renderDefinition.getApiName()+"]..."); } diff --git a/gradle.properties b/gradle.properties index 90fd6504d..31c530cab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,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.2.0 +mcVer=26.1.2 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment minecraftMemoryJavaArg=-Xmx6G diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java index 60e91805e..c82eadc56 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java @@ -23,7 +23,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper @Override - public int getDepthTextureId() + public int getGlDepthTextureId() { #if MC_VER < MC_1_21_9 // no special handling required, @@ -50,7 +50,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper } @Override - public int getColorTextureId() + public int getGlColorTextureId() { #if MC_VER < MC_1_21_9 // no special handling required,