Initial 1.7 commit

This commit is contained in:
Chicken-Bomes committed 2014-04-07 14:02:47 +10:00
1 parent 34154fc011
commit ca675b5f31
72 files changed
+2967 -3335

No files matched your search

+3 -1
View File
@@ -12,11 +12,13 @@ public interface MCDataInput
public short readShort();
public int readUShort();
public byte readByte();
public int readUByte();
public short readUByte();
public double readDouble();
public float readFloat();
public boolean readBoolean();
public char readChar();
public int readVarShort();
public int readVarInt();
public byte[] readByteArray(int length);
public String readString();
public BlockCoord readCoord();
+2
View File
@@ -15,6 +15,8 @@ public interface MCDataOutput
public MCDataOutput writeFloat(float f);
public MCDataOutput writeBoolean(boolean b);
public MCDataOutput writeChar(char c);
public MCDataOutput writeVarInt(int i);
public MCDataOutput writeVarShort(int s);
public MCDataOutput writeByteArray(byte[] array);
public MCDataOutput writeString(String s);
public MCDataOutput writeCoord(int x, int y, int z);
+31 -10
View File
@@ -3,6 +3,7 @@ package codechicken.lib.data;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
@@ -122,7 +123,31 @@ public class MCOutputStreamWrapper implements MCDataOutput
}
return this;
}
@Override
public MCDataOutput writeVarInt(int i) {
while ((i & 0x80) != 0)
{
writeByte(i & 0x7F | 0x80);
i >>>= 7;
}
writeByte(i);
return this;
}
@Override
public MCDataOutput writeVarShort(int s) {
int low = s & 0x7FFF;
int high = (s & 0x7F8000) >> 15;
if (high != 0)
low |= 0x8000;
writeShort(low);
if (high != 0)
writeByte(high);
return this;
}
public MCOutputStreamWrapper writeByteArray(byte[] barray)
{
try
@@ -174,16 +199,12 @@ public class MCOutputStreamWrapper implements MCDataOutput
return this;
}
public MCOutputStreamWrapper writeItemStack(ItemStack stack, boolean large)
{
if (stack == null)
{
public MCOutputStreamWrapper writeItemStack(ItemStack stack, boolean large) {
if (stack == null) {
writeShort(-1);
}
else
{
writeShort(stack.itemID);
if(large)
} else {
writeShort(Item.getIdFromItem(stack.getItem()));
if (large)
writeInt(stack.stackSize);
else
writeByte(stack.stackSize);
-246
View File
@@ -1,246 +0,0 @@
package codechicken.lib.data;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagByteArray;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagDouble;
import net.minecraft.nbt.NBTTagFloat;
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagLong;
import net.minecraft.nbt.NBTTagShort;
import net.minecraft.nbt.NBTTagString;
import net.minecraftforge.fluids.FluidStack;
import codechicken.lib.vec.BlockCoord;
public class NBTDataWrapper implements MCDataInput, MCDataOutput
{
private NBTTagList readList;
private int readTag = 0;
private NBTTagList writeList;
public NBTDataWrapper(NBTTagList input)
{
readList = input;
}
public NBTDataWrapper()
{
writeList = new NBTTagList();
}
public NBTTagList toTag()
{
return writeList;
}
@Override
public NBTDataWrapper writeLong(long l)
{
writeList.appendTag(new NBTTagLong(null, l));
return this;
}
@Override
public NBTDataWrapper writeInt(int i)
{
writeList.appendTag(new NBTTagInt(null, i));
return this;
}
@Override
public NBTDataWrapper writeShort(int s)
{
writeList.appendTag(new NBTTagShort(null, (short) s));
return this;
}
@Override
public NBTDataWrapper writeByte(int b)
{
writeList.appendTag(new NBTTagByte(null, (byte) b));
return this;
}
@Override
public NBTDataWrapper writeDouble(double d)
{
writeList.appendTag(new NBTTagDouble(null, d));
return this;
}
@Override
public NBTDataWrapper writeFloat(float f)
{
writeList.appendTag(new NBTTagFloat(null, f));
return this;
}
@Override
public NBTDataWrapper writeBoolean(boolean b)
{
writeList.appendTag(new NBTTagByte(null, (byte) (b ? 1 : 0)));
return this;
}
@Override
public NBTDataWrapper writeChar(char c)
{
writeList.appendTag(new NBTTagShort(null, (short)c));
return this;
}
@Override
public NBTDataWrapper writeByteArray(byte[] array)
{
writeList.appendTag(new NBTTagByteArray(null, array));
return this;
}
@Override
public NBTDataWrapper writeString(String s)
{
writeList.appendTag(new NBTTagString(null, s));
return this;
}
@Override
public NBTDataWrapper writeCoord(int x, int y, int z)
{
writeInt(x);
writeInt(y);
writeInt(z);
return this;
}
@Override
public NBTDataWrapper writeCoord(BlockCoord coord)
{
writeCoord(coord.x, coord.y, coord.z);
return this;
}
@Override
public NBTDataWrapper writeNBTTagCompound(NBTTagCompound tag)
{
writeList.appendTag(tag);
return this;
}
@Override
public NBTDataWrapper writeItemStack(ItemStack stack)
{
writeList.appendTag(stack.writeToNBT(new NBTTagCompound()));
return this;
}
@Override
public NBTDataWrapper writeFluidStack(FluidStack liquid)
{
writeList.appendTag(liquid.writeToNBT(new NBTTagCompound()));
return this;
}
@Override
public long readLong()
{
return ((NBTTagLong)readTag()).data;
}
@Override
public int readInt()
{
return ((NBTTagInt)readTag()).data;
}
@Override
public short readShort()
{
return ((NBTTagShort)readTag()).data;
}
@Override
public int readUShort()
{
return ((NBTTagShort)readTag()).data & 0xFFFF;
}
@Override
public byte readByte()
{
return ((NBTTagByte)readTag()).data;
}
@Override
public int readUByte()
{
return ((NBTTagByte)readTag()).data & 0xFF;
}
@Override
public double readDouble()
{
return ((NBTTagDouble)readTag()).data;
}
@Override
public float readFloat()
{
return ((NBTTagFloat)readTag()).data;
}
@Override
public boolean readBoolean()
{
return ((NBTTagByte)readTag()).data != 0;
}
@Override
public char readChar()
{
return (char)((NBTTagShort)readTag()).data;
}
@Override
public byte[] readByteArray(int length)
{
return ((NBTTagByteArray)readTag()).byteArray;
}
@Override
public String readString()
{
return ((NBTTagString)readTag()).data;
}
@Override
public BlockCoord readCoord()
{
return new BlockCoord(readInt(), readInt(), readInt());
}
@Override
public NBTTagCompound readNBTTagCompound()
{
return (NBTTagCompound)readTag();
}
@Override
public ItemStack readItemStack()
{
return ItemStack.loadItemStackFromNBT(readNBTTagCompound());
}
@Override
public FluidStack readFluidStack()
{
return FluidStack.loadFluidStackFromNBT(readNBTTagCompound());
}
private NBTBase readTag()
{
return readList.tagAt(readTag++);
}
}