From b5e24e84cbaee0c44d4ada2d9f633bd60ca4f2e3 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 6 Jan 2017 23:52:53 -0800 Subject: [PATCH] Fix #1560 network sync issue for genome tracker when player logs in --- .../java/forestry/core/EventHandlerCore.java | 31 ++++------- .../forestry/core/network/PacketHandler.java | 8 +-- .../forestry/core/network/PacketIdServer.java | 3 ++ .../core/network/PacketRegistryCore.java | 2 + .../packets/PacketGenomeTrackerRequest.java | 39 ++++++++++++++ .../core/proxy/ProxyNetworkClient.java | 6 +-- .../forestry/mail/EventHandlerMailAlert.java | 26 ++++------ .../mail/network/PacketRegistryMail.java | 2 + .../packets/PacketPOBoxInfoRequest.java | 52 +++++++++++++++++++ 9 files changed, 128 insertions(+), 41 deletions(-) create mode 100644 src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java create mode 100644 src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index ba9e7b3cb..a4792a976 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.core; -import java.util.Collection; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.Constants; import forestry.core.errors.ErrorStateRegistry; import forestry.core.loot.LootTableLoader; import forestry.core.models.ModelBlockCached; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.packets.PacketGenomeTrackerRequest; import forestry.core.render.TextureManager; import forestry.plugins.PluginManager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.client.event.TextureStitchEvent; @@ -31,7 +28,6 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,22 +51,17 @@ public class EventHandlerCore { } } - @SubscribeEvent - public void handlePlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - EntityPlayer player = event.player; - if (player != null) { - Collection speciesRoots = AlleleManager.alleleRegistry.getSpeciesRoot().values(); - for (ISpeciesRoot speciesRoot : speciesRoots) { - IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.getEntityWorld(), player.getGameProfile()); - breedingTracker.synchToPlayer(player); - } - } - } - @SubscribeEvent public void handleWorldLoad(WorldEvent.Load event) { + World world = event.getWorld(); + for (ISaveEventHandler handler : PluginManager.saveEventHandlers) { - handler.onWorldLoad(event.getWorld()); + handler.onWorldLoad(world); + } + + if (world.isRemote) { + IForestryPacketServer packet = new PacketGenomeTrackerRequest(); + world.sendPacketToServer(packet.getPacket()); } } diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index c5a20db2c..4921bc18a 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -12,6 +12,7 @@ package forestry.core.network; import java.io.IOException; +import com.google.common.base.Preconditions; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import net.minecraft.client.Minecraft; @@ -49,22 +50,23 @@ public class PacketHandler { @SubscribeEvent public void onPacket(ClientCustomPacketEvent event) { PacketBufferForestry data = new PacketBufferForestry(event.getPacket().payload()); - EntityPlayer player = Proxies.common.getPlayer(); byte packetIdOrdinal = data.readByte(); PacketIdClient packetId = PacketIdClient.VALUES[packetIdOrdinal]; IForestryPacketHandlerClient packetHandler = packetId.getPacketHandler(); - checkThreadAndEnqueue(packetHandler, data, player, Minecraft.getMinecraft()); + checkThreadAndEnqueue(packetHandler, data, Minecraft.getMinecraft()); } public void sendPacket(FMLProxyPacket packet, EntityPlayerMP player) { channel.sendTo(packet, player); } - private static void checkThreadAndEnqueue(final IForestryPacketHandlerClient packet, final PacketBufferForestry data, final EntityPlayer player, IThreadListener threadListener) { + private static void checkThreadAndEnqueue(final IForestryPacketHandlerClient packet, final PacketBufferForestry data, IThreadListener threadListener) { if (!threadListener.isCallingFromMinecraftThread()) { threadListener.addScheduledTask(() -> { try { + EntityPlayer player = Proxies.common.getPlayer(); + Preconditions.checkNotNull(player, "Tried to send data to client before the player exists."); packet.onPacketData(data, player); } catch (IOException e) { Log.error("Network Error", e); diff --git a/src/main/java/forestry/core/network/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java index 248e6125c..113235f6d 100644 --- a/src/main/java/forestry/core/network/PacketIdServer.java +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -34,6 +34,9 @@ public enum PacketIdServer implements IPacketId { // Apiculture BEE_LOGIC_ACTIVE_ENTITY_REQUEST, + // Genetics + GENOME_TRACKER_REQUEST, + // Mail LETTER_INFO_REQUEST, TRADING_ADDRESS_REQUEST, diff --git a/src/main/java/forestry/core/network/PacketRegistryCore.java b/src/main/java/forestry/core/network/PacketRegistryCore.java index bf910c6d4..5dcb773fd 100644 --- a/src/main/java/forestry/core/network/PacketRegistryCore.java +++ b/src/main/java/forestry/core/network/PacketRegistryCore.java @@ -16,6 +16,7 @@ import forestry.core.network.packets.PacketChipsetClick; import forestry.core.network.packets.PacketErrorUpdate; import forestry.core.network.packets.PacketErrorUpdateEntity; import forestry.core.network.packets.PacketFXSignal; +import forestry.core.network.packets.PacketGenomeTrackerRequest; import forestry.core.network.packets.PacketGenomeTrackerSync; import forestry.core.network.packets.PacketGuiEnergy; import forestry.core.network.packets.PacketGuiLayoutSelect; @@ -53,5 +54,6 @@ public class PacketRegistryCore implements IPacketRegistry { PacketIdServer.SOLDERING_IRON_CLICK.setPacketHandler(new PacketSolderingIronClick.Handler()); PacketIdServer.CAMOUFLAGE_SELECTION.setPacketHandler(new PacketCamouflageSelectServer.Handler()); PacketIdServer.CLIMATE_CONTROL_UPDATE.setPacketHandler(new PacketUpdateClimateControl.Handler()); + PacketIdServer.GENOME_TRACKER_REQUEST.setPacketHandler(new PacketGenomeTrackerRequest.Handler()); } } diff --git a/src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java b/src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java new file mode 100644 index 000000000..3af1aa4bb --- /dev/null +++ b/src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java @@ -0,0 +1,39 @@ +package forestry.core.network.packets; + +import java.io.IOException; +import java.util.Collection; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import net.minecraft.entity.player.EntityPlayerMP; + +public class PacketGenomeTrackerRequest extends ForestryPacket implements IForestryPacketServer { + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.GENOME_TRACKER_REQUEST; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + // no data, just need to know which player is requesting information + } + + public static class Handler implements IForestryPacketHandlerServer { + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; + Collection speciesRoots = alleleRegistry.getSpeciesRoot().values(); + for (ISpeciesRoot speciesRoot : speciesRoots) { + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.getEntityWorld(), player.getGameProfile()); + breedingTracker.synchToPlayer(player); + } + } + } +} diff --git a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java index 58ef30873..3b9919990 100644 --- a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java +++ b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.proxy; +import com.google.common.base.Preconditions; import forestry.core.network.IForestryPacketServer; import net.minecraft.client.network.NetHandlerPlayClient; @@ -19,8 +20,7 @@ public class ProxyNetworkClient extends ProxyNetwork { @Override public void sendToServer(IForestryPacketServer packet) { NetHandlerPlayClient netHandler = Proxies.common.getClientInstance().getConnection(); - if (netHandler != null) { - netHandler.sendPacket(packet.getPacket()); - } + Preconditions.checkNotNull(netHandler, "Tried to send packet before netHandler (client world) exists."); + netHandler.sendPacket(packet.getPacket()); } } diff --git a/src/main/java/forestry/mail/EventHandlerMailAlert.java b/src/main/java/forestry/mail/EventHandlerMailAlert.java index 884ecdafd..237057cd8 100644 --- a/src/main/java/forestry/mail/EventHandlerMailAlert.java +++ b/src/main/java/forestry/mail/EventHandlerMailAlert.java @@ -10,35 +10,31 @@ ******************************************************************************/ package forestry.mail; -import forestry.core.proxy.Proxies; import forestry.mail.gui.GuiMailboxInfo; -import forestry.mail.network.packets.PacketPOBoxInfoResponse; +import forestry.mail.network.packets.PacketPOBoxInfoRequest; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; public class EventHandlerMailAlert { @SubscribeEvent public void onRenderTick(TickEvent.RenderTickEvent event) { - if (event.phase != Phase.END) { - return; - } - - if (Minecraft.getMinecraft().world != null && GuiMailboxInfo.instance.hasPOBoxInfo()) { + if (event.phase == Phase.END && + Minecraft.getMinecraft().world != null && + GuiMailboxInfo.instance.hasPOBoxInfo()) { GuiMailboxInfo.instance.render(); } } @SubscribeEvent - public void handlePlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - EntityPlayer player = event.player; - if (player != null) { - MailAddress address = new MailAddress(player.getGameProfile()); - POBox pobox = PostRegistry.getOrCreatePOBox(player.world, address); - Proxies.net.sendToPlayer(new PacketPOBoxInfoResponse(pobox.getPOBoxInfo()), player); + public void handleWorldLoad(WorldEvent.Load event) { + World world = event.getWorld(); + if (world.isRemote) { + PacketPOBoxInfoRequest packet = new PacketPOBoxInfoRequest(); + world.sendPacketToServer(packet.getPacket()); } } } diff --git a/src/main/java/forestry/mail/network/PacketRegistryMail.java b/src/main/java/forestry/mail/network/PacketRegistryMail.java index eaab4d585..08d71d911 100644 --- a/src/main/java/forestry/mail/network/PacketRegistryMail.java +++ b/src/main/java/forestry/mail/network/PacketRegistryMail.java @@ -16,6 +16,7 @@ import forestry.core.network.PacketIdServer; import forestry.mail.network.packets.PacketLetterInfoRequest; import forestry.mail.network.packets.PacketLetterInfoResponse; import forestry.mail.network.packets.PacketLetterTextSet; +import forestry.mail.network.packets.PacketPOBoxInfoRequest; import forestry.mail.network.packets.PacketPOBoxInfoResponse; import forestry.mail.network.packets.PacketTraderAddressRequest; import forestry.mail.network.packets.PacketTraderAddressResponse; @@ -30,5 +31,6 @@ public class PacketRegistryMail implements IPacketRegistry { PacketIdServer.LETTER_INFO_REQUEST.setPacketHandler(new PacketLetterInfoRequest.Handler()); PacketIdServer.TRADING_ADDRESS_REQUEST.setPacketHandler(new PacketTraderAddressRequest.Handler()); PacketIdServer.LETTER_TEXT_SET.setPacketHandler(new PacketLetterTextSet.Handler()); + PacketIdServer.POBOX_INFO_REQUEST.setPacketHandler(new PacketPOBoxInfoRequest.Handler()); } } diff --git a/src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java b/src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java new file mode 100644 index 000000000..365a31d63 --- /dev/null +++ b/src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.network.packets; + +import java.io.IOException; + +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import forestry.core.proxy.Proxies; +import forestry.mail.POBox; +import forestry.mail.PostRegistry; +import net.minecraft.entity.player.EntityPlayerMP; + +public class PacketPOBoxInfoRequest extends ForestryPacket implements IForestryPacketServer { + + public PacketPOBoxInfoRequest() { + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.POBOX_INFO_REQUEST; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + // no data, just need to know which player is requesting information + } + + public static class Handler implements IForestryPacketHandlerServer { + + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + IMailAddress address = PostManager.postRegistry.getMailAddress(player.getGameProfile()); + POBox pobox = PostRegistry.getOrCreatePOBox(player.world, address); + PacketPOBoxInfoResponse packet = new PacketPOBoxInfoResponse(pobox.getPOBoxInfo()); + Proxies.net.sendToPlayer(packet, player); + } + } +}