Corporea no longer runs clientside

This commit is contained in:
Vincent Lee committed 2016-08-13 15:21:32 -05:00
1 parent 1eafb2e85e
commit 687d475aeb
3 files changed
+41 -44

No files matched your search

@@ -61,6 +61,10 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
float absTime = Math.abs(time) - pticks;
ItemStack stack = entity.getDisplayedItem().orNull();
if(stack == null)
return;
GlStateManager.pushMatrix();
GlStateManager.rotate(90F, 1F, 0F, 0F);
float scalef = 1F / 6F;
@@ -70,10 +74,6 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
GlStateManager.color(1F, 1F, 1F, absTime / 10);
GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6);
ItemStack stack = entity.getDisplayedItem().orNull();
if(stack == null)
return;
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture();
@@ -52,10 +52,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
private ICorporeaSpark master;
private List<ICorporeaSpark> connections = new ArrayList<>();
private List<ICorporeaSpark> connectionsClient = new ArrayList<>();
private List<ICorporeaSpark> relatives = new ArrayList<>();
private boolean firstUpdateClient = true;
private boolean firstUpdateServer = true;
private boolean firstTick = true;
public EntityCorporeaSpark(World world) {
super(world);
@@ -86,24 +84,25 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
@Override
public void onUpdate() {
super.onUpdate();
if(worldObj.isRemote)
return;
InvWithLocation inv = getSparkInventory();
if(inv == null) {
if(!worldObj.isRemote)
dropAndKill();
dropAndKill();
return;
}
if(isMaster())
master = this;
if(worldObj.isRemote ? firstUpdateClient : firstUpdateServer) {
if(firstTick) {
if(isMaster())
restartNetwork();
else findNetwork();
if(worldObj.isRemote)
firstUpdateClient = false;
else firstUpdateServer = false;
firstTick = false;
}
if(master != null && (((Entity) master).isDead || master.getNetwork() != getNetwork()))
@@ -125,7 +124,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
public void setDead() {
super.setDead();
connections.remove(this);
connectionsClient.remove(this);
restartNetwork();
}
@@ -143,20 +141,16 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
}
this.master = master;
if(worldObj.isRemote)
connectionsClient = connections;
else this.connections = connections;
this.connections = connections;
}
List<ICorporeaSpark> getNearbySparks() {
private List<ICorporeaSpark> getNearbySparks() {
List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class));
return ((List<ICorporeaSpark>) ret);
}
void restartNetwork() {
if(worldObj.isRemote)
connectionsClient = new ArrayList<>();
else connections = new ArrayList<>();
private void restartNetwork() {
connections = new ArrayList<>();
relatives = new ArrayList<>();
if(master != null) {
@@ -167,7 +161,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
}
}
void findNetwork() {
private void findNetwork() {
List<ICorporeaSpark> sparks = getNearbySparks();
if(sparks.size() > 0) {
for(ICorporeaSpark spark : sparks)
@@ -183,18 +177,18 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
}
}
void displayRelatives(ArrayList<ICorporeaSpark> checked, ICorporeaSpark spark) {
private static void displayRelatives(EntityPlayer player, List<ICorporeaSpark> checked, ICorporeaSpark spark) {
if(spark == null)
return;
List<ICorporeaSpark> sparks = spark.getRelatives();
if(sparks.isEmpty())
EntitySpark.particleBeam((Entity) spark, (Entity) spark.getMaster());
EntitySpark.particleBeam(player, (Entity) spark, (Entity) spark.getMaster());
else for(ICorporeaSpark endSpark : sparks) {
if(!checked.contains(endSpark)) {
EntitySpark.particleBeam((Entity) spark, (Entity) endSpark);
EntitySpark.particleBeam(player, (Entity) spark, (Entity) endSpark);
checked.add(endSpark);
displayRelatives(checked, endSpark);
displayRelatives(player, checked, endSpark);
}
}
}
@@ -209,7 +203,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
@Override
public List<ICorporeaSpark> getConnections() {
return worldObj.isRemote ? connectionsClient : connections;
return connections;
}
@Override
@@ -275,29 +269,30 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
if(stack != null) {
if(stack.getItem() == ModItems.twigWand) {
if(player.isSneaking()) {
if(!player.worldObj.isRemote)
if(!player.worldObj.isRemote) {
dropAndKill();
if(isMaster())
restartNetwork();
if(player.worldObj.isRemote)
player.swingArm(hand);
if(isMaster())
restartNetwork();
} else player.swingArm(hand);
return true;
} else {
displayRelatives(new ArrayList<>(), master);
if(!player.worldObj.isRemote) {
displayRelatives(player, new ArrayList<>(), master);
}
return true;
}
} else if(stack.getItem() == ModItems.dye) {
int color = stack.getItemDamage();
if(color != getNetwork().getMetadata()) {
setNetwork(EnumDyeColor.byMetadata(color));
if(!worldObj.isRemote) {
setNetwork(EnumDyeColor.byMetadata(color));
if(master != null)
restartNetwork();
else findNetwork();
if(master != null)
restartNetwork();
else findNetwork();
stack.stackSize--;
if(player.worldObj.isRemote)
player.swingArm(hand);
stack.stackSize--;
} else player.swingArm(hand);
}
}
}
@@ -12,8 +12,10 @@ package vazkii.botania.common.entity;
import baubles.common.lib.PlayerHandler;
import gnu.trove.map.hash.TObjectIntHashMap;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataParameter;
@@ -215,9 +217,9 @@ public class EntitySpark extends Entity implements ISparkEntity {
getEntityId(), e.getEntityId()));
}
public static void particleBeam(Entity e1, Entity e2) {
public static void particleBeam(EntityPlayer player, Entity e1, Entity e2) {
if(e1 != null && e2 != null && !e1.worldObj.isRemote) {
PacketHandler.sendToNearby(e1.worldObj, e1,
PacketHandler.sendTo(((EntityPlayerMP) player),
new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ,
e1.getEntityId(), e2.getEntityId()));
}
@@ -258,7 +260,7 @@ public class EntitySpark extends Entity implements ISparkEntity {
} else {
List<ISparkEntity> allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ);
for(ISparkEntity spark : allSparks)
particleBeam(this, (Entity) spark);
particleBeam(player, this, (Entity) spark);
return true;
}
} else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) {