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

Replace reflection in ChunkLoadingRenderGlobal with mixin

Browse Source
This commit is contained in:
Jonas Herzig
2021-02-23 11:45:08 +01:00
parent 4b4d18026b
commit 90bbc68443
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java
View File

@@ -3,8 +3,6 @@ package com.replaymod.render.hooks;
import net.minecraft.client.render.WorldRenderer;
import java.lang.reflect.Field;
//#if MC>=11500
//#else
//$$ import com.replaymod.render.mixin.ChunkRenderDispatcherAccessor;
@@ -45,20 +43,10 @@ public class ChunkLoadingRenderGlobal {
this.hooked = renderGlobal;
//#if MC>=11500
install();
//#else
//$$ setup(((WorldRendererAccessor) renderGlobal).getRenderDispatcher());
//$$ install();
//#endif
}
private void install() {
try {
Field hookField = WorldRenderer.class.getField("replayModRender_hook");
hookField.set(hooked, this);
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new Error(e);
}
IForceChunkLoading.from(renderGlobal).replayModRender_setHook(this);
}
//#if MC>=11500
@@ -153,12 +141,7 @@ public class ChunkLoadingRenderGlobal {
//$$ workerJailingQueue.freeAll();
//#endif
try {
Field hookField = WorldRenderer.class.getField("replayModRender_hook");
hookField.set(hooked, null);
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new Error(e);
}
IForceChunkLoading.from(hooked).replayModRender_setHook(null);
}
//#if MC>=11500

13
src/main/java/com/replaymod/render/hooks/IForceChunkLoading.java Normal file
View File

@@ -0,0 +1,13 @@
//#if MC>=10800
package com.replaymod.render.hooks;
import net.minecraft.client.render.WorldRenderer;
public interface IForceChunkLoading {
void replayModRender_setHook(ChunkLoadingRenderGlobal hook);
static IForceChunkLoading from(WorldRenderer worldRenderer) {
return (IForceChunkLoading) worldRenderer;
}
}
//#endif

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

@@ -3,6 +3,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.IForceChunkLoading;
import net.minecraft.client.render.Camera;
import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.WorldRenderer;
@@ -31,8 +32,13 @@ import java.util.Set;
//#endif
@Mixin(WorldRenderer.class)
public abstract class Mixin_ForceChunkLoading {
public ChunkLoadingRenderGlobal replayModRender_hook;
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
private ChunkLoadingRenderGlobal replayModRender_hook;
@Override
public void replayModRender_setHook(ChunkLoadingRenderGlobal hook) {
this.replayModRender_hook = hook;
}
//#if MC>=11500
@Shadow private Set<ChunkBuilder.BuiltChunk> chunksToRebuild;