From 3fbb4b50ea277de2ef1f25374aa5943f51840ed9 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 23 Feb 2021 12:06:15 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20ChunkLoadingRenderGlobal=20=E2=86=92?= =?UTF-8?q?=20ForceChunkLoadingHook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More descriptive, less MCP. --- .../extras/advancedscreenshots/ScreenshotRenderer.java | 4 ++-- ...oadingRenderGlobal.java => ForceChunkLoadingHook.java} | 4 ++-- .../com/replaymod/render/hooks/IForceChunkLoading.java | 2 +- .../render/mixin/Mixin_BlockOnChunkRebuilds.java | 4 ++-- .../replaymod/render/mixin/Mixin_ForceChunkLoading.java | 8 ++++---- .../com/replaymod/render/rendering/VideoRenderer.java | 8 ++++---- ...oadingRenderGlobal.java => ForceChunkLoadingHook.java} | 4 ++-- .../replaymod/render/mixin/Mixin_ForceChunkLoading.java | 6 +++--- ...oadingRenderGlobal.java => ForceChunkLoadingHook.java} | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/com/replaymod/render/hooks/{ChunkLoadingRenderGlobal.java => ForceChunkLoadingHook.java} (81%) rename versions/1.14.4/src/main/java/com/replaymod/render/hooks/{ChunkLoadingRenderGlobal.java => ForceChunkLoadingHook.java} (97%) rename versions/1.7.10/src/main/java/com/replaymod/render/hooks/{ChunkLoadingRenderGlobal.java => ForceChunkLoadingHook.java} (56%) diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java index 4a0e2e98..7b730a86 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java @@ -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())); diff --git a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java similarity index 81% rename from src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java rename to src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java index 147a0a20..14143698 100644 --- a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java +++ b/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java @@ -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); diff --git a/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java b/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java index 83de7bcc..7c21c77e 100644 --- a/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java +++ b/src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java @@ -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; diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java b/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java index dff22e27..a11818c4 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_BlockOnChunkRebuilds.java @@ -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 threadBuffers; @Shadow public abstract boolean upload(); 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 eb322b1c..3312a60e 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java @@ -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); diff --git a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java index 9dd07878..1fa40c7c 100644 --- a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java +++ b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java @@ -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 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 { 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/ForceChunkLoadingHook.java similarity index 97% rename from versions/1.14.4/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java rename to versions/1.14.4/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java index c87e64a8..181c7fc1 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/ForceChunkLoadingHook.java @@ -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()); diff --git a/versions/1.14.4/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java b/versions/1.14.4/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java index 593c61ad..92120a32 100644 --- a/versions/1.14.4/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java +++ b/versions/1.14.4/src/main/java/com/replaymod/render/mixin/Mixin_ForceChunkLoading.java @@ -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; } 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/ForceChunkLoadingHook.java similarity index 56% rename from versions/1.7.10/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java rename to versions/1.7.10/src/main/java/com/replaymod/render/hooks/ForceChunkLoadingHook.java index 7366d092..670c7426 100644 --- 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/ForceChunkLoadingHook.java @@ -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() {