diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java old mode 100755 new mode 100644 index 67db81d2b..94273ca7a --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,33 +10,27 @@ ******************************************************************************/ package forestry.core; -import java.util.Collection; - +import forestry.core.config.Constants; +import forestry.core.errors.ErrorStateRegistry; +import forestry.core.loot.LootTableLoader; import forestry.core.models.ModelBlockCached; -import net.minecraft.entity.player.EntityPlayer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.packets.PacketGenomeTrackerRequest; +import forestry.core.render.TextureManager; +import forestry.plugins.PluginManager; 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; import net.minecraftforge.event.LootTableLoadEvent; 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; -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.render.TextureManager; -import forestry.plugins.PluginManager; - public class EventHandlerCore { public EventHandlerCore() { @@ -57,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/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java index a48c5608d..b13579b41 100644 --- a/src/main/java/forestry/core/network/PacketIdServer.java +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -33,6 +33,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 8e1784d52..34d9b1933 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 extends PacketRegistry { registerServerPacket(new PacketSolderingIronClick()); registerServerPacket(new PacketCamouflageSelectServer()); registerServerPacket(new PacketUpdateClimateControl()); + registerServerPacket(new PacketGenomeTrackerRequest()); } } 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..d75c34205 --- /dev/null +++ b/src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java @@ -0,0 +1,32 @@ +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.DataInputStreamForestry; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketServer; +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 + public void onPacketData(DataInputStreamForestry 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 8a43af080..70f5fa6c9 100644 --- a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java +++ b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.core.proxy; -import net.minecraft.client.network.NetHandlerPlayClient; - +import com.google.common.base.Preconditions; import forestry.core.network.IForestryPacketServer; +import net.minecraft.client.network.NetHandlerPlayClient; 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 1144284fb..f2bf3f4bb 100644 --- a/src/main/java/forestry/mail/EventHandlerMailAlert.java +++ b/src/main/java/forestry/mail/EventHandlerMailAlert.java @@ -10,39 +10,32 @@ ******************************************************************************/ package forestry.mail; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import forestry.mail.gui.GuiMailboxInfo; +import forestry.mail.network.packets.PacketPOBoxInfoRequest; +import net.minecraft.client.Minecraft; +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; -import forestry.core.proxy.Proxies; -import forestry.mail.gui.GuiMailboxInfo; -import forestry.mail.network.packets.PacketPOBoxInfoUpdate; - public class EventHandlerMailAlert { @SubscribeEvent public void onRenderTick(TickEvent.RenderTickEvent event) { - if (event.phase != Phase.END) { - return; - } - - if (Minecraft.getMinecraft().theWorld != null && GuiMailboxInfo.instance.hasPOBoxInfo()) { + if (event.phase == Phase.END && + Minecraft.getMinecraft().theWorld != 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.worldObj, address); - if (pobox != null) { - Proxies.net.sendToPlayer(new PacketPOBoxInfoUpdate(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 4dd7138e2..eba347ec0 100644 --- a/src/main/java/forestry/mail/network/PacketRegistryMail.java +++ b/src/main/java/forestry/mail/network/PacketRegistryMail.java @@ -14,6 +14,7 @@ import forestry.core.network.PacketRegistry; 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.PacketPOBoxInfoUpdate; import forestry.mail.network.packets.PacketTraderAddressRequest; import forestry.mail.network.packets.PacketTraderAddressResponse; @@ -24,6 +25,7 @@ public class PacketRegistryMail extends PacketRegistry { registerServerPacket(new PacketLetterInfoRequest()); registerServerPacket(new PacketTraderAddressRequest()); registerServerPacket(new PacketLetterTextSet()); + registerServerPacket(new PacketPOBoxInfoRequest()); registerClientPacket(new PacketLetterInfoResponse()); registerClientPacket(new PacketTraderAddressResponse()); 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..6d79d4ae2 --- /dev/null +++ b/src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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.DataInputStreamForestry; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketServer; +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 { + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + IMailAddress address = PostManager.postRegistry.getMailAddress(player.getGameProfile()); + POBox pobox = PostRegistry.getOrCreatePOBox(player.worldObj, address); + PacketPOBoxInfoUpdate packet = new PacketPOBoxInfoUpdate(pobox.getPOBoxInfo()); + Proxies.net.sendToPlayer(packet, player); + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.POBOX_INFO_REQUEST; + } +}