DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ChunkLoadingRenderGlobal → ForceChunkLoadingHook

Browse Source 
More descriptive, less MCP.
This commit is contained in:
Jonas Herzig
2021-02-23 12:06:15 +01:00
parent ab5b101f96
commit 3fbb4b50ea
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java
View File

@@ -4,7 +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.hooks.ForceChunkLoadingHook;
import com.replaymod.render.rendering.Pipelines;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
@@ -43,7 +43,7 @@ public class ScreenshotRenderer implements RenderInfo {
boolean hideGUIBefore = mc.options.hudHidden;
mc.options.hudHidden = true;
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
ForceChunkLoadingHook clrg = new ForceChunkLoadingHook(mc.worldRenderer);
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
BlendState.setState(new BlendState(settings.getOutputFile()));

4
src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java → src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java
View File

@@ -2,11 +2,11 @@ package com.replaymod.render.hooks;
import net.minecraft.client.render.WorldRenderer;
public class ChunkLoadingRenderGlobal {
public class ForceChunkLoadingHook {
private final WorldRenderer hooked;
public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) {
public ForceChunkLoadingHook(WorldRenderer renderGlobal) {
this.hooked = renderGlobal;
IForceChunkLoading.from(renderGlobal).replayModRender_setHook(this);

2
src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java
View File

@@ -3,7 +3,7 @@ package com.replaymod.render.hooks;
import net.minecraft.client.render.WorldRenderer;
public interface IForceChunkLoading {
void replayModRender_setHook(ChunkLoadingRenderGlobal hook);
void replayModRender_setHook(ForceChunkLoadingHook hook);
static IForceChunkLoading from(WorldRenderer worldRenderer) {
return (IForceChunkLoading) worldRenderer;

4
src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java
View File

@@ -2,7 +2,7 @@ package com.replaymod.render.mixin;
//#if MC>=11500
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.ChunkBuilder;
import net.minecraft.util.thread.TaskExecutor;
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@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 public abstract boolean upload();

8
src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java
View File

@@ -1,7 +1,7 @@
package com.replaymod.render.mixin;
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 net.minecraft.client.render.Camera;
import net.minecraft.client.render.Frustum;
@@ -17,10 +17,10 @@ import java.util.Set;
@Mixin(WorldRenderer.class)
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
private ChunkLoadingRenderGlobal replayModRender_hook;
private ForceChunkLoadingHook replayModRender_hook;
@Override
public void replayModRender_setHook(ChunkLoadingRenderGlobal hook) {
public void replayModRender_setHook(ForceChunkLoadingHook hook) {
this.replayModRender_hook = hook;
}
@@ -66,7 +66,7 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
this.chunksToRebuild.clear();
// Upload all chunks
this.needsTerrainUpdate |= ((ChunkLoadingRenderGlobal.IBlockOnChunkRebuilds) this.chunkBuilder).uploadEverythingBlocking();
this.needsTerrainUpdate |= ((ForceChunkLoadingHook.IBlockOnChunkRebuilds) this.chunkBuilder).uploadEverythingBlocking();
// Repeat until no more updates are needed
} while (this.needsTerrainUpdate);

8
src/main/java/com/replaymod/render/rendering/VideoRenderer.java
View File

@@ -17,7 +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.hooks.ForceChunkLoadingHook;
import com.replaymod.render.metadata.MetadataInjector;
import com.replaymod.render.mixin.WorldRendererAccessor;
import com.replaymod.replay.ReplayHandler;
@@ -95,7 +95,7 @@ public class VideoRenderer implements RenderInfo {
private TimelinePlayer timelinePlayer;
private Future<Void> timelinePlayerFuture;
private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal;
private ForceChunkLoadingHook forceChunkLoadingHook;
//#if MC<10800
//$$ private GuiOpeningReplay guiOpeningReplay;
//#endif
@@ -369,7 +369,7 @@ public class VideoRenderer implements RenderInfo {
//$$ gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight());
//#endif
chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.worldRenderer);
forceChunkLoadingHook = new ForceChunkLoadingHook(mc.worldRenderer);
// Set up our own framebuffer to render the GUI to
guiFramebuffer = new Framebuffer(displayWidth, displayHeight, true
@@ -404,7 +404,7 @@ public class VideoRenderer implements RenderInfo {
mc.options.setSoundVolume(entry.getKey(), entry.getValue());
}
mc.openScreen(null);
chunkLoadingRenderGlobal.uninstall();
forceChunkLoadingHook.uninstall();
if (!hasFailed() && cameraPathExporter != null) {
try {

4
versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java → versions/1.14.4/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java
View File

@@ -20,7 +20,7 @@ import java.util.concurrent.PriorityBlockingQueue;
import static com.replaymod.core.versions.MCVer.ChunkRenderWorkerAccessor;
public class ChunkLoadingRenderGlobal {
public class ForceChunkLoadingHook {
private final WorldRenderer hooked;
@@ -33,7 +33,7 @@ public class ChunkLoadingRenderGlobal {
private ChunkRenderWorkerAccessor renderWorker;
private int frame;
public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) {
public ForceChunkLoadingHook(WorldRenderer renderGlobal) {
this.hooked = renderGlobal;
setup(((WorldRendererAccessor) renderGlobal).getRenderDispatcher());

6
versions/1.14.4/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java
View File

@@ -2,7 +2,7 @@ package com.replaymod.render.mixin;
//#if MC>=10800
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 net.minecraft.client.render.VisibleRegion;
import net.minecraft.client.render.WorldRenderer;
@@ -27,10 +27,10 @@ import net.minecraft.client.render.Camera;
@Mixin(WorldRenderer.class)
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
private ChunkLoadingRenderGlobal replayModRender_hook;
private ForceChunkLoadingHook replayModRender_hook;
@Override
public void replayModRender_setHook(ChunkLoadingRenderGlobal hook) {
public void replayModRender_setHook(ForceChunkLoadingHook hook) {
this.replayModRender_hook = hook;
}

4
versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java → versions/1.7.10/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java
View File

@@ -2,8 +2,8 @@ package com.replaymod.render.hooks;
import net.minecraft.client.renderer.RenderGlobal;
public class ChunkLoadingRenderGlobal {
public ChunkLoadingRenderGlobal(RenderGlobal renderGlobal) {
public class ForceChunkLoadingHook {
public ForceChunkLoadingHook(RenderGlobal renderGlobal) {
}
public void uninstall() {