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

Update to 20w22a (minimal mode only)

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-04 11:54:33 +02:00
parent 6210cb09aa
commit 88be6b3935
26 changed files with 293 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,11 +82,15 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
// There doesn't seem to be an KeyBindingUpdate event, so we'll just update it every time
String keyName = "???";
try {
//#if MC>=11600
//$$ keyName = keyBinding.getBoundKeyLocalizedText().asString();
//#else
//#if MC>=11400
keyName = keyBinding.getLocalizedName();
//#else
//$$ keyName = Keyboard.getKeyName(keyBinding.getKeyCode());
//#endif
//#endif
} catch (ArrayIndexOutOfBoundsException e) {
// Apparently windows likes to press strange keys, see https://www.replaymod.com/forum/thread/55
}

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

@@ -116,7 +116,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
}.setSize(16, 16),
new GuiLabel().setText(
//#if MC>=11400
p.getName().asFormattedString()
p.getName().asString()
//#else
//#if MC>=10800
//$$ p.getName()
@@ -181,7 +181,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
if (isSpectator(o1) && !isSpectator(o2)) return 1;
if (isSpectator(o2) && !isSpectator(o1)) return -1;
//#if MC>=11400
return o1.getName().asFormattedString().compareToIgnoreCase(o2.getName().asFormattedString());
return o1.getName().asString().compareToIgnoreCase(o2.getName().asString());
//#else
//#if MC>=10800
//$$ return o1.getName().compareToIgnoreCase(o2.getName());