Add syncing to other clients for toggleable DS upgrades

This commit is contained in:
tterrag1098 committed 2015-05-07 10:43:33 -04:00
1 parent 66de4cf20d
commit 05ab60db97
2 files changed
+48 -10

No files matched your search

@@ -10,6 +10,7 @@ import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@@ -17,6 +18,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovementInput;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import org.lwjgl.opengl.GL11;
@@ -28,6 +30,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.PacketUpgradeState.Type;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade;
import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
@@ -77,8 +80,21 @@ public class DarkSteelController {
private DarkSteelController() {
PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT);
}
public boolean isActive(EntityPlayer player, Type type) {
switch(type) {
case GLIDE:
return isGlideActive(player);
case SPEED:
return isSpeedActive(player);
case STEP_ASSIST:
return isStepAssistActive(player);
}
return false;
}
public void setGlideActive(EntityPlayer player, boolean isGlideActive) {
if(player.getGameProfile().getId() != null) {
glideActiveMap.put(player.getGameProfile().getId(), isGlideActive);
@@ -360,6 +376,15 @@ public class DarkSteelController {
}
return res;
}
@SubscribeEvent
public void onStartTracking(PlayerEvent.StartTracking event) {
if (event.target instanceof EntityPlayerMP) {
for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) {
PacketHandler.sendTo(new PacketUpgradeState(type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), (EntityPlayerMP) event.entityPlayer);
}
}
}
@SideOnly(Side.CLIENT)
@SubscribeEvent
@@ -1,10 +1,12 @@
package crazypants.enderio.item.darksteel;
import net.minecraft.entity.player.EntityPlayerMP;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.PacketHandler;
public class PacketUpgradeState implements IMessage, IMessageHandler<PacketUpgradeState, IMessage> {
@@ -19,28 +21,36 @@ public class PacketUpgradeState implements IMessage, IMessageHandler<PacketUpgra
private boolean isActive;
private Type type;
private int entityID;
public PacketUpgradeState(Type type, boolean isActive) {
this(type, isActive, 0);
}
public PacketUpgradeState(Type type, boolean isActive, int entityID) {
this.type = type;
this.isActive = isActive;
this.entityID = entityID;
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeShort(type.ordinal());
buf.writeBoolean(isActive);
buf.writeBoolean(isActive);
buf.writeInt(entityID);
}
@Override
public void fromBytes(ByteBuf buf) {
type = Type.values()[buf.readShort()];
isActive = buf.readBoolean();
isActive = buf.readBoolean();
entityID = buf.readInt();
}
@Override
public IMessage onMessage(PacketUpgradeState message, MessageContext ctx) {
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
switch(message.type) {
EntityPlayer player = (EntityPlayer) (ctx.side.isClient() ? EnderIO.proxy.getClientWorld().getEntityByID(message.entityID) : ctx.getServerHandler().playerEntity);
switch (message.type) {
case GLIDE:
DarkSteelController.instance.setGlideActive(player, message.isActive);
break;
@@ -51,9 +61,12 @@ public class PacketUpgradeState implements IMessage, IMessageHandler<PacketUpgra
DarkSteelController.instance.setStepAssistActive(player, message.isActive);
break;
default:
break;
}
break;
}
if (ctx.side.isServer()) {
message.entityID = player.getEntityId();
PacketHandler.INSTANCE.sendToDimension(message, player.worldObj.provider.dimensionId);
}
return null;
}
}