diff --git a/build.gradle b/build.gradle index 0b8825cc..45749588 100755 --- a/build.gradle +++ b/build.gradle @@ -34,9 +34,9 @@ archivesBaseName = "replaymod" minecraft { coreMod = 'com.replaymod.core.LoadingPlugin' - version = '1.11-13.19.1.2188' + version = '1.11.2-13.20.0.2216' runDir = "eclipse" - mappings = "snapshot_20161111" + mappings = "snapshot_20161220" replace '@MOD_VERSION@', project.version // Includes intentional whitespace to stop Forge from declaring the mod to be compatible with // a newer srg-compatible MC version (that may be using a different protocol version) @@ -69,7 +69,7 @@ dependencies { shade 'org.aspectj:aspectjrt:1.8.2' - shade 'com.github.replaymod:ReplayStudio:a5618f7' + shade 'com.github.replaymod:ReplayStudio:a4a75b3' testCompile 'junit:junit:4.11' } diff --git a/jGui b/jGui index e2bd9062..bd3fa93d 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit e2bd90628e29809609f7dad0acb1ab3adab2b7c8 +Subproject commit bd3fa93d7d531792c97958795eddd27438d1635a diff --git a/src/integration-test/java/com/replaymod/replay/SpectatePlayer.java b/src/integration-test/java/com/replaymod/replay/SpectatePlayer.java index e024f347..c248333b 100644 --- a/src/integration-test/java/com/replaymod/replay/SpectatePlayer.java +++ b/src/integration-test/java/com/replaymod/replay/SpectatePlayer.java @@ -34,7 +34,7 @@ public class SpectatePlayer extends AbstractTask { future.setException(new TimeoutException("Camera hasn't stopped spectating.")); return; } - if (mc.getRenderViewEntity() == mc.thePlayer) { + if (mc.getRenderViewEntity() == mc.player) { future.set(null); } } diff --git a/src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java b/src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java index 05a27731..3b34380d 100644 --- a/src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java +++ b/src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java @@ -52,17 +52,17 @@ public class DisableBetterSprinting { @SubscribeEvent(priority = EventPriority.HIGH) public void beforeGuiOpenEvent(GuiOpenEvent event) { - if (ReplayModReplay.instance.getReplayHandler() != null && mc.theWorld != null) { + if (ReplayModReplay.instance.getReplayHandler() != null && mc.world != null) { // During replay, get ready to revert BetterSprinting's overwritten playerController originalController = mc.playerController; - mc.theWorld.addEventListener(worldAccessHook); + mc.world.addEventListener(worldAccessHook); } } @SubscribeEvent(priority = EventPriority.LOW) public void afterGuiOpenEvent(GuiOpenEvent event) { - if (ReplayModReplay.instance.getReplayHandler() != null && mc.theWorld != null) { - mc.theWorld.addEventListener(worldAccessHook); + if (ReplayModReplay.instance.getReplayHandler() != null && mc.world != null) { + mc.world.addEventListener(worldAccessHook); } } @@ -93,7 +93,7 @@ public class DisableBetterSprinting { @Override public void playSoundToAllNearExcept(@Nullable EntityPlayer player, SoundEvent soundIn, SoundCategory category, double x, double y, double z, float volume, float pitch) {} @Override public void playRecord(SoundEvent soundIn, BlockPos pos) {} @Override public void spawnParticle(int p_180442_1_, boolean p_180442_2_, double p_180442_3_, double p_180442_5_, double p_180442_7_, double p_180442_9_, double p_180442_11_, double p_180442_13_, int... p_180442_15_) {} - @Override public void func_190570_a(int p_190570_1_, boolean p_190570_2_, boolean p_190570_3_, double p_190570_4_, double p_190570_6_, double p_190570_8_, double p_190570_10_, double p_190570_12_, double p_190570_14_, int... p_190570_16_) {} + @Override public void spawnParticle(int p_190570_1_, boolean p_190570_2_, boolean p_190570_3_, double p_190570_4_, double p_190570_6_, double p_190570_8_, double p_190570_10_, double p_190570_12_, double p_190570_14_, int... p_190570_16_) {} @Override public void onEntityAdded(Entity entityIn) {} @Override public void broadcastSound(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_) {} @Override public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {} diff --git a/src/main/java/com/replaymod/compat/oranges17animations/HideInvisibleEntities.java b/src/main/java/com/replaymod/compat/oranges17animations/HideInvisibleEntities.java index 58d8bb7f..d4f20165 100644 --- a/src/main/java/com/replaymod/compat/oranges17animations/HideInvisibleEntities.java +++ b/src/main/java/com/replaymod/compat/oranges17animations/HideInvisibleEntities.java @@ -20,7 +20,7 @@ public class HideInvisibleEntities { @SubscribeEvent(priority = EventPriority.HIGH) public void preRenderLiving(RenderLivingEvent.Pre event) { if (modLoaded) { - if (mc.thePlayer instanceof CameraEntity && event.getEntity().isInvisible()) { + if (mc.player instanceof CameraEntity && event.getEntity().isInvisible()) { event.setCanceled(true); } } diff --git a/src/main/java/com/replaymod/core/utils/Restrictions.java b/src/main/java/com/replaymod/core/utils/Restrictions.java index f3f0f437..251542eb 100644 --- a/src/main/java/com/replaymod/core/utils/Restrictions.java +++ b/src/main/java/com/replaymod/core/utils/Restrictions.java @@ -17,7 +17,7 @@ public class Restrictions { public String handle(SPacketCustomPayload packet) { PacketBuffer buffer = packet.getBufferData(); while (buffer.isReadable()) { - String name = buffer.readStringFromBuffer(64); + String name = buffer.readString(64); boolean active = buffer.readBoolean(); // if ("no_xray".equals(name)) { // noXray = active; diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java index feb9b459..ee41b96e 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java @@ -34,7 +34,7 @@ public class PlayerOverview implements Extra { public void run() { if (module.getReplayHandler() != null) { @SuppressWarnings("unchecked") - List players = mod.getMinecraft().theWorld.getPlayers(EntityPlayer.class, new Predicate() { + List players = mod.getMinecraft().world.getPlayers(EntityPlayer.class, new Predicate() { @Override public boolean apply(Object input) { return !(input instanceof CameraEntity); // Exclude the camera entity diff --git a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java index d7e6a3c2..065a7439 100644 --- a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java +++ b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java @@ -5,7 +5,8 @@ public enum MinecraftVersion { MC_1_8("Minecraft 1.8", "1.8"), MC_1_9_4("Minecraft 1.9.4", "1.9.4"), MC_1_10_2("Minecraft 1.10.2", "1.10.2"), - MC_1_11("Minecraft 1.11", "1.11"); + MC_1_11("Minecraft 1.11", "1.11"), + MC_1_11_2("Minecraft 1.11.2", "1.11.2"); private String niceName, apiName; diff --git a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java index 3c15874c..cc237ac8 100755 --- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java @@ -57,7 +57,7 @@ public class RecordingEventHandler { public void onPlayerJoin() { try { - packetListener.save(new SPacketSpawnPlayer(mc.thePlayer)); + packetListener.save(new SPacketSpawnPlayer(mc.player)); } catch(Exception e1) { e1.printStackTrace(); } @@ -65,7 +65,7 @@ public class RecordingEventHandler { public void onPlayerRespawn() { try { - packetListener.save(new SPacketSpawnPlayer(mc.thePlayer)); + packetListener.save(new SPacketSpawnPlayer(mc.player)); } catch(Exception e) { e.printStackTrace(); } @@ -93,7 +93,7 @@ public class RecordingEventHandler { @SubscribeEvent public void onPlayerTick(PlayerTickEvent e) { try { - if(e.player != mc.thePlayer) return; + if(e.player != mc.player) return; boolean force = false; if(lastX == null || lastY == null || lastZ == null) { @@ -168,62 +168,62 @@ public class RecordingEventHandler { */ //Inventory Handling - if (playerItems[0] != mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND)) { - playerItems[0] = mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND); + if (playerItems[0] != mc.player.getHeldItem(EnumHand.MAIN_HAND)) { + playerItems[0] = mc.player.getHeldItem(EnumHand.MAIN_HAND); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.MAINHAND, playerItems[0])); } - if (playerItems[1] != mc.thePlayer.getHeldItem(EnumHand.OFF_HAND)) { - playerItems[1] = mc.thePlayer.getHeldItem(EnumHand.OFF_HAND); + if (playerItems[1] != mc.player.getHeldItem(EnumHand.OFF_HAND)) { + playerItems[1] = mc.player.getHeldItem(EnumHand.OFF_HAND); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.OFFHAND, playerItems[1])); } - if (playerItems[2] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET)) { - playerItems[2] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET); + if (playerItems[2] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET)) { + playerItems[2] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.FEET, playerItems[2])); } - if (playerItems[3] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) { - playerItems[3] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS); + if (playerItems[3] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) { + playerItems[3] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.LEGS, playerItems[3])); } - if (playerItems[4] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) { - playerItems[4] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + if (playerItems[4] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) { + playerItems[4] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.CHEST, playerItems[4])); } - if (playerItems[5] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) { - playerItems[5] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD); + if (playerItems[5] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) { + playerItems[5] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.HEAD, playerItems[5])); } //Leaving Ride - if((!mc.thePlayer.isRiding() && lastRiding != -1) || - (mc.thePlayer.isRiding() && lastRiding != mc.thePlayer.getRidingEntity().getEntityId())) { - if(!mc.thePlayer.isRiding()) { + if((!mc.player.isRiding() && lastRiding != -1) || + (mc.player.isRiding() && lastRiding != mc.player.getRidingEntity().getEntityId())) { + if(!mc.player.isRiding()) { lastRiding = -1; } else { - lastRiding = mc.thePlayer.getRidingEntity().getEntityId(); + lastRiding = mc.player.getRidingEntity().getEntityId(); } packetListener.save(new SPacketEntityAttach(e.player, e.player.getRidingEntity())); } //Sleeping - if(!mc.thePlayer.isPlayerSleeping() && wasSleeping) { + if(!mc.player.isPlayerSleeping() && wasSleeping) { packetListener.save(new SPacketAnimation(e.player, 2)); wasSleeping = false; } // Active hand (e.g. eating, drinking, blocking) - if (mc.thePlayer.isHandActive() ^ wasHandActive || mc.thePlayer.getActiveHand() != lastActiveHand) { - wasHandActive = mc.thePlayer.isHandActive(); - lastActiveHand = mc.thePlayer.getActiveHand(); + if (mc.player.isHandActive() ^ wasHandActive || mc.player.getActiveHand() != lastActiveHand) { + wasHandActive = mc.player.isHandActive(); + lastActiveHand = mc.player.getActiveHand(); EntityDataManager dataManager = new EntityDataManager(null); int state = (wasHandActive ? 1 : 0) | (lastActiveHand == EnumHand.OFF_HAND ? 2 : 0); dataManager.register(EntityLiving.HAND_STATES, (byte) state); - packetListener.save(new SPacketEntityMetadata(mc.thePlayer.getEntityId(), dataManager, true)); + packetListener.save(new SPacketEntityMetadata(mc.player.getEntityId(), dataManager, true)); } } catch(Exception e1) { @@ -244,7 +244,7 @@ public class RecordingEventHandler { @SubscribeEvent public void onSleep(PlayerSleepInBedEvent event) { try { - if (event.getEntityPlayer() != mc.thePlayer) { + if (event.getEntityPlayer() != mc.player) { return; } @@ -260,7 +260,7 @@ public class RecordingEventHandler { @SubscribeEvent public void enterMinecart(MinecartInteractEvent event) { try { - if(event.getEntity() != mc.thePlayer) { + if(event.getEntity() != mc.player) { return; } @@ -273,7 +273,7 @@ public class RecordingEventHandler { } public void onBlockBreakAnim(int breakerId, BlockPos pos, int progress) { - EntityPlayer thePlayer = mc.thePlayer; + EntityPlayer thePlayer = mc.player; if (thePlayer != null && breakerId == thePlayer.getEntityId()) { packetListener.save(new SPacketBlockBreakAnim(breakerId, pos, progress)); } diff --git a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java b/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java index b7db8327..7420e7eb 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java +++ b/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java @@ -37,14 +37,14 @@ public abstract class MixinNetHandlerPlayClient { */ @Inject(method = "handlePlayerListItem", at=@At("HEAD")) public void recordOwnJoin(SPacketPlayerListItem packet, CallbackInfo ci) { - if (gameController.thePlayer == null) return; + if (gameController.player == null) return; RecordingEventHandler handler = getRecordingEventHandler(); if (handler != null && packet.getAction() == SPacketPlayerListItem.Action.ADD_PLAYER) { for (SPacketPlayerListItem.AddPlayerData data : packet.getEntries()) { 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 - if (data.getProfile().getId().equals(Minecraft.getMinecraft().thePlayer.getGameProfile().getId()) + if (data.getProfile().getId().equals(Minecraft.getMinecraft().player.getGameProfile().getId()) && !playerInfoMap.containsKey(data.getProfile().getId())) { handler.onPlayerJoin(); } diff --git a/src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java b/src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java index 366141e0..6d76c0ed 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java +++ b/src/main/java/com/replaymod/recording/mixin/MixinPlayerControllerMP.java @@ -23,6 +23,6 @@ public abstract class MixinPlayerControllerMP implements RecordingEventHandler.R @Redirect(method = "onPlayerDestroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;playEvent(ILnet/minecraft/util/math/BlockPos;I)V")) public void replayModRecording_playEvent_fixed(World world, int type, BlockPos pos, int data) { - world.playEvent(mc.thePlayer, type, pos, data); + world.playEvent(mc.player, type, pos, data); } } diff --git a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java b/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java index 74a5a57c..ac7a13f3 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java +++ b/src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java @@ -38,7 +38,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa @Inject(method = "playSound", at = @At("HEAD")) public void replayModRecording_recordClientSound(EntityPlayer player, double x, double y, double z, SoundEvent sound, SoundCategory category, float volume, float pitch, CallbackInfo ci) { - if (player == mc.thePlayer) { + if (player == mc.player) { RecordingEventHandler handler = replayModRecording_getRecordingEventHandler(); if (handler != null) { handler.onClientSound(sound, category, x, y, z, volume, pitch); @@ -50,7 +50,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa // These are handled in the World class, so we override the method in WorldClient and add our special handling. @Override public void playEvent(EntityPlayer player, int type, BlockPos pos, int data) { - if (player == mc.thePlayer) { + if (player == mc.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/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index 3f721ec8..f41c9e8d 100755 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -160,8 +160,8 @@ public class PacketListener extends ChannelInboundHandlerAdapter { Packet packet = (Packet) msg; if(packet instanceof SPacketCollectItem) { - if(mc.thePlayer != null || - ((SPacketCollectItem) packet).getEntityID() == mc.thePlayer.getEntityId()) { + if(mc.player != null || + ((SPacketCollectItem) packet).getEntityID() == mc.player.getEntityId()) { super.channelRead(ctx, msg); return; } @@ -233,7 +233,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter { } ByteBuf byteBuf = Unpooled.buffer(); PacketBuffer packetBuffer = new PacketBuffer(byteBuf); - packetBuffer.writeVarIntToBuffer(packetId); + packetBuffer.writeVarInt(packetId); packet.writePacketData(packetBuffer); byteBuf.readerIndex(0); diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 7b3afc31..9beaf95d 100755 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -110,12 +110,12 @@ public class ReplayHandler { channel.close().awaitUninterruptibly(); - if (mc.thePlayer instanceof CameraEntity) { - mc.thePlayer.setDead(); + if (mc.player instanceof CameraEntity) { + mc.player.setDead(); } - if (mc.theWorld != null) { - mc.theWorld.sendQuittingDisconnectingPacket(); + if (mc.world != null) { + mc.world.sendQuittingDisconnectingPacket(); mc.loadWorld(null); } @@ -246,7 +246,7 @@ public class ReplayHandler { * @return {@code true} if the camera is the view entity, {@code false} otherwise */ public boolean isCameraView() { - return mc.thePlayer instanceof CameraEntity && mc.thePlayer == mc.getRenderViewEntity(); + return mc.player instanceof CameraEntity && mc.player == mc.getRenderViewEntity(); } /** @@ -254,7 +254,7 @@ public class ReplayHandler { * @return The camera entity or {@code null} if it does not yet exist */ public CameraEntity getCameraEntity() { - return mc.thePlayer instanceof CameraEntity ? (CameraEntity) mc.thePlayer : null; + return mc.player instanceof CameraEntity ? (CameraEntity) mc.player : null; } public UUID getSpectatedUUID() { @@ -334,7 +334,7 @@ public class ReplayHandler { replaySender.setReplaySpeed(0); mc.getConnection().getNetworkManager().processReceivedPackets(); - for (Entity entity : mc.theWorld.loadedEntityList) { + for (Entity entity : mc.world.loadedEntityList) { if (entity instanceof EntityOtherPlayerMP) { EntityOtherPlayerMP e = (EntityOtherPlayerMP) entity; e.setPosition(e.otherPlayerMPX, e.otherPlayerMPY, e.otherPlayerMPZ); diff --git a/src/main/java/com/replaymod/replay/ReplaySender.java b/src/main/java/com/replaymod/replay/ReplaySender.java index 6904d62f..eb2146f2 100755 --- a/src/main/java/com/replaymod/replay/ReplaySender.java +++ b/src/main/java/com/replaymod/replay/ReplaySender.java @@ -263,8 +263,8 @@ public class ReplaySender extends ChannelDuplexHandler { // Entity#addedToChunk is not set and it is therefore not updated every tick. // To counteract this, we need to manually update it's position if it hasn't been added // to any chunk yet. - if (mc.theWorld != null) { - for (EntityPlayer playerEntity : mc.theWorld.playerEntities) { + if (mc.world != null) { + for (EntityPlayer playerEntity : mc.world.playerEntities) { if (!playerEntity.addedToChunk && playerEntity instanceof EntityOtherPlayerMP) { playerEntity.onLivingUpdate(); } @@ -298,7 +298,7 @@ public class ReplaySender extends ChannelDuplexHandler { // If we do not give minecraft time to tick, there will be dead entity artifacts left in the world // Therefore we have to remove all loaded, dead entities manually if we are in sync mode. // We do this after every SpawnX packet and after the destroy entities packet. - if (!asyncMode && mc.theWorld != null) { + if (!asyncMode && mc.world != null) { if (p instanceof SPacketSpawnPlayer || p instanceof SPacketSpawnObject || p instanceof SPacketSpawnMob @@ -306,7 +306,7 @@ public class ReplaySender extends ChannelDuplexHandler { || p instanceof SPacketSpawnPainting || p instanceof SPacketSpawnExperienceOrb || p instanceof SPacketDestroyEntities) { - World world = mc.theWorld; + World world = mc.world; for (int i = 0; i < world.loadedEntityList.size(); ++i) { Entity entity = world.loadedEntityList.get(i); if (entity.isDead) { @@ -337,7 +337,7 @@ public class ReplaySender extends ChannelDuplexHandler { ByteBuf bb = Unpooled.wrappedBuffer(bytes); PacketBuffer pb = new PacketBuffer(bb); - int i = pb.readVarIntFromBuffer(); + int i = pb.readVarInt(); Packet p = EnumConnectionState.PLAY.getPacket(EnumPacketDirection.CLIENTBOUND, i); p.readPacketData(pb); @@ -473,7 +473,7 @@ public class ReplaySender extends ChannelDuplexHandler { @Override @SuppressWarnings("unchecked") public void run() { - if (mc.theWorld == null || !mc.isCallingFromMinecraftThread()) { + if (mc.world == null || !mc.isCallingFromMinecraftThread()) { ReplayMod.instance.runLater(this); return; } @@ -829,7 +829,7 @@ public class ReplaySender extends ChannelDuplexHandler { // unloaded even though they shouldn't. // To make things worse, it seems like players were never supposed to be unloaded this way because // they will remain glitched in the World#playerEntities list. - World world = mc.theWorld; + World world = mc.world; IChunkProvider chunkProvider = world.getChunkProvider(); // Get the chunk that will be unloaded Chunk chunk = chunkProvider.provideChunk(packet.getX(), packet.getZ()); @@ -849,8 +849,8 @@ public class ReplaySender extends ChannelDuplexHandler { } // Check whether the entity has left the chunk - int chunkX = MathHelper.floor_double(entity.posX / 16); - int chunkZ = MathHelper.floor_double(entity.posZ / 16); + int chunkX = MathHelper.floor(entity.posX / 16); + int chunkZ = MathHelper.floor(entity.posZ / 16); if (entity.chunkCoordX != chunkX || entity.chunkCoordZ != chunkZ) { // Entity has left the chunk chunk.removeEntityAtIndex(entity, entity.chunkCoordY); diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index a733b511..c6726c38 100755 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -41,7 +41,7 @@ import java.util.function.Function; /** * The camera entity used as the main player entity during replay viewing. - * During a replay {@link Minecraft#thePlayer} should be an instance of this class. + * During a replay {@link Minecraft#player} should be an instance of this class. * Camera movement is controlled by a separate {@link CameraController}. */ public class CameraEntity extends EntityPlayerSP { @@ -158,14 +158,14 @@ public class CameraEntity extends EntityPlayerSP { // entity is recreated and we have to spectate a new entity UUID spectating = ReplayModReplay.instance.getReplayHandler().getSpectatedUUID(); if (spectating != null && (view.getUniqueID() != spectating - || view.worldObj != worldObj) - || worldObj.getEntityByID(view.getEntityId()) != view) { + || view.world != world) + || world.getEntityByID(view.getEntityId()) != view) { if (spectating == null) { // Entity (non-player) died, stop spectating ReplayModReplay.instance.getReplayHandler().spectateEntity(this); return; } - view = worldObj.getPlayerEntityByUUID(spectating); + view = world.getPlayerEntityByUUID(spectating); if (view != null) { mc.setRenderViewEntity(view); } else { @@ -184,17 +184,17 @@ public class CameraEntity extends EntityPlayerSP { @Override public void preparePlayerToSpawn() { // Make sure our world is up-to-date in case of world changes - if (mc.theWorld != null) { - worldObj = mc.theWorld; + if (mc.world != null) { + world = mc.world; } super.preparePlayerToSpawn(); } @Override - public void setAngles(float yaw, float pitch) { + public void setRotation(float yaw, float pitch) { if (mc.getRenderViewEntity() == this) { // Only update camera rotation when the camera is the view - super.setAngles(yaw, pitch); + super.setRotation(yaw, pitch); } } @@ -392,9 +392,9 @@ public class CameraEntity extends EntityPlayerSP { } @Override - public void addChatMessage(ITextComponent message) { + public void sendMessage(ITextComponent message) { if (MinecraftForge.EVENT_BUS.post(new ReplayChatMessageEvent(this))) return; - super.addChatMessage(message); + super.sendMessage(message); } private class EventHandler { @@ -461,8 +461,8 @@ public class CameraEntity extends EntityPlayerSP { mc.entityRenderer.itemRenderer.itemStackOffHand = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); - mc.thePlayer.renderArmYaw = mc.thePlayer.prevRenderArmYaw = player.rotationYaw; - mc.thePlayer.renderArmPitch = mc.thePlayer.prevRenderArmPitch = player.rotationPitch; + mc.player.renderArmYaw = mc.player.prevRenderArmYaw = player.rotationYaw; + mc.player.renderArmPitch = mc.player.prevRenderArmPitch = player.rotationPitch; } } } diff --git a/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java b/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java index 04cf7391..96b5cf44 100644 --- a/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java +++ b/src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java @@ -58,7 +58,7 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline im protected void drawMarker(GuiRenderer renderer, ReadableDimension size, Marker marker) { int visibleLength = (int) (getLength() * getZoom()); - int markerPos = MathHelper.clamp_int(marker.getTime(), getOffset(), getOffset() + visibleLength); + int markerPos = MathHelper.clamp(marker.getTime(), getOffset(), getOffset() + visibleLength); double positionInVisible = markerPos - getOffset(); double fractionOfVisible = positionInVisible / visibleLength; int markerX = (int) (BORDER_LEFT + fractionOfVisible * (size.getWidth() - BORDER_LEFT - BORDER_RIGHT)); @@ -99,7 +99,7 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline im int visibleLength = (int) (getLength() * getZoom()); int contentWidth = lastSize.getWidth() - BORDER_LEFT - BORDER_RIGHT; for (Marker marker : replayHandler.getMarkers()) { - int markerPos = MathHelper.clamp_int(marker.getTime(), getOffset(), getOffset() + visibleLength); + int markerPos = MathHelper.clamp(marker.getTime(), getOffset(), getOffset() + visibleLength); double positionInVisible = markerPos - getOffset(); double fractionOfVisible = positionInVisible / visibleLength; int markerX = (int) (BORDER_LEFT + fractionOfVisible * contentWidth); diff --git a/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java b/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java index 4525ddd8..e64e0b10 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinGuiSpectator.java @@ -17,7 +17,7 @@ public abstract class MixinGuiSpectator { @Inject(method = "onHotbarSelected", at = @At("HEAD"), cancellable = true) public void isInReplay(int i, CallbackInfo ci) { // Prevent spectator gui from opening while in a replay - if (mc.thePlayer instanceof CameraEntity) { + if (mc.player instanceof CameraEntity) { ci.cancel(); } } diff --git a/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java b/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java index e70bb184..9aefe1ac 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java @@ -33,8 +33,8 @@ public abstract class MixinPlayerControllerMP { @Inject(method = "isSpectator", at=@At("HEAD"), cancellable = true) private void replayModReplay_isSpectator(CallbackInfoReturnable ci) { - if (mc.thePlayer instanceof CameraEntity) { // this check should in theory not be required - ci.setReturnValue(mc.thePlayer.isSpectator()); + if (mc.player instanceof CameraEntity) { // this check should in theory not be required + ci.setReturnValue(mc.player.isSpectator()); } } } diff --git a/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java b/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java index fe497cc4..f4090bd4 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinRenderLivingBase.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public abstract class MixinRenderLivingBase { @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true) private void replayModReplay_canRenderInvisibleName(EntityLivingBase entity, CallbackInfoReturnable ci) { - EntityPlayer thePlayer = Minecraft.getMinecraft().thePlayer; + EntityPlayer thePlayer = Minecraft.getMinecraft().player; if (thePlayer instanceof CameraEntity && entity.isInvisible()) { ci.setReturnValue(false); } diff --git a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java b/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java index d37bbad5..280401cf 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java @@ -43,8 +43,8 @@ public abstract class MixinViewFrustum { return; } - int i = MathHelper.floor_double(viewEntityX) - 8; - int j = MathHelper.floor_double(viewEntityZ) - 8; + int i = MathHelper.floor(viewEntityX) - 8; + int j = MathHelper.floor(viewEntityZ) - 8; int k = this.countChunksX * 16; for (int l = 0; l < this.countChunksX; ++l) {