aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GTNetwork.java4
-rw-r--r--src/main/java/gregtech/common/blocks/PacketOres.java10
2 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/GTNetwork.java b/src/main/java/gregtech/common/GTNetwork.java
index 30aaecc6cb..8da23fdc1b 100644
--- a/src/main/java/gregtech/common/GTNetwork.java
+++ b/src/main/java/gregtech/common/GTNetwork.java
@@ -20,7 +20,6 @@ import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.Side;
import gregtech.api.enums.GTValues;
import gregtech.api.net.GTPacket;
-import gregtech.api.net.GTPacketNew;
import gregtech.api.net.GTPacketTypes;
import gregtech.api.net.IGT_NetworkHandler;
import io.netty.buffer.ByteBuf;
@@ -31,7 +30,6 @@ import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.MessageToMessageCodec;
@ChannelHandler.Sharable
-@SuppressWarnings("deprecation")
public class GTNetwork extends MessageToMessageCodec<FMLProxyPacket, GTPacket> implements IGT_NetworkHandler {
private final EnumMap<Side, FMLEmbeddedChannel> mChannel;
@@ -41,7 +39,7 @@ public class GTNetwork extends MessageToMessageCodec<FMLProxyPacket, GTPacket> i
this("GregTech", GTPacketTypes.referencePackets());
}
- public GTNetwork(String channelName, GTPacketNew... packetTypes) {
+ public GTNetwork(String channelName, GTPacket... packetTypes) {
this.mChannel = NetworkRegistry.INSTANCE.newChannel(channelName, this, new HandlerShared());
final int lastPId = packetTypes[packetTypes.length - 1].getPacketID();
this.mSubChannels = new GTPacket[lastPId + 1];
diff --git a/src/main/java/gregtech/common/blocks/PacketOres.java b/src/main/java/gregtech/common/blocks/PacketOres.java
index 6548f8ae66..18a5672c55 100644
--- a/src/main/java/gregtech/common/blocks/PacketOres.java
+++ b/src/main/java/gregtech/common/blocks/PacketOres.java
@@ -6,11 +6,11 @@ import net.minecraft.world.World;
import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.net.GTPacketNew;
+import gregtech.api.net.GTPacket;
import gregtech.api.net.GTPacketTypes;
import io.netty.buffer.ByteBuf;
-public class PacketOres extends GTPacketNew {
+public class PacketOres extends GTPacket {
private int mX;
private int mZ;
@@ -18,11 +18,11 @@ public class PacketOres extends GTPacketNew {
private short mMetaData;
public PacketOres() {
- super(true);
+ super();
}
public PacketOres(int aX, short aY, int aZ, short aMetaData) {
- super(false);
+ super();
this.mX = aX;
this.mY = aY;
this.mZ = aZ;
@@ -38,7 +38,7 @@ public class PacketOres extends GTPacketNew {
}
@Override
- public GTPacketNew decode(ByteArrayDataInput aData) {
+ public GTPacket decode(ByteArrayDataInput aData) {
return new PacketOres(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
}