Refactor RenderHelper

2 files changed, 8 insertions, 19 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
index b64a8404..3d8213fe 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
@@ -71,7 +71,7 @@ public class RenderHelper {
         matrices.translate(-camera.x, -camera.y, -camera.z);
 
         VertexConsumerProvider consumers = context.consumers();
-        VertexConsumer buffer = throughWalls ? consumers.getBuffer(SRenderLayers.getFilledThroughWalls()) : consumers.getBuffer(SRenderLayers.getFilled());
+        VertexConsumer buffer = consumers.getBuffer(throughWalls ? SkyblockerRenderLayers.FILLED_THROUGH_WALLS : SkyblockerRenderLayers.FILLED);
 
         WorldRenderer.renderFilledBox(matrices, buffer, pos.x, pos.y, pos.z, pos.x + dimensions.x, pos.y + dimensions.y, pos.z + dimensions.z, colorComponents[0], colorComponents[1], colorComponents[2], alpha);
 
@@ -267,18 +267,14 @@ public class RenderHelper {
     public static void runOnRenderThread(Runnable runnable) {
         if (RenderSystem.isOnRenderThread()) {
             runnable.run();
-
-            return;
         } else if (SCHEDULE_DEFERRED_RENDER_TASK != null) { //Sodium
             try {
                 SCHEDULE_DEFERRED_RENDER_TASK.invokeExact(runnable);
             } catch (Throwable t) {
                 LOGGER.error("[Skyblocker] Failed to schedule a render task!", t);
             }
-
-            return;
         } else { //Vanilla
-            RenderSystem.recordRenderCall(() -> runnable.run());
+            RenderSystem.recordRenderCall(runnable::run);
         }
     }
 
@@ -316,7 +312,8 @@ public class RenderHelper {
     public static boolean pointIsInArea(double x, double y, double x1, double y1, double x2, double y2) {
         return x >= x1 && x <= x2 && y >= y1 && y <= y2;
     }
-    
+
+    // TODO Get rid of reflection once the new Sodium is released
     private static MethodHandle getDeferredRenderTaskHandle() {
         try {
             Class<?> deferredTaskClass = Class.forName("me.jellysquid.mods.sodium.client.render.util.DeferredRenderTask");
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/SRenderLayers.java b/src/main/java/de/hysky/skyblocker/utils/render/SkyblockerRenderLayers.java
index e2725767..ee113cc4 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/SRenderLayers.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/SkyblockerRenderLayers.java
@@ -12,13 +12,13 @@ import net.minecraft.client.render.RenderPhase.Transparency;
 import net.minecraft.client.render.VertexFormat.DrawMode;
 import net.minecraft.client.render.VertexFormats;
 
-public class SRenderLayers {
+public class SkyblockerRenderLayers {
 	private static final Transparency DEFAULT_TRANSPARENCY = new Transparency("default_transparency", () -> {
 		RenderSystem.enableBlend();
 		RenderSystem.defaultBlendFunc();
-	}, () -> RenderSystem.disableBlend());
+	}, RenderSystem::disableBlend);
 	
-	private static final MultiPhase FILLED = RenderLayer.of("filled", VertexFormats.POSITION_COLOR, DrawMode.TRIANGLE_STRIP, RenderLayer.CUTOUT_BUFFER_SIZE, false, true, MultiPhaseParameters.builder()
+	public static final MultiPhase FILLED = RenderLayer.of("filled", VertexFormats.POSITION_COLOR, DrawMode.TRIANGLE_STRIP, RenderLayer.CUTOUT_BUFFER_SIZE, false, true, MultiPhaseParameters.builder()
 			.program(RenderPhase.COLOR_PROGRAM)
 			.cull(Cull.DISABLE_CULLING)
 			.layering(RenderPhase.POLYGON_OFFSET_LAYERING)
@@ -26,19 +26,11 @@ public class SRenderLayers {
 			.depthTest(DepthTest.LEQUAL_DEPTH_TEST)
 			.build(false));
 	
-	private static final MultiPhase FILLED_THROUGH_WALLS = RenderLayer.of("filled_through_walls", VertexFormats.POSITION_COLOR, DrawMode.TRIANGLE_STRIP, RenderLayer.CUTOUT_BUFFER_SIZE, false, true, MultiPhaseParameters.builder()
+	public static final MultiPhase FILLED_THROUGH_WALLS = RenderLayer.of("filled_through_walls", VertexFormats.POSITION_COLOR, DrawMode.TRIANGLE_STRIP, RenderLayer.CUTOUT_BUFFER_SIZE, false, true, MultiPhaseParameters.builder()
 			.program(RenderPhase.COLOR_PROGRAM)
 			.cull(Cull.DISABLE_CULLING)
 			.layering(RenderPhase.POLYGON_OFFSET_LAYERING)
 			.transparency(DEFAULT_TRANSPARENCY)
 			.depthTest(DepthTest.ALWAYS_DEPTH_TEST)
 			.build(false));
-	
-	public static MultiPhase getFilled() {
-		return FILLED;
-	}
-		
-	public static MultiPhase getFilledThroughWalls() {
-		return FILLED_THROUGH_WALLS;
-	}
 }