From ad533bcae95633fcbc2e27809219a8d011c1d9f4 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 6 Jan 2024 20:43:36 -0800 Subject: [PATCH] Don't remap, and throw early --- src/main/java/com/gtnewhorizons/angelica/glsm/VBOManager.java | 1 + .../angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/VBOManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/VBOManager.java index edc9bae9a..65adcab7e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/VBOManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/VBOManager.java @@ -31,6 +31,7 @@ public class VBOManager { } public static VertexBuffer registerVBO(int displayList, VertexBuffer vertexBuffer) { + if(displayList > 0) throw new IllegalArgumentException("Display list must be negative!"); displayList -= Integer.MIN_VALUE; final int requestedSize = displayList + 1; if(requestedSize + 1 > vertexBuffers.size()) { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java index b588313a6..e03ec8a8c 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java @@ -28,7 +28,7 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture { @Shadow public Minecraft mc; @Shadow private int cloudTickCounter; - @Redirect(method="", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 0), remap = false) + @Redirect(method="", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 0)) private int generateGLRenderListBaseDisplayLists(int range) { return AngelicaConfig.enableSodium ? -1 : GLAllocation.generateDisplayLists(range); }