Cleanup 1.15.2 → 1.14.4 remapping

This commit is contained in:
Jonas Herzig
2020-03-31 16:03:25 +02:00
parent 9e7dc61d20
commit 5315c66943
9 changed files with 70 additions and 32 deletions

View File

@@ -63,14 +63,11 @@ public class NoGuiScreenshot {
mc.getFramebuffer().beginWrite(true);
GlStateManager.enableTexture();
//#if MC>=11500
//$$ mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime(), new MatrixStack());
//#else
//#if MC>=11400
mc.gameRenderer.renderWorld(
MCVer.getRenderPartialTicks(),
System.nanoTime()
//#if MC>=11500
//$$ , new MatrixStack()
//#endif
);
mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime());
//#else
//#if MC>=10809
//$$ mc.entityRenderer.updateCameraAndRender(MCVer.getRenderPartialTicks(), System.nanoTime());
@@ -78,6 +75,7 @@ public class NoGuiScreenshot {
//$$ mc.entityRenderer.updateCameraAndRender(MCVer.getRenderPartialTicks());
//#endif
//#endif
//#endif
mc.getFramebuffer().endWrite();
GlStateManager.popMatrix();

View File

@@ -2,12 +2,17 @@
package com.replaymod.replay.mixin;
import net.minecraft.client.render.BuiltChunkStorage;
import net.minecraft.client.render.chunk.ChunkRenderer;
import net.minecraft.util.math.BlockPos;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
//#if MC>=11500
//$$ import net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk;
//#else
import net.minecraft.client.render.chunk.ChunkRenderer;
//#endif
@Mixin(BuiltChunkStorage.class)
public abstract class MixinViewFrustum {
@Redirect(
@@ -15,14 +20,22 @@ public abstract class MixinViewFrustum {
at = @At(
value = "INVOKE",
//#if MC>=10904
//#if MC>=11500
//$$ target = "Lnet/minecraft/client/render/chunk/ChunkBuilder/BuiltChunk;setOrigin(III)V"
//#else
target = "Lnet/minecraft/client/render/chunk/ChunkRenderer;setOrigin(III)V"
//#endif
//#else
//$$ target = "Lnet/minecraft/client/renderer/chunk/RenderChunk;setPosition(Lnet/minecraft/util/BlockPos;)V"
//#endif
)
)
private void replayModReplay_updatePositionAndMarkForUpdate(
//#if MC>=11500
//$$ BuiltChunk renderChunk,
//#else
ChunkRenderer renderChunk,
//#endif
//#if MC>=10904
int x, int y, int z
//#else