fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported to 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sync/AppEngClientPacketHandler.java
-53
View File
@@ -1,53 +0,0 @@
package appeng.core.sync;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import appeng.core.AELog;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler
{
@Override
public void onPacketData(INetworkManager network, Packet250CustomPayload packet, Player player)
{
DataInputStream stream = new DataInputStream( new ByteArrayInputStream( packet.data ) );
// Determine packet type and coordinates of affected tile entity
int packetType = -1;
try
{
packetType = stream.readInt();
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
pack.clientPacketData( network, pack, (EntityPlayer) player );
}
catch (IOException e)
{
AELog.error( e );
}
catch (InstantiationException e)
{
AELog.error( e );
}
catch (IllegalAccessException e)
{
AELog.error( e );
}
catch (IllegalArgumentException e)
{
AELog.error( e );
}
catch (InvocationTargetException e)
{
AELog.error( e );
}
}
}
core/sync/AppEngConnectionHandler.java
-49
View File
@@ -1,49 +0,0 @@
package appeng.core.sync;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetLoginHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.server.MinecraftServer;
import appeng.core.WorldSettings;
import cpw.mods.fml.common.network.IConnectionHandler;
import cpw.mods.fml.common.network.Player;
public class AppEngConnectionHandler implements IConnectionHandler
{
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
{
WorldSettings.getInstance().sendToPlayer( player );
}
@Override
public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
{
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
{
}
@Override
public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
{
}
@Override
public void connectionClosed(INetworkManager manager)
{
}
@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
{
}
}
core/sync/AppEngPacket.java
+11 -13
View File
@@ -1,15 +1,15 @@
package appeng.core.sync;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import appeng.core.Configuration;
import appeng.core.sync.network.INetworkInfo;
import appeng.core.sync.network.NetworkHandler;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
public abstract class AppEngPacket
{
private Packet250CustomPayload p;
protected boolean isChunkDataPacket;
private ByteBuf p;
AppEngPacketHandlerBase.PacketTypes id;
@@ -18,26 +18,24 @@ public abstract class AppEngPacket
return AppEngPacketHandlerBase.PacketTypes.getID( this.getClass() ).ordinal();
}
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
throw new RuntimeException( "This packet ( " + getPacketID() + " does not implement a server side handler." );
}
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
throw new RuntimeException( "This packet ( " + getPacketID() + " does not implement a client side handler." );
}
public Packet250CustomPayload getPacket()
protected void configureWrite(ByteBuf data)
{
// / += p.getPacketSize();
return p;
p = data;
}
protected void configureWrite(byte[] par2ArrayOfByte)
public FMLProxyPacket getProxy()
{
p = new Packet250CustomPayload( Configuration.PACKET_CHANNEL, par2ArrayOfByte );
p.isChunkDataPacket = isChunkDataPacket;
return new FMLProxyPacket( p, NetworkHandler.instance.getChannel() );
}
}
core/sync/AppEngPacketHandlerBase.java
+4 -6
View File
@@ -1,6 +1,7 @@
package appeng.core.sync;
import java.io.DataInputStream;
import io.netty.buffer.ByteBuf;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
@@ -9,7 +10,6 @@ import java.util.Map;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.core.sync.packets.PacketInventoryAction;
import appeng.core.sync.packets.PacketLightning;
import appeng.core.sync.packets.PacketLocalizedChatMsg;
import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.core.sync.packets.PacketMatterCannon;
import appeng.core.sync.packets.PacketMockExplosion;
@@ -41,8 +41,6 @@ public class AppEngPacketHandlerBase
PACKET_MOCKEXPLOSION(PacketMockExplosion.class),
PACKET_LOCALIZED_CHATMSG(PacketLocalizedChatMsg.class),
PACKET_VALUE_CONFIG(PacketValueConfig.class),
PACKET_SWITCH_GUIS(PacketSwitchGuis.class);
@@ -56,7 +54,7 @@ public class AppEngPacketHandlerBase
Constructor x = null;
try
{
x = pc.getConstructor( DataInputStream.class );
x = pc.getConstructor( ByteBuf.class );
}
catch (NoSuchMethodException e)
{
@@ -72,7 +70,7 @@ public class AppEngPacketHandlerBase
throw new RuntimeException( "Invalid Packet Class, must be constructable on DataInputStream" );
}
AppEngPacket parsePacket(DataInputStream in) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
public AppEngPacket parsePacket(ByteBuf in) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
{
return (AppEngPacket) con.newInstance( in );
}
core/sync/GuiBridge.java
+4 -4
View File
@@ -7,7 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.exceptions.AppEngException;
@@ -231,7 +231,7 @@ public enum GuiBridge implements IGuiHandler
}
else
{
TileEntity TE = w.getBlockTileEntity( x, y, z );
TileEntity TE = w.getTileEntity( x, y, z );
if ( TE instanceof IPartHost )
{
((IPartHost) TE).getPart( side );
@@ -286,7 +286,7 @@ public enum GuiBridge implements IGuiHandler
}
else
{
TileEntity TE = w.getBlockTileEntity( x, y, z );
TileEntity TE = w.getTileEntity( x, y, z );
if ( TE instanceof IPartHost )
{
@@ -325,7 +325,7 @@ public enum GuiBridge implements IGuiHandler
}
else
{
TileEntity TE = w.getBlockTileEntity( x, y, z );
TileEntity TE = w.getTileEntity( x, y, z );
if ( TE instanceof IPartHost )
{
((IPartHost) TE).getPart( side );
core/sync/network/AppEngClientPacketHandler.java
+46
View File
@@ -0,0 +1,46 @@
package appeng.core.sync.network;
import io.netty.buffer.ByteBuf;
import java.lang.reflect.InvocationTargetException;
import net.minecraft.entity.player.EntityPlayer;
import appeng.core.AELog;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.AppEngPacketHandlerBase;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler
{
@Override
public void onPacketData(INetworkInfo network, FMLProxyPacket packet, EntityPlayer player)
{
ByteBuf stream = packet.payload();
int packetType = -1;
try
{
packetType = stream.readInt();
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
pack.clientPacketData( network, pack, player );
}
catch (InstantiationException e)
{
AELog.error( e );
}
catch (IllegalAccessException e)
{
AELog.error( e );
}
catch (IllegalArgumentException e)
{
AELog.error( e );
}
catch (InvocationTargetException e)
{
AELog.error( e );
}
}
}
core/sync/AppEngServerPacketHandler.java → core/sync/network/AppEngServerPacketHandler.java
+8 -15
View File
@@ -1,25 +1,22 @@
package appeng.core.sync;
package appeng.core.sync.network;
import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import appeng.core.AELog;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.AppEngPacketHandlerBase;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler
{
@Override
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
public void onPacketData(INetworkInfo manager, FMLProxyPacket packet, EntityPlayer player)
{
DataInputStream stream = new DataInputStream( new ByteArrayInputStream( packet.data ) );
// Determine packet type and coordinates of affected tile entity
ByteBuf stream = packet.payload();
int packetType = -1;
try
@@ -28,10 +25,6 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
pack.serverPacketData( manager, pack, (EntityPlayer) player );
}
catch (IOException e)
{
AELog.error( e );
}
catch (InstantiationException e)
{
AELog.error( e );
core/sync/network/INetworkInfo.java
+7
View File
@@ -0,0 +1,7 @@
package appeng.core.sync.network;
public interface INetworkInfo
{
}
core/sync/network/IPacketHandler.java
+11
View File
@@ -0,0 +1,11 @@
package appeng.core.sync.network;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
public interface IPacketHandler
{
void onPacketData(INetworkInfo manager, FMLProxyPacket packet, EntityPlayer player);
}
core/sync/network/NetworkHandler.java
+82
View File
@@ -0,0 +1,82 @@
package appeng.core.sync.network;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.NetHandlerPlayServer;
import appeng.core.WorldSettings;
import appeng.core.sync.AppEngPacket;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import cpw.mods.fml.common.network.FMLEventChannel;
import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
public class NetworkHandler
{
public static NetworkHandler instance;
final FMLEventChannel ec;
final String myChannelName;
final IPacketHandler clientHandler;
final IPacketHandler serveHandler;
public NetworkHandler(String channelName) {
ec = NetworkRegistry.INSTANCE.newEventDrivenChannel( myChannelName = channelName );
ec.register( this );
clientHandler = new AppEngClientPacketHandler();
serveHandler = new AppEngServerPacketHandler();
}
@SubscribeEvent
public void newPlayer(PlayerLoggedInEvent ev)
{
WorldSettings.getInstance().sendToPlayer( ev.player );
}
@SubscribeEvent
public void serverPacket(ServerCustomPacketEvent ev)
{
NetHandlerPlayServer srv = (NetHandlerPlayServer) ev.packet.handler();
serveHandler.onPacketData( null, ev.packet, srv.playerEntity );
}
@SubscribeEvent
public void clientPacket(ClientCustomPacketEvent ev)
{
clientHandler.onPacketData( null, ev.packet, null );
}
public String getChannel()
{
return myChannelName;
}
public void sendToAll(AppEngPacket message)
{
ec.sendToAll( message.getProxy() );
}
public void sendTo(AppEngPacket message, EntityPlayerMP player)
{
ec.sendTo( message.getProxy(), player );
}
public void sendToAllAround(AppEngPacket message, NetworkRegistry.TargetPoint point)
{
ec.sendToAllAround( message.getProxy(), point );
}
public void sendToDimension(AppEngPacket message, int dimensionId)
{
ec.sendToDimension( message.getProxy(), dimensionId );
}
public void sendToServer(AppEngPacket message)
{
ec.sendToServer( message.getProxy() );
}
}
core/sync/packets/PacketConfigButton.java
+8 -10
View File
@@ -1,18 +1,18 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import appeng.api.config.Settings;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject;
import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.Platform;
public class PacketConfigButton extends AppEngPacket
@@ -22,13 +22,13 @@ public class PacketConfigButton extends AppEngPacket
final public boolean rotationDirection;
// automatic.
public PacketConfigButton(DataInputStream stream) throws IOException {
public PacketConfigButton(ByteBuf stream) throws IOException {
option = Settings.values()[stream.readInt()];
rotationDirection = stream.readBoolean();
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
EntityPlayerMP sender = (EntityPlayerMP) player;
AEBaseContainer aebc = (AEBaseContainer) sender.openContainer;
@@ -45,14 +45,12 @@ public class PacketConfigButton extends AppEngPacket
this.option = option;
this.rotationDirection = rotationDirection;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeInt( option.ordinal() );
data.writeBoolean( rotationDirection );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketInventoryAction.java
+8 -10
View File
@@ -1,16 +1,16 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.helpers.InventoryAction;
import appeng.util.item.AEItemStack;
@@ -22,7 +22,7 @@ public class PacketInventoryAction extends AppEngPacket
final public IAEItemStack slotItem;
// automatic.
public PacketInventoryAction(DataInputStream stream) throws IOException {
public PacketInventoryAction(ByteBuf stream) throws IOException {
action = InventoryAction.values()[stream.readInt()];
slot = stream.readInt();
boolean hasItem = stream.readBoolean();
@@ -33,7 +33,7 @@ public class PacketInventoryAction extends AppEngPacket
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
EntityPlayerMP sender = (EntityPlayerMP) player;
if ( sender.openContainer instanceof AEBaseContainer )
@@ -49,8 +49,7 @@ public class PacketInventoryAction extends AppEngPacket
this.slot = slot;
this.slotItem = slotItem;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeInt( action.ordinal() );
@@ -64,8 +63,7 @@ public class PacketInventoryAction extends AppEngPacket
slotItem.writeToPacket( data );
}
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketLightning.java
+8 -10
View File
@@ -1,18 +1,18 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import appeng.client.ClientHelper;
import appeng.client.render.effects.LightningEffect;
import appeng.core.Configuration;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -25,7 +25,7 @@ public class PacketLightning extends AppEngPacket
final double z;
// automatic.
public PacketLightning(DataInputStream stream) throws IOException {
public PacketLightning(ByteBuf stream) throws IOException {
x = stream.readFloat();
y = stream.readFloat();
z = stream.readFloat();
@@ -33,7 +33,7 @@ public class PacketLightning extends AppEngPacket
@Override
@SideOnly(Side.CLIENT)
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
try
{
@@ -55,16 +55,14 @@ public class PacketLightning extends AppEngPacket
this.y = y;
this.z = z;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeFloat( (float) x );
data.writeFloat( (float) y );
data.writeFloat( (float) z );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketLocalizedChatMsg.java
-46
View File
@@ -1,46 +0,0 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.util.ChatMessageComponent;
import appeng.core.sync.AppEngPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PacketLocalizedChatMsg extends AppEngPacket
{
final public String msg;
// automatic.
public PacketLocalizedChatMsg(DataInputStream stream) throws IOException {
msg = stream.readUTF();
}
@Override
@SideOnly(Side.CLIENT)
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
{
((EntityPlayer) player).sendChatToPlayer( ChatMessageComponent.createFromTranslationWithSubstitutions( msg ) );
}
// api
public PacketLocalizedChatMsg(String msg) throws IOException {
this.msg = msg;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
data.writeInt( getPacketID() );
data.writeUTF( msg );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
}
}
core/sync/packets/PacketMEInventoryUpdate.java
+18 -22
View File
@@ -1,8 +1,8 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import java.nio.BufferOverflowException;
import java.util.LinkedList;
@@ -11,13 +11,13 @@ import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.gui.implementations.GuiMEMonitorable;
import appeng.client.gui.implementations.GuiNetworkStatus;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.item.AEItemStack;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -25,8 +25,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
{
// output...
final private ByteArrayOutputStream bytes;
final private DataOutputStream data;
final private ByteBuf data;
int lastSize = 0;
boolean empty = true;
@@ -34,18 +33,17 @@ public class PacketMEInventoryUpdate extends AppEngPacket
final List<IAEItemStack> list;
// automatic.
public PacketMEInventoryUpdate(DataInputStream stream) throws IOException {
bytes = null;
public PacketMEInventoryUpdate(ByteBuf stream) throws IOException {
data = null;
list = new LinkedList();
while (stream.available() > 0)
while (stream.readableBytes() > 0)
list.add( AEItemStack.loadItemStackFromPacket( stream ) );
empty = list.isEmpty();
}
@Override
@SideOnly(Side.CLIENT)
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
GuiScreen gs = Minecraft.getMinecraft().currentScreen;
@@ -58,36 +56,34 @@ public class PacketMEInventoryUpdate extends AppEngPacket
}
@Override
public Packet250CustomPayload getPacket()
public FMLProxyPacket getProxy()
{
isChunkDataPacket = false;
byte[] dataOut = new byte[lastSize];
System.arraycopy( bytes.toByteArray(), 0, dataOut, 0, lastSize );
configureWrite( dataOut );
return super.getPacket();
data.capacity( lastSize );
configureWrite( data );
return super.getProxy();
}
// api
public PacketMEInventoryUpdate() throws IOException {
bytes = new ByteArrayOutputStream();
data = new DataOutputStream( bytes );
data = Unpooled.buffer( 2048 );
list = null;
data.writeInt( getPacketID() );
lastSize = data.readableBytes();
}
public void appendItem(IAEItemStack is) throws IOException, BufferOverflowException
{
is.writeToPacket( data );
empty = false;
if ( bytes.size() > 20000 )
if ( data.readableBytes() > 20000 )
throw new BufferOverflowException();
else
lastSize = bytes.size();
lastSize = data.readableBytes();
}
public int getLength()
{
return data.size();
return data.readableBytes();
}
public boolean isEmpty()
core/sync/packets/PacketMatterCannon.java
+10 -12
View File
@@ -1,18 +1,18 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.network.INetworkManager;
import net.minecraft.init.Items;
import net.minecraft.world.World;
import appeng.client.render.effects.MatterCannonEffect;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -29,7 +29,7 @@ public class PacketMatterCannon extends AppEngPacket
final byte len;
// automatic.
public PacketMatterCannon(DataInputStream stream) throws IOException {
public PacketMatterCannon(ByteBuf stream) throws IOException {
x = stream.readFloat();
y = stream.readFloat();
z = stream.readFloat();
@@ -41,7 +41,7 @@ public class PacketMatterCannon extends AppEngPacket
@Override
@SideOnly(Side.CLIENT)
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
try
{
@@ -49,7 +49,7 @@ public class PacketMatterCannon extends AppEngPacket
World world = FMLClientHandler.instance().getClient().theWorld;
for (int a = 1; a < len; a++)
{
MatterCannonEffect fx = new MatterCannonEffect( world, x + dx * a, y + dy * a, z + dz * a, Item.diamond );
MatterCannonEffect fx = new MatterCannonEffect( world, x + dx * a, y + dy * a, z + dz * a, Items.diamond );
Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
}
@@ -72,8 +72,7 @@ public class PacketMatterCannon extends AppEngPacket
this.dz = dz / dlz;
this.len = len;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeFloat( (float) x );
@@ -84,8 +83,7 @@ public class PacketMatterCannon extends AppEngPacket
data.writeFloat( (float) this.dz );
data.writeByte( len );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketMockExplosion.java
+8 -10
View File
@@ -1,15 +1,15 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.world.World;
import appeng.core.CommonHelper;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -22,14 +22,14 @@ public class PacketMockExplosion extends AppEngPacket
@Override
@SideOnly(Side.CLIENT)
public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
World world = CommonHelper.proxy.getWorld();
world.spawnParticle( "largeexplode", this.x, this.y, this.z, 1.0D, 0.0D, 0.0D );
}
// automatic.
public PacketMockExplosion(DataInputStream stream) throws IOException {
public PacketMockExplosion(ByteBuf stream) throws IOException {
x = stream.readDouble();
y = stream.readDouble();
z = stream.readDouble();
@@ -41,16 +41,14 @@ public class PacketMockExplosion extends AppEngPacket
this.y = y;
this.z = z;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeDouble( x );
data.writeDouble( y );
data.writeDouble( z );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketMultiPart.java
+16 -13
View File
@@ -1,42 +1,45 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import net.minecraftforge.common.MinecraftForge;
import appeng.core.AppEng;
import appeng.core.sync.AppEngPacket;
import appeng.integration.modules.helpers.FMPPacketEvent;
import appeng.core.sync.network.INetworkInfo;
import appeng.integration.abstraction.IFMP;
public class PacketMultiPart extends AppEngPacket
{
// automatic.
public PacketMultiPart(DataInputStream stream) throws IOException {
public PacketMultiPart(ByteBuf stream) throws IOException {
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
EntityPlayerMP sender = (EntityPlayerMP) player;
MinecraftForge.EVENT_BUS.post( new FMPPacketEvent( sender ) );
IFMP fmp = (IFMP) AppEng.instance.getIntegration( "FMP" );
if ( fmp != null )
{
EntityPlayerMP sender = (EntityPlayerMP) player;
MinecraftForge.EVENT_BUS.post( fmp.newFMPPacketEvent( sender ) ); // when received it just pots this event.
}
}
// api
public PacketMultiPart() throws IOException {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketPartPlacement.java
+8 -10
View File
@@ -1,14 +1,14 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.helpers.PartPlacement;
public class PacketPartPlacement extends AppEngPacket
@@ -17,7 +17,7 @@ public class PacketPartPlacement extends AppEngPacket
int x, y, z, face;
// automatic.
public PacketPartPlacement(DataInputStream stream) throws IOException {
public PacketPartPlacement(ByteBuf stream) throws IOException {
x = stream.readInt();
y = stream.readInt();
z = stream.readInt();
@@ -25,7 +25,7 @@ public class PacketPartPlacement extends AppEngPacket
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
EntityPlayerMP sender = (EntityPlayerMP) player;
PartPlacement.place( sender.getHeldItem(), x, y, z, face, sender, sender.worldObj, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 );
@@ -34,8 +34,7 @@ public class PacketPartPlacement extends AppEngPacket
// api
public PacketPartPlacement(int x, int y, int z, int face) throws IOException {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeInt( x );
@@ -43,8 +42,7 @@ public class PacketPartPlacement extends AppEngPacket
data.writeInt( z );
data.writeByte( face );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketSwitchGuis.java
+9 -11
View File
@@ -1,18 +1,18 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.network.INetworkManager;
import net.minecraft.tileentity.TileEntity;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerOpenContext;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.Platform;
public class PacketSwitchGuis extends AppEngPacket
@@ -21,12 +21,12 @@ public class PacketSwitchGuis extends AppEngPacket
final GuiBridge newGui;
// automatic.
public PacketSwitchGuis(DataInputStream stream) throws IOException {
public PacketSwitchGuis(ByteBuf stream) throws IOException {
newGui = GuiBridge.values()[stream.readInt()];
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
Container c = player.openContainer;
if ( c instanceof AEBaseContainer )
@@ -35,7 +35,7 @@ public class PacketSwitchGuis extends AppEngPacket
ContainerOpenContext context = bc.openContext;
if ( context != null )
{
TileEntity te = context.w.getBlockTileEntity( context.x, context.y, context.z );
TileEntity te = context.w.getTileEntity( context.x, context.y, context.z );
Platform.openGUI( player, te, context.side, newGui );
}
}
@@ -46,13 +46,11 @@ public class PacketSwitchGuis extends AppEngPacket
this.newGui = newGui;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeInt( newGui.ordinal() );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
configureWrite( data );
}
}
core/sync/packets/PacketValueConfig.java
+23 -12
View File
@@ -1,19 +1,24 @@
package appeng.core.sync.packets;
import java.io.ByteArrayOutputStream;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.network.INetworkManager;
import appeng.api.config.FuzzyMode;
import appeng.container.implementations.ContainerCellWorkbench;
import appeng.container.implementations.ContainerLevelEmitter;
import appeng.container.implementations.ContainerPriority;
import appeng.container.implementations.ContainerSecurity;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
public class PacketValueConfig extends AppEngPacket
{
@@ -22,13 +27,15 @@ public class PacketValueConfig extends AppEngPacket
final public String Value;
// automatic.
public PacketValueConfig(DataInputStream stream) throws IOException {
Name = stream.readUTF();
Value = stream.readUTF();
public PacketValueConfig(ByteBuf stream) throws IOException {
DataInputStream dis = new DataInputStream( new ByteInputStream( stream.array(), 0, stream.readableBytes() ) );
Name = dis.readUTF();
Value = dis.readUTF();
dis.close();
}
@Override
public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
{
Container c = player.openContainer;
@@ -77,14 +84,18 @@ public class PacketValueConfig extends AppEngPacket
this.Name = Name;
this.Value = Value;
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream( bytes );
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
data.writeUTF( Name );
data.writeUTF( Value );
isChunkDataPacket = false;
configureWrite( bytes.toByteArray() );
ByteOutputStream bos = new ByteOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
data.writeBytes( Name.getBytes() );
data.writeBytes( Value.getBytes() );
dos.close();
data.writeBytes( bos.getBytes() );
configureWrite( data );
}
}