Fix #1566 Incompatibility with Schematica

This commit is contained in:
mezz committed 2017-01-14 11:08:47 -08:00
1 parent 6cb3b73200
commit a13e63cb2d
8 files changed
+34 -116

No files matched your search

@@ -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<ISpeciesRoot> 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
@@ -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();
@@ -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());
}
}
@@ -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<ISpeciesRoot> speciesRoots = alleleRegistry.getSpeciesRoot().values();
for (ISpeciesRoot speciesRoot : speciesRoots) {
IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.getEntityWorld(), player.getGameProfile());
breedingTracker.synchToPlayer(player);
}
}
}
}
@@ -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);
}
}
@@ -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());
}
}
@@ -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);
}
}
}