diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBlock.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemBlock.java | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index adfa43df..0449461d 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -2,24 +2,24 @@ package net.minecraft.server; public class ItemBlock extends Item { - private int id; + protected final Block block; - public ItemBlock(int i) { - super(i); - this.id = i + 256; + public ItemBlock(Block block) { + this.block = block; } - public int g() { - return this.id; + public ItemBlock b(String s) { + super.c(s); + return this; } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit - int i1 = world.getTypeId(i, j, k); + Block block = world.getType(i, j, k); - if (i1 == Block.SNOW.id && (world.getData(i, j, k) & 7) < 1) { + if (block == Blocks.SNOW && (world.getData(i, j, k) & 7) < 1) { l = 1; - } else if (i1 != Block.VINE.id && i1 != Block.LONG_GRASS.id && i1 != Block.DEAD_BUSH.id) { + } else if (block != Blocks.VINE && block != Blocks.LONG_GRASS && block != Blocks.DEAD_BUSH) { if (l == 0) { --j; } @@ -49,28 +49,27 @@ public class ItemBlock extends Item { return false; } else if (!entityhuman.a(i, j, k, l, itemstack)) { return false; - } else if (j == 255 && Block.byId[this.id].material.isBuildable()) { + } else if (j == 255 && this.block.getMaterial().isBuildable()) { return false; - } else if (world.mayPlace(this.id, i, j, k, false, l, entityhuman, itemstack)) { - Block block = Block.byId[this.id]; - int j1 = this.filterData(itemstack.getData()); - int k1 = Block.byId[this.id].getPlacedData(world, i, j, k, l, f, f1, f2, j1); + } else if (world.mayPlace(this.block, i, j, k, false, l, entityhuman, itemstack)) { + int i1 = this.filterData(itemstack.getData()); + int j1 = this.block.getPlacedData(world, i, j, k, l, f, f1, f2, i1); // CraftBukkit start - Redirect to common function handler /* - if (world.setTypeIdAndData(i, j, k, this.id, k1, 3)) { - if (world.getTypeId(i, j, k) == this.id) { - Block.byId[this.id].postPlace(world, i, j, k, entityhuman, itemstack); - Block.byId[this.id].postPlace(world, i, j, k, k1); + if (world.setTypeAndData(i, j, k, this.block, j1, 3)) { + if (world.getType(i, j, k) == this.block) { + this.block.postPlace(world, i, j, k, entityhuman, itemstack); + this.block.postPlace(world, i, j, k, j1); } - world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F); + world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.block.stepSound.getPlaceSound(), (this.block.stepSound.getVolume1() + 1.0F) / 2.0F, this.block.stepSound.getVolume2() * 0.8F); --itemstack.count; } return true; */ - return processBlockPlace(world, entityhuman, itemstack, i, j, k, this.id, k1, clickedX, clickedY, clickedZ); + return processBlockPlace(world, entityhuman, itemstack, i, j, k, this.block, j1, clickedX, clickedY, clickedZ); // CraftBukkit end } else { return false; @@ -78,13 +77,13 @@ public class ItemBlock extends Item { } // CraftBukkit start - Add method to process block placement - static boolean processBlockPlace(final World world, final EntityHuman entityhuman, final ItemStack itemstack, final int x, final int y, final int z, final int id, final int data, final int clickedX, final int clickedY, final int clickedZ) { + static boolean processBlockPlace(final World world, final EntityHuman entityhuman, final ItemStack itemstack, final int x, final int y, final int z, final Block id, final int data, final int clickedX, final int clickedY, final int clickedZ) { org.bukkit.block.BlockState blockstate = org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(world, x, y, z); world.callingPlaceEvent = true; // Sign is now 3 not 2. - int flag = (id == Block.SIGN_POST.id || id == Block.WALL_SIGN.id) ? 3 : 2; - world.setTypeIdAndData(x, y, z, id, data, flag); + int flag = (id == Blocks.SIGN_POST || id == Blocks.WALL_SIGN) ? 3 : 2; + world.setTypeAndData(x, y, z, id, data, flag); org.bukkit.event.block.BlockPlaceEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockstate, clickedX, clickedY, clickedZ); if (event.isCancelled() || !event.canBuild()) { @@ -95,18 +94,17 @@ public class ItemBlock extends Item { world.callingPlaceEvent = false; - int newId = world.getTypeId(x, y, z); + Block block = world.getType(x, y, z); int newData = world.getData(x, y, z); - Block block = Block.byId[newId]; if (block != null && !(block instanceof BlockContainer)) { // Containers get placed automatically block.onPlace(world, x, y, z); } - world.update(x, y, z, newId); + world.update(x, y, z, block); // Skulls don't get block data applied to them - if (block != null && block != Block.SKULL) { + if (block != null && block != Blocks.SKULL) { block.postPlace(world, x, y, z, entityhuman, itemstack); block.postPlace(world, x, y, z, newData); @@ -121,11 +119,15 @@ public class ItemBlock extends Item { } // CraftBukkit end - public String d(ItemStack itemstack) { - return Block.byId[this.id].a(); + public String a(ItemStack itemstack) { + return this.block.a(); } public String getName() { - return Block.byId[this.id].a(); + return this.block.a(); + } + + public Item c(String s) { + return this.b(s); } } |