Merge pull request #25 from tildejustin/1.16.1

1.16.1 - fix adjState crash, add renderLayer profiler entries, fix c counter, fix mc-4647

Author: tildejustin

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "fabric-loom" version "1.5-SNAPSHOT"
+    id "maven-publish"
 }
 
 version = "$mod_version+$target_version"
@@ -36,8 +37,16 @@ tasks.withType(JavaCompile).configureEach {
 java {
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
     toolchain { languageVersion = JavaLanguageVersion.of(8) }
+    withSourcesJar()
 }
 
 jar {
     from "LICENSE.txt"
 }
+
+publishing {
+    publications.create("mavenJava", MavenPublication) {
+        from components.java
+    }
+    repositories {}
+}

gradle.properties

@@ -2,7 +2,8 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 2.2.0
+mod_version = 2.2.1
+
 minecraft_version = 1.16.1
 yarn_mappings = 1.16.1-build.22
 loader_version = 0.15.6

src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java

@@ -204,9 +204,12 @@ public void updateChunks(Camera camera, Frustum frustum, boolean hasForcedFrustu
     public void drawChunkLayer(RenderLayer renderLayer, MatrixStack matrixStack, double x, double y, double z) {
         BlockRenderPass pass = this.renderPassManager.getRenderPassForLayer(renderLayer);
         pass.startDrawing();
+        this.client.getProfiler().push("filterempty");
+        this.client.getProfiler().swap(() -> "render_" + renderLayer);
 
         this.chunkRenderManager.renderLayer(matrixStack, pass, x, y, z);
 
+        this.client.getProfiler().pop();
         pass.endDrawing();
 
         RenderSystem.clearCurrentColor();

src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java

@@ -30,6 +30,7 @@
 import me.jellysquid.mods.sodium.common.util.IdTable;
 import me.jellysquid.mods.sodium.common.util.collections.FutureDequeDrain;
 import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.math.Vector3f;
@@ -503,7 +504,8 @@ public void destroy() {
     }
 
     public int getTotalSections() {
-        return this.columns.size() * 16;
+        int renderDistance = MinecraftClient.getInstance().options.viewDistance * 2 + 1;
+        return renderDistance * 16 * renderDistance;
     }
 
     public void scheduleRebuild(int x, int y, int z, boolean important) {

src/main/java/me/jellysquid/mods/sodium/client/render/occlusion/BlockOcclusionCache.java

@@ -33,6 +33,9 @@ public boolean shouldDrawSide(BlockState selfState, BlockView view, BlockPos pos
         adjPos.set(pos.getX() + facing.getOffsetX(), pos.getY() + facing.getOffsetY(), pos.getZ() + facing.getOffsetZ());
 
         BlockState adjState = view.getBlockState(adjPos);
+        if (adjState == null) {
+            return false;
+        }
 
         if (selfState.isSideInvisible(adjState, facing)) {
             return false;

src/main/java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinBackgroundRenderer.java

@@ -0,0 +1,33 @@
+package me.jellysquid.mods.sodium.mixin.features.chunk_rendering;
+
+import net.minecraft.client.render.BackgroundRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BackgroundRenderer.class)
+public abstract class MixinBackgroundRenderer {
+    @Shadow
+    private static float red;
+
+    @Shadow
+    private static float blue;
+
+    @Shadow
+    private static float green;
+
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;clearColor(FFFF)V"))
+    private static void handleNaNIntensity(CallbackInfo ci) {
+        if (Float.isNaN(red)) {
+            red = 0;
+        }
+        if (Float.isNaN(green)) {
+            green = 0;
+        }
+        if (Float.isNaN(blue)) {
+            blue = 0;
+        }
+    }
+}

src/main/resources/sodium.mixins.json

@@ -27,6 +27,7 @@
     "features.buffer_builder.intrinsics.MixinBufferBuilder",
     "features.buffer_builder.intrinsics.MixinSpriteTexturedVertexConsumer",
     "features.buffer_builder.intrinsics.MixinWorldRenderer",
+    "features.chunk_rendering.MixinBackgroundRenderer",
     "features.chunk_rendering.MixinChunkBuilder",
     "features.chunk_rendering.MixinClientChunkManager",
     "features.chunk_rendering.MixinClientChunkManager$MixinClientChunkMap",