From 74580e6649a82e3be123f3dfcea5682e99a0107e Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 23 Feb 2021 11:27:36 +0100 Subject: [PATCH] Remove redundant preprocessor statements --- .../hooks/ChunkLoadingRenderGlobal.java | 20 +------------------ .../render/mixin/Mixin_ForceChunkLoading.java | 11 +--------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java index f15097cf..f43a0c9c 100644 --- a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java +++ b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java @@ -27,11 +27,7 @@ import java.util.concurrent.PriorityBlockingQueue; public class ChunkLoadingRenderGlobal { - //#if MC>=11400 private final WorldRenderer hooked; - //#else - //$$ private final RenderGlobal hooked; - //#endif //#if MC>=11500 //#else @@ -45,13 +41,7 @@ public class ChunkLoadingRenderGlobal { //$$ private int frame; //#endif - public ChunkLoadingRenderGlobal( - //#if MC>=11400 - WorldRenderer renderGlobal - //#else - //$$ RenderGlobal renderGlobal - //#endif - ) { + public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) { this.hooked = renderGlobal; //#if MC>=11500 @@ -64,11 +54,7 @@ public class ChunkLoadingRenderGlobal { private void install() { try { - //#if MC>=11400 Field hookField = WorldRenderer.class.getField("replayModRender_hook"); - //#else - //$$ Field hookField = RenderGlobal.class.getField("replayModRender_hook"); - //#endif hookField.set(hooked, this); } catch (NoSuchFieldException | IllegalAccessException e) { throw new Error(e); @@ -168,11 +154,7 @@ public class ChunkLoadingRenderGlobal { //#endif try { - //#if MC>=11400 Field hookField = WorldRenderer.class.getField("replayModRender_hook"); - //#else - //$$ Field hookField = RenderGlobal.class.getField("replayModRender_hook"); - //#endif hookField.set(hooked, null); } catch (NoSuchFieldException | IllegalAccessException e) { throw new Error(e); diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java b/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java index f7b8b80b..23f98910 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java @@ -5,6 +5,7 @@ import com.replaymod.compat.shaders.ShaderReflection; import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; import net.minecraft.client.render.Camera; import net.minecraft.client.render.Frustum; +import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.chunk.ChunkBuilder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -23,23 +24,13 @@ import java.util.Set; //$$ import net.minecraft.client.render.Camera; //#endif -//#if MC>=11400 -import net.minecraft.client.render.WorldRenderer; -//#else -//$$ import net.minecraft.client.renderer.RenderGlobal; -//#endif - //#if MC<10904 //$$ import net.minecraft.client.renderer.chunk.RenderChunk; //$$ import net.minecraft.util.BlockPos; //$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; //#endif -//#if MC>=11400 @Mixin(WorldRenderer.class) -//#else -//$$ @Mixin(RenderGlobal.class) -//#endif public abstract class Mixin_ForceChunkLoading { public ChunkLoadingRenderGlobal replayModRender_hook;