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

Switch core to 1.14 (generated via ./gradlew :1.14:setCoreVersion)

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-10 14:09:22 +02:00
parent 7f7d33def8
commit 7cbf7f7c94
183 changed files with 3250 additions and 3250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/replaymod/extras/FullBrightness.java
View File

@@ -10,14 +10,14 @@ import de.johni0702.minecraft.gui.element.GuiImage;
import de.johni0702.minecraft.gui.element.IGuiImage;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import net.minecraft.client.GameSettings;
import net.minecraft.client.options.GameOptions;
//#if MC>=11400
//$$ import com.replaymod.core.events.PreRenderCallback;
//$$ import com.replaymod.core.events.PostRenderCallback;
import com.replaymod.core.events.PreRenderCallback;
import com.replaymod.core.events.PostRenderCallback;
//#else
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
//$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
//$$ import net.minecraftforge.fml.common.gameevent.TickEvent;
//#endif
public class FullBrightness extends EventRegistrations implements Extra {
@@ -25,7 +25,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 90, 20, 19, 13).setSize(19, 13);
private GameSettings gameSettings;
private GameOptions gameSettings;
private boolean active;
//#if MC>=11300
private double originalGamma;
@@ -36,7 +36,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
@Override
public void register(final ReplayMod mod) throws Exception {
this.module = ReplayModReplay.instance;
this.gameSettings = mod.getMinecraft().gameSettings;
this.gameSettings = mod.getMinecraft().options;
mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.lighting", Keyboard.KEY_Z, new Runnable() {
@Override
@@ -44,7 +44,7 @@ public class FullBrightness extends EventRegistrations implements Extra {
active = !active;
// need to tick once to update lightmap when replay is paused
//#if MC>=11300
mod.getMinecraft().entityRenderer.tick();
mod.getMinecraft().gameRenderer.tick();
//#else
//$$ mod.getMinecraft().entityRenderer.updateRenderer();
//#endif
@@ -59,29 +59,29 @@ public class FullBrightness extends EventRegistrations implements Extra {
}
//#if MC>=11400
//$$ { on(PreRenderCallback.EVENT, this::preRender); }
//$$ private void preRender() {
{ on(PreRenderCallback.EVENT, this::preRender); }
private void preRender() {
//#else
@SubscribeEvent
public void preRender(TickEvent.RenderTickEvent event) {
if (event.phase != TickEvent.Phase.START) return;
//$$ @SubscribeEvent
//$$ public void preRender(TickEvent.RenderTickEvent event) {
//$$ if (event.phase != TickEvent.Phase.START) return;
//#endif
if (active && module.getReplayHandler() != null) {
originalGamma = gameSettings.gammaSetting;
gameSettings.gammaSetting = 1000;
originalGamma = gameSettings.gamma;
gameSettings.gamma = 1000;
}
}
//#if MC>=11400
//$$ { on(PostRenderCallback.EVENT, this::postRender); }
//$$ private void postRender() {
{ on(PostRenderCallback.EVENT, this::postRender); }
private void postRender() {
//#else
@SubscribeEvent
public void postRender(TickEvent.RenderTickEvent event) {
if (event.phase != TickEvent.Phase.END) return;
//$$ @SubscribeEvent
//$$ public void postRender(TickEvent.RenderTickEvent event) {
//$$ if (event.phase != TickEvent.Phase.END) return;
//#endif
if (active && module.getReplayHandler() != null) {
gameSettings.gammaSetting = originalGamma;
gameSettings.gamma = originalGamma;
}
}

8
src/main/java/com/replaymod/extras/HotkeyButtons.java
View File

@@ -20,7 +20,7 @@ import de.johni0702.minecraft.gui.layout.LayoutData;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
//#if MC>=11300
//#else
@@ -74,7 +74,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
final KeyBindingRegistry keyBindingRegistry = mod.getKeyBindingRegistry();
keyBindingRegistry.getKeyBindings().values().stream()
.sorted(Comparator.comparing(it -> I18n.format(it.getKeyDescription())))
.sorted(Comparator.comparing(it -> I18n.translate(it.getId())))
.forEachOrdered(keyBinding -> {
GuiButton button = new GuiButton(){
@Override
@@ -83,7 +83,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
String keyName = "???";
try {
//#if MC>=11300
keyName = keyBinding.func_197978_k();
keyName = keyBinding.getLocalizedName();
//#else
//$$ keyName = Keyboard.getKeyName(keyBinding.getKeyCode());
//#endif
@@ -111,7 +111,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
return new Dimension(Math.max(10, button.getMinSize().getWidth()) + 10, 20);
}
}).addElements(null, button),
new GuiLabel().setI18nText(keyBinding.getKeyDescription())
new GuiLabel().setI18nText(keyBinding.getId())
));
});

2
src/main/java/com/replaymod/extras/OpenEyeExtra.java
View File

@@ -86,7 +86,7 @@ public class OpenEyeExtra implements Extra {
GuiPopup popup = new GuiPopup(OfferGui.this);
new Thread(() -> {
try {
File targetFile = new File(mod.getMinecraft().gameDir, "mods/" + ReplayMod.getMinecraftVersion() + "/OpenEye.jar");
File targetFile = new File(mod.getMinecraft().runDirectory, "mods/" + ReplayMod.getMinecraftVersion() + "/OpenEye.jar");
FileUtils.forceMkdir(targetFile.getParentFile());
HttpsURLConnection connection = (HttpsURLConnection) new URL(DOWNLOAD_URL).openConnection();

10
src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java
View File

@@ -10,7 +10,7 @@ import de.johni0702.minecraft.gui.element.GuiLabel;
import de.johni0702.minecraft.gui.function.Loadable;
import de.johni0702.minecraft.gui.layout.GridLayout;
import de.johni0702.minecraft.gui.layout.VerticalLayout;
import net.minecraft.crash.CrashReport;
import net.minecraft.util.crash.CrashReport;
import java.io.File;
import java.nio.file.Path;
@@ -50,7 +50,7 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable {
buttonPanel.removeElement(queueButton);
renderButton.setI18nLabel("replaymod.gui.advancedscreenshots.create").onClick(() -> {
// Closing this GUI ensures that settings are saved
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
mod.runLater(() -> {
try {
@@ -63,7 +63,7 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable {
}
} catch (Throwable t) {
error(LOGGER, GuiCreateScreenshot.this, CrashReport.makeCrashReport(t, "Rendering video"), () -> {});
error(LOGGER, GuiCreateScreenshot.this, CrashReport.create(t, "Rendering video"), () -> {});
display(); // Re-show the render settings gui and the new error popup
}
});
@@ -84,7 +84,7 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable {
@Override
protected File generateOutputFile(RenderSettings.EncodingPreset encodingPreset) {
DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss");
File screenshotFolder = new File(getMinecraft().gameDir, "screenshots");
File screenshotFolder = new File(getMinecraft().runDirectory, "screenshots");
String baseName = DATE_FORMAT.format(new Date());
for (int i = 1; ; i++) {
File screenshotFile = new File(screenshotFolder, baseName + (i == 1 ? "" : "_" + i) + ".png");
@@ -96,6 +96,6 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable {
@Override
protected Path getSettingsPath() {
return getMinecraft().gameDir.toPath().resolve("config/replaymod-screenshotsettings.json");
return getMinecraft().runDirectory.toPath().resolve("config/replaymod-screenshotsettings.json");
}
}

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

@@ -8,8 +8,8 @@ import com.replaymod.render.rendering.Pipelines;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import lombok.RequiredArgsConstructor;
import net.minecraft.client.Minecraft;
import net.minecraft.crash.CrashReport;
import net.minecraft.client.MinecraftClient;
import net.minecraft.util.crash.CrashReport;
//#if MC>=11300
import com.replaymod.render.mixin.MainWindowAccessor;
@@ -24,7 +24,7 @@ import static com.replaymod.core.versions.MCVer.getRenderPartialTicks;
@RequiredArgsConstructor
public class ScreenshotRenderer implements RenderInfo {
private final Minecraft mc = MCVer.getMinecraft();
private final MinecraftClient mc = MCVer.getMinecraft();
private final RenderSettings settings;
@@ -33,18 +33,18 @@ public class ScreenshotRenderer implements RenderInfo {
public boolean renderScreenshot() throws Throwable {
try {
//#if MC>=11300
int displayWidthBefore = mc.mainWindow.getFramebufferWidth();
int displayHeightBefore = mc.mainWindow.getFramebufferHeight();
int displayWidthBefore = mc.window.getFramebufferWidth();
int displayHeightBefore = mc.window.getFramebufferHeight();
//#else
//$$ int displayWidthBefore = mc.displayWidth;
//$$ int displayHeightBefore = mc.displayHeight;
//#endif
boolean hideGUIBefore = mc.gameSettings.hideGUI;
mc.gameSettings.hideGUI = true;
boolean hideGUIBefore = mc.options.hudHidden;
mc.options.hudHidden = true;
//#if MC>=10800
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.renderGlobal);
ChunkLoadingRenderGlobal clrg = new ChunkLoadingRenderGlobal(mc.worldRenderer);
//#endif
if (settings.getRenderMethod() == RenderSettings.RenderMethod.BLEND) {
@@ -59,15 +59,15 @@ public class ScreenshotRenderer implements RenderInfo {
clrg.uninstall();
//#endif
mc.gameSettings.hideGUI = hideGUIBefore;
mc.options.hudHidden = hideGUIBefore;
//#if MC>=11300
//noinspection ConstantConditions
MainWindowAccessor acc = (MainWindowAccessor) (Object) mc.mainWindow;
MainWindowAccessor acc = (MainWindowAccessor) (Object) mc.window;
acc.setFramebufferWidth(displayWidthBefore);
acc.setFramebufferHeight(displayHeightBefore);
mc.getFramebuffer().createBindFramebuffer(displayWidthBefore, displayHeightBefore
mc.getFramebuffer().resize(displayWidthBefore, displayHeightBefore
//#if MC>=11400
//$$ , false
, false
//#endif
);
//#else
@@ -76,8 +76,8 @@ public class ScreenshotRenderer implements RenderInfo {
return true;
} catch (OutOfMemoryError e) {
e.printStackTrace();
CrashReport report = CrashReport.makeCrashReport(e, "Creating Equirectangular Screenshot");
MCVer.getMinecraft().crashed(report);
CrashReport report = CrashReport.create(e, "Creating Equirectangular Screenshot");
MCVer.getMinecraft().setCrashReport(report);
}
return false;
}

8
src/main/java/com/replaymod/extras/advancedscreenshots/ScreenshotWriter.java
View File

@@ -8,7 +8,7 @@ import com.replaymod.render.frame.RGBFrame;
import com.replaymod.render.rendering.FrameConsumer;
import com.replaymod.replay.ReplayModReplay;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import net.minecraft.crash.CrashReport;
import net.minecraft.util.crash.CrashReport;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@@ -47,10 +47,10 @@ public class ScreenshotWriter implements FrameConsumer<RGBFrame> {
ImageIO.write(img, "PNG", outputFile);
} catch (OutOfMemoryError e) {
e.printStackTrace();
CrashReport report = CrashReport.makeCrashReport(e, "Exporting frame");
MCVer.getMinecraft().crashed(report);
CrashReport report = CrashReport.create(e, "Exporting frame");
MCVer.getMinecraft().setCrashReport(report);
} catch (Throwable t) {
CrashReport report = CrashReport.makeCrashReport(t, "Exporting frame");
CrashReport report = CrashReport.create(t, "Exporting frame");
ReplayMod.instance.runLater(() -> Utils.error(ReplayModExtras.LOGGER,
ReplayModReplay.instance.getReplayHandler().getOverlay(),

60
src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java
View File

@@ -11,23 +11,23 @@ import com.replaymod.replay.events.ReplayClosedCallback;
import com.replaymod.replay.events.ReplayOpenedCallback;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
//#if MC>=11400
//$$ import com.replaymod.core.events.PreRenderHandCallback;
//$$ import java.util.stream.Collectors;
import com.replaymod.core.events.PreRenderHandCallback;
import java.util.stream.Collectors;
//#else
import net.minecraftforge.client.event.RenderHandEvent;
//$$ import net.minecraftforge.client.event.RenderHandEvent;
//$$
//#if MC>=11300
//#else
//$$ import org.lwjgl.input.Keyboard;
//#endif
//$$
//#if MC>=10800
import com.google.common.base.Predicate;
//$$ import com.google.common.base.Predicate;
//#if MC>=11300
import net.minecraftforge.eventbus.api.SubscribeEvent;
//$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
//#else
//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
//#endif
@@ -59,20 +59,20 @@ public class PlayerOverview extends EventRegistrations implements Extra {
public void run() {
if (module.getReplayHandler() != null) {
//#if MC>=11400
//$$ List<PlayerEntity> players = mod.getMinecraft().world.getPlayers()
//$$ .stream()
//$$ .map(it -> (PlayerEntity) it)
//$$ .filter(it -> !(it instanceof CameraEntity))
//$$ .collect(Collectors.toList());
List<PlayerEntity> players = mod.getMinecraft().world.getPlayers()
.stream()
.map(it -> (PlayerEntity) it)
.filter(it -> !(it instanceof CameraEntity))
.collect(Collectors.toList());
//#else
@SuppressWarnings("unchecked")
//$$ @SuppressWarnings("unchecked")
//#if MC>=10800
List<EntityPlayer> players = mod.getMinecraft().world.getPlayers(EntityPlayer.class, new Predicate() {
@Override
public boolean apply(Object input) {
return !(input instanceof CameraEntity); // Exclude the camera entity
}
});
//$$ List<EntityPlayer> players = mod.getMinecraft().world.getPlayers(EntityPlayer.class, new Predicate() {
//$$ @Override
//$$ public boolean apply(Object input) {
//$$ return !(input instanceof CameraEntity); // Exclude the camera entity
//$$ }
//$$ });
//#else
//$$ List<EntityPlayer> players = mod.getMinecraft().theWorld.playerEntities;
//$$ players = players.stream()
@@ -82,7 +82,7 @@ public class PlayerOverview extends EventRegistrations implements Extra {
//#endif
if (!Utils.isCtrlDown()) {
// Hide all players that have an UUID v2 (commonly used for NPCs)
Iterator<EntityPlayer> iter = players.iterator();
Iterator<PlayerEntity> iter = players.iterator();
while (iter.hasNext()) {
UUID uuid = iter.next().getGameProfile().getId();
if (uuid != null && uuid.version() == 2) {
@@ -99,7 +99,7 @@ public class PlayerOverview extends EventRegistrations implements Extra {
ReplayClosedCallback.EVENT.register(this::onReplayClose);
//#if MC>=11400
//#else
FORGE_BUS.register(this);
//$$ FORGE_BUS.register(this);
//#endif
}
@@ -130,18 +130,18 @@ public class PlayerOverview extends EventRegistrations implements Extra {
}
//#if MC>=11400
//$$ { on(PreRenderHandCallback.EVENT, this::shouldHideHand); }
{ on(PreRenderHandCallback.EVENT, this::shouldHideHand); }
//#else
@SubscribeEvent
public void oRenderHand(RenderHandEvent event) {
if (shouldHideHand()) {
event.setCanceled(true);
}
}
//$$ @SubscribeEvent
//$$ public void oRenderHand(RenderHandEvent event) {
//$$ if (shouldHideHand()) {
//$$ event.setCanceled(true);
//$$ }
//$$ }
//#endif
private boolean shouldHideHand() {
Entity view = getRenderViewEntity(module.getCore().getMinecraft());
return view != null && isHidden(view.getUniqueID());
return view != null && isHidden(view.getUuid());
}
// See MixinRender for why this is 1.7.10 only

28
src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java
View File

@@ -20,17 +20,17 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.utils.Colors;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.Identifier;
//#if MC>=10904
import net.minecraft.init.MobEffects;
import net.minecraft.entity.effect.StatusEffects;
//#else
//$$ import net.minecraft.potion.Potion;
//#endif
//#if MC>=10800
import net.minecraft.entity.player.EnumPlayerModelParts;
import net.minecraft.client.render.entity.PlayerModelPart;
//#endif
import java.util.Collections;
@@ -89,12 +89,12 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
private final PlayerOverview extra;
public PlayerOverviewGui(final PlayerOverview extra, List<EntityPlayer> players) {
public PlayerOverviewGui(final PlayerOverview extra, List<PlayerEntity> players) {
this.extra = extra;
Collections.sort(players, new PlayerComparator()); // Sort by name, spectators last
for (final EntityPlayer p : players) {
final ResourceLocation texture = Utils.getResourceLocationForPlayerUUID(p.getUniqueID());
for (final PlayerEntity p : players) {
final Identifier texture = Utils.getResourceLocationForPlayerUUID(p.getUuid());
final GuiClickable panel = new GuiClickable().setLayout(new HorizontalLayout().setSpacing(2)).addElements(
new HorizontalLayout.Data(0.5), new GuiImage() {
@Override
@@ -102,7 +102,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
renderer.bindTexture(texture);
renderer.drawTexturedRect(0, 0, 8, 8, 16, 16, 8, 8, 64, 64);
//#if MC>=10809
if (p.isWearing(EnumPlayerModelParts.HAT)) {
if (p.isSkinOverlayVisible(PlayerModelPart.HEAD)) {
//#else
//#if MC>=10800
//$$ if (p.func_175148_a(EnumPlayerModelParts.HAT)) {
@@ -134,10 +134,10 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
final GuiCheckbox checkbox = new GuiCheckbox() {
@Override
public GuiCheckbox setChecked(boolean checked) {
extra.setHidden(p.getUniqueID(), !checked);
extra.setHidden(p.getUuid(), !checked);
return super.setChecked(checked);
}
}.setChecked(!extra.isHidden(p.getUniqueID()));
}.setChecked(!extra.isHidden(p.getUuid()));
new GuiPanel(playersScrollable.getListPanel()).setLayout(new CustomLayout<GuiPanel>() {
@Override
protected void layout(GuiPanel container, int width, int height) {
@@ -167,17 +167,17 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
extra.saveHiddenPlayers();
}
private static boolean isSpectator(EntityPlayer e) {
private static boolean isSpectator(PlayerEntity e) {
//#if MC>=10904
return e.isInvisible() && e.getActivePotionEffect(MobEffects.INVISIBILITY) == null;
return e.isInvisible() && e.getStatusEffect(StatusEffects.INVISIBILITY) == null;
//#else
//$$ return e.isInvisible() && e.getActivePotionEffect(Potion.invisibility) == null;
//#endif
}
private static final class PlayerComparator implements Comparator<EntityPlayer> {
private static final class PlayerComparator implements Comparator<PlayerEntity> {
@Override
public int compare(EntityPlayer o1, EntityPlayer o2) {
public int compare(PlayerEntity o1, PlayerEntity o2) {
if (isSpectator(o1) && !isSpectator(o2)) return 1;
if (isSpectator(o2) && !isSpectator(o1)) return -1;
//#if MC>=11300

18
src/main/java/com/replaymod/extras/playeroverview/mixin/MixinRender.java
View File

@@ -2,15 +2,15 @@ package com.replaymod.extras.playeroverview.mixin;
import com.replaymod.extras.ReplayModExtras;
import com.replaymod.extras.playeroverview.PlayerOverview;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
//#if MC>=10800
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.render.VisibleRegion;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
//#else
//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -31,15 +31,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
*
* For 1.7.10, that method doesn't exist, so we use a combination of the event and inject into
*/
@Mixin(value = Render.class, priority = 1200)
@Mixin(value = EntityRenderer.class, priority = 1200)
public abstract class MixinRender {
//#if MC>=10800
@Inject(method = "shouldRender", at=@At("HEAD"), cancellable = true)
public void replayModExtras_isPlayerHidden(Entity entity, ICamera camera, double camX, double camY, double camZ, CallbackInfoReturnable<Boolean> ci) {
@Inject(method = "isVisible", at=@At("HEAD"), cancellable = true)
public void replayModExtras_isPlayerHidden(Entity entity, VisibleRegion camera, double camX, double camY, double camZ, CallbackInfoReturnable<Boolean> ci) {
ReplayModExtras.instance.get(PlayerOverview.class).ifPresent(playerOverview -> {
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
if (playerOverview.isHidden(player.getUniqueID())) {
if (entity instanceof PlayerEntity) {
PlayerEntity player = (PlayerEntity) entity;
if (playerOverview.isHidden(player.getUuid())) {
ci.setReturnValue(false);
}
}

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

@@ -1,6 +1,6 @@
package com.replaymod.extras.urischeme;
import net.minecraft.util.Util;
import net.minecraft.util.SystemUtil;
import javax.swing.*;
import java.io.*;
@@ -70,12 +70,12 @@ public abstract class UriScheme {
}
public static UriScheme create() {
switch (Util.getOSType()) {
case LINUX:
switch (SystemUtil.getOperatingSystem()) {
case UNIX:
return new LinuxUriScheme();
case WINDOWS:
return new WindowsUriScheme();
case OSX:
case MAC:
return new OSXUriScheme();
case SOLARIS:
case UNKNOWN:

12
src/main/java/com/replaymod/extras/youtube/GuiYoutubeUpload.java
View File

@@ -21,11 +21,11 @@ import de.johni0702.minecraft.gui.popup.GuiFileChooserPopup;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import joptsimple.internal.Strings;
import lombok.RequiredArgsConstructor;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
import org.apache.commons.io.IOUtils;
//#if MC>=11300
import net.minecraft.util.Util;
import net.minecraft.util.SystemUtil;
//#else
//$$ import org.lwjgl.Sys;
//#endif
@@ -83,7 +83,7 @@ public class GuiYoutubeUpload extends GuiScreen {
public final GuiTextArea descriptionField = new GuiTextArea().setMaxCharCount(Integer.MAX_VALUE)
.setMaxTextWidth(Integer.MAX_VALUE).setMaxTextHeight(Integer.MAX_VALUE);
{
descriptionField.setText(new String[]{I18n.format("replaymod.gui.videodescription")});
descriptionField.setText(new String[]{I18n.translate("replaymod.gui.videodescription")});
}
public final GuiTextField tagsField = new GuiTextField().setI18nHint("replaymod.gui.videotags");
@@ -219,17 +219,17 @@ public class GuiYoutubeUpload extends GuiScreen {
Desktop.getDesktop().browse(new URL(url).toURI());
} catch(Throwable throwable) {
//#if MC>=11400
//$$ SystemUtil.getOperatingSystem().open(url);
SystemUtil.getOperatingSystem().open(url);
//#else
//#if MC>=11300
Util.getOSType().openURI(url);
//$$ Util.getOSType().openURI(url);
//#else
//$$ Sys.openURL(url);
//#endif
//#endif
}
upload = null;
progressBar.setLabel(I18n.format("replaymod.gui.ytuploadprogress.done", url));
progressBar.setLabel(I18n.translate("replaymod.gui.ytuploadprogress.done", url));
setState(false);
}

4
src/main/java/com/replaymod/extras/youtube/VideoVisibility.java
View File

@@ -1,12 +1,12 @@
package com.replaymod.extras.youtube;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
public enum VideoVisibility {
PUBLIC, UNLISTED, PRIVATE;
@Override
public String toString() {
return I18n.format("replaymod.gui.videovisibility." + name().toLowerCase());
return I18n.translate("replaymod.gui.videovisibility." + name().toLowerCase());
}
}

18
src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java
View File

@@ -8,11 +8,11 @@ import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
//#if MC>=11400
//$$ import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback;
//$$ import net.minecraft.client.gui.Screen;
import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback;
import net.minecraft.client.gui.Screen;
//#else
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
//$$ import net.minecraftforge.client.event.GuiScreenEvent;
//$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
//#endif
import static com.replaymod.core.versions.MCVer.*;
@@ -24,12 +24,12 @@ public class YoutubeUpload extends EventRegistrations implements Extra {
}
//#if MC>=11400
//$$ { on(OpenGuiScreenCallback.EVENT, this::onGuiOpen); }
//$$ private void onGuiOpen(Screen vanillaGui) {
{ on(OpenGuiScreenCallback.EVENT, this::onGuiOpen); }
private void onGuiOpen(Screen vanillaGui) {
//#else
@SubscribeEvent
public void onGuiOpen(GuiScreenEvent.InitGuiEvent.Post event) {
net.minecraft.client.gui.GuiScreen vanillaGui = getGui(event);
//$$ @SubscribeEvent
//$$ public void onGuiOpen(GuiScreenEvent.InitGuiEvent.Post event) {
//$$ net.minecraft.client.gui.GuiScreen vanillaGui = getGui(event);
//#endif
if (GuiScreen.from(vanillaGui) instanceof GuiRenderingDone) {
GuiRenderingDone gui = (GuiRenderingDone) GuiScreen.from(vanillaGui);

6
src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java
View File

@@ -28,7 +28,7 @@ import com.replaymod.render.RenderSettings;
import com.replaymod.render.metadata.MetadataInjector;
import lombok.Getter;
import lombok.NonNull;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MinecraftClient;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.io.FileUtils;
@@ -66,7 +66,7 @@ public class YoutubeUploader {
@Getter
private volatile boolean cancelled;
public YoutubeUploader(Minecraft minecraft, File videoFile, int videoFrames,
public YoutubeUploader(MinecraftClient minecraft, File videoFile, int videoFrames,
String thumbnailFormat, byte[] thumbnailImage,
RenderSettings settings, VideoVisibility videoVisibility, VideoSnippet videoSnippet)
throws GeneralSecurityException, IOException {
@@ -78,7 +78,7 @@ public class YoutubeUploader {
this.videoVisibility = videoVisibility;
this.videoSnippet = videoSnippet;
this.httpTransport = GoogleNetHttpTransport.newTrustedTransport();
this.dataStoreFactory = new FileDataStoreFactory(minecraft.gameDir);
this.dataStoreFactory = new FileDataStoreFactory(minecraft.runDirectory);
}