Make TPlayerStats an IExtendedEntityProperties + associated changes

Inventory + Knapsack inventory (and whether you have the manual) is now synced
whenever the player data is (e.g. on disconnect, on changing dimensions and
when going into the menu in SSP.

Other changes:
 * Remove Armor sync packet as it's not needed anymore
 * Move dropping of inventory and knapsack items from TEventHandler to
     TPlayerHandler. Changes to drop items will all other inventory items.
 * Make playerstats store in TPlayerHandler and make it use player UUIDs
     instead of player names (for compatibility with 1.7.6+)
 * Don't sync inventory manually on logging off / changing dimension
     (it's unneeded)
This commit is contained in:
James McKay committed 2014-03-06 22:33:35 +11:00
1 parent cc2aeb82e0
commit 244428928c
13 files changed
+137 -223

No files matched your search

+1
View File
@@ -158,6 +158,7 @@ public class TConstruct
playerTracker = new TPlayerHandler();
// GameRegistry.registerPlayerTracker(playerTracker);
FMLCommonHandler.instance().bus().register(playerTracker);
MinecraftForge.EVENT_BUS.register(playerTracker);
if (event.getSide() == Side.CLIENT)
{
@@ -116,7 +116,6 @@ public class TClientEvents
int scaledHeight = scaledresolution.getScaledHeight();
int xBasePos = scaledWidth / 2 - 91;
int yBasePos = scaledHeight - 39;
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.getDisplayName());
boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1;
@@ -151,6 +151,7 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.VillagerRegistry;
import tconstruct.util.player.TPlayerStats;
public class TProxyClient extends TProxyCommon
{
@@ -1050,7 +1051,7 @@ public class TProxyClient extends TProxyCommon
public void recalculateHealth ()
{
armorExtended.recalculateHealth(mc.thePlayer, TConstruct.playerTracker.getPlayerStats(mc.thePlayer.getDisplayName()));
armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer));
}
private static IIcon getIcon (IIcon icon)
@@ -65,12 +65,12 @@ public class TProxyCommon implements IGuiHandler
}
if (ID == armorGuiID)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
return new ArmorExtendedContainer(player.inventory, stats.armor);
}
if (ID == knapsackGuiID)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
return new KnapsackContainer(player.inventory, stats.knapsack);
}
}
@@ -36,7 +36,7 @@ public class HeartCanister extends CraftingItem implements IHealthAccessory
}
if (!world.isRemote && meta == 2)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
if (stats != null)
{
ArmorExtended armor = stats.armor;
@@ -25,7 +25,7 @@ public class TCraftingHandler // implements ICraftingHandler
{
if (ComparisonHelper.areEquivalent(item, TRepo.toolStationWood))
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(event.player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(event.player);
NBTTagCompound tags = event.player.getEntityData().getCompoundTag("TConstruct");
if (!tags.getBoolean("materialManual") || !stats.materialManual)
{
@@ -36,7 +36,7 @@ public class TCraftingHandler // implements ICraftingHandler
}
if (ComparisonHelper.areEquivalent(item, TRepo.smeltery) || ComparisonHelper.areEquivalent(item, TRepo.lavaTank))
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(event.player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(event.player);
NBTTagCompound tags = event.player.getEntityData().getCompoundTag("TConstruct");
if (!tags.getBoolean("smelteryManual") || !stats.smelteryManual)
{
@@ -459,19 +459,6 @@ public class TEventHandler
}
}
}
GameRules rules = player.worldObj.getGameRules(); // Player is null
// if this
// crashes
if (rules == null || !rules.getGameRuleBooleanValue("keepInventory"))
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
if (stats != null)
{
stats.armor.dropItems();
stats.knapsack.dropItems();
}
}
}
}
@@ -632,7 +619,7 @@ public class TEventHandler
if (event.entityLiving instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) event.entityLiving;
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
if (stats != null && stats.armor != null)
{
@@ -1,77 +0,0 @@
package tconstruct.util.network.packet;
import java.io.IOException;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import tconstruct.TConstruct;
import tconstruct.client.TProxyClient;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import tconstruct.util.player.ArmorExtended;
import tconstruct.util.player.KnapsackInventory;
public class PacketArmorSync extends AbstractPacket
{
ArmorExtended armor;
KnapsackInventory knapsack;
public PacketArmorSync()
{
armor = new ArmorExtended();
knapsack = new KnapsackInventory();
}
public PacketArmorSync(ArmorExtended armor, KnapsackInventory knapsack)
{
this.armor = armor;
this.knapsack = knapsack;
}
@Override
public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
{
try {
armor.writeInventoryToStream(buffer);
knapsack.writeInventoryToStream(buffer);
} catch (IOException e) {
TConstruct.logger.warn("Failed at writing Server packet for TConstruct.");
e.printStackTrace();
}
}
@Override
public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
{
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
{
try
{
armor.readInventoryFromStream(buffer);
knapsack.readInventoryFromStream(buffer);
}
catch (Exception e)
{
TConstruct.logger.warn("Failed at reading Client packet for TConstruct.");
e.printStackTrace();
}
}
}
@Override
public void handleClientSide (EntityPlayer player)
{
armor.saveToNBT(player);
knapsack.saveToNBT(player);
TProxyClient.armorExtended.recalculateHealth(player, TConstruct.playerTracker.getPlayerStats(player.getDisplayName()));
}
@Override
public void handleServerSide (EntityPlayer player)
{
}
}
@@ -141,7 +141,6 @@ public class PacketPipeline extends MessageToMessageCodec<FMLProxyPacket, Abstra
registerPacket(PacketSmeltery.class);
registerPacket(PacketStencilTable.class);
registerPacket(PacketToolStation.class);
registerPacket(PacketArmorSync.class);
}
// Method to call from FMLPostInitializationEvent
@@ -4,11 +4,13 @@ import io.netty.buffer.ByteBuf;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.UUID;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -66,7 +68,7 @@ public class ArmorExtended implements IInventory
inventory[slot] = null;
}
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
recalculateHealth(player, stats);
return split;
}
@@ -94,7 +96,7 @@ public class ArmorExtended implements IInventory
}
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
recalculateHealth(player, stats);
}
@@ -120,7 +122,7 @@ public class ArmorExtended implements IInventory
public void markDirty ()
{
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
TPlayerStats stats = TPlayerStats.get(player);
// recalculateSkills(player, stats);
recalculateHealth(player, stats);
@@ -223,9 +225,8 @@ public class ArmorExtended implements IInventory
}
/* Save/Load */
public void saveToNBT (EntityPlayer entityplayer)
public void saveToNBT (NBTTagCompound tagCompound)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = new NBTTagList();
NBTTagCompound invSlot;
@@ -240,13 +241,12 @@ public class ArmorExtended implements IInventory
}
}
tags.setTag("TConstruct.Inventory", tagList);
tagCompound.setTag("Inventory", tagList);
}
public void readFromNBT (EntityPlayer entityplayer)
public void readFromNBT (NBTTagCompound tagCompound)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = tags.getTagList("TConstruct.Inventory", 10);
NBTTagList tagList = tagCompound.getTagList("Inventory", 10);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i);
@@ -260,14 +260,15 @@ public class ArmorExtended implements IInventory
}
}
public void dropItems ()
public void dropItems(ArrayList<EntityItem> drops)
{
EntityPlayer player = parent.get();
for (int i = 0; i < 4; ++i)
{
if (this.inventory[i] != null)
{
player.dropPlayerItemWithRandomChoice(this.inventory[i], true);
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
drops.add(entityItem);
this.inventory[i] = null;
}
}
@@ -2,6 +2,7 @@ package tconstruct.util.player;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
@@ -124,9 +125,8 @@ public class KnapsackInventory implements IInventory
}
/* Save/Load */
public void saveToNBT (EntityPlayer entityplayer)
public void saveToNBT (NBTTagCompound tagCompound)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = new NBTTagList();
NBTTagCompound invSlot;
@@ -141,13 +141,12 @@ public class KnapsackInventory implements IInventory
}
}
tags.setTag("TConstruct.Knapsack", tagList);
tagCompound.setTag("Knapsack", tagList);
}
public void readFromNBT (EntityPlayer entityplayer)
public void readFromNBT (NBTTagCompound tagCompound)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = tags.getTagList("TConstruct.Knapsack", 10);
NBTTagList tagList = tagCompound.getTagList("Knapsack", 10);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i);
@@ -161,14 +160,15 @@ public class KnapsackInventory implements IInventory
}
}
public void dropItems ()
public void dropItems(ArrayList<EntityItem> drops)
{
EntityPlayer player = parent.get();
for (int i = 0; i < inventory.length; ++i)
{
if (this.inventory[i] != null)
{
player.dropPlayerItemWithRandomChoice(this.inventory[i], true);
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
drops.add(entityItem);
this.inventory[i] = null;
}
}
@@ -2,32 +2,29 @@ package tconstruct.util.player;
import java.lang.ref.WeakReference;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import mantle.player.PlayerUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.Entity.EnumEntitySize;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingFallEvent;
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.util.config.PHConstruct;
import tconstruct.util.network.packet.AbstractPacket;
import tconstruct.util.network.packet.PacketArmorSync;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
import cpw.mods.fml.relauncher.Side;
@@ -36,7 +33,7 @@ public class TPlayerHandler
/* Player */
// public int hunger;
public ConcurrentHashMap<String, TPlayerStats> playerStats = new ConcurrentHashMap<String, TPlayerStats>();
public ConcurrentHashMap<UUID, TPlayerStats> playerStats = new ConcurrentHashMap<UUID, TPlayerStats>();
@SubscribeEvent
public void PlayerLoggedInEvent (PlayerLoggedInEvent event)
@@ -44,56 +41,42 @@ public class TPlayerHandler
onPlayerLogin(event.player);
}
@SubscribeEvent
public void PlayerLoggedOutEvent (PlayerLoggedOutEvent event)
{
savePlayerStats(event.player, true);
}
@SubscribeEvent
public void onPlayerChangedDimension (PlayerChangedDimensionEvent event)
{
savePlayerStats(event.player, false);
updatePlayerInventory(event.player, getPlayerStats(event.player.getDisplayName()));
}
@SubscribeEvent
public void onPlayerRespawn (PlayerRespawnEvent event)
{
onPlayerRespawn(event.player);
}
@SubscribeEvent
public void onEntityConstructing(EntityEvent.EntityConstructing event)
{
if (event.entity instanceof EntityPlayer && TPlayerStats.get((EntityPlayer) event.entity) == null)
{
TPlayerStats.register((EntityPlayer) event.entity);
}
}
public void onPlayerLogin (EntityPlayer entityplayer)
{
TPlayerStats playerData = playerStats.remove(entityplayer.getPersistentID());
if(playerData != null)
{
playerData.saveNBTData(entityplayer.getEntityData());
}
// TConstruct.logger.info("Player: "+entityplayer);
// Lookup player
NBTTagCompound tags = entityplayer.getEntityData();
if (!tags.hasKey("TConstruct"))
{
tags.setTag("TConstruct", new NBTTagCompound());
}
TPlayerStats stats = new TPlayerStats();
stats.player = new WeakReference<EntityPlayer>(entityplayer);
stats.armor = new ArmorExtended();
stats.armor.init(entityplayer);
stats.armor.readFromNBT(entityplayer);
stats.knapsack = new KnapsackInventory();
stats.knapsack.init(entityplayer);
stats.knapsack.readFromNBT(entityplayer);
TPlayerStats stats = TPlayerStats.get(entityplayer);
stats.level = entityplayer.experienceLevel;
stats.hunger = entityplayer.getFoodStats().getFoodLevel();
stats.beginnerManual = tags.getCompoundTag("TConstruct").getBoolean("beginnerManual");
stats.materialManual = tags.getCompoundTag("TConstruct").getBoolean("materialManual");
stats.smelteryManual = tags.getCompoundTag("TConstruct").getBoolean("smelteryManual");
// gamerule naturalRegeneration false
if (!PHConstruct.enableHealthRegen)
entityplayer.worldObj.getGameRules().setOrCreateGameRule("naturalRegeneration", "false");
if (!stats.beginnerManual)
{
stats.beginnerManual = true;
tags.getCompoundTag("TConstruct").setBoolean("beginnerManual", true);
if (PHConstruct.beginnerBook)
{
ItemStack diary = new ItemStack(TRepo.manualBook);
@@ -135,8 +118,6 @@ public class TPlayerHandler
}
}
playerStats.put(entityplayer.getDisplayName(), stats);
if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon"))
{
PHConstruct.gregtech = false;
@@ -147,43 +128,18 @@ public class TPlayerHandler
PlayerUtils.sendChatMessage(entityplayer, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct.");
}
}
updatePlayerInventory(entityplayer, stats);
}
void updatePlayerInventory (EntityPlayer player, TPlayerStats stats)
{
if (player instanceof EntityPlayerMP)
{
AbstractPacket packet = new PacketArmorSync(stats.armor, stats.knapsack);
TConstruct.packetPipeline.sendTo(packet, (EntityPlayerMP) player);
}
}
void savePlayerStats (EntityPlayer player, boolean clean)
{
if (player != null)
{
TPlayerStats stats = getPlayerStats(player.getDisplayName());
if (stats != null && stats.armor != null)
{
stats.armor.saveToNBT(player);
stats.knapsack.saveToNBT(player);
if (clean)
playerStats.remove(player.getDisplayName());
}
else
// Revalidate all players
{
}
}
}
public void onPlayerRespawn (EntityPlayer entityplayer)
{
// Boom!
TPlayerStats stats = getPlayerStats(entityplayer.getDisplayName());
TPlayerStats playerData = playerStats.remove(entityplayer.getPersistentID());
TPlayerStats stats = TPlayerStats.get(entityplayer);
if(playerData != null)
{
stats = playerData;
}
stats.player = new WeakReference<EntityPlayer>(entityplayer);
stats.armor.recalculateHealth(entityplayer, stats);
@@ -195,12 +151,6 @@ public class TPlayerHandler
entityplayer.experienceLevel = stats.level;
if (PHConstruct.keepHunger)
entityplayer.getFoodStats().addStats(-1 * (20 - stats.hunger), 0);
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagCompound tTag = new NBTTagCompound();
tTag.setBoolean("beginnerManual", stats.beginnerManual);
tTag.setBoolean("materialManual", stats.materialManual);
tTag.setBoolean("smelteryManual", stats.smelteryManual);
tags.setTag("TConstruct", tTag);
Side side = FMLCommonHandler.instance().getEffectiveSide();
if (side == Side.CLIENT)
@@ -209,7 +159,6 @@ public class TPlayerHandler
if (PHConstruct.keepHunger)
entityplayer.getFoodStats().setFoodLevel(stats.hunger);
}
updatePlayerInventory(entityplayer, getPlayerStats(entityplayer.getDisplayName()));
}
@SubscribeEvent
@@ -234,10 +183,24 @@ public class TPlayerHandler
* //TConstruct.logger.info("Fall: "+player.fallDistance); } } }
*/
@SubscribeEvent
public void playerDeath(LivingDeathEvent event)
{
if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer)
{
TPlayerStats properties = (TPlayerStats) event.entity.getExtendedProperties(TPlayerStats.PROP_NAME);
properties.hunger = ((EntityPlayer) event.entity).getFoodStats().getFoodLevel();
playerStats.put(((EntityPlayer) event.entity).getPersistentID(), properties);
}
}
@SubscribeEvent
public void playerDrops (PlayerDropsEvent evt)
{
TPlayerStats stats = getPlayerStats(evt.entityPlayer.getDisplayName());
// After playerDeath event. Modifying saved data.
TPlayerStats stats = playerStats.get(evt.entityPlayer.getPersistentID());
stats.level = evt.entityPlayer.experienceLevel / 2;
// stats.health = 20;
int hunger = evt.entityPlayer.getFoodStats().getFoodLevel();
@@ -245,32 +208,11 @@ public class TPlayerHandler
stats.hunger = 6;
else
stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel();
}
/* Find the right player */
public TPlayerStats getPlayerStats (String username)
{
TPlayerStats stats = playerStats.get(username);
// TConstruct.logger.info("Stats: "+stats);
if (stats == null)
{
stats = new TPlayerStats();
playerStats.put(username, stats);
}
return stats;
}
stats.armor.dropItems(evt.drops);
stats.knapsack.dropItems(evt.drops);
public EntityPlayer getEntityPlayer (String username)
{
TPlayerStats stats = playerStats.get(username);
if (stats == null)
{
return null;
}
else
{
return stats.player.get();
}
playerStats.put(evt.entityPlayer.getPersistentID(), stats);
}
/* Modify Player */
@@ -2,10 +2,16 @@ package tconstruct.util.player;
import java.lang.ref.WeakReference;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.IExtendedEntityProperties;
public class TPlayerStats
public class TPlayerStats implements IExtendedEntityProperties
{
public static final String PROP_NAME = "TConstruct";
public WeakReference<EntityPlayer> player;
public int level;
public int bonusHealth;
@@ -16,4 +22,59 @@ public class TPlayerStats
public boolean smelteryManual;
public ArmorExtended armor;
public KnapsackInventory knapsack;
public TPlayerStats()
{
}
public TPlayerStats(EntityPlayer entityplayer)
{
this.player = new WeakReference<EntityPlayer>(entityplayer);
this.armor = new ArmorExtended();
this.armor.init(entityplayer);
this.knapsack = new KnapsackInventory();
this.knapsack.init(entityplayer);
}
@Override
public void saveNBTData(NBTTagCompound compound)
{
NBTTagCompound tTag = new NBTTagCompound();
armor.saveToNBT(tTag);
knapsack.saveToNBT(tTag);
tTag.setBoolean("beginnerManual", this.beginnerManual);
tTag.setBoolean("materialManual", this.materialManual);
tTag.setBoolean("smelteryManual", this.smelteryManual);
compound.setTag(PROP_NAME, tTag);
}
@Override
public void loadNBTData(NBTTagCompound compound)
{
NBTTagCompound properties = (NBTTagCompound)compound.getTag(PROP_NAME);
this.armor.readFromNBT(properties);
this.knapsack.readFromNBT(properties);
this.beginnerManual = properties.getBoolean("beginnerManual");
this.materialManual = properties.getBoolean("materialManual");
this.smelteryManual = properties.getBoolean("smelteryManual");
}
@Override
public void init(Entity entity, World world)
{
}
public static final void register(EntityPlayer player)
{
player.registerExtendedProperties(TPlayerStats.PROP_NAME, new TPlayerStats(player));
}
public static final TPlayerStats get(EntityPlayer player)
{
return (TPlayerStats) player.getExtendedProperties(PROP_NAME);
}
}