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

4
src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java
View File

@@ -14,7 +14,7 @@ import de.johni0702.minecraft.gui.function.Typeable;
import de.johni0702.minecraft.gui.utils.lwjgl.Point;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -219,7 +219,7 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline<GuiMarkerTimeline> im
protected String getTooltipText(RenderInfo renderInfo) {
Marker marker = getMarkerAt(renderInfo.mouseX, renderInfo.mouseY);
if (marker != null) {
return marker.getName() != null ? marker.getName() : I18n.format("replaymod.gui.ingame.unnamedmarker");
return marker.getName() != null ? marker.getName() : I18n.translate("replaymod.gui.ingame.unnamedmarker");
}
return super.getTooltipText(renderInfo);
}

16
src/main/java/com/replaymod/replay/gui/overlay/GuiReplayOverlay.java
View File

@@ -19,8 +19,8 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import de.johni0702.minecraft.gui.utils.lwjgl.WritablePoint;
import net.minecraft.client.GameSettings;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.options.GameOptions;
import net.minecraft.client.resource.language.I18n;
//#if MC>=11300
import com.replaymod.core.events.KeyBindingEventCallback;
@@ -117,7 +117,7 @@ public class GuiReplayOverlay extends AbstractGuiOverlay<GuiReplayOverlay> {
@Override
public void run() {
double speed = getSpeedSliderValue();
speedSlider.setText(I18n.format("replaymod.gui.speed") + ": " + speed + "x");
speedSlider.setText(I18n.translate("replaymod.gui.speed") + ": " + speed + "x");
ReplaySender replaySender = replayHandler.getReplaySender();
if (!replaySender.paused()) {
replaySender.setReplaySpeed(speed);
@@ -157,7 +157,7 @@ public class GuiReplayOverlay extends AbstractGuiOverlay<GuiReplayOverlay> {
@Override
public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
// Do not render overlay when user pressed F1 and we are not currently in some popup
if (getMinecraft().gameSettings.hideGUI && isAllowUserInput()) {
if (getMinecraft().options.hudHidden && isAllowUserInput()) {
// Note that this only applies to when the mouse is visible, otherwise
// the draw method isn't called in the first place
return;
@@ -178,8 +178,8 @@ public class GuiReplayOverlay extends AbstractGuiOverlay<GuiReplayOverlay> {
//$$ @SubscribeEvent
//$$ public void onKeyBindingEvent(InputEvent.KeyInputEvent event) {
//#endif
GameSettings gameSettings = getMinecraft().gameSettings;
while (gameSettings.keyBindChat.isPressed() || gameSettings.keyBindCommand.isPressed()) {
GameOptions gameSettings = getMinecraft().options;
while (gameSettings.keyChat.wasPressed() || gameSettings.keyCommand.wasPressed()) {
if (!isMouseVisible()) {
setMouseVisible(true);
}
@@ -196,10 +196,10 @@ public class GuiReplayOverlay extends AbstractGuiOverlay<GuiReplayOverlay> {
//$$ if (!Keyboard.getEventKeyState()) return;
//$$ int key = Keyboard.getEventKey();
//#endif
GameSettings gameSettings = getMinecraft().gameSettings;
GameOptions gameSettings = getMinecraft().options;
// Handle the F1 key binding while the overlay is opened as a gui screen
if (isMouseVisible() && key == Keyboard.KEY_F1) {
gameSettings.hideGUI = !gameSettings.hideGUI;
gameSettings.hudHidden = !gameSettings.hudHidden;
}
}
}

2
src/main/java/com/replaymod/replay/gui/screen/GuiModCompatWarning.java
View File

@@ -81,7 +81,7 @@ public class GuiModCompatWarning extends AbstractGuiScreen<GuiModCompatWarning>
}
}
cancelButton.onClick(() -> getMinecraft().displayGuiScreen(null));
cancelButton.onClick(() -> getMinecraft().openScreen(null));
loadButton.onClick(() -> {
try {
mod.startReplay(replayFile, false);

32
src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java
View File

@@ -5,7 +5,7 @@ import com.google.common.base.Supplier;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.text.TextFormat;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.SettingsRegistry;
import com.replaymod.core.gui.GuiReplaySettings;
@@ -36,9 +36,9 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import lombok.Getter;
import net.minecraft.client.gui.GuiErrorScreen;
import net.minecraft.crash.CrashReport;
import net.minecraft.crash.ReportedException;
import net.minecraft.client.gui.menu.NoticeScreen;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.crash.CrashException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOCase;
import org.apache.commons.io.filefilter.SuffixFileFilter;
@@ -57,9 +57,9 @@ import java.util.List;
import static com.replaymod.replay.ReplayModReplay.LOGGER;
//#if MC>=11400
//$$ import net.minecraft.text.TranslatableTextComponent;
import net.minecraft.text.TranslatableTextComponent;
//#else
import net.minecraft.client.resources.I18n;
//$$ import net.minecraft.client.resources.I18n;
//#endif
public class GuiReplayViewer extends GuiScreen {
@@ -141,14 +141,14 @@ public class GuiReplayViewer extends GuiScreen {
} catch (IOException e) {
// We failed (might also be their OS)
e.printStackTrace();
getMinecraft().displayGuiScreen(new GuiErrorScreen(
getMinecraft().openScreen(new NoticeScreen(
//#if MC>=11400
//$$ () -> {},
//$$ new TranslatableTextComponent("replaymod.gui.viewer.delete.failed1"),
//$$ new TranslatableTextComponent("replaymod.gui.viewer.delete.failed2")
() -> {},
new TranslatableTextComponent("replaymod.gui.viewer.delete.failed1"),
new TranslatableTextComponent("replaymod.gui.viewer.delete.failed2")
//#else
I18n.format("replaymod.gui.viewer.delete.failed1"),
I18n.format("replaymod.gui.viewer.delete.failed2")
//$$ I18n.format("replaymod.gui.viewer.delete.failed1"),
//$$ I18n.format("replaymod.gui.viewer.delete.failed2")
//#endif
));
return;
@@ -170,7 +170,7 @@ public class GuiReplayViewer extends GuiScreen {
String name = list.getSelected().name.getText();
GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this,
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.linea").setColor(Colors.BLACK),
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + TextFormatting.RESET).setColor(Colors.BLACK)
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + TextFormat.RESET).setColor(Colors.BLACK)
).setYesI18nLabel("replaymod.gui.delete").setNoI18nLabel("replaymod.gui.cancel");
Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
@Override
@@ -203,7 +203,7 @@ public class GuiReplayViewer extends GuiScreen {
public final GuiButton cancelButton = new GuiButton().onClick(new Runnable() {
@Override
public void run() {
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}).setSize(73, 20).setI18nLabel("replaymod.gui.cancel");
@@ -225,7 +225,7 @@ public class GuiReplayViewer extends GuiScreen {
try {
list.setFolder(mod.getCore().getReplayFolder());
} catch (IOException e) {
throw new ReportedException(CrashReport.makeCrashReport(e, "Getting replay folder"));
throw new CrashException(CrashReport.create(e, "Getting replay folder"));
}
setTitle(new GuiLabel().setI18nText("replaymod.gui.replayviewer"));
@@ -404,7 +404,7 @@ public class GuiReplayViewer extends GuiScreen {
public GuiReplayEntry(File file, ReplayMetaData metaData, BufferedImage thumbImage) {
this.file = file;
name.setText(TextFormatting.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
name.setText(TextFormat.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
if (StringUtils.isEmpty(metaData.getServerName())
|| !ReplayMod.instance.getSettingsRegistry().get(Setting.SHOW_SERVER_IPS)) {
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);