Add stub ChunkLoadingRenderGlobal for 1.7.10
Allows us to get rid of all preprocessor guards around its usages.
This commit is contained in:
@@ -4,6 +4,7 @@ import com.replaymod.core.versions.MCVer;
|
|||||||
import com.replaymod.render.RenderSettings;
|
import com.replaymod.render.RenderSettings;
|
||||||
import com.replaymod.render.blend.BlendState;
|
import com.replaymod.render.blend.BlendState;
|
||||||
import com.replaymod.render.capturer.RenderInfo;
|
import com.replaymod.render.capturer.RenderInfo;
|
||||||
|
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
||||||
import com.replaymod.render.rendering.Pipelines;
|
import com.replaymod.render.rendering.Pipelines;
|
||||||
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
|
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
|
||||||
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
|
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;
|
import static com.replaymod.core.versions.MCVer.getWindow;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//#if MC>=10800
|
|
||||||
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
import static com.replaymod.core.versions.MCVer.getRenderPartialTicks;
|
import static com.replaymod.core.versions.MCVer.getRenderPartialTicks;
|
||||||
|
|
||||||
public class ScreenshotRenderer implements RenderInfo {
|
public class ScreenshotRenderer implements RenderInfo {
|
||||||
@@ -46,9 +43,7 @@ public class ScreenshotRenderer implements RenderInfo {
|
|||||||
boolean hideGUIBefore = mc.options.hudHidden;
|
boolean hideGUIBefore = mc.options.hudHidden;
|
||||||
mc.options.hudHidden = true;
|
mc.options.hudHidden = true;
|
||||||
|
|
||||||
//#if MC>=10800
|
|
||||||
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
||||||
//#endif
|
|
||||||
|
|
||||||
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
|
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
|
||||||
BlendState.setState(new BlendState(settings.getOutputFile()));
|
BlendState.setState(new BlendState(settings.getOutputFile()));
|
||||||
@@ -58,9 +53,7 @@ public class ScreenshotRenderer implements RenderInfo {
|
|||||||
new ScreenshotWriter(settings.getOutputFile())).run();
|
new ScreenshotWriter(settings.getOutputFile())).run();
|
||||||
}
|
}
|
||||||
|
|
||||||
//#if MC>=10800
|
|
||||||
clrg.uninstall();
|
clrg.uninstall();
|
||||||
//#endif
|
|
||||||
|
|
||||||
mc.options.hudHidden = hideGUIBefore;
|
mc.options.hudHidden = hideGUIBefore;
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//#if MC>=10800
|
|
||||||
package com.replaymod.render.hooks;
|
package com.replaymod.render.hooks;
|
||||||
|
|
||||||
import net.minecraft.client.render.WorldRenderer;
|
import net.minecraft.client.render.WorldRenderer;
|
||||||
@@ -10,4 +9,3 @@ public interface IForceChunkLoading {
|
|||||||
return (IForceChunkLoading) worldRenderer;
|
return (IForceChunkLoading) worldRenderer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//#endif
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import com.replaymod.render.events.ReplayRenderCallback;
|
|||||||
import com.replaymod.render.frame.BitmapFrame;
|
import com.replaymod.render.frame.BitmapFrame;
|
||||||
import com.replaymod.render.gui.GuiRenderingDone;
|
import com.replaymod.render.gui.GuiRenderingDone;
|
||||||
import com.replaymod.render.gui.GuiVideoRenderer;
|
import com.replaymod.render.gui.GuiVideoRenderer;
|
||||||
|
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
||||||
import com.replaymod.render.metadata.MetadataInjector;
|
import com.replaymod.render.metadata.MetadataInjector;
|
||||||
import com.replaymod.render.mixin.WorldRendererAccessor;
|
import com.replaymod.render.mixin.WorldRendererAccessor;
|
||||||
import com.replaymod.replay.ReplayHandler;
|
import com.replaymod.replay.ReplayHandler;
|
||||||
@@ -57,7 +58,6 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
|
||||||
import static com.mojang.blaze3d.platform.GlStateManager.*;
|
import static com.mojang.blaze3d.platform.GlStateManager.*;
|
||||||
//#else
|
//#else
|
||||||
//$$ import com.replaymod.replay.gui.screen.GuiOpeningReplay;
|
//$$ import com.replaymod.replay.gui.screen.GuiOpeningReplay;
|
||||||
@@ -95,9 +95,7 @@ public class VideoRenderer implements RenderInfo {
|
|||||||
|
|
||||||
private TimelinePlayer timelinePlayer;
|
private TimelinePlayer timelinePlayer;
|
||||||
private Future<Void> timelinePlayerFuture;
|
private Future<Void> timelinePlayerFuture;
|
||||||
//#if MC>=10800
|
|
||||||
private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal;
|
private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal;
|
||||||
//#endif
|
|
||||||
//#if MC<10800
|
//#if MC<10800
|
||||||
//$$ private GuiOpeningReplay guiOpeningReplay;
|
//$$ private GuiOpeningReplay guiOpeningReplay;
|
||||||
//#endif
|
//#endif
|
||||||
@@ -371,9 +369,7 @@ public class VideoRenderer implements RenderInfo {
|
|||||||
//$$ gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight());
|
//$$ gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight());
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//#if MC>=10800
|
|
||||||
chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
||||||
//#endif
|
|
||||||
|
|
||||||
// Set up our own framebuffer to render the GUI to
|
// Set up our own framebuffer to render the GUI to
|
||||||
guiFramebuffer = new Framebuffer(displayWidth, displayHeight, true
|
guiFramebuffer = new Framebuffer(displayWidth, displayHeight, true
|
||||||
@@ -408,11 +404,7 @@ public class VideoRenderer implements RenderInfo {
|
|||||||
mc.options.setSoundVolume(entry.getKey(), entry.getValue());
|
mc.options.setSoundVolume(entry.getKey(), entry.getValue());
|
||||||
}
|
}
|
||||||
mc.openScreen(null);
|
mc.openScreen(null);
|
||||||
//#if MC>=10800
|
chunkLoadingRenderGlobal.uninstall();
|
||||||
if (chunkLoadingRenderGlobal != null) {
|
|
||||||
chunkLoadingRenderGlobal.uninstall();
|
|
||||||
}
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
if (!hasFailed() && cameraPathExporter != null) {
|
if (!hasFailed() && cameraPathExporter != null) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//#if MC>=10800
|
|
||||||
package com.replaymod.render.hooks;
|
package com.replaymod.render.hooks;
|
||||||
|
|
||||||
import com.replaymod.render.mixin.ChunkRenderDispatcherAccessor;
|
import com.replaymod.render.mixin.ChunkRenderDispatcherAccessor;
|
||||||
@@ -130,4 +129,3 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
IForceChunkLoading.from(hooked).replayModRender_setHook(null);
|
IForceChunkLoading.from(hooked).replayModRender_setHook(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//#endif
|
|
||||||
|
|||||||
@@ -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() {
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user