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

Work around mixin bug where a non-@Shadow field is treated as @Shadow

Browse Source 
Note: Happens on 1.12.2 (different mappings than 1.14.1) and probably
only in dev env.
This commit is contained in:
Jonas Herzig
2019-05-20 18:37:40 +02:00
parent fc1d99f985
commit 993cdeab73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java
View File

@@ -29,7 +29,8 @@ import java.util.UUID;
@Mixin(ClientPlayNetworkHandler.class) @Mixin(ClientPlayNetworkHandler.class)
public abstract class MixinNetHandlerPlayClient { public abstract class MixinNetHandlerPlayClient {
private static MinecraftClient gameController = MCVer.getMinecraft(); // The stupid name is required as otherwise Mixin treats it as a shadow, seemingly ignoring the lack of @Shadow
private static MinecraftClient mcStatic = MCVer.getMinecraft();
//#if MC>=10800 //#if MC>=10800
@Shadow @Shadow
@@ -37,7 +38,7 @@ public abstract class MixinNetHandlerPlayClient {
//#endif //#endif
public RecordingEventHandler getRecordingEventHandler() { public RecordingEventHandler getRecordingEventHandler() {
return ((RecordingEventHandler.RecordingEventSender) gameController.worldRenderer).getRecordingEventHandler(); return ((RecordingEventHandler.RecordingEventSender) mcStatic.worldRenderer).getRecordingEventHandler();
} }
/** /**
@@ -50,7 +51,7 @@ public abstract class MixinNetHandlerPlayClient {
//#if MC>=10800 //#if MC>=10800
@Inject(method = "onPlayerList", at=@At("HEAD")) @Inject(method = "onPlayerList", at=@At("HEAD"))
public void recordOwnJoin(PlayerListS2CPacket packet, CallbackInfo ci) { public void recordOwnJoin(PlayerListS2CPacket packet, CallbackInfo ci) {
if (gameController.player == null) return; if (mcStatic.player == null) return;
RecordingEventHandler handler = getRecordingEventHandler(); RecordingEventHandler handler = getRecordingEventHandler();
if (handler != null && packet.getAction() == PlayerListS2CPacket.Action.ADD_PLAYER) { if (handler != null && packet.getAction() == PlayerListS2CPacket.Action.ADD_PLAYER) {
@@ -76,7 +77,7 @@ public abstract class MixinNetHandlerPlayClient {
for (com.github.steveice10.mc.protocol.data.game.PlayerListEntry data : mcpl.getEntries()) { for (com.github.steveice10.mc.protocol.data.game.PlayerListEntry data : mcpl.getEntries()) {
if (data.getProfile() == null || data.getProfile().getId() == null) continue; if (data.getProfile() == null || data.getProfile().getId() == null) continue;
// Only add spawn packet for our own player and only if he isn't known yet // Only add spawn packet for our own player and only if he isn't known yet
if (data.getProfile().getId().equals(gameController.player.getGameProfile().getId()) if (data.getProfile().getId().equals(mcStatic.player.getGameProfile().getId())
&& !this.playerListEntries.containsKey(data.getProfile().getId())) { && !this.playerListEntries.containsKey(data.getProfile().getId())) {
handler.onPlayerJoin(); handler.onPlayerJoin();
} }