From 357501e5dbb88dc6e96b6eac111626ad7453566b Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 17 Jun 2019 12:04:13 +0200 Subject: [PATCH] Qualify some (remapped) field references which the preprocesser ignored The preprocessor should have complained about these but it didn't for some reason. This commit isn't fixing any imminent bug, it's just precautionary (and required to compile once the preprocessor is fixed). --- .../com/replaymod/recording/mixin/MixinWorldClient.java | 6 +++--- src/main/java/com/replaymod/replay/ReplayHandler.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java b/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java index 2d3bf882..1b1af283 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java +++ b/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java @@ -63,7 +63,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa //#endif private RecordingEventHandler replayModRecording_getRecordingEventHandler() { - return ((RecordingEventHandler.RecordingEventSender) client.worldRenderer).getRecordingEventHandler(); + return ((RecordingEventHandler.RecordingEventSender) this.client.worldRenderer).getRecordingEventHandler(); } // Sounds that are emitted by thePlayer no longer take the long way over the server @@ -79,7 +79,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa //#endif public void replayModRecording_recordClientSound(PlayerEntity player, double x, double y, double z, SoundEvent sound, SoundCategory category, float volume, float pitch, CallbackInfo ci) { - if (player == client.player) { + if (player == this.client.player) { RecordingEventHandler handler = replayModRecording_getRecordingEventHandler(); if (handler != null) { handler.onClientSound(sound, category, x, y, z, volume, pitch); @@ -96,7 +96,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa //$$ @Override //$$ public void playEvent (EntityPlayer player, int type, BlockPos pos, int data) { //#endif - if (player == client.player) { + if (player == this.client.player) { // We caused this event, the server won't send it to us RecordingEventHandler handler = replayModRecording_getRecordingEventHandler(); if (handler != null) { diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 6279c1f8..b8365844 100755 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -585,7 +585,7 @@ public class ReplayHandler { //$$ public void drawScreen(int mouseX, int mouseY, float partialTicks) { //#endif renderDirtBackground(0); - drawCenteredString(minecraft.textRenderer, I18n.translate("replaymod.gui.pleasewait"), + drawCenteredString(this.minecraft.textRenderer, I18n.translate("replaymod.gui.pleasewait"), width / 2, height / 2, 0xffffffff); } };