fixed bug with optifine shaders

huihiuhuai · Nov 14, 2024 · 57fc786 · 57fc786
1 parent 7ced94e
commit 57fc786
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/src/main/java/com/falsepattern/rple/internal/client/lightmap/LightMap.java b/src/main/java/com/falsepattern/rple/internal/client/lightmap/LightMap.java
@@ -84,7 +84,6 @@ public void toggleEnabled(boolean enabled) {
 
     public void disable() {
         resetScale();
-        unbind();
     }
 
     public void enable() {
@@ -98,12 +97,6 @@ public void bind() {
         bTexture.bind();
     }
 
-    public void unbind() {
-        rTexture.unbind();
-        gTexture.unbind();
-        bTexture.unbind();
-    }
-
     public void resetScale() {
         rTexture.resetScale();
         gTexture.resetScale();

diff --git a/src/main/java/com/falsepattern/rple/internal/client/lightmap/LightMapTexture.java b/src/main/java/com/falsepattern/rple/internal/client/lightmap/LightMapTexture.java
@@ -190,7 +190,6 @@ public void resetScale() {
             GL13.glActiveTexture(shaderTextureCoordsBinding);
         } else {
             GL13.glActiveTexture(fixedTextureUnitBinding);
-            GL11.glEnable(GL11.GL_TEXTURE_2D);
         }
         val lastMatrixMode = GL11.glGetInteger(GL11.GL_MATRIX_MODE);
         GL11.glMatrixMode(GL11.GL_TEXTURE);

diff --git a/src/main/java/com/falsepattern/rple/internal/mixin/mixins/client/EntityRendererMixin.java b/src/main/java/com/falsepattern/rple/internal/mixin/mixins/client/EntityRendererMixin.java
@@ -67,11 +67,9 @@ private void setupColorLightMaps(Minecraft minecraft, IResourceManager resourceM
 
     @Inject(method = "disableLightmap",
             at = @At("HEAD"),
-            cancellable = true,
             require = 1)
     private void disableLightMaps(double p_78463_1_, CallbackInfo ci) {
         LightMap.lightMap().disable();
-        ci.cancel();
     }
 
     @Inject(method = "enableLightmap",