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

./gradlew :1.15.2:setCoreVersion

Browse Source 
Also `./gradlew :jGui:1.15.2:setCoreVersion`.
This commit is contained in:
Jonas Herzig
2020-04-06 12:35:56 +02:00
parent f3c4092c72
commit b119d2d127
70 changed files with 1217 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -585,7 +585,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
entId,
GameMode.SPECTATOR,
//#if MC>=11500
//$$ packet.getSeed(),
packet.getSeed(),
//#endif
false,
packet.getDimension(),
@@ -594,7 +594,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
packet.getChunkLoadDistance(),
packet.hasReducedDebugInfo()
//#if MC>=11500
//$$ , packet.showsDeathScreen()
, packet.showsDeathScreen()
//#endif
);
//#else
@@ -637,7 +637,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
p = new PlayerRespawnS2CPacket(
respawn.getDimension(),
//#if MC>=11500
//$$ respawn.getSha256Seed(),
respawn.getSha256Seed(),
//#endif
respawn.getGeneratorType(),
GameMode.SPECTATOR

8
src/main/java/com/replaymod/replay/NoGuiScreenshot.java
View File

@@ -13,7 +13,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.util.ScreenshotUtils;
//#if MC>=11500
//$$ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.MatrixStack;
//#endif
//#if MC>=11400
@@ -64,10 +64,10 @@ public class NoGuiScreenshot {
GlStateManager.enableTexture();
//#if MC>=11500
//$$ mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime(), new MatrixStack());
mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime(), new MatrixStack());
//#else
//#if MC>=11400
mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime());
//$$ mc.gameRenderer.renderWorld(MCVer.getRenderPartialTicks(), System.nanoTime());
//#else
//#if MC>=10809
//$$ mc.entityRenderer.updateCameraAndRender(MCVer.getRenderPartialTicks(), System.nanoTime());
@@ -94,7 +94,7 @@ public class NoGuiScreenshot {
// Read it, create the screenshot and finish the future
try {
//#if MC>=11400
Image image = new Image(ScreenshotUtils.method_1663(frameWidth, frameHeight, mc.getFramebuffer()));
Image image = new Image(ScreenshotUtils.takeScreenshot(frameWidth, frameHeight, mc.getFramebuffer()));
//#else
//$$ // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to
//$$ // disk for better maintainability

16
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -99,14 +99,14 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
protected Packet<?> decode(com.github.steveice10.netty.buffer.ByteBuf byteBuf) throws IOException {
int packetId = new ByteBufNetInput(byteBuf).readVarInt();
//#if MC>=11500
//$$ Packet<?> mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
Packet<?> mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
//#else
Packet<?> mcPacket;
try {
mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
} catch (IllegalAccessException | InstantiationException e) {
throw new IOException(e);
}
//$$ Packet<?> mcPacket;
//$$ try {
//$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
//$$ } catch (IllegalAccessException | InstantiationException e) {
//$$ throw new IOException(e);
//$$ }
//#endif
if (mcPacket != null) {
int size = byteBuf.readableBytes();
@@ -196,7 +196,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
//$$ 0,
//#endif
//#if MC>=11500
//$$ 0,
0,
//#endif
//#if MC<11400
//$$ EnumDifficulty.NORMAL,

26
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -37,8 +37,8 @@ import java.io.IOException;
import java.util.*;
//#if MC>=11500
//$$ import com.mojang.blaze3d.systems.RenderSystem;
//$$ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import org.lwjgl.opengl.GL11;
//#endif
//#if MC>=11400
@@ -622,17 +622,17 @@ public class ReplayHandler {
enableTexture();
mc.getFramebuffer().beginWrite(true);
//#if MC>=11500
//$$ Window window = getWindow(mc);
//$$ RenderSystem.clear(256, MinecraftClient.IS_SYSTEM_MAC);
//$$ RenderSystem.matrixMode(GL11.GL_PROJECTION);
//$$ RenderSystem.loadIdentity();
//$$ RenderSystem.ortho(0, window.getFramebufferWidth() / window.getScaleFactor(), window.getFramebufferHeight() / window.getScaleFactor(), 0, 1000, 3000);
//$$ RenderSystem.matrixMode(GL11.GL_MODELVIEW);
//$$ RenderSystem.loadIdentity();
//$$ RenderSystem.translatef(0, 0, -2000);
Window window = getWindow(mc);
RenderSystem.clear(256, MinecraftClient.IS_SYSTEM_MAC);
RenderSystem.matrixMode(GL11.GL_PROJECTION);
RenderSystem.loadIdentity();
RenderSystem.ortho(0, window.getFramebufferWidth() / window.getScaleFactor(), window.getFramebufferHeight() / window.getScaleFactor(), 0, 1000, 3000);
RenderSystem.matrixMode(GL11.GL_MODELVIEW);
RenderSystem.loadIdentity();
RenderSystem.translatef(0, 0, -2000);
//#else
//#if MC>=11400
getWindow(mc).method_4493(true);
//$$ getWindow(mc).method_4493(true);
//#else
//#if MC>=11400
//$$ mc.mainWindow.setupOverlayRendering();
@@ -666,10 +666,10 @@ public class ReplayHandler {
popMatrix();
//#if MC>=11500
//$$ getWindow(mc).swapBuffers();
getWindow(mc).swapBuffers();
//#else
//#if MC>=11400
getWindow(mc).setFullscreen(true);
//$$ getWindow(mc).setFullscreen(true);
//#else
//$$ Display.update();
//#endif

10
src/main/java/com/replaymod/replay/mixin/EntityLivingBaseAccessor.java
View File

@@ -7,15 +7,15 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(LivingEntity.class)
public interface EntityLivingBaseAccessor {
//#if MC>=11400
@Accessor("field_6224")
@Accessor("serverX")
double getInterpTargetX();
@Accessor("field_6245")
@Accessor("serverY")
double getInterpTargetY();
@Accessor("field_6263")
@Accessor("serverZ")
double getInterpTargetZ();
@Accessor("field_6284")
@Accessor("serverYaw")
double getInterpTargetYaw();
@Accessor("field_6221")
@Accessor("serverPitch")
double getInterpTargetPitch();
//#endif

60
src/main/java/com/replaymod/replay/mixin/MixinCamera.java
View File

@@ -9,51 +9,51 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11500
//$$ import net.minecraft.client.MinecraftClient;
//$$ import net.minecraft.client.util.math.MatrixStack;
//$$ import net.minecraft.client.util.math.Vector3f;
//$$ import org.spongepowered.asm.mixin.Final;
//$$ import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Shadow;
//#else
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.world.BlockView;
//$$ import com.mojang.blaze3d.platform.GlStateManager;
//$$ import net.minecraft.world.BlockView;
//#endif
//#if MC>=11500
//$$ @Mixin(net.minecraft.client.render.GameRenderer.class)
@Mixin(net.minecraft.client.render.GameRenderer.class)
//#else
@Mixin(net.minecraft.client.render.Camera.class)
//$$ @Mixin(net.minecraft.client.render.Camera.class)
//#endif
public class MixinCamera {
//#if MC>=11500
//$$ @Shadow @Final private MinecraftClient client;
//$$ @Inject(
//$$ method = "renderWorld",
//$$ at = @At(
//$$ value = "INVOKE",
//$$ target = "Lnet/minecraft/client/render/Camera;getPitch()F"
//$$ )
//$$ )
//$$ private void applyRoll(float float_1, long long_1, MatrixStack matrixStack, CallbackInfo ci) {
//$$ Entity entity = this.client.getCameraEntity() == null ? this.client.player : this.client.getCameraEntity();
//$$ if (entity instanceof CameraEntity) {
//$$ matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(((CameraEntity) entity).roll));
//$$ }
//$$ }
//#else
@Shadow @Final private MinecraftClient client;
@Inject(
method = "update",
method = "renderWorld",
at = @At(
value = "INVOKE",
target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
ordinal = 0
target = "Lnet/minecraft/client/render/Camera;getPitch()F"
)
)
private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
if (view instanceof CameraEntity) {
GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
private void applyRoll(float float_1, long long_1, MatrixStack matrixStack, CallbackInfo ci) {
Entity entity = this.client.getCameraEntity() == null ? this.client.player : this.client.getCameraEntity();
if (entity instanceof CameraEntity) {
matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(((CameraEntity) entity).roll));
}
}
//#else
//$$ @Inject(
//$$ method = "update",
//$$ at = @At(
//$$ value = "INVOKE",
//$$ target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
//$$ ordinal = 0
//$$ )
//$$ )
//$$ private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
//$$ if (view instanceof CameraEntity) {
//$$ GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
//$$ }
//$$ }
//#endif
}
//#endif

2
src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java
View File

@@ -13,7 +13,7 @@ import static com.replaymod.core.versions.MCVer.*;
@Mixin(SpectatorHud.class)
public abstract class MixinGuiSpectator {
//#if MC>=10904
@Inject(method = "method_1976", at = @At("HEAD"), cancellable = true)
@Inject(method = "cycleSlot", at = @At("HEAD"), cancellable = true)
//#else
//$$ @Inject(method = "func_175260_a", at = @At("HEAD"), cancellable = true)
//#endif

2
src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java
View File

@@ -28,7 +28,7 @@ public abstract class MixinKeyboardListener {
at = @At(
value = "INVOKE",
//#if MC>=11400
target = "Lnet/minecraft/client/util/ScreenshotUtils;method_1659(Ljava/io/File;IILnet/minecraft/client/gl/Framebuffer;Ljava/util/function/Consumer;)V"
target = "Lnet/minecraft/client/util/ScreenshotUtils;saveScreenshot(Ljava/io/File;IILnet/minecraft/client/gl/Framebuffer;Ljava/util/function/Consumer;)V"
//#else
//#if MC>=11400
//$$ target = "Lnet/minecraft/util/ScreenShotHelper;saveScreenshot(Ljava/io/File;IILnet/minecraft/client/shader/Framebuffer;Ljava/util/function/Consumer;)V"

12
src/main/java/com/replaymod/replay/mixin/MixinRenderArrow.java
View File

@@ -9,9 +9,9 @@ import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
//#if MC>=11500
//$$ import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.Frustum;
//#else
import net.minecraft.client.render.VisibleRegion;
//$$ import net.minecraft.client.render.VisibleRegion;
//#endif
@Mixin(ArrowEntityRenderer.class)
@@ -22,15 +22,15 @@ public abstract class MixinRenderArrow extends EntityRenderer {
@SuppressWarnings("unchecked")
@Override
public boolean isVisible(Entity entity,
public boolean shouldRender(Entity entity,
//#if MC>=11500
//$$ Frustum camera,
Frustum camera,
//#else
VisibleRegion camera,
//$$ VisibleRegion camera,
//#endif
double camX, double camY, double camZ) {
// Force arrows to always render, otherwise they stop rendering when you get close to them
return ReplayModReplay.instance.getReplayHandler() != null || super.isVisible(entity, camera, camX, camY, camZ);
return ReplayModReplay.instance.getReplayHandler() != null || super.shouldRender(entity, camera, camX, camY, camZ);
}
}
//#endif

8
src/main/java/com/replaymod/replay/mixin/MixinRenderItem.java
View File

@@ -13,17 +13,17 @@ import net.minecraft.util.Util;
//#endif
//#if MC>=11500
//$$ @Mixin(net.minecraft.client.render.RenderPhase.class)
@Mixin(net.minecraft.client.render.RenderPhase.class)
//#else
@Mixin(net.minecraft.client.render.item.ItemRenderer.class)
//$$ @Mixin(net.minecraft.client.render.item.ItemRenderer.class)
//#endif
public class MixinRenderItem {
//#if MC>=11400
//#if MC>=11500
//$$ @Redirect(method = "setupGlintTexturing", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
@Redirect(method = "setupGlintTexturing", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//#else
//#if MC>=11400
@Redirect(method = "renderGlint", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//$$ @Redirect(method = "renderGlint", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//#else
//$$ @Redirect(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;milliTime()J"))
//#endif

10
src/main/java/com/replaymod/replay/mixin/MixinTileEntityEndPortalRenderer.java
View File

@@ -13,17 +13,17 @@ import net.minecraft.util.Util;
//#endif
//#if MC>=11500
//$$ @Mixin(net.minecraft.client.render.RenderPhase.PortalTexturing.class)
@Mixin(net.minecraft.client.render.RenderPhase.PortalTexturing.class)
//#else
@Mixin(net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer.class)
//$$ @Mixin(net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer.class)
//#endif
public class MixinTileEntityEndPortalRenderer {
//#if MC>=11500
//$$ @Redirect(method = "method_23557", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//$$ static
@Redirect(method = "method_23557", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
static
//#else
//#if MC>=11400
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"))
//#else
//#if MC>=11200
//$$ @Redirect(method = "renderTileEntityAt(Lnet/minecraft/tileentity/TileEntityEndPortal;DDDFIF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getSystemTime()J"))

12
src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java
View File

@@ -8,9 +8,9 @@ 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;
import net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk;
//#else
import net.minecraft.client.render.chunk.ChunkRenderer;
//$$ import net.minecraft.client.render.chunk.ChunkRenderer;
//#endif
@Mixin(BuiltChunkStorage.class)
@@ -21,9 +21,9 @@ public abstract class MixinViewFrustum {
value = "INVOKE",
//#if MC>=10904
//#if MC>=11500
//$$ target = "Lnet/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk;setOrigin(III)V"
target = "Lnet/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk;setOrigin(III)V"
//#else
target = "Lnet/minecraft/client/render/chunk/ChunkRenderer;setOrigin(III)V"
//$$ 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"
@@ -32,9 +32,9 @@ public abstract class MixinViewFrustum {
)
private void replayModReplay_updatePositionAndMarkForUpdate(
//#if MC>=11500
//$$ BuiltChunk renderChunk,
BuiltChunk renderChunk,
//#else
ChunkRenderer renderChunk,
//$$ ChunkRenderer renderChunk,
//#endif
//#if MC>=10904
int x, int y, int z