summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockDispenser.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDispenser.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockDispenser.java311
1 files changed, 203 insertions, 108 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java
index 8a009674..c6636f27 100644
--- a/src/main/java/net/minecraft/server/BlockDispenser.java
+++ b/src/main/java/net/minecraft/server/BlockDispenser.java
@@ -14,9 +14,10 @@ public class BlockDispenser extends BlockContainer {
protected BlockDispenser(int i) {
super(i, Material.STONE);
this.textureId = 45;
+ this.a(CreativeModeTab.d);
}
- public int d() {
+ public int p_() {
return 4;
}
@@ -26,10 +27,10 @@ public class BlockDispenser extends BlockContainer {
public void onPlace(World world, int i, int j, int k) {
super.onPlace(world, i, j, k);
- this.g(world, i, j, k);
+ this.l(world, i, j, k);
}
- private void g(World world, int i, int j, int k) {
+ private void l(World world, int i, int j, int k) {
if (!world.isStatic) {
int l = world.getTypeId(i, j, k - 1);
int i1 = world.getTypeId(i, j, k + 1);
@@ -61,7 +62,7 @@ public class BlockDispenser extends BlockContainer {
return i == 1 ? this.textureId + 17 : (i == 0 ? this.textureId + 17 : (i == 3 ? this.textureId + 1 : this.textureId));
}
- public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) {
+ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) {
if (world.isStatic) {
return true;
} else {
@@ -75,7 +76,7 @@ public class BlockDispenser extends BlockContainer {
}
}
- // CraftBukkit - priv to public
+ // CraftBukkit - private to public
public void dispense(World world, int i, int j, int k, Random random) {
int l = world.getData(i, j, k);
byte b0 = 0;
@@ -94,103 +95,53 @@ public class BlockDispenser extends BlockContainer {
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) world.getTileEntity(i, j, k);
if (tileentitydispenser != null) {
- // CraftBukkit start
- int dispenseSlot = tileentitydispenser.findDispenseSlot();
- ItemStack itemstack = null;
- if (dispenseSlot > -1) {
- itemstack = tileentitydispenser.getContents()[dispenseSlot];
-
- // Copy item stack, because we want it to have 1 item
- itemstack = new ItemStack(itemstack.id, 1, itemstack.getData(), itemstack.getEnchantments());
- }
- // CraftBukkit end
-
- double d0 = (double) i + (double) b0 * 0.6D + 0.5D;
- double d1 = (double) j + 0.5D;
- double d2 = (double) k + (double) b1 * 0.6D + 0.5D;
+ int i1 = tileentitydispenser.i();
- if (itemstack == null) {
+ if (i1 < 0) {
world.triggerEffect(1001, i, j, k, 0);
} else {
- // CraftBukkit start
- double d3 = random.nextDouble() * 0.1D + 0.2D;
- double motX = (double) b0 * d3;
- double motY = 0.20000000298023224D;
- double motZ = (double) b1 * d3;
- motX += random.nextGaussian() * 0.007499999832361937D * 6.0D;
- motY += random.nextGaussian() * 0.007499999832361937D * 6.0D;
- motZ += random.nextGaussian() * 0.007499999832361937D * 6.0D;
-
- org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
- org.bukkit.inventory.ItemStack bukkitItem = new CraftItemStack(itemstack).clone();
-
- BlockDispenseEvent event = new BlockDispenseEvent(block, bukkitItem, new org.bukkit.util.Vector(motX, motY, motZ));
- world.getServer().getPluginManager().callEvent(event);
-
- if (event.isCancelled()) {
- return;
- }
+ double d0 = (double) i + (double) b0 * 0.6D + 0.5D;
+ double d1 = (double) j + 0.5D;
+ double d2 = (double) k + (double) b1 * 0.6D + 0.5D;
+ ItemStack itemstack = tileentitydispenser.getItem(i1);
+ int j1 = a(tileentitydispenser, world, itemstack, random, i, j, k, b0, b1, d0, d1, d2);
+
+ if (j1 == 1) {
+ tileentitydispenser.splitStack(i1, 1);
+ } else if (j1 == 0) {
+ // CraftBukkit start
+ double d3 = random.nextDouble() * 0.1D + 0.2D;
+ double motX = (double) b0 * d3;
+ double motY = 0.20000000298023224D;
+ double motZ = (double) b1 * d3;
+ motX += random.nextGaussian() * 0.007499999832361937D * 6.0D;
+ motY += random.nextGaussian() * 0.007499999832361937D * 6.0D;
+ motZ += random.nextGaussian() * 0.007499999832361937D * 6.0D;
+
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
+ org.bukkit.inventory.ItemStack bukkitItem = new CraftItemStack(itemstack).clone();
+
+ BlockDispenseEvent event = new BlockDispenseEvent(block, bukkitItem, new org.bukkit.util.Vector(motX, motY, motZ));
+ world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
- if (event.getItem().equals(bukkitItem)) {
- // Actually remove the item
- tileentitydispenser.splitStack(dispenseSlot, 1);
- }
+ if (event.getItem().equals(bukkitItem)) {
+ // Actually remove the item
+ tileentitydispenser.splitStack(i1, 1);
+ }
- motX = event.getVelocity().getX();
- motY = event.getVelocity().getY();
- motZ = event.getVelocity().getZ();
-
- itemstack = CraftItemStack.createNMSItemStack(event.getItem());
- // CraftBukkit end
-
- if (itemstack.id == Item.ARROW.id) {
- EntityArrow entityarrow = new EntityArrow(world, d0, d1, d2);
-
- entityarrow.shoot((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
- entityarrow.fromPlayer = true;
- world.addEntity(entityarrow);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.EGG.id) {
- EntityEgg entityegg = new EntityEgg(world, d0, d1, d2);
-
- entityegg.a((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
- world.addEntity(entityegg);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.SNOW_BALL.id) {
- EntitySnowball entitysnowball = new EntitySnowball(world, d0, d1, d2);
-
- entitysnowball.a((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
- world.addEntity(entitysnowball);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.POTION.id && ItemPotion.c(itemstack.getData())) {
- EntityPotion entitypotion = new EntityPotion(world, d0, d1, d2, itemstack.getData());
-
- entitypotion.a((double) b0, 0.10000000149011612D, (double) b1, 1.375F, 3.0F);
- world.addEntity(entitypotion);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.EXP_BOTTLE.id) {
- EntityThrownExpBottle entitythrownexpbottle = new EntityThrownExpBottle(world, d0, d1, d2);
-
- entitythrownexpbottle.a((double) b0, 0.10000000149011612D, (double) b1, 1.375F, 3.0F);
- world.addEntity(entitythrownexpbottle);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.MONSTER_EGG.id) {
- ItemMonsterEgg.a(world, itemstack.getData(), d0 + (double) b0 * 0.3D, d1 - 0.3D, d2 + (double) b1 * 0.3D);
- world.triggerEffect(1002, i, j, k, 0);
- } else if (itemstack.id == Item.FIREBALL.id) {
- EntitySmallFireball entitysmallfireball = new EntitySmallFireball(world, d0 + (double) b0 * 0.3D, d1, d2 + (double) b1 * 0.3D, (double) b0 + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, (double) b1 + random.nextGaussian() * 0.05D);
-
- world.addEntity(entitysmallfireball);
- world.triggerEffect(1009, i, j, k, 0);
- } else {
- EntityItem entityitem = new EntityItem(world, d0, d1 - 0.3D, d2, itemstack);
- // CraftBukkit start
- // double d3 = random.nextDouble() * 0.1D + 0.2D; // Moved up
- entityitem.motX = motX;
- entityitem.motY = motY;
- entityitem.motZ = motZ;
+ motX = event.getVelocity().getX();
+ motY = event.getVelocity().getY();
+ motZ = event.getVelocity().getZ();
+
+ itemstack = CraftItemStack.createNMSItemStack(event.getItem());
+
+ a(world, itemstack, random, motX, motY, motZ, d0, d1, d2);
// CraftBukkit end
- world.addEntity(entityitem);
+
world.triggerEffect(1000, i, j, k, 0);
}
@@ -204,18 +155,18 @@ public class BlockDispenser extends BlockContainer {
boolean flag = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k);
if (flag) {
- world.c(i, j, k, this.id, this.d());
+ world.a(i, j, k, this.id, this.p_());
}
}
}
- public void a(World world, int i, int j, int k, Random random) {
+ public void b(World world, int i, int j, int k, Random random) {
if (!world.isStatic && (world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k))) {
this.dispense(world, i, j, k, random);
}
}
- public TileEntity a_() {
+ public TileEntity a(World world) {
return new TileEntityDispenser();
}
@@ -239,12 +190,12 @@ public class BlockDispenser extends BlockContainer {
}
}
- public void remove(World world, int i, int j, int k) {
+ public void remove(World world, int i, int j, int k, int l, int i1) {
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) world.getTileEntity(i, j, k);
if (tileentitydispenser != null) {
- for (int l = 0; l < tileentitydispenser.getSize(); ++l) {
- ItemStack itemstack = tileentitydispenser.getItem(l);
+ for (int j1 = 0; j1 < tileentitydispenser.getSize(); ++j1) {
+ ItemStack itemstack = tileentitydispenser.getItem(j1);
if (itemstack != null) {
float f = this.a.nextFloat() * 0.8F + 0.1F;
@@ -252,14 +203,14 @@ public class BlockDispenser extends BlockContainer {
float f2 = this.a.nextFloat() * 0.8F + 0.1F;
while (itemstack.count > 0) {
- int i1 = this.a.nextInt(21) + 10;
+ int k1 = this.a.nextInt(21) + 10;
- if (i1 > itemstack.count) {
- i1 = itemstack.count;
+ if (k1 > itemstack.count) {
+ k1 = itemstack.count;
}
- itemstack.count -= i1;
- EntityItem entityitem = new EntityItem(world, (double) ((float) i + f), (double) ((float) j + f1), (double) ((float) k + f2), new ItemStack(itemstack.id, i1, itemstack.getData()));
+ itemstack.count -= k1;
+ EntityItem entityitem = new EntityItem(world, (double) ((float) i + f), (double) ((float) j + f1), (double) ((float) k + f2), new ItemStack(itemstack.id, k1, itemstack.getData()));
if (itemstack.hasTag()) {
entityitem.itemStack.setTag((NBTTagCompound) itemstack.getTag().clone());
@@ -276,6 +227,150 @@ public class BlockDispenser extends BlockContainer {
}
}
- super.remove(world, i, j, k);
+ super.remove(world, i, j, k, l, i1);
+ }
+
+ // CraftBukkit start - change of method signature!
+ private static void a(World world, ItemStack itemstack, Random random, double motX, double motY, double motZ, double d0, double d1, double d2) {
+ EntityItem entityitem = new EntityItem(world, d0, d1 - 0.3D, d2, itemstack);
+ // double d3 = random.nextDouble() * 0.1D + 0.2D; // Moved up
+
+ entityitem.motX = motX;
+ entityitem.motY = motY;
+ entityitem.motZ = motZ;
+ world.addEntity(entityitem);
+ }
+ // CraftBukkit end
+
+ private static int a(TileEntityDispenser tileentitydispenser, World world, ItemStack itemstack, Random random, int i, int j, int k, int l, int i1, double d0, double d1, double d2) {
+ float f = 1.1F;
+ byte b0 = 6;
+
+ if (itemstack.id == Item.ARROW.id) {
+ EntityArrow entityarrow = new EntityArrow(world, d0, d1, d2);
+
+ entityarrow.shoot((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
+ entityarrow.fromPlayer = 1;
+ world.addEntity(entityarrow);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.EGG.id) {
+ EntityEgg entityegg = new EntityEgg(world, d0, d1, d2);
+
+ entityegg.c((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
+ world.addEntity(entityegg);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.SNOW_BALL.id) {
+ EntitySnowball entitysnowball = new EntitySnowball(world, d0, d1, d2);
+
+ entitysnowball.c((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
+ world.addEntity(entitysnowball);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.POTION.id && ItemPotion.g(itemstack.getData())) {
+ EntityPotion entitypotion = new EntityPotion(world, d0, d1, d2, itemstack.getData());
+
+ entitypotion.c((double) l, 0.10000000149011612D, (double) i1, f * 1.25F, (float) b0 * 0.5F);
+ world.addEntity(entitypotion);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.EXP_BOTTLE.id) {
+ EntityThrownExpBottle entitythrownexpbottle = new EntityThrownExpBottle(world, d0, d1, d2);
+
+ entitythrownexpbottle.c((double) l, 0.10000000149011612D, (double) i1, f * 1.25F, (float) b0 * 0.5F);
+ world.addEntity(entitythrownexpbottle);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.MONSTER_EGG.id) {
+ ItemMonsterEgg.a(world, itemstack.getData(), d0 + (double) l * 0.3D, d1 - 0.3D, d2 + (double) i1 * 0.3D);
+ world.triggerEffect(1002, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.FIREBALL.id) {
+ EntitySmallFireball entitysmallfireball = new EntitySmallFireball(world, d0 + (double) l * 0.3D, d1, d2 + (double) i1 * 0.3D, (double) l + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, (double) i1 + random.nextGaussian() * 0.05D);
+
+ world.addEntity(entitysmallfireball);
+ world.triggerEffect(1009, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id != Item.LAVA_BUCKET.id && itemstack.id != Item.WATER_BUCKET.id) {
+ if (itemstack.id == Item.BUCKET.id) {
+ int j1 = i + l;
+ int k1 = k + i1;
+ Material material = world.getMaterial(j1, j, k1);
+ int l1 = world.getData(j1, j, k1);
+
+ if (material == Material.WATER && l1 == 0) {
+ world.setTypeId(j1, j, k1, 0);
+ if (--itemstack.count == 0) {
+ itemstack.id = Item.WATER_BUCKET.id;
+ itemstack.count = 1;
+ } else if (tileentitydispenser.a(new ItemStack(Item.WATER_BUCKET)) < 0) {
+ a(world, new ItemStack(Item.WATER_BUCKET), random, 6, l, i1, d0, d1, d2);
+ }
+
+ return 2;
+ } else if (material == Material.LAVA && l1 == 0) {
+ world.setTypeId(j1, j, k1, 0);
+ if (--itemstack.count == 0) {
+ itemstack.id = Item.LAVA_BUCKET.id;
+ itemstack.count = 1;
+ } else if (tileentitydispenser.a(new ItemStack(Item.LAVA_BUCKET)) < 0) {
+ a(world, new ItemStack(Item.LAVA_BUCKET), random, 6, l, i1, d0, d1, d2);
+ }
+
+ return 2;
+ } else {
+ return 0;
+ }
+ } else if (itemstack.getItem() instanceof ItemMinecart) {
+ d0 = (double) i + (l < 0 ? (double) l * 0.8D : (double) ((float) l * 1.8F)) + (double) ((float) Math.abs(i1) * 0.5F);
+ d2 = (double) k + (i1 < 0 ? (double) i1 * 0.8D : (double) ((float) i1 * 1.8F)) + (double) ((float) Math.abs(l) * 0.5F);
+ if (BlockMinecartTrack.d_(world, i + l, j, k + i1)) {
+ d1 = (double) ((float) j + 0.5F);
+ } else {
+ if (!world.isEmpty(i + l, j, k + i1) || !BlockMinecartTrack.d_(world, i + l, j - 1, k + i1)) {
+ return 0;
+ }
+
+ d1 = (double) ((float) j - 0.5F);
+ }
+
+ EntityMinecart entityminecart = new EntityMinecart(world, d0, d1, d2, ((ItemMinecart) itemstack.getItem()).a);
+
+ world.addEntity(entityminecart);
+ world.triggerEffect(1000, i, j, k, 0);
+ return 1;
+ } else if (itemstack.id == Item.BOAT.id) {
+ d0 = (double) i + (l < 0 ? (double) l * 0.8D : (double) ((float) l * 1.8F)) + (double) ((float) Math.abs(i1) * 0.5F);
+ d2 = (double) k + (i1 < 0 ? (double) i1 * 0.8D : (double) ((float) i1 * 1.8F)) + (double) ((float) Math.abs(l) * 0.5F);
+ if (world.getMaterial(i + l, j, k + i1) == Material.WATER) {
+ d1 = (double) ((float) j + 1.0F);
+ } else {
+ if (!world.isEmpty(i + l, j, k + i1) || world.getMaterial(i + l, j - 1, k + i1) != Material.WATER) {
+ return 0;
+ }
+
+ d1 = (double) j;
+ }
+
+ EntityBoat entityboat = new EntityBoat(world, d0, d1, d2);
+
+ world.addEntity(entityboat);
+ world.triggerEffect(1000, i, j, k, 0);
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ ItemBucket itembucket = (ItemBucket) itemstack.getItem();
+
+ if (itembucket.a(world, (double) i, (double) j, (double) k, i + l, j, k + i1)) {
+ itemstack.id = Item.BUCKET.id;
+ itemstack.count = 1;
+ return 2;
+ } else {
+ return 0;
+ }
+ }
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 13:24:50 +0000