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

Move from ByteBuf to PacketBuffer

Browse Source
This commit is contained in:
covers1624
2020-06-02 11:07:46 +09:30
parent d4c9e5c490
commit 19cdea7eb5
58 changed files with 158 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AEItemStack.java
+2 -5
View File
@@ -26,7 +26,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.core.Api;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -38,7 +37,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.ItemHandlerHelper;
import appeng.api.AEApi;
import appeng.api.config.FuzzyMode;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
@@ -113,15 +111,14 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
i.putBoolean( "Craft", this.isCraftable() );
}
public static AEItemStack fromPacket( final ByteBuf data )
public static AEItemStack fromPacket( final PacketBuffer data )
{
final byte mask = data.readByte();
final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
final boolean isCraftable = ( mask & 0x40 ) > 0;
final PacketBuffer p = new PacketBuffer( data );
final ItemStack itemstack = p.readItemStack();
final ItemStack itemstack = data.readItemStack();
final long stackSize = getPacketValue( stackType, data );
final long countRequestable = getPacketValue( countReqType, data );
src/main/java/appeng/util/item/AEStack.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.util.item;
import io.netty.buffer.ByteBuf;
import net.minecraft.network.PacketBuffer;
import appeng.api.storage.data.IAEStack;
@@ -31,7 +31,7 @@ public abstract class AEStack<StackType extends IAEStack<StackType>> implements
private long stackSize;
private long countRequestable;
protected static long getPacketValue( final byte type, final ByteBuf tag )
protected static long getPacketValue( final byte type, final PacketBuffer tag )
{
if( type == 0 )
{
@@ -164,7 +164,7 @@ public abstract class AEStack<StackType extends IAEStack<StackType>> implements
protected abstract boolean hasTagCompound();
protected void putPacketValue( final ByteBuf tag, final long num )
protected void putPacketValue( final PacketBuffer tag, final long num )
{
if( num <= 255 )
{