Update to Minecraft 1.3 beta

This commit is contained in:
Dinnerbone
2011-02-23 02:37:56 +00:00
parent a124bfdab5
commit f759e0b60d
83 changed files with 3182 additions and 3292 deletions

View File

@@ -1,120 +1,120 @@
package net.minecraft.server;
import java.util.Random;
public class TileEntityDispenser extends TileEntity implements IInventory {
private ItemStack[] e = new ItemStack[9];
private Random f = new Random();
// CraftBukkit start
public ItemStack[] getContents() {
return e;
}
// CraftBukkit end
public TileEntityDispenser() {}
public int h_() {
return this.e.length; //Craftbukkit
}
public ItemStack a(int i) {
return this.e[i];
}
public ItemStack b(int i, int j) {
if (this.e[i] != null) {
ItemStack itemstack;
if (this.e[i].count <= j) {
itemstack = this.e[i];
this.e[i] = null;
this.d();
return itemstack;
} else {
itemstack = this.e[i].a(j);
if (this.e[i].count == 0) {
this.e[i] = null;
}
this.d();
return itemstack;
}
} else {
return null;
}
}
public ItemStack e() {
int i = -1;
int j = 1;
for (int k = 0; k < this.e.length; ++k) {
if (this.e[k] != null && this.f.nextInt(j) == 0) {
i = k;
++j;
}
}
if (i >= 0) {
return this.b(i, 1);
} else {
return null;
}
}
public void a(int i, ItemStack itemstack) {
this.e[i] = itemstack;
if (itemstack != null && itemstack.count > this.c()) {
itemstack.count = this.c();
}
this.d();
}
public String b() {
return "Trap";
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
NBTTagList nbttaglist = nbttagcompound.k("Items");
this.e = new ItemStack[this.h_()];
for (int i = 0; i < nbttaglist.b(); ++i) {
NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.a(i);
int j = nbttagcompound1.b("Slot") & 255;
if (j >= 0 && j < this.e.length) {
this.e[j] = new ItemStack(nbttagcompound1);
}
}
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
NBTTagList nbttaglist = new NBTTagList();
for (int i = 0; i < this.e.length; ++i) {
if (this.e[i] != null) {
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
nbttagcompound1.a("Slot", (byte) i);
this.e[i].a(nbttagcompound1);
nbttaglist.a((NBTBase) nbttagcompound1);
}
}
nbttagcompound.a("Items", (NBTBase) nbttaglist);
}
public int c() {
return 64;
}
public boolean a_(EntityHuman entityhuman) {
return this.a.getTileEntity(this.b, this.c, this.d) != this ? false : entityhuman.d((double) this.b + 0.5D, (double) this.c + 0.5D, (double) this.d + 0.5D) <= 64.0D;
}
}
package net.minecraft.server;
import java.util.Random;
public class TileEntityDispenser extends TileEntity implements IInventory {
private ItemStack[] a = new ItemStack[9];
private Random b = new Random();
// CraftBukkit start
public ItemStack[] getContents() {
return a;
}
// CraftBukkit end
public TileEntityDispenser() {}
public int m_() {
return 9;
}
public ItemStack c_(int i) {
return this.a[i];
}
public ItemStack a(int i, int j) {
if (this.a[i] != null) {
ItemStack itemstack;
if (this.a[i].count <= j) {
itemstack = this.a[i];
this.a[i] = null;
this.h();
return itemstack;
} else {
itemstack = this.a[i].a(j);
if (this.a[i].count == 0) {
this.a[i] = null;
}
this.h();
return itemstack;
}
} else {
return null;
}
}
public ItemStack b() {
int i = -1;
int j = 1;
for (int k = 0; k < this.a.length; ++k) {
if (this.a[k] != null && this.b.nextInt(j) == 0) {
i = k;
++j;
}
}
if (i >= 0) {
return this.a(i, 1);
} else {
return null;
}
}
public void a(int i, ItemStack itemstack) {
this.a[i] = itemstack;
if (itemstack != null && itemstack.count > this.n_()) {
itemstack.count = this.n_();
}
this.h();
}
public String c() {
return "Trap";
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
NBTTagList nbttaglist = nbttagcompound.l("Items");
this.a = new ItemStack[this.m_()];
for (int i = 0; i < nbttaglist.c(); ++i) {
NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.a(i);
int j = nbttagcompound1.c("Slot") & 255;
if (j >= 0 && j < this.a.length) {
this.a[j] = new ItemStack(nbttagcompound1);
}
}
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
NBTTagList nbttaglist = new NBTTagList();
for (int i = 0; i < this.a.length; ++i) {
if (this.a[i] != null) {
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
nbttagcompound1.a("Slot", (byte) i);
this.a[i].a(nbttagcompound1);
nbttaglist.a((NBTBase) nbttagcompound1);
}
}
nbttagcompound.a("Items", (NBTBase) nbttaglist);
}
public int n_() {
return 64;
}
public boolean a_(EntityHuman entityhuman) {
return this.d.getTileEntity(this.e, this.f, this.g) != this ? false : entityhuman.d((double) this.e + 0.5D, (double) this.f + 0.5D, (double) this.g + 0.5D) <= 64.0D;
}
}