Rename ChunkLoadingRenderGlobal → ForceChunkLoadingHook
More descriptive, less MCP.
This commit is contained in:
@@ -4,7 +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.hooks.ForceChunkLoadingHook;
|
||||||
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;
|
||||||
@@ -43,7 +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;
|
||||||
|
|
||||||
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
ForceChunkLoadingHook clrg = new ForceChunkLoadingHook(mc.worldRenderer);
|
||||||
|
|
||||||
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
|
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
|
||||||
BlendState.setState(new BlendState(settings.getOutputFile()));
|
BlendState.setState(new BlendState(settings.getOutputFile()));
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ package com.replaymod.render.hooks;
|
|||||||
|
|
||||||
import net.minecraft.client.render.WorldRenderer;
|
import net.minecraft.client.render.WorldRenderer;
|
||||||
|
|
||||||
public class ChunkLoadingRenderGlobal {
|
public class ForceChunkLoadingHook {
|
||||||
|
|
||||||
private final WorldRenderer hooked;
|
private final WorldRenderer hooked;
|
||||||
|
|
||||||
public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) {
|
public ForceChunkLoadingHook(WorldRenderer renderGlobal) {
|
||||||
this.hooked = renderGlobal;
|
this.hooked = renderGlobal;
|
||||||
|
|
||||||
IForceChunkLoading.from(renderGlobal).replayModRender_setHook(this);
|
IForceChunkLoading.from(renderGlobal).replayModRender_setHook(this);
|
||||||
@@ -3,7 +3,7 @@ package com.replaymod.render.hooks;
|
|||||||
import net.minecraft.client.render.WorldRenderer;
|
import net.minecraft.client.render.WorldRenderer;
|
||||||
|
|
||||||
public interface IForceChunkLoading {
|
public interface IForceChunkLoading {
|
||||||
void replayModRender_setHook(ChunkLoadingRenderGlobal hook);
|
void replayModRender_setHook(ForceChunkLoadingHook hook);
|
||||||
|
|
||||||
static IForceChunkLoading from(WorldRenderer worldRenderer) {
|
static IForceChunkLoading from(WorldRenderer worldRenderer) {
|
||||||
return (IForceChunkLoading) worldRenderer;
|
return (IForceChunkLoading) worldRenderer;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package com.replaymod.render.mixin;
|
|||||||
|
|
||||||
//#if MC>=11500
|
//#if MC>=11500
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
import com.replaymod.render.hooks.ForceChunkLoadingHook;
|
||||||
import net.minecraft.client.render.chunk.BlockBufferBuilderStorage;
|
import net.minecraft.client.render.chunk.BlockBufferBuilderStorage;
|
||||||
import net.minecraft.client.render.chunk.ChunkBuilder;
|
import net.minecraft.client.render.chunk.ChunkBuilder;
|
||||||
import net.minecraft.util.thread.TaskExecutor;
|
import net.minecraft.util.thread.TaskExecutor;
|
||||||
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Lock;
|
|||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
|
||||||
@Mixin(ChunkBuilder.class)
|
@Mixin(ChunkBuilder.class)
|
||||||
public abstract class Mixin_BlockOnChunkRebuilds implements ChunkLoadingRenderGlobal.IBlockOnChunkRebuilds {
|
public abstract class Mixin_BlockOnChunkRebuilds implements ForceChunkLoadingHook.IBlockOnChunkRebuilds {
|
||||||
@Shadow @Final private Queue<BlockBufferBuilderStorage> threadBuffers;
|
@Shadow @Final private Queue<BlockBufferBuilderStorage> threadBuffers;
|
||||||
|
|
||||||
@Shadow public abstract boolean upload();
|
@Shadow public abstract boolean upload();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.replaymod.render.mixin;
|
package com.replaymod.render.mixin;
|
||||||
|
|
||||||
import com.replaymod.compat.shaders.ShaderReflection;
|
import com.replaymod.compat.shaders.ShaderReflection;
|
||||||
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
import com.replaymod.render.hooks.ForceChunkLoadingHook;
|
||||||
import com.replaymod.render.hooks.IForceChunkLoading;
|
import com.replaymod.render.hooks.IForceChunkLoading;
|
||||||
import net.minecraft.client.render.Camera;
|
import net.minecraft.client.render.Camera;
|
||||||
import net.minecraft.client.render.Frustum;
|
import net.minecraft.client.render.Frustum;
|
||||||
@@ -17,10 +17,10 @@ import java.util.Set;
|
|||||||
|
|
||||||
@Mixin(WorldRenderer.class)
|
@Mixin(WorldRenderer.class)
|
||||||
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
|
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
|
||||||
private ChunkLoadingRenderGlobal replayModRender_hook;
|
private ForceChunkLoadingHook replayModRender_hook;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void replayModRender_setHook(ChunkLoadingRenderGlobal hook) {
|
public void replayModRender_setHook(ForceChunkLoadingHook hook) {
|
||||||
this.replayModRender_hook = hook;
|
this.replayModRender_hook = hook;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
|
|||||||
this.chunksToRebuild.clear();
|
this.chunksToRebuild.clear();
|
||||||
|
|
||||||
// Upload all chunks
|
// Upload all chunks
|
||||||
this.needsTerrainUpdate |= ((ChunkLoadingRenderGlobal.IBlockOnChunkRebuilds) this.chunkBuilder).uploadEverythingBlocking();
|
this.needsTerrainUpdate |= ((ForceChunkLoadingHook.IBlockOnChunkRebuilds) this.chunkBuilder).uploadEverythingBlocking();
|
||||||
|
|
||||||
// Repeat until no more updates are needed
|
// Repeat until no more updates are needed
|
||||||
} while (this.needsTerrainUpdate);
|
} while (this.needsTerrainUpdate);
|
||||||
|
|||||||
@@ -17,7 +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.hooks.ForceChunkLoadingHook;
|
||||||
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;
|
||||||
@@ -95,7 +95,7 @@ public class VideoRenderer implements RenderInfo {
|
|||||||
|
|
||||||
private TimelinePlayer timelinePlayer;
|
private TimelinePlayer timelinePlayer;
|
||||||
private Future<Void> timelinePlayerFuture;
|
private Future<Void> timelinePlayerFuture;
|
||||||
private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal;
|
private ForceChunkLoadingHook forceChunkLoadingHook;
|
||||||
//#if MC<10800
|
//#if MC<10800
|
||||||
//$$ private GuiOpeningReplay guiOpeningReplay;
|
//$$ private GuiOpeningReplay guiOpeningReplay;
|
||||||
//#endif
|
//#endif
|
||||||
@@ -369,7 +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
|
||||||
|
|
||||||
chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.worldRenderer);
|
forceChunkLoadingHook = new ForceChunkLoadingHook(mc.worldRenderer);
|
||||||
|
|
||||||
// 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
|
||||||
@@ -404,7 +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);
|
||||||
chunkLoadingRenderGlobal.uninstall();
|
forceChunkLoadingHook.uninstall();
|
||||||
|
|
||||||
if (!hasFailed() && cameraPathExporter != null) {
|
if (!hasFailed() && cameraPathExporter != null) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import java.util.concurrent.PriorityBlockingQueue;
|
|||||||
|
|
||||||
import static com.replaymod.core.versions.MCVer.ChunkRenderWorkerAccessor;
|
import static com.replaymod.core.versions.MCVer.ChunkRenderWorkerAccessor;
|
||||||
|
|
||||||
public class ChunkLoadingRenderGlobal {
|
public class ForceChunkLoadingHook {
|
||||||
|
|
||||||
private final WorldRenderer hooked;
|
private final WorldRenderer hooked;
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
private ChunkRenderWorkerAccessor renderWorker;
|
private ChunkRenderWorkerAccessor renderWorker;
|
||||||
private int frame;
|
private int frame;
|
||||||
|
|
||||||
public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) {
|
public ForceChunkLoadingHook(WorldRenderer renderGlobal) {
|
||||||
this.hooked = renderGlobal;
|
this.hooked = renderGlobal;
|
||||||
|
|
||||||
setup(((WorldRendererAccessor) renderGlobal).getRenderDispatcher());
|
setup(((WorldRendererAccessor) renderGlobal).getRenderDispatcher());
|
||||||
@@ -2,7 +2,7 @@ package com.replaymod.render.mixin;
|
|||||||
|
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
import com.replaymod.compat.shaders.ShaderReflection;
|
import com.replaymod.compat.shaders.ShaderReflection;
|
||||||
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
|
import com.replaymod.render.hooks.ForceChunkLoadingHook;
|
||||||
import com.replaymod.render.hooks.IForceChunkLoading;
|
import com.replaymod.render.hooks.IForceChunkLoading;
|
||||||
import net.minecraft.client.render.VisibleRegion;
|
import net.minecraft.client.render.VisibleRegion;
|
||||||
import net.minecraft.client.render.WorldRenderer;
|
import net.minecraft.client.render.WorldRenderer;
|
||||||
@@ -27,10 +27,10 @@ import net.minecraft.client.render.Camera;
|
|||||||
|
|
||||||
@Mixin(WorldRenderer.class)
|
@Mixin(WorldRenderer.class)
|
||||||
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
|
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
|
||||||
private ChunkLoadingRenderGlobal replayModRender_hook;
|
private ForceChunkLoadingHook replayModRender_hook;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void replayModRender_setHook(ChunkLoadingRenderGlobal hook) {
|
public void replayModRender_setHook(ForceChunkLoadingHook hook) {
|
||||||
this.replayModRender_hook = hook;
|
this.replayModRender_hook = hook;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package com.replaymod.render.hooks;
|
|||||||
|
|
||||||
import net.minecraft.client.renderer.RenderGlobal;
|
import net.minecraft.client.renderer.RenderGlobal;
|
||||||
|
|
||||||
public class ChunkLoadingRenderGlobal {
|
public class ForceChunkLoadingHook {
|
||||||
public ChunkLoadingRenderGlobal(RenderGlobal renderGlobal) {
|
public ForceChunkLoadingHook(RenderGlobal renderGlobal) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void uninstall() {
|
public void uninstall() {
|
||||||
Reference in New Issue
Block a user