aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/net
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
commit0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch)
tree1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/api/net
parentf8cc82edeb9810c45cba762d733a2c909a302faa (diff)
downloadGT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/api/net')
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet.java13
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_Block_Event.java12
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java11
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java26
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java21
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_New.java2
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_Pollution.java7
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java19
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java11
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java20
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java21
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_Sound.java10
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntity.java92
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java11
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java52
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java21
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java13
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java22
-rw-r--r--src/main/java/gregtech/api/net/IGT_NetworkHandler.java4
19 files changed, 204 insertions, 184 deletions
diff --git a/src/main/java/gregtech/api/net/GT_Packet.java b/src/main/java/gregtech/api/net/GT_Packet.java
index 48cc171d61..fe2ac22ed3 100644
--- a/src/main/java/gregtech/api/net/GT_Packet.java
+++ b/src/main/java/gregtech/api/net/GT_Packet.java
@@ -1,15 +1,17 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import io.netty.buffer.ByteBuf;
import net.minecraft.network.INetHandler;
import net.minecraft.world.IBlockAccess;
+import com.google.common.io.ByteArrayDataInput;
+import io.netty.buffer.ByteBuf;
+
/**
* @deprecated Use {@link GT_Packet_New} instead
*/
@Deprecated
public abstract class GT_Packet {
+
public GT_Packet(boolean aIsReference) {
//
}
@@ -29,8 +31,8 @@ public abstract class GT_Packet {
public abstract byte[] encode();
/**
- * Encode the data into given byte buffer without creating an intermediate byte array.
- * Default implementation just throw {@link UnsupportedOperationException}.
+ * Encode the data into given byte buffer without creating an intermediate byte array. Default implementation just
+ * throw {@link UnsupportedOperationException}.
*/
public void encode(ByteBuf aOut) {
throw new UnsupportedOperationException();
@@ -49,7 +51,8 @@ public abstract class GT_Packet {
public abstract void process(IBlockAccess aWorld);
/**
- * This will be called just before {@link #process(IBlockAccess)} to inform the handler about the source and type of connection
+ * This will be called just before {@link #process(IBlockAccess)} to inform the handler about the source and type of
+ * connection
*/
public void setINetHandler(INetHandler aHandler) {}
}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java b/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java
index ebc69cd540..74876ef2bc 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java
@@ -1,14 +1,16 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import io.netty.buffer.ByteBuf;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
+import com.google.common.io.ByteArrayDataInput;
+import io.netty.buffer.ByteBuf;
+
/**
* Used to transfer Block Events in a much better fashion
*/
public class GT_Packet_Block_Event extends GT_Packet_New {
+
private int mX, mZ;
private short mY;
private byte mID, mValue;
@@ -38,7 +40,11 @@ public class GT_Packet_Block_Event extends GT_Packet_New {
@Override
public GT_Packet_New decode(ByteArrayDataInput aData) {
return new GT_Packet_Block_Event(
- aData.readInt(), aData.readShort(), aData.readInt(), aData.readByte(), aData.readByte());
+ aData.readInt(),
+ aData.readShort(),
+ aData.readInt(),
+ aData.readByte(),
+ aData.readByte());
}
@Override
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
index f692a4c88a..7322339167 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
@@ -1,15 +1,18 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_ClientPreference;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.world.IBlockAccess;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.GT_Mod;
+import gregtech.api.util.GT_ClientPreference;
+import io.netty.buffer.ByteBuf;
+
public class GT_Packet_ClientPreference extends GT_Packet_New {
+
private GT_ClientPreference mPreference;
private EntityPlayerMP mPlayer;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java
index e2df15cb33..dbc72042a3 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java
@@ -1,17 +1,19 @@
package gregtech.api.net;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.metatileentity.BaseTileEntity;
import gregtech.api.metatileentity.CoverableTileEntity;
import gregtech.common.GT_Proxy;
import io.netty.buffer.ByteBuf;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
/**
* Client -> Server: Request that the server opens a Gregtech GUI for us after providing us with the required data.
@@ -31,8 +33,8 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New {
super(true);
}
- public GT_Packet_GtTileEntityGuiRequest(
- int mX, short mY, int mZ, int guiId, int dimID, int playerID, int parentGuiId) {
+ public GT_Packet_GtTileEntityGuiRequest(int mX, short mY, int mZ, int guiId, int dimID, int playerID,
+ int parentGuiId) {
super(false);
this.mX = mX;
this.mY = mY;
@@ -90,11 +92,11 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New {
final BaseTileEntity baseTile = ((BaseTileEntity) tile);
final EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId);
- final CoverableTileEntity coverableTile =
- (baseTile instanceof CoverableTileEntity) ? (CoverableTileEntity) baseTile : null;
- // If the requested Gui ID corresponds to a cover, send the cover data to the client so they can open it.
- if (GT_Proxy.GUI_ID_COVER_SIDE_BASE <= guiId
- && guiId < GT_Proxy.GUI_ID_COVER_SIDE_BASE + 6
+ final CoverableTileEntity coverableTile = (baseTile instanceof CoverableTileEntity)
+ ? (CoverableTileEntity) baseTile
+ : null;
+ // If the requested Gui ID corresponds to a cover, send the cover data to the client so they can open it.
+ if (GT_Proxy.GUI_ID_COVER_SIDE_BASE <= guiId && guiId < GT_Proxy.GUI_ID_COVER_SIDE_BASE + 6
&& coverableTile != null) {
final byte coverSide = (byte) (guiId - GT_Proxy.GUI_ID_COVER_SIDE_BASE);
final GT_Packet_TileEntityCoverGUI packet = new GT_Packet_TileEntityCoverGUI(
diff --git a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java
index 5263549264..9f83cc4eda 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java
@@ -2,19 +2,22 @@ package gregtech.api.net;
import static gregtech.api.enums.GT_Values.B;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.IBlockAccess;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.GT_Mod;
import gregtech.api.metatileentity.GregTechTileClientEvents;
import gregtech.api.multitileentity.MultiTileEntityBlock;
import gregtech.api.multitileentity.interfaces.IMultiBlockPart;
import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
import io.netty.buffer.ByteBuf;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.IBlockAccess;
public class GT_Packet_MultiTileEntity extends GT_Packet_New {
+
public static final int COVERS = B[0], REDSTONE = B[1], MODES = B[2], CONTROLLER = B[3];
private int features = 0;
@@ -34,8 +37,8 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
}
// For multi tiles
- public GT_Packet_MultiTileEntity(
- int aFeatures, int aX, short aY, int aZ, short aRID, short aID, byte aCommonData, byte aColor) {
+ public GT_Packet_MultiTileEntity(int aFeatures, int aX, short aY, int aZ, short aRID, short aID, byte aCommonData,
+ byte aColor) {
super(false);
features = aFeatures;
@@ -189,7 +192,11 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
}
} catch (Exception e) {
GT_Mod.GT_FML_LOGGER.error(
- "Exception setting tile entity data for tile entity {} at ({}, {}, {})", tTileEntity, mX, mY, mZ);
+ "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
+ tTileEntity,
+ mX,
+ mY,
+ mZ);
}
}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_New.java b/src/main/java/gregtech/api/net/GT_Packet_New.java
index f987ebe24b..41eb1740b3 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_New.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_New.java
@@ -1,11 +1,13 @@
package gregtech.api.net;
import com.google.common.io.ByteArrayDataInput;
+
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@SuppressWarnings("deprecation")
public abstract class GT_Packet_New extends GT_Packet {
+
public GT_Packet_New(boolean aIsReference) {
super(aIsReference);
}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
index b79ce20e39..b095dd6238 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
@@ -1,12 +1,15 @@
package gregtech.api.net;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.IBlockAccess;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.common.GT_Client;
import io.netty.buffer.ByteBuf;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.IBlockAccess;
public class GT_Packet_Pollution extends GT_Packet_New {
+
private ChunkCoordIntPair chunk;
private int pollution;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java
index c330514144..e997c8feb9 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java
@@ -1,10 +1,5 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.metatileentity.CoverableTileEntity;
-import gregtech.common.covers.CoverInfo;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
@@ -13,10 +8,18 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.metatileentity.CoverableTileEntity;
+import gregtech.common.covers.CoverInfo;
+import io.netty.buffer.ByteBuf;
+
/**
* Client -> Server : ask for cover data
*/
public class GT_Packet_RequestCoverData extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -78,7 +81,11 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
@Override
public GT_Packet_New decode(ByteArrayDataInput aData) {
return new GT_Packet_RequestCoverData(
- aData.readInt(), aData.readShort(), aData.readInt(), aData.readByte(), aData.readInt());
+ aData.readInt(),
+ aData.readShort(),
+ aData.readInt(),
+ aData.readByte(),
+ aData.readInt());
}
@Override
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java
index 86ecb8b468..66faa2c7d7 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java
@@ -1,19 +1,22 @@
package gregtech.api.net;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.metatileentity.CoverableTileEntity;
import gregtech.api.util.ISerializableObject;
import gregtech.common.covers.CoverInfo;
import io.netty.buffer.ByteBuf;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
/**
* Server -> Client : Update cover data
*/
public class GT_Packet_SendCoverData extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -26,8 +29,8 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
super(true);
}
- public GT_Packet_SendCoverData(
- int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData) {
+ public GT_Packet_SendCoverData(int mX, short mY, int mZ, byte coverSide, int coverID,
+ ISerializableObject coverData) {
super(false);
this.mX = mX;
this.mY = mY;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
index eff095b0fc..917e0865da 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
@@ -1,6 +1,15 @@
package gregtech.api.net;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+
import com.google.common.io.ByteArrayDataInput;
+
import cpw.mods.fml.common.network.ByteBufUtils;
import gregtech.api.interfaces.IConfigurationCircuitSupport;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -9,18 +18,12 @@ import gregtech.api.metatileentity.BaseTileEntity;
import gregtech.api.util.GT_Utility;
import gregtech.api.util.ISerializableObject;
import io.netty.buffer.ByteBuf;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
/**
* Client -> Server: Update machine configuration data
*/
public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -98,8 +101,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
final IConfigurationCircuitSupport machine = ((BaseTileEntity) tile).getConfigurationCircuitSupport();
if (machine == null) return;
if (!machine.allowSelectCircuit()) return;
- machine.getConfigurationCircuits().stream()
- .filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
+ machine.getConfigurationCircuits().stream().filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
.findFirst()
.ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack));
}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java
index 9342248a7a..a96d33bda6 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java
@@ -1,12 +1,5 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.interfaces.metatileentity.IFluidLockable;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
@@ -17,7 +10,17 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.api.interfaces.metatileentity.IFluidLockable;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import io.netty.buffer.ByteBuf;
+
public class GT_Packet_SetLockedFluid extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -89,7 +92,9 @@ public class GT_Packet_SetLockedFluid extends GT_Packet_New {
mPlayer,
String.format(
GT_LanguageManager.addStringLocalization(
- "Interaction_DESCRIPTION_Index_151.4", "Successfully locked Fluid to %s", false),
+ "Interaction_DESCRIPTION_Index_151.4",
+ "Successfully locked Fluid to %s",
+ false),
new FluidStack(tFluid, 1).getLocalizedName()));
mteToLock.onFluidLockPacketReceived(tFluid.getName());
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Sound.java b/src/main/java/gregtech/api/net/GT_Packet_Sound.java
index ae779efc75..808ddc218c 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_Sound.java
@@ -1,15 +1,19 @@
package gregtech.api.net;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import net.minecraft.world.IBlockAccess;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Utility;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufOutputStream;
-import java.io.DataOutput;
-import java.io.IOException;
-import net.minecraft.world.IBlockAccess;
public class GT_Packet_Sound extends GT_Packet_New {
+
private int mX, mZ;
private short mY;
private String mSoundName;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
index 3f1425272a..cb38ca5d32 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
@@ -1,15 +1,18 @@
package gregtech.api.net;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.GT_Mod;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.BaseMetaTileEntity;
import io.netty.buffer.ByteBuf;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
public class GT_Packet_TileEntity extends GT_Packet_New {
+
private int mX, mZ, mC0, mC1, mC2, mC3, mC4, mC5;
private short mY, mID, mRID;
private byte mTexture, mTexturePage, mUpdate, mRedstone, mColor;
@@ -19,23 +22,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
}
// For multi tiles
- public GT_Packet_TileEntity(
- int aX,
- short aY,
- int aZ,
- short aRID,
- short aID,
- int aC0,
- int aC1,
- int aC2,
- int aC3,
- int aC4,
- int aC5,
- byte aTexture,
- byte aTexturePage,
- byte aUpdate,
- byte aRedstone,
- byte aColor) {
+ public GT_Packet_TileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
+ int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
super(false);
mX = aX;
mY = aY;
@@ -56,22 +44,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
}
// For meta tiles
- public GT_Packet_TileEntity(
- int aX,
- short aY,
- int aZ,
- short aID,
- int aC0,
- int aC1,
- int aC2,
- int aC3,
- int aC4,
- int aC5,
- byte aTexture,
- byte aTexturePage,
- byte aUpdate,
- byte aRedstone,
- byte aColor) {
+ public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
+ int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
this(
aX,
aY,
@@ -92,21 +66,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
}
// For pipes
- public GT_Packet_TileEntity(
- int aX,
- short aY,
- int aZ,
- short aID,
- int aC0,
- int aC1,
- int aC2,
- int aC3,
- int aC4,
- int aC5,
- byte aTexture,
- byte aUpdate,
- byte aRedstone,
- byte aColor) {
+ public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
+ int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor);
}
@@ -164,17 +125,28 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ);
try {
final Block tBlock;
- if (tTileEntity instanceof BaseMetaTileEntity)
- ((BaseMetaTileEntity) tTileEntity)
- .receiveMetaTileEntityData(
- mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor);
- else if (tTileEntity instanceof BaseMetaPipeEntity)
- ((BaseMetaPipeEntity) tTileEntity)
- .receiveMetaTileEntityData(
- mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
+ if (tTileEntity instanceof BaseMetaTileEntity) ((BaseMetaTileEntity) tTileEntity).receiveMetaTileEntityData(
+ mID,
+ mC0,
+ mC1,
+ mC2,
+ mC3,
+ mC4,
+ mC5,
+ mTexture,
+ mTexturePage,
+ mUpdate,
+ mRedstone,
+ mColor);
+ else if (tTileEntity instanceof BaseMetaPipeEntity) ((BaseMetaPipeEntity) tTileEntity)
+ .receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
} catch (Exception e) {
GT_Mod.GT_FML_LOGGER.error(
- "Exception setting tile entity data for tile entity {} at ({}, {}, {})", tTileEntity, mX, mY, mZ);
+ "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
+ tTileEntity,
+ mX,
+ mY,
+ mZ);
}
}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java
index 6989acca9e..07d99a3896 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java
@@ -1,18 +1,21 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import io.netty.buffer.ByteBuf;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import io.netty.buffer.ByteBuf;
+
/**
* Client -> Server: Update cover data. use this only if you are using the legacy data storage
*/
public class GT_Packet_TileEntityCover extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java
index 6fbaf81b53..f14e000a3b 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java
@@ -1,6 +1,15 @@
package gregtech.api.net;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
import com.google.common.io.ByteArrayDataInput;
+
import gregtech.api.GregTech_API;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.interfaces.tileentity.ICoverable;
@@ -9,18 +18,12 @@ import gregtech.api.util.GT_CoverBehaviorBase;
import gregtech.api.util.ISerializableObject;
import gregtech.common.covers.CoverInfo;
import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
/**
* Server -> Client: Show GUI
*/
public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -35,8 +38,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
super(true);
}
- public GT_Packet_TileEntityCoverGUI(
- int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID, int playerID) {
+ public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID,
+ int playerID) {
super(false);
this.mX = mX;
this.mY = mY;
@@ -51,15 +54,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
this.parentGuiId = -1;
}
- public GT_Packet_TileEntityCoverGUI(
- int mX,
- short mY,
- int mZ,
- byte coverSide,
- int coverID,
- ISerializableObject coverData,
- int dimID,
- int playerID) {
+ public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID,
+ ISerializableObject coverData, int dimID, int playerID) {
super(false);
this.mX = mX;
this.mY = mY;
@@ -89,16 +85,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
this.parentGuiId = parentGuiId;
}
- public GT_Packet_TileEntityCoverGUI(
- int mX,
- short mY,
- int mZ,
- byte coverSide,
- int coverID,
- ISerializableObject coverData,
- int dimID,
- int playerID,
- int parentGuiId) {
+ public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID,
+ ISerializableObject coverData, int dimID, int playerID, int parentGuiId) {
super(false);
this.mX = mX;
this.mY = mY;
@@ -112,8 +100,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
this.parentGuiId = parentGuiId;
}
- public GT_Packet_TileEntityCoverGUI(
- byte side, int coverID, int coverData, ICoverable tile, EntityPlayerMP aPlayer) {
+ public GT_Packet_TileEntityCoverGUI(byte side, int coverID, int coverData, ICoverable tile,
+ EntityPlayerMP aPlayer) {
super(false);
this.mX = tile.getXCoord();
@@ -143,8 +131,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New {
this.parentGuiId = -1;
}
- public GT_Packet_TileEntityCoverGUI(
- byte side, int coverID, ISerializableObject coverData, ICoverable tile, EntityPlayerMP aPlayer) {
+ public GT_Packet_TileEntityCoverGUI(byte side, int coverID, ISerializableObject coverData, ICoverable tile,
+ EntityPlayerMP aPlayer) {
super(false);
this.mX = tile.getXCoord();
this.mY = tile.getYCoord();
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java
index 2b2338d4ce..562edc9770 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java
@@ -1,11 +1,5 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.ISerializableObject;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
@@ -14,10 +8,19 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.ISerializableObject;
+import io.netty.buffer.ByteBuf;
+
/**
* Client -> Server: Update cover data
*/
public class GT_Packet_TileEntityCoverNew extends GT_Packet_New {
+
protected int mX;
protected short mY;
protected int mZ;
@@ -32,8 +35,8 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New {
super(true);
}
- public GT_Packet_TileEntityCoverNew(
- int mX, short mY, int mZ, byte coverSide, int coverID, ISerializableObject coverData, int dimID) {
+ public GT_Packet_TileEntityCoverNew(int mX, short mY, int mZ, byte coverSide, int coverID,
+ ISerializableObject coverData, int dimID) {
super(false);
this.mX = mX;
this.mY = mY;
@@ -100,7 +103,7 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New {
@Override
public void process(IBlockAccess aWorld) {
if (mPlayer == null) // impossible, but who knows
- return;
+ return;
World world = DimensionManager.getWorld(dimID);
if (world != null) {
TileEntity tile = world.getTileEntity(mX, mY, mZ);
diff --git a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java b/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java
index db94051946..e8ec9be80b 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java
@@ -1,10 +1,5 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.interfaces.INetworkUpdatableItem;
-import gregtech.api.util.ISerializableObject;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -12,10 +7,18 @@ import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.world.IBlockAccess;
+import com.google.common.io.ByteArrayDataInput;
+
+import cpw.mods.fml.common.network.ByteBufUtils;
+import gregtech.api.interfaces.INetworkUpdatableItem;
+import gregtech.api.util.ISerializableObject;
+import io.netty.buffer.ByteBuf;
+
/**
* Client -> Server: send arbitrary data to server and update the currently held item.
*/
public class GT_Packet_UpdateItem extends GT_Packet_New {
+
private NBTTagCompound tag;
private EntityPlayerMP mPlayer;
diff --git a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java
index 3d18c9d204..cac5405eec 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java
@@ -1,9 +1,5 @@
package gregtech.api.net;
-import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
@@ -12,7 +8,14 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import com.google.common.io.ByteArrayDataInput;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import io.netty.buffer.ByteBuf;
+
public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover {
+
private static final int PRIVATE_MASK = 0xFFFE0000;
private static final int PUBLIC_MASK = 0x0000FFFF;
private static final int CHECKBOX_MASK = 0x00010000;
@@ -25,15 +28,15 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover {
super();
}
- public GT_Packet_WirelessRedstoneCover(
- int mX, short mY, int mZ, byte coverSide, int coverID, int dimID, int publicChannel, int checkBoxValue) {
+ public GT_Packet_WirelessRedstoneCover(int mX, short mY, int mZ, byte coverSide, int coverID, int dimID,
+ int publicChannel, int checkBoxValue) {
super(mX, mY, mZ, coverSide, coverID, 0, dimID);
mPublicChannel = publicChannel;
mCheckBoxValue = checkBoxValue;
}
- public GT_Packet_WirelessRedstoneCover(
- byte coverSide, int coverID, ICoverable tile, int publicChannel, int checkBoxValue) {
+ public GT_Packet_WirelessRedstoneCover(byte coverSide, int coverID, ICoverable tile, int publicChannel,
+ int checkBoxValue) {
super(coverSide, coverID, 0, tile);
mPublicChannel = publicChannel;
mCheckBoxValue = checkBoxValue;
@@ -85,8 +88,7 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover {
if (world != null && world.blockExists(mX, mY, mZ)) {
TileEntity tile = world.getTileEntity(mX, mY, mZ);
if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) {
- int tPrivateChannel =
- (mCheckBoxValue > 0) ? mPlayer.getUniqueID().hashCode() & PRIVATE_MASK : 0;
+ int tPrivateChannel = (mCheckBoxValue > 0) ? mPlayer.getUniqueID().hashCode() & PRIVATE_MASK : 0;
int tCoverData = tPrivateChannel | (mCheckBoxValue & CHECKBOX_MASK) | (mPublicChannel & PUBLIC_MASK);
((IGregTechTileEntity) tile).receiveCoverData(side, coverID, tCoverData);
}
diff --git a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
index 2949ec6791..07c4a37030 100644
--- a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
+++ b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
@@ -1,11 +1,13 @@
package gregtech.api.net;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.world.World;
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+
@SuppressWarnings("deprecation")
public interface IGT_NetworkHandler {
+
void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer);
void sendToAllAround(GT_Packet aPacket, TargetPoint aPosition);