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

WIP 1.15 and ReplayStudio v2 update

Browse Source
This commit is contained in:
Jonas Herzig
2020-03-13 14:18:19 +01:00
parent 8bc0b0a4df
commit af8803d6b5
65 changed files with 874 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotRenderer.java
View File

@@ -13,9 +13,10 @@ import net.minecraft.util.crash.CrashReport;
//#if MC>=11300
import com.replaymod.render.mixin.MainWindowAccessor;
import static com.replaymod.core.versions.MCVer.getWindow;
//#endif
//#if MC>=10800
//#if MC>=10800 && MC<11500
import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
//#endif
@@ -33,8 +34,8 @@ public class ScreenshotRenderer implements RenderInfo {
public boolean renderScreenshot() throws Throwable {
try {
//#if MC>=11300
int displayWidthBefore = mc.window.getFramebufferWidth();
int displayHeightBefore = mc.window.getFramebufferHeight();
int displayWidthBefore = getWindow(mc).getFramebufferWidth();
int displayHeightBefore = getWindow(mc).getFramebufferHeight();
//#else
//$$ int displayWidthBefore = mc.displayWidth;
//$$ int displayHeightBefore = mc.displayHeight;
@@ -43,7 +44,7 @@ public class ScreenshotRenderer implements RenderInfo {
boolean hideGUIBefore = mc.options.hudHidden;
mc.options.hudHidden = true;
//#if MC>=10800
//#if MC>=10800 && MC<11500
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
//#endif
@@ -55,14 +56,14 @@ public class ScreenshotRenderer implements RenderInfo {
new ScreenshotWriter(settings.getOutputFile())).run();
}
//#if MC>=10800
//#if MC>=10800 && MC<11500
clrg.uninstall();
//#endif
mc.options.hudHidden = hideGUIBefore;
//#if MC>=11300
//noinspection ConstantConditions
MainWindowAccessor acc = (MainWindowAccessor) (Object) mc.window;
MainWindowAccessor acc = (MainWindowAccessor) (Object) getWindow(mc);
acc.setFramebufferWidth(displayWidthBefore);
acc.setFramebufferHeight(displayHeightBefore);
mc.getFramebuffer().resize(displayWidthBefore, displayHeightBefore

7
src/main/java/com/replaymod/extras/urischeme/UriScheme.java
View File

@@ -73,10 +73,17 @@ public abstract class UriScheme {
switch (SystemUtil.getOperatingSystem()) {
case LINUX:
return new LinuxUriScheme();
//#if MC>=11500
//$$ case WINDOWS:
//$$ return new WindowsUriScheme();
//$$ case OSX:
//$$ return new OSXUriScheme();
//#else
case field_1133:
return new WindowsUriScheme();
case field_1137:
return new OSXUriScheme();
//#endif
case SOLARIS:
case UNKNOWN:
default: