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

Remove redundant preprocessor statements

Browse Source
This commit is contained in:
Jonas Herzig
2021-02-23 11:27:36 +01:00
parent 87b55e187c
commit 74580e6649
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,7 @@ import java.util.concurrent.PriorityBlockingQueue;
public class ChunkLoadingRenderGlobal { public class ChunkLoadingRenderGlobal {
//#if MC>=11400
private final WorldRenderer hooked; private final WorldRenderer hooked;
//#else
//$$ private final RenderGlobal hooked;
//#endif
//#if MC>=11500 //#if MC>=11500
//#else //#else
@@ -45,13 +41,7 @@ public class ChunkLoadingRenderGlobal {
//$$ private int frame; //$$ private int frame;
//#endif //#endif
public ChunkLoadingRenderGlobal( public ChunkLoadingRenderGlobal(WorldRenderer renderGlobal) {
//#if MC>=11400
WorldRenderer renderGlobal
//#else
//$$ RenderGlobal renderGlobal
//#endif
) {
this.hooked = renderGlobal; this.hooked = renderGlobal;
//#if MC>=11500 //#if MC>=11500
@@ -64,11 +54,7 @@ public class ChunkLoadingRenderGlobal {
private void install() { private void install() {
try { try {
//#if MC>=11400
Field hookField = WorldRenderer.class.getField("replayModRender_hook"); Field hookField = WorldRenderer.class.getField("replayModRender_hook");
//#else
//$$ Field hookField = RenderGlobal.class.getField("replayModRender_hook");
//#endif
hookField.set(hooked, this); hookField.set(hooked, this);
} catch (NoSuchFieldException | IllegalAccessException e) { } catch (NoSuchFieldException | IllegalAccessException e) {
throw new Error(e); throw new Error(e);
@@ -168,11 +154,7 @@ public class ChunkLoadingRenderGlobal {
//#endif //#endif
try { try {
//#if MC>=11400
Field hookField = WorldRenderer.class.getField("replayModRender_hook"); Field hookField = WorldRenderer.class.getField("replayModRender_hook");
//#else
//$$ Field hookField = RenderGlobal.class.getField("replayModRender_hook");
//#endif
hookField.set(hooked, null); hookField.set(hooked, null);
} catch (NoSuchFieldException | IllegalAccessException e) { } catch (NoSuchFieldException | IllegalAccessException e) {
throw new Error(e); throw new Error(e);

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

@@ -5,6 +5,7 @@ import com.replaymod.compat.shaders.ShaderReflection;
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
import net.minecraft.client.render.Camera; import net.minecraft.client.render.Camera;
import net.minecraft.client.render.Frustum; import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.chunk.ChunkBuilder; import net.minecraft.client.render.chunk.ChunkBuilder;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@@ -23,23 +24,13 @@ import java.util.Set;
//$$ import net.minecraft.client.render.Camera; //$$ import net.minecraft.client.render.Camera;
//#endif //#endif
//#if MC>=11400
import net.minecraft.client.render.WorldRenderer;
//#else
//$$ import net.minecraft.client.renderer.RenderGlobal;
//#endif
//#if MC<10904 //#if MC<10904
//$$ import net.minecraft.client.renderer.chunk.RenderChunk; //$$ import net.minecraft.client.renderer.chunk.RenderChunk;
//$$ import net.minecraft.util.BlockPos; //$$ import net.minecraft.util.BlockPos;
//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; //$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
//#endif //#endif
//#if MC>=11400
@Mixin(WorldRenderer.class) @Mixin(WorldRenderer.class)
//#else
//$$ @Mixin(RenderGlobal.class)
//#endif
public abstract class Mixin_ForceChunkLoading { public abstract class Mixin_ForceChunkLoading {
public ChunkLoadingRenderGlobal replayModRender_hook; public ChunkLoadingRenderGlobal replayModRender_hook;