From a13e63cb2dd8c9b0827bfbc085bf1fe5637f79c1 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 14 Jan 2017 11:07:43 -0800 Subject: [PATCH] Fix #1566 Incompatibility with Schematica --- gradle.properties | 2 +- .../java/forestry/core/EventHandlerCore.java | 27 +++++++--- .../forestry/core/network/PacketIdServer.java | 4 -- .../core/network/PacketRegistryCore.java | 2 - .../packets/PacketGenomeTrackerRequest.java | 39 -------------- .../forestry/mail/EventHandlerMailAlert.java | 22 ++++---- .../mail/network/PacketRegistryMail.java | 2 - .../packets/PacketPOBoxInfoRequest.java | 52 ------------------- 8 files changed, 34 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java delete mode 100644 src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java diff --git a/gradle.properties b/gradle.properties index 75dc27c4d..2b80b4e3c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.11.2 -forgeversion=13.20.0.2201 +forgeversion=13.20.0.2207 mcp_mappings=snapshot_20161220 tesla_version=1.11-1.3.0.51 diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index a4792a976..b64eb5deb 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,14 +10,19 @@ ******************************************************************************/ package forestry.core; +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.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; @@ -28,6 +33,7 @@ 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; @@ -51,6 +57,18 @@ public class EventHandlerCore { } } + @SubscribeEvent + public void handlePlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + EntityPlayer player = event.player; + + IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; + Collection speciesRoots = 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(); @@ -58,11 +76,6 @@ public class EventHandlerCore { for (ISaveEventHandler handler : PluginManager.saveEventHandlers) { handler.onWorldLoad(world); } - - if (world.isRemote) { - IForestryPacketServer packet = new PacketGenomeTrackerRequest(); - world.sendPacketToServer(packet.getPacket()); - } } @SubscribeEvent diff --git a/src/main/java/forestry/core/network/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java index 113235f6d..14c95fb66 100644 --- a/src/main/java/forestry/core/network/PacketIdServer.java +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -34,13 +34,9 @@ public enum PacketIdServer implements IPacketId { // Apiculture BEE_LOGIC_ACTIVE_ENTITY_REQUEST, - // Genetics - GENOME_TRACKER_REQUEST, - // Mail LETTER_INFO_REQUEST, TRADING_ADDRESS_REQUEST, - POBOX_INFO_REQUEST, LETTER_TEXT_SET; public static final PacketIdServer[] VALUES = values(); diff --git a/src/main/java/forestry/core/network/PacketRegistryCore.java b/src/main/java/forestry/core/network/PacketRegistryCore.java index 5dcb773fd..bf910c6d4 100644 --- a/src/main/java/forestry/core/network/PacketRegistryCore.java +++ b/src/main/java/forestry/core/network/PacketRegistryCore.java @@ -16,7 +16,6 @@ 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; @@ -54,6 +53,5 @@ 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 deleted file mode 100644 index 3af1aa4bb..000000000 --- a/src/main/java/forestry/core/network/packets/PacketGenomeTrackerRequest.java +++ /dev/null @@ -1,39 +0,0 @@ -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/mail/EventHandlerMailAlert.java b/src/main/java/forestry/mail/EventHandlerMailAlert.java index 237057cd8..2eea014dc 100644 --- a/src/main/java/forestry/mail/EventHandlerMailAlert.java +++ b/src/main/java/forestry/mail/EventHandlerMailAlert.java @@ -10,12 +10,15 @@ ******************************************************************************/ package forestry.mail; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; +import forestry.core.proxy.Proxies; import forestry.mail.gui.GuiMailboxInfo; -import forestry.mail.network.packets.PacketPOBoxInfoRequest; +import forestry.mail.network.packets.PacketPOBoxInfoResponse; import net.minecraft.client.Minecraft; -import net.minecraft.world.World; -import net.minecraftforge.event.world.WorldEvent; +import net.minecraft.entity.player.EntityPlayer; 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; @@ -30,11 +33,12 @@ public class EventHandlerMailAlert { } @SubscribeEvent - public void handleWorldLoad(WorldEvent.Load event) { - World world = event.getWorld(); - if (world.isRemote) { - PacketPOBoxInfoRequest packet = new PacketPOBoxInfoRequest(); - world.sendPacketToServer(packet.getPacket()); - } + public void handlePlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + EntityPlayer player = event.player; + + 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); } } diff --git a/src/main/java/forestry/mail/network/PacketRegistryMail.java b/src/main/java/forestry/mail/network/PacketRegistryMail.java index 08d71d911..eaab4d585 100644 --- a/src/main/java/forestry/mail/network/PacketRegistryMail.java +++ b/src/main/java/forestry/mail/network/PacketRegistryMail.java @@ -16,7 +16,6 @@ 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; @@ -31,6 +30,5 @@ 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 deleted file mode 100644 index 365a31d63..000000000 --- a/src/main/java/forestry/mail/network/packets/PacketPOBoxInfoRequest.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * 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); - } - } -}