From 48879269944d833386dfcf20bc2cb15aabb17808 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 25 Mar 2015 22:11:19 -0700 Subject: [PATCH] Fix #563 Player's Breeding Tracker is not sent on opening GUI --- .../apiculture/genetics/ApiaristTracker.java | 10 ++-- .../genetics/ArboristTracker.java | 10 ++-- .../core/genetics/BreedingTracker.java | 54 +++++++++++++------ .../genetics/LepidopteristTracker.java | 10 ++-- 4 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java index 89ccbbd55..3a1b2b6c2 100755 --- a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java +++ b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java @@ -24,10 +24,6 @@ import forestry.plugins.PluginApiculture; public class ApiaristTracker extends BreedingTracker implements IApiaristTracker { - public ApiaristTracker(String s) { - this(s, null); - } - public ApiaristTracker(String s, GameProfile player) { super(s, player); } @@ -107,12 +103,12 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker } @Override - protected IBreedingTracker getCommonTracker(EntityPlayer player) { - return PluginApiculture.beeInterface.getBreedingTracker(player.worldObj, null); + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { + return PluginApiculture.beeInterface.getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override - protected String getPacketTag() { + protected String speciesRootUID() { return BeeHelper.UID; } diff --git a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java index 020efc2a2..37d17ad58 100755 --- a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java +++ b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java @@ -22,21 +22,17 @@ import forestry.plugins.PluginArboriculture; public class ArboristTracker extends BreedingTracker implements IArboristTracker { - public ArboristTracker(String s) { - this(s, null); - } - public ArboristTracker(String s, GameProfile player) { super(s, player); } @Override - protected IBreedingTracker getCommonTracker(EntityPlayer player) { - return PluginArboriculture.treeInterface.getBreedingTracker(player.worldObj, null); + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { + return PluginArboriculture.treeInterface.getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override - protected String getPacketTag() { + protected String speciesRootUID() { return TreeHelper.UID; } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index 80f0e4b1e..f401c5a55 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -11,6 +11,7 @@ package forestry.core.genetics; import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -26,14 +27,15 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; import forestry.core.network.PacketIds; import forestry.core.network.PacketNBT; import forestry.core.proxy.Proxies; public abstract class BreedingTracker extends WorldSavedData implements IBreedingTracker { - private ArrayList discoveredSpecies = new ArrayList(); - private ArrayList discoveredMutations = new ArrayList(); + private List discoveredSpecies = new ArrayList(); + private List discoveredMutations = new ArrayList(); private String modeName; private final GameProfile username; @@ -60,16 +62,19 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin * @param player used to get worldObj * @return common tracker for this breeding system */ - protected abstract IBreedingTracker getCommonTracker(EntityPlayer player); + protected abstract IBreedingTracker getBreedingTracker(EntityPlayer player); /** * Tag stored in NBT to identify the type of the tracker being synced */ - protected abstract String getPacketTag(); + protected abstract String speciesRootUID(); @Override public void synchToPlayer(EntityPlayer player) { - setModeName(getCommonTracker(player).getModeName()); + IBreedingTracker breedingTracker = getBreedingTracker(player); + String modeName = breedingTracker.getModeName(); + setModeName(modeName); + NBTTagCompound nbttagcompound = new NBTTagCompound(); encodeToNBT(nbttagcompound); Proxies.net.sendToPlayer(new PacketNBT(PacketIds.GENOME_TRACKER_UPDATE, nbttagcompound), player); @@ -116,7 +121,7 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin nbttagcompound.setString("BMS", modeName); } - nbttagcompound.setString("TYPE", getPacketTag()); + nbttagcompound.setString("TYPE", speciesRootUID()); // / SPECIES nbttagcompound.setInteger("SpeciesCount", discoveredSpecies.size()); @@ -138,20 +143,35 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin private static final String MUTATION_FORMAT = "%s-%s=%s"; + private static String getMutationString(IMutation mutation) { + String species0 = mutation.getAllele0().getUID(); + String species1 = mutation.getAllele1().getUID(); + String resultSpecies = mutation.getTemplate()[0].getUID(); + return String.format(MUTATION_FORMAT, species0, species1, resultSpecies); + } + @Override public void registerMutation(IMutation mutation) { - discoveredMutations.add(String.format(MUTATION_FORMAT, mutation.getAllele0().getUID(), mutation.getAllele1().getUID(), mutation.getTemplate()[0].getUID())); + String mutationString = getMutationString(mutation); + discoveredMutations.add(mutationString); markDirty(); - MinecraftForge.EVENT_BUS.post(new ForestryEvent.MutationDiscovered( - AlleleManager.alleleRegistry.getSpeciesRoot(this.getPacketTag()), - username, - mutation, this)); + + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(speciesRootUID()); + ForestryEvent event = new ForestryEvent.MutationDiscovered(speciesRoot, username, mutation, this); + MinecraftForge.EVENT_BUS.post(event); } @Override public boolean isDiscovered(IMutation mutation) { - return discoveredMutations.contains(String.format(MUTATION_FORMAT, mutation.getAllele0().getUID(), mutation.getAllele1().getUID(), mutation.getTemplate()[0].getUID())) - || discoveredMutations.contains(mutation.getAllele0().getUID() + "-" + mutation.getAllele1().getUID()); + String mutationString = getMutationString(mutation); + if (discoveredMutations.contains(mutationString)) { + return true; + } + + // TODO: remove legacy handling + String species0 = mutation.getAllele0().getUID(); + String species1 = mutation.getAllele1().getUID(); + return discoveredMutations.contains(mutationString) || discoveredMutations.contains(species0 + '-' + species1); } @Override @@ -174,10 +194,10 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin public void registerSpecies(IAlleleSpecies species) { if (!discoveredSpecies.contains(species.getUID())) { discoveredSpecies.add(species.getUID()); - MinecraftForge.EVENT_BUS.post(new ForestryEvent.SpeciesDiscovered( - AlleleManager.alleleRegistry.getSpeciesRoot(this.getPacketTag()), - username, - species, this)); + + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(speciesRootUID()); + ForestryEvent event = new ForestryEvent.SpeciesDiscovered(speciesRoot, username, species, this); + MinecraftForge.EVENT_BUS.post(event); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java index ba5bda455..37a237b75 100755 --- a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java +++ b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java @@ -23,21 +23,17 @@ import forestry.plugins.PluginLepidopterology; public class LepidopteristTracker extends BreedingTracker implements ILepidopteristTracker { - public LepidopteristTracker(String s) { - this(s, null); - } - public LepidopteristTracker(String s, GameProfile player) { super(s, player); } @Override - protected IBreedingTracker getCommonTracker(EntityPlayer player) { - return PluginLepidopterology.butterflyInterface.getBreedingTracker(player.worldObj, null); + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { + return PluginLepidopterology.butterflyInterface.getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override - protected String getPacketTag() { + protected String speciesRootUID() { return ButterflyHelper.UID; }