diff --git a/buildSrc/src/main/groovy/dh-loader.gradle b/buildSrc/src/main/groovy/dh-loader.gradle index d94732d08..02aad4ffa 100644 --- a/buildSrc/src/main/groovy/dh-loader.gradle +++ b/buildSrc/src/main/groovy/dh-loader.gradle @@ -128,7 +128,7 @@ unimined.minecraft(sourceSets.main, true) { mappings { mojmap() - devNamespace "mojmap" + //devNamespace "mojmap" } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index cd71bb320..e76d489e9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -29,7 +29,6 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; @@ -140,16 +139,16 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer private void createPipelines() { VertexFormat vertexFormat = VertexFormat.builder() - .add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS) + //.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS) .build(); RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); { pipelineBuilder.withCull(false); - pipelineBuilder.withDepthWrite(true); - pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); - pipelineBuilder.withColorWrite(true); - pipelineBuilder.withoutBlend(); + //pipelineBuilder.withDepthWrite(true); + //pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); + //pipelineBuilder.withColorWrite(true); + //pipelineBuilder.withoutBlend(); pipelineBuilder.withPolygonMode(PolygonMode.WIREFRAME); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:debug_wireframe_renderer")); @@ -229,11 +228,11 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer { this.init(); - if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() - || BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) - { - return; - } + //if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty() + // || BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty()) + //{ + // return; + //} // shouldn't happen, but just in case if (box == null) @@ -298,27 +297,27 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer // render // - try (RenderPass renderPass = commandEncoder.createRenderPass( - this::getRenderPassName, - BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, - /*optionalClearColorAsInt*/ OptionalInt.empty(), - BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, - /*optionalDepthValueAsDouble*/ OptionalDouble.empty())) - { - // Bind instance data // - renderPass.setUniform("uniformBlock", this.uniformBuffer); - - renderPass.setPipeline(this.pipeline); - renderPass.setIndexBuffer(this.boxIndexBuffer, VertexFormat.IndexType.INT); - - renderPass.setVertexBuffer(0, this.boxVertexBuffer); - - renderPass.drawIndexed( - /*indexStart*/ 0, - /*firstIndex*/0, - /*indexCount*/BOX_OUTLINE_INDICES.length, - /*instanceCount*/1); - } + //try (RenderPass renderPass = commandEncoder.createRenderPass( + // this::getRenderPassName, + // BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, + // /*optionalClearColorAsInt*/ OptionalInt.empty(), + // BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, + // /*optionalDepthValueAsDouble*/ OptionalDouble.empty())) + //{ + // // Bind instance data // + // renderPass.setUniform("uniformBlock", this.uniformBuffer); + // + // renderPass.setPipeline(this.pipeline); + // renderPass.setIndexBuffer(this.boxIndexBuffer, VertexFormat.IndexType.INT); + // + // renderPass.setVertexBuffer(0, this.boxVertexBuffer); + // + // renderPass.drawIndexed( + // /*indexStart*/ 0, + // /*firstIndex*/0, + // /*indexCount*/BOX_OUTLINE_INDICES.length, + // /*instanceCount*/1); + //} } private String getRenderPassName() { return "distantHorizons:McDebugRenderer"; } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java index 18fdf02f5..abb61caac 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java @@ -30,7 +30,6 @@ import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; @@ -132,9 +131,9 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer this.init = true; this.vertexFormat = VertexFormat.builder() - .add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS) - .add("aColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR) - .add("aMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL) + //.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS) + //.add("aColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR) + //.add("aMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL) .build(); this.createPipelines(); @@ -149,10 +148,10 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); { pipelineBuilder.withCull(true); - pipelineBuilder.withDepthWrite(true); - pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); - pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT); - pipelineBuilder.withColorWrite(true); + //pipelineBuilder.withDepthWrite(true); + //pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); + //pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT); + //pipelineBuilder.withColorWrite(true); pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:generic")); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index 3350a5b0d..72a3ea985 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java @@ -11,7 +11,6 @@ import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; @@ -85,21 +84,21 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer VertexFormat vertexFormat = VertexFormat.builder() - .add("vPosition", BlazeDhVertexFormatUtil.SHORT_XYZ_POS) - .add("meta", BlazeDhVertexFormatUtil.META) - .add("vColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR) - .add("irisMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL) - .add("irisNormal", BlazeDhVertexFormatUtil.IRIS_NORMAL) - .add("paddingTwo", BlazeDhVertexFormatUtil.BYTE_PAD) - .add("paddingThree", BlazeDhVertexFormatUtil.BYTE_PAD) // padding is to make sure the format is a multiple of 4 + //.add("vPosition", BlazeDhVertexFormatUtil.SHORT_XYZ_POS) + //.add("meta", BlazeDhVertexFormatUtil.META) + //.add("vColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR) + //.add("irisMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL) + //.add("irisNormal", BlazeDhVertexFormatUtil.IRIS_NORMAL) + //.add("paddingTwo", BlazeDhVertexFormatUtil.BYTE_PAD) + //.add("paddingThree", BlazeDhVertexFormatUtil.BYTE_PAD) // padding is to make sure the format is a multiple of 4 .build(); RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); { pipelineBuilder.withCull(true); - pipelineBuilder.withDepthWrite(true); - pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); - pipelineBuilder.withColorWrite(true); + //pipelineBuilder.withDepthWrite(true); + //pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST); + //pipelineBuilder.withColorWrite(true); pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:lod_render")); @@ -117,13 +116,13 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer // opaque { - pipelineBuilder.withoutBlend(); + //pipelineBuilder.withoutBlend(); this.opaquePipeline = pipelineBuilder.build(); } // transparent { - pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT); + //pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT); this.transparentPipeline = pipelineBuilder.build(); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java index 83accc661..a26aea2cc 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java @@ -27,7 +27,6 @@ public class BlazeDhApplyRenderer {} import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; @@ -151,24 +150,24 @@ public class BlazeDhApplyRenderer } VertexFormat vertexFormat = VertexFormat.builder() - .add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS) + //.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS) .build(); RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); { pipelineBuilder.withCull(false); - pipelineBuilder.withDepthWrite(false); - pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST); - pipelineBuilder.withColorWrite(true); + //pipelineBuilder.withDepthWrite(false); + //pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST); + //pipelineBuilder.withColorWrite(true); - if (this.blendFunction != null) - { - pipelineBuilder.withBlend(this.blendFunction); - } - else - { - pipelineBuilder.withoutBlend(); - } + //if (this.blendFunction != null) + //{ + // pipelineBuilder.withBlend(this.blendFunction); + //} + //else + //{ + // pipelineBuilder.withoutBlend(); + //} pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse(this.identifierName)); // TODO will complain if capital letters are included diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java index 7286a0758..f6df0734b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java @@ -26,7 +26,6 @@ public class BlazeDhCopyRenderer {} import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; @@ -85,10 +84,10 @@ public class BlazeDhCopyRenderer RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder(); { pipelineBuilder.withCull(false); - pipelineBuilder.withDepthWrite(false); - pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST); - pipelineBuilder.withColorWrite(true); - pipelineBuilder.withoutBlend(); + //pipelineBuilder.withDepthWrite(false); + //pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST); + //pipelineBuilder.withColorWrite(true); + //pipelineBuilder.withoutBlend(); pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:copy_render")); @@ -119,17 +118,17 @@ public class BlazeDhCopyRenderer BlazeTextureWrapper sourceColorTextureWrapper, BlazeTextureViewWrapper destinationColorTextureWrapper) { - this.render( - sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, - destinationColorTextureWrapper.textureView); + //this.render( + // sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, + // destinationColorTextureWrapper.textureView); } public void render( BlazeTextureWrapper sourceColorTextureWrapper, BlazeTextureWrapper destinationColorTextureWrapper) { - this.render( - sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, - destinationColorTextureWrapper.textureView); + //this.render( + // sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler, + // destinationColorTextureWrapper.textureView); } private void render( diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java index 8d1d0a451..75d819d71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java @@ -29,7 +29,6 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.systems.CommandEncoder; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java index 4d20e9c65..94a7400c9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java @@ -30,7 +30,6 @@ import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.DestFactor; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.platform.SourceFactor; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 1a6ff387e..42d126437 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -93,6 +93,8 @@ public class VersionConstants implements IVersionConstants return "1.21.10"; #elif MC_VER == MC_1_21_11 return "1.21.11"; + #elif MC_VER == MC_1_26_1 + return "21.6"; #else ERROR MC version constant missing #endif @@ -102,7 +104,7 @@ public class VersionConstants implements IVersionConstants @Override public EDhApiRenderApi getDefaultRenderingApi() { - #if MC_VER <= MC_1_21_11 + #if MC_VER <= MC_1_26_1 return EDhApiRenderApi.OPEN_GL; #else ERROR MC version constant missing diff --git a/gradle.properties b/gradle.properties index 343a6ad13..53feaec03 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues mod_discord=https://discord.gg/xAB8G4cENx # Global Plugin Versions -manifold_version=2026.1.6 +manifold_version=2025.1.31 # 2023.1.17 can be used if there are mystery Java compiler issues nightconfig_version=3.8.3 lz4_version=1.8.0 @@ -46,7 +46,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.11 +mcVer=1.26.1 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment #minecraftMemoryJavaArg="-Xmx4G" diff --git a/versionProperties/1.26.1.properties b/versionProperties/1.26.1.properties new file mode 100644 index 000000000..7e8aa8304 --- /dev/null +++ b/versionProperties/1.26.1.properties @@ -0,0 +1,59 @@ +# 1.26.1 version +java_version=25 +minecraft_version=26.1 +parchment_version=1.21:2024.07.28 +compatible_minecraft_versions=["26.1"] +accessWidenerVersion=1_21_11 +builds_for= +#fabric,neoforge +# forge is broken due to gradle/build script issues + +# Netty +netty_version=4.1.97.Final + +# LWJGL +lwjgl_version=3.3.3 + +# Fabric loader +fabric_loader_version=0.18.5 +fabric_api_version=0.144.3+26.1 +modmenu_version=18.0.0-alpha.7 +starlight_version_fabric= +phosphor_version_fabric= +lithium_version= +sodium_version=mc1.21.11-0.8.7-fabric +iris_version=1.10.7+26.1-fabric +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=2 +enable_starlight=0 +enable_phosphor=0 +enable_sodium=1 +enable_lithium=0 +enable_iris=1 +enable_bclib=0 +enable_immersive_portals=0 +enable_canvas=0 + +# NeoForge loader +forge_version= +neoforge_version=26.1.0.1-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 \ No newline at end of file