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

14
src/main/java/com/replaymod/online/ReplayModOnline.java
View File

@@ -57,7 +57,7 @@ public class ReplayModOnline implements Module {
@Override
public void initClient() {
Path path = MCVer.getMinecraft().gameDir.toPath().resolve("config/replaymod-online.token");
Path path = MCVer.getMinecraft().runDirectory.toPath().resolve("config/replaymod-online.token");
PlainFileAuthData authData = new PlainFileAuthData(path);
apiClient = new ApiClient(authData);
if (Files.notExists(path)) {
@@ -89,11 +89,11 @@ public class ReplayModOnline implements Module {
@Override
public void run() {
//#if MC>=11400
//$$ if (getMinecraft().overlay != null) {
//$$ // delay until after resources have been loaded
//$$ core.runLater(this);
//$$ return;
//$$ }
if (getMinecraft().overlay != null) {
// delay until after resources have been loaded
core.runLater(this);
return;
}
//#endif
GuiScreen parent = GuiScreen.wrap(getMinecraft().currentScreen);
new GuiLoginPrompt(apiClient, parent, parent, false).display();
@@ -142,7 +142,7 @@ public class ReplayModOnline implements Module {
public File getDownloadsFolder() {
String path = core.getSettingsRegistry().get(Setting.DOWNLOAD_PATH);
return new File(path.startsWith("./") ? getMinecraft().gameDir : null, path);
return new File(path.startsWith("./") ? getMinecraft().runDirectory : null, path);
}
public File getDownloadedFile(int id) {

6
src/main/java/com/replaymod/online/api/ApiClient.java
View File

@@ -11,7 +11,7 @@ import com.replaymod.online.AuthenticationHash;
import com.replaymod.online.api.replay.ReplayModApiMethods;
import com.replaymod.online.api.replay.SearchQuery;
import com.replaymod.online.api.replay.holders.*;
import net.minecraft.client.Minecraft;
import net.minecraft.client.MinecraftClient;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -31,7 +31,7 @@ import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
public class ApiClient {
private static final Minecraft mc = MCVer.getMinecraft();
private static final MinecraftClient mc = MCVer.getMinecraft();
private static final Gson gson = new Gson();
private static final JsonParser jsonParser = new JsonParser();
@@ -101,7 +101,7 @@ public class ApiClient {
AuthenticationHash hash = new AuthenticationHash();
mc.getSessionService().joinServer(
mc.getSession().getProfile(), mc.getSession().getToken(), hash.hash);
mc.getSession().getProfile(), mc.getSession().getAccessToken(), hash.hash);
return hash;
}

4
src/main/java/com/replaymod/online/api/replay/holders/ApiError.java
View File

@@ -1,7 +1,7 @@
package com.replaymod.online.api.replay.holders;
import lombok.Data;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
@Data
public class ApiError {
@@ -13,7 +13,7 @@ public class ApiError {
public String getTranslatedDesc() {
try {
return I18n.format(key, (Object[]) objects);
return I18n.translate(key, (Object[]) objects);
} catch(Exception e) {
e.printStackTrace();
return desc;

4
src/main/java/com/replaymod/online/api/replay/holders/Category.java
View File

@@ -1,6 +1,6 @@
package com.replaymod.online.api.replay.holders;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
public enum Category {
@@ -27,7 +27,7 @@ public enum Category {
}
public String toNiceString() {
return I18n.format(this.name);
return I18n.translate(this.name);
}
public Category next() {

8
src/main/java/com/replaymod/online/gui/GuiRegister.java
View File

@@ -15,7 +15,7 @@ import de.johni0702.minecraft.gui.utils.Utils;
import com.replaymod.core.utils.Patterns;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.font.TextRenderer;
public class GuiRegister extends AbstractGuiScreen<GuiRegister> {
public static final int MIN_PW_LENGTH = 5;
@@ -56,9 +56,9 @@ public class GuiRegister extends AbstractGuiScreen<GuiRegister> {
pos(cancelButton, width / 2 + 2, 170);
pos(statusLabel, width / 2 - statusLabel.getMinSize().getWidth() / 2, 152);
FontRenderer font = getMinecraft().fontRenderer;
int lineCount = font.listFormattedStringToWidth(disclaimerLabel.getText(), width - 10).size();
Dimension dim = new Dimension(width - 10, font.FONT_HEIGHT * lineCount);
TextRenderer font = getMinecraft().textRenderer;
int lineCount = font.wrapStringToWidthAsList(disclaimerLabel.getText(), width - 10).size();
Dimension dim = new Dimension(width - 10, font.fontHeight * lineCount);
disclaimerLabel.setSize(dim);
pos(disclaimerLabel, 5, height - dim.getHeight() - 5);
}

12
src/main/java/com/replaymod/online/gui/GuiReplayCenter.java
View File

@@ -39,7 +39,7 @@ import de.johni0702.minecraft.gui.utils.Consumer;
import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import org.apache.commons.lang3.StringUtils;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.text.TextFormat;
import java.awt.image.BufferedImage;
import java.io.IOException;
@@ -220,7 +220,7 @@ public class GuiReplayCenter extends GuiScreen {
public void onSuccess(Boolean result) {
if (result) {
apiClient.logout();
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}
@@ -235,7 +235,7 @@ public class GuiReplayCenter extends GuiScreen {
public final GuiButton mainMenuButton = new GuiButton().onClick(new Runnable() {
@Override
public void run() {
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}).setSize(195, 20).setI18nLabel("replaymod.gui.mainmenu");
@@ -417,9 +417,9 @@ public class GuiReplayCenter extends GuiScreen {
this.downloaded = downloaded;
ReplayMetaData metaData = fileInfo.getMetadata();
name.setText(TextFormatting.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName()));
name.setText(TextFormat.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName()));
author.setI18nText("replaymod.gui.center.author",
"" + TextFormatting.GRAY + TextFormatting.ITALIC, fileInfo.getOwner());
"" + TextFormat.GRAY + TextFormat.ITALIC, fileInfo.getOwner());
if (StringUtils.isEmpty(metaData.getServerName())) {
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
} else {
@@ -443,7 +443,7 @@ public class GuiReplayCenter extends GuiScreen {
favorites.setText("⭑" + fileInfo.getFavorites());
likes.setText("⬆" + fileInfo.getRatings().getPositive());
dislikes.setText("⬇" + fileInfo.getRatings().getNegative());
category.setText(TextFormatting.ITALIC + Optional.fromNullable(Category.fromId(fileInfo.getCategory()))
category.setText(TextFormat.ITALIC + Optional.fromNullable(Category.fromId(fileInfo.getCategory()))
.or(Category.MISCELLANEOUS).toNiceString());
addElements(null, durationPanel, downloadsPanel);

16
src/main/java/com/replaymod/online/gui/GuiReplayCenterSearch.java
View File

@@ -16,7 +16,7 @@ import de.johni0702.minecraft.gui.layout.GridLayout;
import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
import de.johni0702.minecraft.gui.utils.Colors;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resource.language.I18n;
//#if MC>=11300
import com.replaymod.core.versions.MCVer.Keyboard;
@@ -61,26 +61,26 @@ public class GuiReplayCenterSearch extends AbstractGuiPopup<GuiReplayCenterSearc
}).setI18nLabel("replaymod.gui.center.top.search");
{
List<String> categories = new ArrayList<>();
categories.add(I18n.format("replaymod.gui.center.search.category"));
categories.add(I18n.translate("replaymod.gui.center.search.category"));
for (Category c : Category.values()) {
categories.add(c.toNiceString());
}
category.setValues(categories.toArray(new String[categories.size()]));
List<String> versions = new ArrayList<>();
versions.add(I18n.format("replaymod.gui.center.search.version"));
versions.add(I18n.translate("replaymod.gui.center.search.version"));
for (MinecraftVersion v : MinecraftVersion.values()) {
versions.add(v.toNiceName());
}
version.setValues(versions.toArray(new String[versions.size()]));
gameType.setI18nLabel("replaymod.gui.center.search.gametype")
.setValues(I18n.format("options.particles.all"),
I18n.format("menu.singleplayer"),
I18n.format("menu.multiplayer"));
.setValues(I18n.translate("options.particles.all"),
I18n.translate("menu.singleplayer"),
I18n.translate("menu.multiplayer"));
sort.setI18nLabel("replaymod.gui.center.search.order")
.setValues(I18n.format("replaymod.gui.center.search.order.best"),
I18n.format("replaymod.gui.center.search.order.recent"));
.setValues(I18n.translate("replaymod.gui.center.search.order.best"),
I18n.translate("replaymod.gui.center.search.order.recent"));
popup.setLayout(new GridLayout().setColumns(3).setSpacingX(5).setSpacingY(5));
popup.addElements(null,

4
src/main/java/com/replaymod/online/gui/GuiReplayDownloading.java
View File

@@ -10,7 +10,7 @@ import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.element.GuiLabel;
import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.text.TextFormat;
import java.io.File;
import java.io.IOException;
@@ -34,7 +34,7 @@ public class GuiReplayDownloading extends AbstractGuiScreen<GuiReplayDownloading
this.apiClient = mod.getApiClient();
setTitle(new GuiLabel().setI18nText("replaymod.gui.viewer.download.title"));
final GuiLabel subTitle = new GuiLabel(this).setI18nText("replaymod.gui.viewer.download.message",
TextFormatting.UNDERLINE + name + TextFormatting.RESET);
TextFormat.UNDERLINE + name + TextFormat.RESET);
setLayout(new CustomLayout<GuiReplayDownloading>() {
@Override
protected void layout(GuiReplayDownloading container, int width, int height) {

6
src/main/java/com/replaymod/online/gui/GuiSaveModifiedReplay.java
View File

@@ -44,7 +44,7 @@ public class GuiSaveModifiedReplay extends GuiScreen {
} catch (IOException e) {
e.printStackTrace();
}
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}
@@ -59,7 +59,7 @@ public class GuiSaveModifiedReplay extends GuiScreen {
} catch (IOException e) {
e.printStackTrace();
}
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}
}).setSize(147, 20).setI18nLabel("replaymod.gui.replaymodified.yes");
@@ -67,7 +67,7 @@ public class GuiSaveModifiedReplay extends GuiScreen {
@Override
public void run() {
FileUtils.deleteQuietly(file);
getMinecraft().displayGuiScreen(null);
getMinecraft().openScreen(null);
}
}).setSize(147, 20).setI18nLabel("replaymod.gui.replaymodified.no");

16
src/main/java/com/replaymod/online/gui/GuiUploadReplay.java
View File

@@ -32,10 +32,10 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout;
import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
import de.johni0702.minecraft.gui.utils.Colors;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.crash.CrashReport;
import net.minecraft.crash.ReportedException;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.client.options.KeyBinding;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.crash.CrashException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
@@ -61,7 +61,7 @@ public class GuiUploadReplay extends GuiScreen {
public final GuiLabel durationLabel = new GuiLabel();
public final GuiCheckbox hideServerIP = new GuiCheckbox();
public final GuiDropdownMenu<Category> category = new GuiDropdownMenu<Category>().setHeight(20)
.setValues(Category.values()).setToString(v -> I18n.format("replaymod.category") + ": " + v.toNiceString());
.setValues(Category.values()).setToString(v -> I18n.translate("replaymod.category") + ": " + v.toNiceString());
public final GuiTextField tags = new GuiTextField().setHeight(20).setMaxLength(30)
.setI18nHint("replaymod.gui.upload.tagshint");
@@ -134,7 +134,7 @@ public class GuiUploadReplay extends GuiScreen {
metaData = replayFile.getMetaData();
optThumbnail = replayFile.getThumb();
} catch (IOException e) {
throw new ReportedException(CrashReport.makeCrashReport(e, "Read replay file " + file.getName()));
throw new CrashException(CrashReport.create(e, "Read replay file " + file.getName()));
}
// Apply to gui
@@ -152,7 +152,7 @@ public class GuiUploadReplay extends GuiScreen {
KeyBindingRegistry registry = mod.getCore().getKeyBindingRegistry();
KeyBinding keyBinding = registry.getKeyBindings().get("replaymod.input.thumbnail");
//#if MC>=11300
String keyName = keyBinding == null ? "???" : keyBinding.func_197978_k();
String keyName = keyBinding == null ? "???" : keyBinding.getLocalizedName();
//#else
//$$ String keyName = keyBinding == null ? "???" : GameSettings.getKeyDisplayString(keyBinding.getKeyCode());
//#endif
@@ -216,7 +216,7 @@ public class GuiUploadReplay extends GuiScreen {
if (e instanceof ApiException) {
message = e.getLocalizedMessage();
} else {
message = I18n.format("replaymod.gui.unknownerror");
message = I18n.translate("replaymod.gui.unknownerror");
}
mod.getCore().runLater(() -> {
// Show error popup

50
src/main/java/com/replaymod/online/handler/GuiHandler.java
View File

@@ -9,18 +9,18 @@ import com.replaymod.replay.gui.screen.GuiReplayViewer;
import com.replaymod.replay.handler.GuiHandler.InjectedButton;
import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
import de.johni0702.minecraft.gui.container.GuiScreen;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiMainMenu;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.MainMenuScreen;
import net.minecraft.client.resource.language.I18n;
//#if MC>=11400
//$$ import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback;
//$$ import net.minecraft.client.gui.Screen;
//$$ import net.minecraft.client.gui.widget.AbstractButtonWidget;
//$$ import java.util.List;
import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback;
import net.minecraft.client.gui.Screen;
import net.minecraft.client.gui.widget.AbstractButtonWidget;
import java.util.List;
//#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 java.io.File;
@@ -37,37 +37,37 @@ public class GuiHandler extends EventRegistrations {
}
//#if MC>=11400
//$$ { on(InitScreenCallback.EVENT, this::injectIntoMainMenu); }
//$$ public void injectIntoMainMenu(Screen guiScreen, List<AbstractButtonWidget> buttonList) {
{ on(InitScreenCallback.EVENT, this::injectIntoMainMenu); }
public void injectIntoMainMenu(Screen guiScreen, List<AbstractButtonWidget> buttonList) {
//#else
@SubscribeEvent
public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
final net.minecraft.client.gui.GuiScreen guiScreen = getGui(event);
//$$ @SubscribeEvent
//$$ public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
//$$ final net.minecraft.client.gui.GuiScreen guiScreen = getGui(event);
//#endif
if (!(guiScreen instanceof GuiMainMenu)) {
if (!(guiScreen instanceof MainMenuScreen)) {
return;
}
GuiButton button = new InjectedButton(
ButtonWidget button = new InjectedButton(
guiScreen,
BUTTON_REPLAY_CENTER,
guiScreen.width / 2 + 2,
guiScreen.height / 4 + 10 + 4 * 24,
98,
20,
I18n.format("replaymod.gui.replaycenter"),
I18n.translate("replaymod.gui.replaycenter"),
this::onButton
);
addButton(guiScreen, button);
}
//#if MC>=11400
//$$ { on(InitScreenCallback.EVENT, this::injectIntoReplayViewer); }
//$$ public void injectIntoReplayViewer(Screen vanillaGuiScreen, List<AbstractButtonWidget> buttonList) {
{ on(InitScreenCallback.EVENT, this::injectIntoReplayViewer); }
public void injectIntoReplayViewer(Screen vanillaGuiScreen, List<AbstractButtonWidget> buttonList) {
//#else
@SubscribeEvent
public void injectIntoReplayViewer(GuiScreenEvent.InitGuiEvent.Post event) {
net.minecraft.client.gui.GuiScreen vanillaGuiScreen = getGui(event);
//$$ @SubscribeEvent
//$$ public void injectIntoReplayViewer(GuiScreenEvent.InitGuiEvent.Post event) {
//$$ net.minecraft.client.gui.GuiScreen vanillaGuiScreen = getGui(event);
//#endif
AbstractGuiScreen guiScreen = GuiScreen.from(vanillaGuiScreen);
if (!(guiScreen instanceof GuiReplayViewer)) {
@@ -89,16 +89,16 @@ public class GuiHandler extends EventRegistrations {
//#if MC>=11300
private void onButton(InjectedButton button) {
net.minecraft.client.gui.GuiScreen guiScreen = button.guiScreen;
net.minecraft.client.gui.Screen guiScreen = button.guiScreen;
//#else
//$$ @SubscribeEvent
//$$ public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
//$$ net.minecraft.client.gui.GuiScreen guiScreen = getGui(event);
//$$ GuiButton button = getButton(event);
//#endif
if(!button.enabled) return;
if(!button.active) return;
if (guiScreen instanceof GuiMainMenu) {
if (guiScreen instanceof MainMenuScreen) {
if (button.id == BUTTON_REPLAY_CENTER) {
GuiReplayCenter replayCenter = new GuiReplayCenter(mod);
if (mod.isLoggedIn()) {