- Familiar renderbug fixxed (FCK you Baubles)

This commit is contained in:
HellFirePvP committed 2015-12-20 22:55:11 +01:00
1 parent fb61cf61ce
commit ebd30deab2
4 files changed
+203 -55

No files matched your search

@@ -3,17 +3,20 @@ package makeo.gadomancy.client.util;
import baubles.api.BaublesApi;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import makeo.gadomancy.common.data.DataFamiliar;
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import makeo.gadomancy.common.network.packets.PacketFamiliarBolt;
import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.client.fx.bolt.FXLightningBolt;
import thaumcraft.client.renderers.entity.RenderWisp;
import thaumcraft.common.entities.monster.EntityWisp;
@@ -37,15 +40,20 @@ public class FamiliarHandlerClient {
private static RenderWisp fallbackRenderer;
private static Map<String, PartialEntityFamiliar> clientFamiliars = new HashMap<String, PartialEntityFamiliar>();
private static Map<String, ExFamiliarData> clientFamiliars = new HashMap<String, ExFamiliarData>();
@SideOnly(Side.CLIENT)
public static void processBoltPacket(PacketFamiliarBolt pkt) {
EntityPlayer p = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(pkt.owner);
if(p == null || p.getDistanceSqToEntity(Minecraft.getMinecraft().thePlayer) > 1024) return; //32^2
PartialEntityFamiliar fam = clientFamiliars.get(p.getCommandSenderName());
if(fam == null) return;
FXLightningBolt bolt = new FXLightningBolt(Minecraft.getMinecraft().theWorld, (float) fam.posX, (float) fam.posY, (float) fam.posZ, pkt.targetX, pkt.targetY, pkt.targetZ, Minecraft.getMinecraft().theWorld.rand.nextLong(), 10, 4.0F, 5);
ExFamiliarData data = clientFamiliars.get(p.getCommandSenderName());
if(data == null) return;
PartialEntityFamiliar fam = data.familiar;
float y = (float) fam.posY;
if (!Minecraft.getMinecraft().thePlayer.getCommandSenderName().equals(pkt.owner)) {
y += 1.32F;
}
FXLightningBolt bolt = new FXLightningBolt(Minecraft.getMinecraft().theWorld, (float) fam.posX, y, (float) fam.posZ, pkt.targetX, pkt.targetY, pkt.targetZ, Minecraft.getMinecraft().theWorld.rand.nextLong(), 10, 4.0F, 5);
bolt.defaultFractal();
bolt.setType(pkt.type);
bolt.finalizeBolt();
@@ -56,23 +64,44 @@ public class FamiliarHandlerClient {
String ownerName = player.getCommandSenderName();
if(!clientFamiliars.containsKey(ownerName)) return;
PartialEntityFamiliar fam = clientFamiliars.get(ownerName);
ExFamiliarData data = clientFamiliars.get(ownerName);
PartialEntityFamiliar fam = data.familiar;
ItemStack stack = BaublesApi.getBaubles(player).getStackInSlot(0);
if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return;
if(((ItemFamiliar) stack.getItem()).hasAspect(stack)) {
ENTITY_WISP.setType(((ItemFamiliar) stack.getItem()).getAspect(stack).getTag());
ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted;
GL11.glPushMatrix();
fallbackRenderer.doRender(ENTITY_WISP, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks);
GL11.glPopMatrix();
Aspect aspect = Aspect.getAspect(data.data.aspectTag);
ENTITY_WISP.setType(aspect.getTag());
ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted;
GL11.glPushMatrix();
if(fam.owner == null || fam.owner.get() == null) {
fam.owner = new WeakReference<EntityPlayer>(player);
}
EntityPlayer current = Minecraft.getMinecraft().thePlayer;
double diffX = fam.renderX - current.posX + player.posX;
double diffY = fam.renderY - current.posY + player.posY + 0.5;
double diffZ = fam.renderZ - current.posZ + player.posZ;
String currentPl = current.getCommandSenderName();
String otherPl = player.getCommandSenderName();
if(!currentPl.equals(otherPl)) {
diffY += 1.32;
EntityLivingBase entity = Minecraft.getMinecraft().renderViewEntity;
diffX -= ((entity.posX - entity.lastTickPosX) * partialTicks);
diffY -= ((entity.posY - entity.lastTickPosY) * partialTicks);
diffZ -= ((entity.posZ - entity.lastTickPosZ) * partialTicks);
}
fallbackRenderer.doRender(ENTITY_WISP, diffX, diffY, diffZ, 0, partialTicks);
GL11.glPopMatrix();
}
@SideOnly(Side.CLIENT)
public static void playerTickEvent() {
if(Minecraft.getMinecraft().theWorld == null) return;
for(PartialEntityFamiliar fam : clientFamiliars.values()) fam.tick();
for(ExFamiliarData data : clientFamiliars.values()) {
data.familiar.tick();
}
PartialEntityFamiliar.DUMMY_FAMILIAR.tick();
}
@@ -82,15 +111,46 @@ public class FamiliarHandlerClient {
ENTITY_WISP = new EntityWisp(new FakeWorld());
}
public static void handleAdditions(List<String> toAdd) {
for(String plName : toAdd) {
clientFamiliars.put(plName, new PartialEntityFamiliar(Minecraft.getMinecraft().theWorld.getPlayerEntityByName(plName), plName));
public static void handleAdditions(List<DataFamiliar.FamiliarData> toAdd) {
for(DataFamiliar.FamiliarData data : toAdd) {
PartialEntityFamiliar familiar = new PartialEntityFamiliar(Minecraft.getMinecraft().theWorld.getPlayerEntityByName(data.owner), data.owner);
ExFamiliarData exData = new ExFamiliarData(data, familiar);
clientFamiliars.put(data.owner, exData);
}
}
public static void handleRemovals(List<String> toRemove) {
for(String plName : toRemove) {
clientFamiliars.remove(plName);
public static void handleRemovals(List<DataFamiliar.FamiliarData> toRemove) {
for(DataFamiliar.FamiliarData data : toRemove) {
clientFamiliars.remove(data.owner);
}
}
public static class ExFamiliarData {
public final DataFamiliar.FamiliarData data;
public final PartialEntityFamiliar familiar;
public ExFamiliarData(DataFamiliar.FamiliarData data, PartialEntityFamiliar familiar) {
this.data = data;
this.familiar = familiar;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ExFamiliarData that = (ExFamiliarData) o;
return !(data != null ? !data.equals(that.data) : that.data != null) && !(familiar != null ? !familiar.equals(that.familiar) : that.familiar != null);
}
@Override
public int hashCode() {
int result = data != null ? data.hashCode() : 0;
result = 31 * result + (familiar != null ? familiar.hashCode() : 0);
return result;
}
}
@@ -161,7 +221,7 @@ public class FamiliarHandlerClient {
double theta = RAD_CAP * part;
this.renderX = RADIUS * Math.cos(theta);
this.renderZ = RADIUS * Math.sin(theta);
this.renderY = 0.7 + Math.sin(theta * 2) / 2D;
this.renderY = Math.sin(theta * 2) / 2D;
this.posX = owner.get().posX + renderX;
this.posZ = owner.get().posZ + renderZ;
@@ -3,12 +3,14 @@ package makeo.gadomancy.common.data;
import baubles.api.BaublesApi;
import makeo.gadomancy.client.util.FamiliarHandlerClient;
import makeo.gadomancy.common.familiar.FamiliarAIController;
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,19 +27,27 @@ import java.util.Map;
*/
public class DataFamiliar extends AbstractData {
private List<String> playersWithFamiliar = new ArrayList<String>();
private List<FamiliarData> playersWithFamiliar = new ArrayList<FamiliarData>();
private Map<EntityPlayer, FamiliarAIController> familiarAI = new HashMap<EntityPlayer, FamiliarAIController>();
private List<String> addClientQueue = new ArrayList<String>();
private List<String> removeClientQueue = new ArrayList<String>();
private List<FamiliarData> addClientQueue = new ArrayList<FamiliarData>();
private List<FamiliarData> removeClientQueue = new ArrayList<FamiliarData>();
public void handleEquip(World world, EntityPlayer player) {
public boolean hasFamiliar(EntityPlayer player) {
for(FamiliarData fam : playersWithFamiliar) {
if(fam.owner.equals(player.getCommandSenderName())) return true;
}
return false;
}
public void handleEquip(World world, EntityPlayer player, Aspect aspect) {
if(world.isRemote) return;
String playerName = player.getCommandSenderName();
FamiliarData data = new FamiliarData(playerName, aspect.getTag());
if(!addClientQueue.contains(playerName)) addClientQueue.add(playerName);
if(!playersWithFamiliar.contains(playerName)) playersWithFamiliar.add(playerName);
if(!addClientQueue.contains(data)) addClientQueue.add(data);
if(!playersWithFamiliar.contains(data)) playersWithFamiliar.add(data);
markDirty();
if(!familiarAI.containsKey(player)) {
@@ -47,29 +57,32 @@ public class DataFamiliar extends AbstractData {
}
}
public void handleUnequip(World world, EntityPlayer player) {
public void handleUnequip(World world, EntityPlayer player, Aspect aspect) {
if(world.isRemote) return;
String playerName = player.getCommandSenderName();
FamiliarData data = new FamiliarData(playerName, aspect.getTag());
if(!removeClientQueue.contains(playerName)) removeClientQueue.add(playerName);
if(playersWithFamiliar.contains(playerName)) playersWithFamiliar.remove(playerName);
if(!removeClientQueue.contains(data)) removeClientQueue.add(data);
if(playersWithFamiliar.contains(data)) playersWithFamiliar.remove(data);
markDirty();
familiarAI.remove(player);
}
public void equipTick(World world, EntityPlayer player) {
public void equipTick(World world, EntityPlayer player, Aspect aspect) {
if(world.isRemote) return;
FamiliarData data = new FamiliarData(player.getCommandSenderName(), aspect.getTag());
IInventory baublesInv = BaublesApi.getBaubles(player);
if(baublesInv.getStackInSlot(0) == null) {
handleUnequip(world, player);
handleUnequip(world, player, aspect);
return;
}
if(familiarAI.get(player) == null || !playersWithFamiliar.contains(player.getCommandSenderName())) {
handleEquip(world, player);
if(familiarAI.get(player) == null || !playersWithFamiliar.contains(data)) {
handleEquip(world, player, aspect);
}
familiarAI.get(player).scheduleTick();
@@ -78,7 +91,14 @@ public class DataFamiliar extends AbstractData {
public void checkPlayerEquipment(EntityPlayer p) {
IInventory baublesInv = BaublesApi.getBaubles(p);
if(baublesInv.getStackInSlot(0) != null) {
handleEquip(p.worldObj, p);
ItemStack amulet = baublesInv.getStackInSlot(0);
if(amulet.getItem() != null && amulet.getItem() instanceof ItemFamiliar) {
ItemFamiliar fam = (ItemFamiliar) amulet.getItem();
Aspect a = fam.getAspect(amulet);
if(a != null) {
handleEquip(p.worldObj, p, a);
}
}
}
}
@@ -90,8 +110,11 @@ public class DataFamiliar extends AbstractData {
@Override
public void writeAllDataToPacket(NBTTagCompound compound) {
NBTTagList list = new NBTTagList();
for(String s : playersWithFamiliar) {
list.appendTag(new NBTTagString(s));
for(FamiliarData data : playersWithFamiliar) {
NBTTagCompound cmp = new NBTTagCompound();
cmp.setString("owner", data.owner);
cmp.setString("aspect", data.aspectTag);
list.appendTag(cmp);
}
compound.setTag("additions", list);
compound.setTag("removals", new NBTTagList());
@@ -100,14 +123,20 @@ public class DataFamiliar extends AbstractData {
@Override
public void writeToPacket(NBTTagCompound compound) {
NBTTagList removal = new NBTTagList();
for(String s : removeClientQueue) {
removal.appendTag(new NBTTagString(s));
for(FamiliarData data : removeClientQueue) {
NBTTagCompound cmp = new NBTTagCompound();
cmp.setString("owner", data.owner);
cmp.setString("aspect", data.aspectTag);
removal.appendTag(cmp);
}
compound.setTag("removals", removal);
NBTTagList additions = new NBTTagList();
for(String s : addClientQueue) {
additions.appendTag(new NBTTagString(s));
for(FamiliarData data : addClientQueue) {
NBTTagCompound cmp = new NBTTagCompound();
cmp.setString("owner", data.owner);
cmp.setString("aspect", data.aspectTag);
additions.appendTag(cmp);
}
compound.setTag("additions", additions);
@@ -117,27 +146,74 @@ public class DataFamiliar extends AbstractData {
@Override
public void readRawFromPacket(NBTTagCompound compound) {
NBTTagList remove = compound.getTagList("removals", new NBTTagString().getId());
NBTTagList remove = compound.getTagList("removals", new NBTTagCompound().getId());
for (int i = 0; i < remove.tagCount(); i++) {
removeClientQueue.add(remove.getStringTagAt(i));
NBTTagCompound cmp = remove.getCompoundTagAt(i);
String owner = cmp.getString("owner");
String aspect = cmp.getString("aspect");
removeClientQueue.add(new FamiliarData(owner, aspect));
}
NBTTagList additions = compound.getTagList("additions", new NBTTagString().getId());
NBTTagList additions = compound.getTagList("additions", new NBTTagCompound().getId());
for (int i = 0; i < additions.tagCount(); i++) {
addClientQueue.add(additions.getStringTagAt(i));
NBTTagCompound cmp = additions.getCompoundTagAt(i);
String owner = cmp.getString("owner");
String aspect = cmp.getString("aspect");
addClientQueue.add(new FamiliarData(owner, aspect));
}
}
@Override
public void handleIncomingData(AbstractData serverData) {
DataFamiliar familiarData = (DataFamiliar) serverData;
List<String> toAdd = familiarData.addClientQueue;
List<FamiliarData> toAdd = familiarData.addClientQueue;
playersWithFamiliar.addAll(toAdd);
FamiliarHandlerClient.handleAdditions(toAdd);
List<String> toRemove = familiarData.removeClientQueue;
List<FamiliarData> toRemove = familiarData.removeClientQueue;
playersWithFamiliar.removeAll(toRemove);
FamiliarHandlerClient.handleRemovals(toRemove);
}
public void handleUnsafeUnequip(EntityPlayer player) {
FamiliarData data = null;
for(FamiliarData fam : playersWithFamiliar) {
if(fam.owner.equals(player.getCommandSenderName())) {
data = fam;
}
}
if(data != null) {
handleUnequip(player.worldObj, player, Aspect.getAspect(data.aspectTag));
}
}
public static class FamiliarData {
public final String owner;
public final String aspectTag;
public FamiliarData(String owner, String aspectTag) {
this.owner = owner;
this.aspectTag = aspectTag;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FamiliarData that = (FamiliarData) o;
return !(aspectTag != null ? !aspectTag.equals(that.aspectTag) : that.aspectTag != null) && !(owner != null ? !owner.equals(that.owner) : that.owner != null);
}
@Override
public int hashCode() {
int result = owner != null ? owner.hashCode() : 0;
result = 31 * result + (aspectTag != null ? aspectTag.hashCode() : 0);
return result;
}
}
public static class Provider extends ProviderAutoAllocate<DataFamiliar> {
public Provider(String key) {
@@ -29,17 +29,20 @@ public class EventHandlerNetwork {
EntityPlayerMP p = (EntityPlayerMP) e.player;
if(!p.playerNetServerHandler.netManager.isLocalChannel()) {
PacketHandler.INSTANCE.sendTo(new PacketUpdateGolemTypeOrder(GolemEnumHelper.getCurrentMapping()), p);
((DataFamiliar) SyncDataHolder.getDataServer("FamiliarData")).checkPlayerEquipment(p);
((DataAchromatic) SyncDataHolder.getDataServer("AchromaticData")).checkPotionEffect(p);
SyncDataHolder.syncAllDataTo(p);
PacketHandler.INSTANCE.sendTo(new PacketSyncConfigs(), p);
}
((DataFamiliar) SyncDataHolder.getDataServer("FamiliarData")).checkPlayerEquipment(p);
((DataAchromatic) SyncDataHolder.getDataServer("AchromaticData")).checkPotionEffect(p);
SyncDataHolder.syncAllDataTo(p);
}
@SubscribeEvent
public void on(PlayerEvent.PlayerLoggedOutEvent e) {
EntityPlayer player = e.player;
((DataFamiliar) SyncDataHolder.getDataServer("FamiliarData")).handleUnequip(player.worldObj, player);
DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData");
if(familiarData.hasFamiliar(player)) {
familiarData.handleUnsafeUnequip(player);
}
TCMazeHandler.closeSession(e.player, true);
}
@@ -127,7 +127,10 @@ public class ItemFamiliar extends Item implements IBauble {
if(itemStack == null) return;
if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) {
DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData");
familiarData.equipTick(((EntityPlayer) entity).worldObj, (EntityPlayer) entity);
Aspect a = getAspect(itemStack);
if(a != null) {
familiarData.equipTick(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a);
}
if(((EntityPlayer) entity).worldObj.isRemote) return;
@@ -148,7 +151,10 @@ public class ItemFamiliar extends Item implements IBauble {
if(itemStack == null) return;
if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) {
DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData");
familiarData.handleEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity);
Aspect a = getAspect(itemStack);
if(a != null) {
familiarData.handleEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a);
}
}
}
@@ -157,7 +163,10 @@ public class ItemFamiliar extends Item implements IBauble {
if(itemStack == null) return;
if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) {
DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData");
familiarData.handleUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity);
Aspect a = getAspect(itemStack);
if(a != null) {
familiarData.handleUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a);
}
}
}