From 9671ee605d80d7bf1f1d9e4a8f6e07a6e5d262cb Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Wed, 27 Sep 2017 00:16:39 +0200 Subject: [PATCH] =?UTF-8?q?Add=20360=C2=B0=20screenshot=20feature=20when?= =?UTF-8?q?=20pressing=20Ctrl=20+=20Screenshot=20Keybind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/replaymod/extras/ReplayModExtras.java | 2 + .../AdvancedScreenshots.java | 93 +++++++++++++++++++ .../advancedscreenshots/ScreenshotWriter.java | 56 +++++++++++ .../replaymod/replay/InputReplayTimer.java | 6 +- .../events/ReplayDispatchKeypressesEvent.java | 9 ++ src/main/resources/META-INF/replaymod_at.cfg | 3 + 6 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/replaymod/extras/advancedscreenshots/AdvancedScreenshots.java create mode 100644 src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java create mode 100644 src/main/java/com/replaymod/replay/events/ReplayDispatchKeypressesEvent.java diff --git a/src/main/java/com/replaymod/extras/ReplayModExtras.java b/src/main/java/com/replaymod/extras/ReplayModExtras.java index 93ed038a..0e34b7c7 100644 --- a/src/main/java/com/replaymod/extras/ReplayModExtras.java +++ b/src/main/java/com/replaymod/extras/ReplayModExtras.java @@ -1,6 +1,7 @@ package com.replaymod.extras; import com.replaymod.core.ReplayMod; +import com.replaymod.extras.advancedscreenshots.AdvancedScreenshots; import com.replaymod.extras.playeroverview.PlayerOverview; import com.replaymod.extras.urischeme.UriSchemeExtra; import com.replaymod.extras.youtube.YoutubeUpload; @@ -27,6 +28,7 @@ public class ReplayModExtras { public static ReplayModExtras instance; private static final List> builtin = Arrays.asList( + AdvancedScreenshots.class, PlayerOverview.class, UriSchemeExtra.class, YoutubeUpload.class, diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/AdvancedScreenshots.java b/src/main/java/com/replaymod/extras/advancedscreenshots/AdvancedScreenshots.java new file mode 100644 index 00000000..b3dd2ae1 --- /dev/null +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/AdvancedScreenshots.java @@ -0,0 +1,93 @@ +package com.replaymod.extras.advancedscreenshots; + +import com.replaymod.core.ReplayMod; +import com.replaymod.extras.Extra; +import com.replaymod.render.RenderSettings; +import com.replaymod.render.capturer.RenderInfo; +import com.replaymod.render.hooks.ChunkLoadingRenderGlobal; +import com.replaymod.render.rendering.Pipelines; +import com.replaymod.replay.events.ReplayDispatchKeypressesEvent; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiControls; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ScreenShotHelper; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.input.Keyboard; +import org.lwjgl.util.Dimension; +import org.lwjgl.util.ReadableDimension; + +import java.io.File; + +public class AdvancedScreenshots implements Extra { + + private final Minecraft mc = Minecraft.getMinecraft(); + + @Override + public void register(ReplayMod mod) throws Exception { + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onDispatchKeypresses(ReplayDispatchKeypressesEvent.Pre event) { + int i = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() : Keyboard.getEventKey(); + + // all the conditions required to trigger a screenshot condensed in a single if statement + if (i != 0 && !Keyboard.isRepeatEvent() + && (!(mc.currentScreen instanceof GuiControls) || ((GuiControls) mc.currentScreen).time <= mc.getSystemTime() - 20L) + && Keyboard.getEventKeyState() + && i == mc.gameSettings.keyBindScreenshot.getKeyCode()) { + + if (GuiScreen.isCtrlKeyDown()) { + ReplayMod.instance.runLater(() -> { + // take 360° screenshot + File screenshotFolder = new File(mc.mcDataDir, "screenshots"); + screenshotFolder.mkdir(); + File screenshotFile = ScreenShotHelper.getTimestampedPNGFileForDirectory(screenshotFolder); + + int width = 8640; + int height = 4320; + + int displayWidthBefore = mc.displayWidth; + int displayHeightBefore = mc.displayHeight; + + ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.renderGlobal); + + Pipelines.newEquirectangularPipeline(new RenderInfo() { + @Override + public ReadableDimension getFrameSize() { + return new Dimension(width, height); + } + + @Override + public int getTotalFrames() { + return 1; + } + + @Override + public float updateForNextFrame() { + return mc.timer.renderPartialTicks; + } + + @Override + public RenderSettings getRenderSettings() { + return new RenderSettings( + null, null, width, height, 0, 0, null, + true, true, true, true, null, + false, RenderSettings.AntiAliasing.NONE, null, null, false + ); + } + }, new ScreenshotWriter(screenshotFile)).run(); + + clrg.uninstall(); + + // the Equirectangular rendering changes mc.displayWidth and mc.displayHeight, + // so we have to reset it to the previous value + mc.resize(displayWidthBefore, displayHeightBefore); + }); + + event.setCanceled(true); + } + } + } +} diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java new file mode 100644 index 00000000..d487b08b --- /dev/null +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java @@ -0,0 +1,56 @@ +package com.replaymod.extras.advancedscreenshots; + +import com.replaymod.core.ReplayMod; +import com.replaymod.core.utils.Utils; +import com.replaymod.extras.ReplayModExtras; +import com.replaymod.render.frame.RGBFrame; +import com.replaymod.render.rendering.FrameConsumer; +import com.replaymod.replay.ReplayModReplay; +import net.minecraft.crash.CrashReport; +import org.lwjgl.util.ReadableDimension; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + +public class ScreenshotWriter implements FrameConsumer { + + private final File outputFile; + + public ScreenshotWriter(File outputFile) { + this.outputFile = outputFile; + } + + @Override + public void consume(RGBFrame frame) { + try { + final ReadableDimension frameSize = frame.getSize(); + + BufferedImage img = new BufferedImage(frameSize.getWidth(), frameSize.getHeight(), BufferedImage.TYPE_INT_RGB); + for (int y = 0; y < frameSize.getHeight(); y++) { + for (int x = 0; x < frameSize.getWidth(); x++) { + byte r = frame.getByteBuffer().get(); + byte g = frame.getByteBuffer().get(); + byte b = frame.getByteBuffer().get(); + + int color = ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); + img.setRGB(x, y, color); + } + } + + ImageIO.write(img, "PNG", outputFile); + } catch (Throwable t) { + CrashReport report = CrashReport.makeCrashReport(t, "Exporting frame"); + + ReplayMod.instance.runLater(() -> Utils.error(ReplayModExtras.LOGGER, + ReplayModReplay.instance.getReplayHandler().getOverlay(), + report, null)); + } + } + + @Override + public void close() throws IOException { + + } +} diff --git a/src/main/java/com/replaymod/replay/InputReplayTimer.java b/src/main/java/com/replaymod/replay/InputReplayTimer.java index da1bd5fb..250ba766 100644 --- a/src/main/java/com/replaymod/replay/InputReplayTimer.java +++ b/src/main/java/com/replaymod/replay/InputReplayTimer.java @@ -3,6 +3,7 @@ package com.replaymod.replay; import com.replaymod.core.utils.WrappedTimer; import com.replaymod.replay.camera.CameraController; import com.replaymod.replay.camera.CameraEntity; +import com.replaymod.replay.events.ReplayDispatchKeypressesEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.settings.GameSettings; @@ -11,6 +12,7 @@ import net.minecraft.crash.CrashReport; import net.minecraft.util.ReportedException; import net.minecraft.util.Timer; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; @@ -122,7 +124,9 @@ public class InputReplayTimer extends WrappedTimer { } // Twitch, screenshot, fullscreen, etc. (stuff that works everywhere) - mc.dispatchKeypresses(); + if (!MinecraftForge.EVENT_BUS.post(new ReplayDispatchKeypressesEvent.Pre())) { + mc.dispatchKeypresses(); + } if (pressed) { // This might be subject to change as vanilla shaders are still kinda unused in 1.8 diff --git a/src/main/java/com/replaymod/replay/events/ReplayDispatchKeypressesEvent.java b/src/main/java/com/replaymod/replay/events/ReplayDispatchKeypressesEvent.java new file mode 100644 index 00000000..15b23352 --- /dev/null +++ b/src/main/java/com/replaymod/replay/events/ReplayDispatchKeypressesEvent.java @@ -0,0 +1,9 @@ +package com.replaymod.replay.events; + +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +@Cancelable +public abstract class ReplayDispatchKeypressesEvent extends Event { + public static class Pre extends ReplayDispatchKeypressesEvent {} +} diff --git a/src/main/resources/META-INF/replaymod_at.cfg b/src/main/resources/META-INF/replaymod_at.cfg index 59d3b95e..08652131 100644 --- a/src/main/resources/META-INF/replaymod_at.cfg +++ b/src/main/resources/META-INF/replaymod_at.cfg @@ -117,5 +117,8 @@ public net.minecraft.client.renderer.GlStateManager$FogState public net.minecraft.client.renderer.GlStateManager$BooleanState public net.minecraft.client.renderer.GlStateManager$BooleanState * +# ScreenShotHelper +public net.minecraft.util.ScreenShotHelper func_74290_a(Ljava/io/File;)Ljava/io/File; # getTimestampedPNGFileForDirectory + # Example # public net.minecraft.package.ClassName func_some_id(Ljava/lang/Class;IZS)V # methodName