From c620086ed19eb523dfde8345683bcc651bced9b0 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 24 Dec 2023 19:03:38 +1030 Subject: [PATCH] Revert "Fixed 1.20.4 forge remap" This reverts commit 0d565895e22b5219f34aa2f836a538a4e1b2b66b. --- .../forge/mixins/client/MixinDynamicTexture.java | 7 +------ .../forge/mixins/client/MixinLevelRenderer.java | 3 --- .../forge/mixins/client/MixinLightTexture.java | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java index 4efbcd350..3f02eb37d 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java @@ -38,19 +38,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import javax.annotation.Nullable; - @Mixin(DynamicTexture.class) -public abstract class MixinDynamicTexture implements ILightTextureMarker +public class MixinDynamicTexture implements ILightTextureMarker { /** Used to prevent accidentally using other dynamic textures as a lightmap */ @Unique private boolean isLightTexture = false; @Shadow - #if MC_VER >= MC_1_20_4 - (remap = false) - #endif @Final private NativeImage pixels; diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index f11c3f6ab..2239adb4f 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -74,9 +74,6 @@ import org.lwjgl.opengl.GL15; public class MixinLevelRenderer { @Shadow - #if MC_VER >= MC_1_20_4 - (remap = false) - #endif private ClientLevel level; @Unique private static float previousPartialTicks = 0; diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java index 9bafb8a8f..f350a1754 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java @@ -36,9 +36,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MixinLightTexture { @Shadow - #if MC_VER >= MC_1_20_4 - (remap = false) - #endif @Final private DynamicTexture lightTexture;