From 0db8d5d11119729d1901062962a74256fa66cd8e Mon Sep 17 00:00:00 2001 From: Dinnerbone Date: Sat, 15 Jan 2011 21:36:57 +0000 Subject: [PATCH] Moved block stuff from org.bukkit to org.bukkit.block --- src/main/java/net/minecraft/server/BlockButton.java | 2 +- src/main/java/net/minecraft/server/BlockFire.java | 8 ++++---- src/main/java/net/minecraft/server/BlockFlowing.java | 2 +- src/main/java/net/minecraft/server/BlockLever.java | 2 +- .../java/net/minecraft/server/BlockPressurePlate.java | 2 +- .../java/net/minecraft/server/BlockRedstoneTorch.java | 2 +- src/main/java/net/minecraft/server/BlockRedstoneWire.java | 2 +- src/main/java/net/minecraft/server/BlockStationary.java | 4 ++-- src/main/java/net/minecraft/server/ItemBlock.java | 2 +- src/main/java/net/minecraft/server/ItemBucket.java | 2 +- src/main/java/net/minecraft/server/ItemFlintAndSteel.java | 4 ++-- src/main/java/net/minecraft/server/NetServerHandler.java | 4 ++-- src/main/java/org/bukkit/craftbukkit/CraftBlock.java | 3 +++ src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 2 +- .../org/bukkit/craftbukkit/block/CraftBlockState.java | 2 +- src/main/java/org/bukkit/craftbukkit/block/CraftSign.java | 2 +- 16 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index b89ab6f8bd..ce01875d8b 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/src/main/java/net/minecraft/server/BlockButton.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index 6aece4c334..a25fbad0ba 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -86,8 +86,8 @@ public class BlockFire extends Block { // CraftBukkit: Call to stop spead of fire. CraftServer server = ((WorldServer)world).getServer(); CraftWorld cworld = ((WorldServer) world).getWorld(); - org.bukkit.Block bblock = (cworld.getBlockAt(i1, k1, j1)); - BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) bblock, BlockIgniteEvent.IgniteCause.SPREAD, null); + org.bukkit.block.Block bblock = (cworld.getBlockAt(i1, k1, j1)); + BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) bblock, BlockIgniteEvent.IgniteCause.SPREAD, null); server.getPluginManager().callEvent(event); if (event.isCancelled()) { return; @@ -111,8 +111,8 @@ public class BlockFire extends Block { // CraftBukkit: Call to stop very slow spread of fire. CraftServer server = ((WorldServer)world).getServer(); CraftWorld cworld = ((WorldServer)world).getWorld(); - org.bukkit.Block sbblock = (cworld.getBlockAt(i, j, k)); - BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) sbblock, BlockIgniteEvent.IgniteCause.SLOW_SPREAD, null); + org.bukkit.block.Block sbblock = (cworld.getBlockAt(i, j, k)); + BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) sbblock, BlockIgniteEvent.IgniteCause.SLOW_SPREAD, null); server.getPluginManager().callEvent(event); if (event.isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java index 64bfe09d10..7e9ebd4883 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockFromToEvent; diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index 3b92c7b422..2fb2981397 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/src/main/java/net/minecraft/server/BlockLever.java @@ -1,7 +1,7 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; diff --git a/src/main/java/net/minecraft/server/BlockPressurePlate.java b/src/main/java/net/minecraft/server/BlockPressurePlate.java index dad613bf4f..6c3367c680 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlate.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlate.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Random; // CraftBukkit start -import org.bukkit.BlockFace;import org.bukkit.craftbukkit.CraftBlock; +import org.bukkit.block.BlockFace;import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java index eccbe944d8..16f03531b2 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -1,7 +1,7 @@ package net.minecraft.server; import java.util.*; -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java index 550b854458..f01108eb36 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Random; import java.util.Set; -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.plugin.PluginLoader; diff --git a/src/main/java/net/minecraft/server/BlockStationary.java b/src/main/java/net/minecraft/server/BlockStationary.java index b08311cd7a..132cc99193 100644 --- a/src/main/java/net/minecraft/server/BlockStationary.java +++ b/src/main/java/net/minecraft/server/BlockStationary.java @@ -39,8 +39,8 @@ public class BlockStationary extends BlockFluids { // Craftbukkit start: prevent lava putting something on fire. CraftServer server = ((WorldServer)world).getServer(); CraftWorld cworld = ((WorldServer)world).getWorld(); - org.bukkit.Block bblock = (cworld.getBlockAt(k, l, i1)); - BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) bblock, BlockIgniteEvent.IgniteCause.LAVA, null); + org.bukkit.block.Block bblock = (cworld.getBlockAt(k, l, i1)); + BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) bblock, BlockIgniteEvent.IgniteCause.LAVA, null); server.getPluginManager().callEvent(event); if (event.isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index abe9ce6787..fbd9b53db1 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -1,7 +1,7 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.entity.CraftPlayer; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index a27e3811f8..eb3c5de9d6 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.BlockFace; +import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.entity.CraftPlayer; diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java index a77217f51b..749e70637b 100644 --- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java +++ b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java @@ -50,8 +50,8 @@ public class ItemFlintAndSteel extends Item { PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l)); ((WorldServer) world).getServer().getPluginManager().callEvent(pie); - org.bukkit.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k)); - BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer); + org.bukkit.block.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k)); + BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.block.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer); ((WorldServer) world).getServer().getPluginManager().callEvent(bie); boolean preventLighter = pie.isCancelled(); diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index e282579991..c7cb6f6115 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -5,8 +5,8 @@ import java.util.*; import java.util.logging.Logger; // CraftBukkit start -import org.bukkit.BlockFace; -import org.bukkit.BlockDamageLevel; +import org.bukkit.block.BlockFace; +import org.bukkit.block.BlockDamageLevel; import org.bukkit.Location; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.inventory.CraftItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/CraftBlock.java index acdce086ee..ad7d386583 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftBlock.java @@ -1,6 +1,9 @@ package org.bukkit.craftbukkit; +import org.bukkit.block.BlockFace; +import org.bukkit.block.Biome; +import org.bukkit.block.Block; import net.minecraft.server.MobSpawnerBase; import org.bukkit.*; import org.bukkit.block.BlockState; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index dd69de78fd..c8af3edbbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -31,7 +31,7 @@ import net.minecraft.server.WorldGenBigTree; import net.minecraft.server.WorldServer; import net.minecraft.server.WorldGenTrees; import org.bukkit.entity.Arrow; -import org.bukkit.Block; +import org.bukkit.block.Block; import org.bukkit.entity.Boat; import org.bukkit.Chunk; import org.bukkit.entity.ItemDrop; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java index f7743c5273..eb5df635a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -1,7 +1,7 @@ package org.bukkit.craftbukkit.block; -import org.bukkit.Block; +import org.bukkit.block.Block; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java index a3a8649b93..3a275d8add 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -2,7 +2,7 @@ package org.bukkit.craftbukkit.block; import net.minecraft.server.TileEntitySign; -import org.bukkit.Block; +import org.bukkit.block.Block; import org.bukkit.block.Sign; import org.bukkit.craftbukkit.CraftWorld;