From ab5b101f96bfef4f1b3fd0ef54aa20de1bab58ed Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 23 Feb 2021 12:01:15 +0100 Subject: [PATCH] Add stub ChunkLoadingRenderGlobal for 1.7.10 Allows us to get rid of all preprocessor guards around its usages. --- .../advancedscreenshots/ScreenshotRenderer.java | 9 +-------- .../replaymod/render/hooks/IForceChunkLoading.java | 2 -- .../replaymod/render/rendering/VideoRenderer.java | 12 ++---------- .../render/hooks/ChunkLoadingRenderGlobal.java | 2 -- .../render/hooks/ChunkLoadingRenderGlobal.java | 11 +++++++++++ 5 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java index e5b292e3..4a0e2e98 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java @@ -4,6 +4,7 @@ import com.replaymod.core.versions.MCVer; import com.replaymod.render.RenderSettings; import com.replaymod.render.blend.BlendState; import com.replaymod.render.capturer.RenderInfo; +import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; import com.replaymod.render.rendering.Pipelines; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; @@ -15,10 +16,6 @@ import com.replaymod.render.mixin.MainWindowAccessor; import static com.replaymod.core.versions.MCVer.getWindow; //#endif -//#if MC>=10800 -import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; -//#endif - import static com.replaymod.core.versions.MCVer.getRenderPartialTicks; public class ScreenshotRenderer implements RenderInfo { @@ -46,9 +43,7 @@ public class ScreenshotRenderer implements RenderInfo { boolean hideGUIBefore = mc.options.hudHidden; mc.options.hudHidden = true; - //#if MC>=10800 ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer); - //#endif if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) { BlendState.setState(new BlendState(settings.getOutputFile())); @@ -58,9 +53,7 @@ public class ScreenshotRenderer implements RenderInfo { new ScreenshotWriter(settings.getOutputFile())).run(); } - //#if MC>=10800 clrg.uninstall(); - //#endif mc.options.hudHidden = hideGUIBefore; //#if MC>=11400 diff --git a/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java b/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java index 57b8c943..83de7bcc 100644 --- a/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java +++ b/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java @@ -1,4 +1,3 @@ -//#if MC>=10800 package com.replaymod.render.hooks; import net.minecraft.client.render.WorldRenderer; @@ -10,4 +9,3 @@ public interface IForceChunkLoading { return (IForceChunkLoading) worldRenderer; } } -//#endif diff --git a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java index 46f56a04..9dd07878 100644 --- a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java +++ b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java @@ -17,6 +17,7 @@ import com.replaymod.render.events.ReplayRenderCallback; import com.replaymod.render.frame.BitmapFrame; import com.replaymod.render.gui.GuiRenderingDone; import com.replaymod.render.gui.GuiVideoRenderer; +import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; import com.replaymod.render.metadata.MetadataInjector; import com.replaymod.render.mixin.WorldRendererAccessor; import com.replaymod.replay.ReplayHandler; @@ -57,7 +58,6 @@ import java.util.concurrent.CompletableFuture; //#endif //#if MC>=10800 -import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; import static com.mojang.blaze3d.platform.GlStateManager.*; //#else //$$ import com.replaymod.replay.gui.screen.GuiOpeningReplay; @@ -95,9 +95,7 @@ public class VideoRenderer implements RenderInfo { private TimelinePlayer timelinePlayer; private Future timelinePlayerFuture; - //#if MC>=10800 private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal; - //#endif //#if MC<10800 //$$ private GuiOpeningReplay guiOpeningReplay; //#endif @@ -371,9 +369,7 @@ public class VideoRenderer implements RenderInfo { //$$ gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight()); //#endif - //#if MC>=10800 chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.worldRenderer); - //#endif // Set up our own framebuffer to render the GUI to guiFramebuffer = new Framebuffer(displayWidth, displayHeight, true @@ -408,11 +404,7 @@ public class VideoRenderer implements RenderInfo { mc.options.setSoundVolume(entry.getKey(), entry.getValue()); } mc.openScreen(null); - //#if MC>=10800 - if (chunkLoadingRenderGlobal != null) { - chunkLoadingRenderGlobal.uninstall(); - } - //#endif + chunkLoadingRenderGlobal.uninstall(); if (!hasFailed() && cameraPathExporter != null) { try { diff --git a/versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java index 6b1acf48..c87e64a8 100644 --- a/versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java +++ b/versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java @@ -1,4 +1,3 @@ -//#if MC>=10800 package com.replaymod.render.hooks; import com.replaymod.render.mixin.ChunkRenderDispatcherAccessor; @@ -130,4 +129,3 @@ public class ChunkLoadingRenderGlobal { IForceChunkLoading.from(hooked).replayModRender_setHook(null); } } -//#endif diff --git a/versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java new file mode 100644 index 00000000..7366d092 --- /dev/null +++ b/versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java @@ -0,0 +1,11 @@ +package com.replaymod.render.hooks; + +import net.minecraft.client.renderer.RenderGlobal; + +public class ChunkLoadingRenderGlobal { + public ChunkLoadingRenderGlobal(RenderGlobal renderGlobal) { + } + + public void uninstall() { + } +}