Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More WorldEvent work

Browse source
This commit is contained in:
pahimar 2012-12-06 21:06:16 -05:00
parent 69293538b9
commit ae14f68167
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ee3_client/ee3/client/core/ClientProxy.java
View file

@ -117,9 +117,9 @@ public class ClientProxy extends CommonProxy {
} }
@Override @Override
public void sendWorldEventPacket(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, int targetID, int targetMeta) { public void sendWorldEventPacket(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketWorldEvent(eventType, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, targetID, targetMeta))); PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketWorldEvent(eventType, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data)));
} }
} }

2
ee3_common/ee3/common/core/CommonProxy.java
View file

@ -63,7 +63,7 @@ public class CommonProxy implements IGuiHandler {
GameRegistry.registerTileEntity(TileCalcinator.class, Strings.TE_CALCINATOR_NAME); GameRegistry.registerTileEntity(TileCalcinator.class, Strings.TE_CALCINATOR_NAME);
} }
public void sendWorldEventPacket(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, int targetID, int targetMeta) { public void sendWorldEventPacket(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
} }

12
ee3_common/ee3/common/item/ItemPhilosopherStone.java
View file

@ -80,14 +80,16 @@ public class ItemPhilosopherStone extends ItemEE
@Override @Override
public boolean onItemUse(ItemStack itemStack, EntityPlayer entityPlayer, World world, int x, int y, int z, int sideHit, float hitVecX, float hitVecY, float hitVecZ) { public boolean onItemUse(ItemStack itemStack, EntityPlayer entityPlayer, World world, int x, int y, int z, int sideHit, float hitVecX, float hitVecY, float hitVecZ) {
boolean result = TransmutationHelper.transmuteInWorld(world, entityPlayer, itemStack, x, y, z); //boolean result = TransmutationHelper.transmuteInWorld(world, entityPlayer, itemStack, x, y, z);
boolean result = true;
EquivalentExchange3.proxy.sendWorldEventPacket(WorldEvents.TRANSMUTATION, x, y, z, (byte)sideHit, (byte)getCharge(itemStack), (byte)getCharge(itemStack), (byte)getCharge(itemStack), 50, 0); if (!world.isRemote) {
EquivalentExchange3.proxy.sendWorldEventPacket(WorldEvents.TRANSMUTATION, x, y, z, (byte)sideHit, (byte)getCharge(itemStack), (byte)getCharge(itemStack), (byte)getCharge(itemStack), "50:0");
}
/*
if (result) { if (result) {
itemStack.damageItem(1, entityPlayer); itemStack.damageItem(1, entityPlayer);
} }
*/
return result; return result;
} }

21
ee3_common/ee3/common/network/PacketWorldEvent.java
View file

@ -13,14 +13,14 @@ public class PacketWorldEvent extends PacketEE {
public int originX, originY, originZ; public int originX, originY, originZ;
public byte sideHit; public byte sideHit;
public byte rangeX, rangeY, rangeZ; public byte rangeX, rangeY, rangeZ;
public int targetID, targetMeta; public String data;
public PacketWorldEvent() { public PacketWorldEvent() {
super(PacketTypeHandler.WORLD_EVENT, false); super(PacketTypeHandler.WORLD_EVENT, false);
} }
public PacketWorldEvent(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, int targetID, int targetMeta) { public PacketWorldEvent(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
super(PacketTypeHandler.WORLD_EVENT, false); super(PacketTypeHandler.WORLD_EVENT, false);
this.eventType = eventType; this.eventType = eventType;
@ -31,8 +31,7 @@ public class PacketWorldEvent extends PacketEE {
this.rangeX = rangeX; this.rangeX = rangeX;
this.rangeY = rangeY; this.rangeY = rangeY;
this.rangeZ = rangeZ; this.rangeZ = rangeZ;
this.targetID = targetID; this.data = data;
this.targetMeta = targetMeta;
} }
public void setEventType(byte eventType) { public void setEventType(byte eventType) {
@ -58,10 +57,9 @@ public class PacketWorldEvent extends PacketEE {
this.rangeZ = rangeZ; this.rangeZ = rangeZ;
} }
public void setTransmutationTarget(int targetID, int targetMeta) { public void setData(String data) {
this.targetID = targetID; this.data = data;
this.targetMeta = targetMeta;
} }
public void writeData(DataOutputStream data) throws IOException { public void writeData(DataOutputStream data) throws IOException {
@ -74,8 +72,7 @@ public class PacketWorldEvent extends PacketEE {
data.writeByte(rangeX); data.writeByte(rangeX);
data.writeByte(rangeY); data.writeByte(rangeY);
data.writeByte(rangeZ); data.writeByte(rangeZ);
data.writeInt(targetID); data.writeUTF(this.data);
data.writeInt(targetMeta);
} }
public void readData(DataInputStream data) throws IOException { public void readData(DataInputStream data) throws IOException {
@ -88,8 +85,7 @@ public class PacketWorldEvent extends PacketEE {
this.rangeX = data.readByte(); this.rangeX = data.readByte();
this.rangeY = data.readByte(); this.rangeY = data.readByte();
this.rangeZ = data.readByte(); this.rangeZ = data.readByte();
this.targetID = data.readInt(); this.data = data.readUTF();
this.targetMeta = data.readInt();
} }
public void execute(INetworkManager manager, Player player) { public void execute(INetworkManager manager, Player player) {
@ -102,8 +98,7 @@ public class PacketWorldEvent extends PacketEE {
System.out.println("rangeX: " + rangeX); System.out.println("rangeX: " + rangeX);
System.out.println("rangeY: " + rangeY); System.out.println("rangeY: " + rangeY);
System.out.println("rangeZ: " + rangeZ); System.out.println("rangeZ: " + rangeZ);
System.out.println("targetID: " + targetID); System.out.println("data: " + data);
System.out.println("targetMeta: " + targetMeta);
} }
} }