move packages

client/src/client/Game.java

@@ -144,21 +144,21 @@ import common.rng.Random;
 import common.sound.EventType;
 import common.sound.PositionedSound;
 import common.sound.Sound;
+import common.util.BlockPos;
+import common.util.BoundingBox;
 import common.util.CharValidator;
 import common.util.ExtMath;
+import common.util.Facing;
 import common.util.FileUtils;
+import common.util.HitPosition;
 import common.util.Util;
-import common.world.BlockPos;
+import common.util.HitPosition.ObjectType;
-import common.world.BoundingBox;
 import common.world.Chunk;
-import common.world.Facing;
-import common.world.HitPosition;
 import common.world.LightType;
 import common.world.Region;
 import common.world.State;
 import common.world.World;
 import common.world.WorldClient;
-import common.world.HitPosition.ObjectType;
 
 /*
 	Een net ganz funktionierndes Programm ...

client/src/client/PlayerController.java

@@ -15,10 +15,10 @@ import common.packet.CPacketBreak;
 import common.packet.CPacketClick;
 import common.packet.CPacketPlace;
 import common.sound.PositionedSound;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Facing;
+import common.util.Facing;
+import common.util.Vec3;
 import common.world.State;
-import common.world.Vec3;
 import common.world.World;
 import common.world.WorldClient;
 

client/src/client/gui/GuiConsole.java

@@ -16,9 +16,9 @@ import common.collect.Lists;
 import common.color.TextColor;
 import common.network.IPlayer;
 import common.packet.CPacketComplete;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.HitPosition;
-import common.world.HitPosition;
 
 public class GuiConsole extends Gui implements Textbox.Callback {
 	public static final GuiConsole INSTANCE = new GuiConsole();

client/src/client/gui/container/GuiCrafting.java

@@ -2,7 +2,7 @@ package client.gui.container;
 
 import common.inventory.ContainerWorkbench;
 import common.inventory.InventoryPlayer;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class GuiCrafting extends GuiContainer

client/src/client/gui/ingame/GuiSign.java

@@ -6,7 +6,7 @@ import client.gui.element.Textbox;
 import client.gui.element.Textbox.Action;
 import client.network.ClientPlayer;
 import common.packet.CPacketSign;
-import common.world.BlockPos;
+import common.util.BlockPos;
 
 public class GuiSign extends Gui implements Textbox.Callback {
 	private final BlockPos position;

client/src/client/init/AnimationRegistry.java

@@ -1,22 +0,0 @@
-package client.init;
-
-import java.util.Map;
-
-import client.renderer.texture.TextureTicked;
-import client.renderer.ticked.TextureFlamesFX1;
-import client.renderer.ticked.TextureFlamesFX2;
-import client.renderer.ticked.TextureLavaFX;
-import client.renderer.ticked.TextureLavaFlowFX;
-import client.renderer.ticked.TextureWaterFX;
-import client.renderer.ticked.TextureWaterFlowFX;
-
-public abstract class AnimationRegistry {
-	public static void registerAnimations(Map<String, Class<? extends TextureTicked>> anim) {
-		anim.put("fire1", TextureFlamesFX1.class);
-		anim.put("fire2", TextureFlamesFX2.class);
-		anim.put("lavaflow", TextureLavaFlowFX.class);
-		anim.put("lava", TextureLavaFX.class);
-		anim.put("waterflow", TextureWaterFlowFX.class);
-		anim.put("water", TextureWaterFX.class);
-	}
-}

client/src/client/init/RenderRegistry.java

@@ -54,6 +54,13 @@ import client.renderer.model.ModelRabbit;
 import client.renderer.model.ModelSheep2;
 import client.renderer.model.ModelSquid;
 import client.renderer.model.ModelWolf;
+import client.renderer.texture.TextureTicked;
+import client.renderer.ticked.TextureFlamesFX1;
+import client.renderer.ticked.TextureFlamesFX2;
+import client.renderer.ticked.TextureLavaFX;
+import client.renderer.ticked.TextureLavaFlowFX;
+import client.renderer.ticked.TextureWaterFX;
+import client.renderer.ticked.TextureWaterFlowFX;
 import common.entity.Entity;
 import common.entity.animal.EntityBat;
 import common.entity.animal.EntityChicken;
@@ -99,7 +106,7 @@ import common.init.Items;
 import common.init.SpeciesRegistry;
 import common.init.SpeciesRegistry.ModelType;
 
-public abstract class EntityRenderRegistry {
+public abstract class RenderRegistry {
 	public static void registerRenderers(Map<Class<? extends Entity>, Render<? extends Entity>> map, 
 			Map<ModelType, RenderNpc> models, RenderManager mgr, RenderItem ritem) {
         map.put(EntityPig.class, new RenderPig(mgr, new ModelPig()));
@@ -154,4 +161,13 @@ public abstract class EntityRenderRegistry {
 			map.put(info.clazz, models.get(info.renderer));
 		}
 	}
+
+	public static void registerAnimations(Map<String, Class<? extends TextureTicked>> anim) {
+		anim.put("fire1", TextureFlamesFX1.class);
+		anim.put("fire2", TextureFlamesFX2.class);
+		anim.put("lavaflow", TextureLavaFlowFX.class);
+		anim.put("lava", TextureLavaFX.class);
+		anim.put("waterflow", TextureWaterFlowFX.class);
+		anim.put("water", TextureWaterFX.class);
+	}
 }

client/src/client/network/ClientPlayer.java

@@ -131,8 +131,8 @@ import common.tileentity.LocalBlockIntercommunication;
 import common.tileentity.TileEntity;
 import common.tileentity.TileEntityMachine;
 import common.tileentity.TileEntitySign;
+import common.util.BlockPos;
 import common.village.MerchantRecipeList;
-import common.world.BlockPos;
 import common.world.Chunk;
 import common.world.Explosion;
 import common.world.Weather;

client/src/client/renderer/ActiveRenderInfo.java

@@ -11,10 +11,10 @@ import common.block.Block;
 import common.block.BlockLiquid;
 import common.entity.Entity;
 import common.entity.npc.EntityNPC;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.Vec3;
 import common.world.State;
-import common.world.Vec3;
 import common.world.World;
 
 public class ActiveRenderInfo

client/src/client/renderer/BlockRenderer.java

@@ -21,13 +21,13 @@ import common.init.BlockRegistry;
 import common.init.FluidRegistry;
 import common.item.ItemStack;
 import common.material.Material;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.Facing;
-import common.world.Facing;
+import common.util.Vec3i;
 import common.world.IBlockAccess;
 import common.world.IWorldAccess;
 import common.world.State;
-import common.world.Vec3i;
 
 public class BlockRenderer
 {

client/src/client/renderer/EntityRenderer.java

@@ -26,11 +26,11 @@ import common.model.BlockLayer;
 import common.model.ParticleType;
 import common.potion.Potion;
 import common.rng.Random;
+import common.util.BlockPos;
+import common.util.BoundingBox;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.HitPosition;
-import common.world.BoundingBox;
+import common.util.Vec3;
-import common.world.HitPosition;
-import common.world.Vec3;
 import common.world.World;
 import common.world.WorldClient;
 

client/src/client/renderer/Frustum.java

@@ -6,8 +6,8 @@ import java.nio.FloatBuffer;
 
 import org.lwjgl.opengl.GL11;
 
+import common.util.BoundingBox;
 import common.util.ExtMath;
-import common.world.BoundingBox;
 
 public class Frustum {
 	private static class ClippingHelper {

client/src/client/renderer/ItemRenderer.java

@@ -22,10 +22,10 @@ import common.item.ItemAction;
 import common.item.ItemStack;
 import common.model.BlockLayer;
 import common.model.Transforms;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.Vec3;
 import common.world.State;
-import common.world.Vec3;
 
 
 public class ItemRenderer

client/src/client/renderer/RegionRenderCache.java

@@ -5,14 +5,14 @@ import java.util.Arrays;
 import common.biome.Biome;
 import common.init.Blocks;
 import common.tileentity.TileEntity;
-import common.world.BlockPos;
+import common.util.BlockPos;
+import common.util.Facing;
+import common.util.Vec3i;
 import common.world.Chunk;
 import common.world.ChunkCache;
-import common.world.Facing;
 import common.world.IWorldAccess;
 import common.world.LightType;
 import common.world.State;
-import common.world.Vec3i;
 import common.world.World;
 
 public class RegionRenderCache extends ChunkCache implements IWorldAccess

client/src/client/renderer/RenderGlobal.java

@@ -42,16 +42,16 @@ import common.rng.Random;
 import common.sound.Sound;
 import common.tileentity.TileEntity;
 import common.tileentity.TileEntityChest;
+import common.util.BlockPos;
+import common.util.BoundingBox;
+import common.util.ClassInheritanceMultiMap;
 import common.util.ExtMath;
+import common.util.Facing;
+import common.util.HitPosition;
+import common.util.Vec3;
 import common.util.Vector3f;
-import common.world.BlockPos;
-import common.world.BoundingBox;
 import common.world.Chunk;
-import common.world.ClassInheritanceMultiMap;
-import common.world.Facing;
-import common.world.HitPosition;
 import common.world.State;
-import common.world.Vec3;
 import common.world.WorldClient;
 
 public class RenderGlobal

client/src/client/renderer/ViewFrustum.java

@@ -1,8 +1,8 @@
 package client.renderer;
 
 import client.renderer.chunk.RenderChunk;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.World;
 
 public class ViewFrustum

client/src/client/renderer/blockmodel/BakedModel.java

@@ -6,7 +6,7 @@ import java.util.List;
 import client.renderer.texture.TextureAtlasSprite;
 import common.collect.Lists;
 import common.model.Transforms;
-import common.world.Facing;
+import common.util.Facing;
 
 public class BakedModel implements IBakedModel
 {

client/src/client/renderer/blockmodel/BakedQuad.java

@@ -1,6 +1,6 @@
 package client.renderer.blockmodel;
 
-import common.world.Facing;
+import common.util.Facing;
 
 public class BakedQuad {
 	protected final int[] data;

client/src/client/renderer/blockmodel/BlockPart.java

@@ -2,8 +2,8 @@ package client.renderer.blockmodel;
 
 import java.util.Map;
 
+import common.util.Facing;
 import common.util.Vector3f;
-import common.world.Facing;
 
 public class BlockPart
 {

client/src/client/renderer/blockmodel/BlockPartFace.java

@@ -1,7 +1,7 @@
 package client.renderer.blockmodel;
 
 import client.renderer.texture.TextureMap;
-import common.world.Facing;
+import common.util.Facing;
 
 public class BlockPartFace {
 	public Facing cull;

client/src/client/renderer/blockmodel/BlockPartRotation.java

@@ -1,7 +1,7 @@
 package client.renderer.blockmodel;
 
+import common.util.Facing;
 import common.util.Vector3f;
-import common.world.Facing;
 
 public class BlockPartRotation {
 	public final Vector3f origin;

client/src/client/renderer/blockmodel/BuiltInModel.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import client.renderer.texture.TextureAtlasSprite;
 import common.model.Transforms;
-import common.world.Facing;
+import common.util.Facing;
 
 public class BuiltInModel implements IBakedModel
 {

client/src/client/renderer/blockmodel/FaceBakery.java

@@ -3,11 +3,11 @@ package client.renderer.blockmodel;
 import client.renderer.texture.TextureAtlasSprite;
 import common.model.ModelRotation;
 import common.util.ExtMath;
+import common.util.Facing;
 import common.util.Matrix4f;
+import common.util.Vec3i;
 import common.util.Vector3f;
 import common.util.Vector4f;
-import common.world.Facing;
-import common.world.Vec3i;
 
 public class FaceBakery
 {

client/src/client/renderer/blockmodel/IBakedModel.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import client.renderer.texture.TextureAtlasSprite;
 import common.model.Transforms;
-import common.world.Facing;
+import common.util.Facing;
 
 public interface IBakedModel
 {

client/src/client/renderer/blockmodel/ModelBakery.java

@@ -21,7 +21,7 @@ import common.init.RegistrySimple;
 import common.item.Item;
 import common.item.ItemStack;
 import common.model.ModelRotation;
-import common.world.Facing;
+import common.util.Facing;
 import common.world.State;
 
 public abstract class ModelBakery

client/src/client/renderer/blockmodel/ModelBlock.java

@@ -9,8 +9,8 @@ import common.model.Model;
 import common.model.ModelProvider;
 import common.model.ModelRotation;
 import common.model.Transforms;
+import common.util.Facing;
 import common.util.Vector3f;
-import common.world.Facing;
 
 public class ModelBlock extends Model {
 	static final ModelProvider PROVIDER = new ModelProvider() {

client/src/client/renderer/blockmodel/ModelGenerator.java

@@ -11,8 +11,8 @@ import client.renderer.texture.TextureUtil;
 import common.collect.Lists;
 import common.collect.Maps;
 import common.log.Log;
+import common.util.Facing;
 import common.util.Vector3f;
-import common.world.Facing;
 
 public abstract class ModelGenerator {
 //	public static final List<String> LAYERS = Lists.newArrayList("layer0", "layer1", "layer2", "layer3", "layer4");

client/src/client/renderer/chunk/CompiledChunk.java

@@ -6,7 +6,7 @@ import client.renderer.RenderBuffer;
 import common.collect.Lists;
 import common.model.BlockLayer;
 import common.tileentity.TileEntity;
-import common.world.Facing;
+import common.util.Facing;
 
 public class CompiledChunk
 {

client/src/client/renderer/chunk/RenderChunk.java

@@ -24,9 +24,9 @@ import common.collect.Maps;
 import common.collect.Sets;
 import common.model.BlockLayer;
 import common.tileentity.TileEntity;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.BoundingBox;
+import common.util.BoundingBox;
-import common.world.Facing;
+import common.util.Facing;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/chunk/SetVisibility.java

@@ -3,7 +3,7 @@ package client.renderer.chunk;
 import java.util.BitSet;
 import java.util.Set;
 
-import common.world.Facing;
+import common.util.Facing;
 
 public class SetVisibility
 {

client/src/client/renderer/chunk/VisGraph.java

@@ -6,8 +6,8 @@ import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Set;
 
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Facing;
+import common.util.Facing;
 
 public class VisGraph
 {

client/src/client/renderer/entity/Render.java

@@ -13,8 +13,8 @@ import client.renderer.texture.TextureAtlasSprite;
 import client.renderer.texture.TextureMap;
 import common.block.Block;
 import common.entity.Entity;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.BoundingBox;
+import common.util.BoundingBox;
 import common.world.World;
 
 public abstract class Render<T extends Entity>

client/src/client/renderer/entity/RenderFallingBlock.java

@@ -12,7 +12,7 @@ import client.renderer.blockmodel.IBakedModel;
 import client.renderer.texture.TextureMap;
 import common.block.Block;
 import common.entity.item.EntityFalling;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/entity/RenderFish.java

@@ -10,7 +10,7 @@ import client.renderer.Tessellator;
 import client.renderer.particle.EffectRenderer;
 import common.entity.projectile.EntityHook;
 import common.util.ExtMath;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class RenderFish extends Render<EntityHook>
 {

client/src/client/renderer/entity/RenderItem.java

@@ -22,8 +22,8 @@ import common.item.Item;
 import common.item.ItemStack;
 import common.model.Transform;
 import common.model.Transforms;
-import common.world.Facing;
+import common.util.Facing;
-import common.world.Vec3i;
+import common.util.Vec3i;
 
 public class RenderItem
 {

client/src/client/renderer/entity/RenderManager.java

@@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 
 import client.Game;
-import client.init.EntityRenderRegistry;
+import client.init.RenderRegistry;
 import client.renderer.DefaultVertexFormats;
 import client.renderer.GlState;
 import client.renderer.RenderBuffer;
@@ -17,8 +17,8 @@ import common.collect.Maps;
 import common.entity.Entity;
 import common.entity.types.EntityLiving;
 import common.init.SpeciesRegistry.ModelType;
-import common.world.BoundingBox;
+import common.util.BoundingBox;
-import common.world.Vec3;
+import common.util.Vec3;
 import common.world.World;
 
 public class RenderManager
@@ -68,7 +68,7 @@ public class RenderManager
     public RenderManager(TextureManager renderEngineIn, RenderItem itemRendererIn)
     {
         this.renderEngine = renderEngineIn;
-        EntityRenderRegistry.registerRenderers(this.entityRenderMap, this.models, this, itemRendererIn);
+        RenderRegistry.registerRenderers(this.entityRenderMap, this.models, this, itemRendererIn);
         for(RenderNpc render : this.models.values()) {
         	render.initSegments();
         }

client/src/client/renderer/entity/RenderMinecart.java

@@ -9,8 +9,8 @@ import client.renderer.model.ModelMinecart;
 import client.renderer.texture.TextureMap;
 import common.entity.item.EntityCart;
 import common.util.ExtMath;
+import common.util.Vec3;
 import common.world.State;
-import common.world.Vec3;
 
 public class RenderMinecart<T extends EntityCart> extends Render<T>
 {

client/src/client/renderer/model/ModelBox.java

@@ -1,8 +1,8 @@
 package client.renderer.model;
 
 import client.renderer.RenderBuffer;
-import common.world.Facing;
+import common.util.Facing;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class ModelBox {
 	private static Vec3[] getPoints(float x1, float y1, float z1, float x2, float y2, float z2, int dir) {

client/src/client/renderer/model/PositionTextureVertex.java

@@ -1,6 +1,6 @@
 package client.renderer.model;
 
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class PositionTextureVertex
 {

client/src/client/renderer/model/TexturedQuad.java

@@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
 import client.renderer.DefaultVertexFormats;
 import client.renderer.RenderBuffer;
 import client.renderer.Tessellator;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class TexturedQuad
 {

client/src/client/renderer/particle/EffectRenderer.java

@@ -19,9 +19,9 @@ import common.entity.Entity;
 import common.material.Material;
 import common.model.ParticleType;
 import common.rng.Random;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.Facing;
-import common.world.Facing;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/particle/EntityBubbleFX.java

@@ -1,7 +1,7 @@
 package client.renderer.particle;
 
 import common.material.Material;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class EntityBubbleFX extends EntityFX

client/src/client/renderer/particle/EntityDiggingFX.java

@@ -6,7 +6,7 @@ import common.block.Block;
 import common.entity.Entity;
 import common.init.BlockRegistry;
 import common.init.Blocks;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/particle/EntityDownfallFX.java

@@ -3,8 +3,8 @@ package client.renderer.particle;
 import common.block.Block;
 import common.block.BlockLiquid;
 import common.material.Material;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/particle/EntityDropParticleFX.java

@@ -3,8 +3,8 @@ package client.renderer.particle;
 import common.block.BlockLiquid;
 import common.material.Material;
 import common.model.ParticleType;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/particle/EntityFirework.java

@@ -7,8 +7,8 @@ import common.init.SoundEvent;
 import common.item.ItemDye;
 import common.nbt.NBTTagCompound;
 import common.nbt.NBTTagList;
+import common.util.BoundingBox;
 import common.util.ExtMath;
-import common.world.BoundingBox;
 import common.world.World;
 import common.world.WorldClient;
 

client/src/client/renderer/particle/EntityFootStepFX.java

@@ -9,7 +9,7 @@ import client.renderer.RenderBuffer;
 import client.renderer.Tessellator;
 import client.renderer.texture.TextureManager;
 import common.entity.Entity;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class EntityFootStepFX extends EntityFX

client/src/client/renderer/particle/EntitySuspendFX.java

@@ -1,7 +1,7 @@
 package client.renderer.particle;
 
 import common.material.Material;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class EntitySuspendFX extends EntityFX

client/src/client/renderer/texture/TextureMap.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import client.init.AnimationRegistry;
+import client.init.RenderRegistry;
 import client.renderer.GlState;
 import common.block.Block;
 import common.collect.Lists;
@@ -40,7 +40,7 @@ public class TextureMap extends Texture
 //		RenderRegistry.registerAnimations(this);
         Map<String, Object> map = Maps.newHashMap();
         Map<String, Class<? extends TextureTicked>> anim = Maps.newHashMap();
-        AnimationRegistry.registerAnimations(anim);
+        RenderRegistry.registerAnimations(anim);
 		for(Block block : BlockRegistry.REGISTRY) {
 			block.getAnimatedTextures(map);
 		}

client/src/client/renderer/tileentity/TileEntityBannerRenderer.java

@@ -15,8 +15,8 @@ import common.collect.Maps;
 import common.color.DyeColor;
 import common.init.Blocks;
 import common.tileentity.TileEntityBanner;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 
 public class TileEntityBannerRenderer extends TileEntitySpecialRenderer<TileEntityBanner>
 {

client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java

@@ -10,7 +10,7 @@ import common.item.ItemStack;
 import common.tileentity.TileEntityBanner;
 import common.tileentity.TileEntityChest;
 import common.tileentity.TileEntitySkull;
-import common.world.Facing;
+import common.util.Facing;
 
 public class TileEntityItemStackRenderer
 {

client/src/client/renderer/tileentity/TileEntityPistonRenderer.java

@@ -16,7 +16,7 @@ import common.block.BlockPistonHead;
 import common.init.Blocks;
 import common.material.Material;
 import common.tileentity.TileEntityPiston;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.World;
 

client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java

@@ -15,7 +15,7 @@ import common.tileentity.TileEntityMobSpawner;
 import common.tileentity.TileEntityPiston;
 import common.tileentity.TileEntitySign;
 import common.tileentity.TileEntitySkull;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class TileEntityRendererDispatcher

client/src/client/renderer/tileentity/TileEntitySkullRenderer.java

@@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
 import client.renderer.GlState;
 import client.renderer.model.ModelHumanoidHead;
 import common.tileentity.TileEntitySkull;
-import common.world.Facing;
+import common.util.Facing;
 
 
 public class TileEntitySkullRenderer extends TileEntitySpecialRenderer<TileEntitySkull>

client/src/client/world/Converter.java

@@ -86,8 +86,8 @@ import common.tileentity.TileEntityNote;
 import common.tileentity.TileEntityPiston;
 import common.tileentity.TileEntitySign;
 import common.tileentity.TileEntitySkull;
-import common.world.Facing;
+import common.util.Facing;
-import common.world.NibbleArray;
+import common.util.NibbleArray;
 import common.world.Region;
 import common.world.State;
 import common.world.Weather;

common/src/common/IClient.java

@@ -6,7 +6,7 @@ import common.entity.types.IEntityFX;
 import common.model.ParticleType;
 import common.nbt.NBTTagCompound;
 import common.sound.Sound;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 
 public interface IClient {

common/src/common/IServer.java

@@ -7,9 +7,9 @@ import common.entity.Entity;
 import common.entity.npc.EntityNPC;
 import common.network.IPlayer;
 import common.network.Packet;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.PortalType;
+import common.util.PortalType;
-import common.world.Position;
+import common.util.Position;
 import common.world.WorldServer;
 
 public interface IServer {

common/src/common/ai/AIFireballAttack.java

@@ -5,8 +5,8 @@ import common.entity.projectile.EntityFireball;
 import common.entity.types.EntityLiving;
 import common.init.Items;
 import common.item.ItemStack;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Vec3;
+import common.util.Vec3;
 import common.world.World;
 
 public class AIFireballAttack extends EntityAIBase

common/src/common/ai/AIFlyingBoxAttack.java

@@ -3,7 +3,7 @@ package common.ai;
 import common.entity.npc.EntityNPC;
 import common.entity.projectile.EntityBox;
 import common.entity.types.EntityLiving;
-import common.world.BlockPos;
+import common.util.BlockPos;
 
 public class AIFlyingBoxAttack extends EntityAIBase
 {

common/src/common/ai/AISmallFireballAttack.java

@@ -3,7 +3,7 @@ package common.ai;
 import common.entity.npc.EntityNPC;
 import common.entity.projectile.EntityFireCharge;
 import common.entity.types.EntityLiving;
-import common.world.BlockPos;
+import common.util.BlockPos;
 
 public class AISmallFireballAttack extends EntityAIBase
 {

common/src/common/ai/EntityAIAttackOnCollide.java

@@ -3,7 +3,7 @@ package common.ai;
 import common.entity.Entity;
 import common.entity.types.EntityLiving;
 import common.pathfinding.PathEntity;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class EntityAIAttackOnCollide extends EntityAIBase

common/src/common/ai/EntityAIAvoidEntity.java

@@ -8,7 +8,7 @@ import common.entity.types.EntityLiving;
 import common.pathfinding.PathEntity;
 import common.pathfinding.PathNavigate;
 import common.util.Predicates;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIAvoidEntity<T extends Entity> extends EntityAIBase
 {

common/src/common/ai/EntityAIControlledByPlayer.java

@@ -9,8 +9,8 @@ import common.init.Items;
 import common.item.ItemStack;
 import common.material.Material;
 import common.pathfinding.WalkNodeProcessor;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 
 public class EntityAIControlledByPlayer extends EntityAIBase
 {

common/src/common/ai/EntityAIDoorInteract.java

@@ -7,7 +7,7 @@ import common.material.Material;
 import common.pathfinding.PathEntity;
 import common.pathfinding.PathNavigateGround;
 import common.pathfinding.PathPoint;
-import common.world.BlockPos;
+import common.util.BlockPos;
 
 public abstract class EntityAIDoorInteract extends EntityAIBase
 {

common/src/common/ai/EntityAIEatGrass.java

@@ -8,8 +8,8 @@ import common.init.BlockRegistry;
 import common.init.Blocks;
 import common.init.Config;
 import common.pattern.BlockStateHelper;
+import common.util.BlockPos;
 import common.util.Predicates;
-import common.world.BlockPos;
 import common.world.State;
 import common.world.World;
 

common/src/common/ai/EntityAIFleeSun.java

@@ -2,8 +2,8 @@ package common.ai;
 
 import common.entity.types.EntityLiving;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Vec3;
+import common.util.Vec3;
 import common.world.World;
 import common.world.WorldServer;
 

common/src/common/ai/EntityAIHarvestFarmland.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public class EntityAIHarvestFarmland extends EntityAIMoveToBlock

common/src/common/ai/EntityAIHurtByTarget.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.BoundingBox;
+import common.util.BoundingBox;
 
 public class EntityAIHurtByTarget extends EntityAITarget
 {

common/src/common/ai/EntityAIMoveIndoors.java

@@ -1,10 +1,10 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
+import common.util.BlockPos;
+import common.util.Vec3;
 import common.village.Village;
 import common.village.VillageDoorInfo;
-import common.world.BlockPos;
-import common.world.Vec3;
 import common.world.WorldServer;
 
 public class EntityAIMoveIndoors extends EntityAIBase

common/src/common/ai/EntityAIMoveThroughVillage.java

@@ -6,11 +6,11 @@ import common.collect.Lists;
 import common.entity.types.EntityLiving;
 import common.pathfinding.PathEntity;
 import common.pathfinding.PathNavigateGround;
+import common.util.BlockPos;
 import common.util.ExtMath;
+import common.util.Vec3;
 import common.village.Village;
 import common.village.VillageDoorInfo;
-import common.world.BlockPos;
-import common.world.Vec3;
 import common.world.WorldServer;
 
 public class EntityAIMoveThroughVillage extends EntityAIBase

common/src/common/ai/EntityAIMoveToBlock.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.World;
 
 public abstract class EntityAIMoveToBlock extends EntityAIBase

common/src/common/ai/EntityAIMoveTowardsRestriction.java

@@ -1,8 +1,8 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIMoveTowardsRestriction extends EntityAIBase
 {

common/src/common/ai/EntityAIMoveTowardsTarget.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIMoveTowardsTarget extends EntityAIBase
 {

common/src/common/ai/EntityAIOcelotSit.java

@@ -6,7 +6,7 @@ import common.entity.animal.EntityOcelot;
 import common.init.Blocks;
 import common.tileentity.TileEntity;
 import common.tileentity.TileEntityChest;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.World;
 

common/src/common/ai/EntityAIPanic.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIPanic extends EntityAIBase
 {

common/src/common/ai/EntityAIPlay.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import common.entity.npc.EntityNPC;
 import common.entity.types.EntityLiving;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIPlay extends EntityAIBase {
 	private EntityNPC entity;

common/src/common/ai/EntityAIRestrictOpenDoor.java

@@ -2,9 +2,9 @@ package common.ai;
 
 import common.entity.types.EntityLiving;
 import common.pathfinding.PathNavigateGround;
+import common.util.BlockPos;
 import common.village.Village;
 import common.village.VillageDoorInfo;
-import common.world.BlockPos;
 import common.world.WorldServer;
 
 public class EntityAIRestrictOpenDoor extends EntityAIBase

common/src/common/ai/EntityAIRunAroundLikeCrazy.java

@@ -3,7 +3,7 @@ package common.ai;
 import common.entity.Entity;
 import common.entity.animal.EntityHorse;
 import common.entity.npc.EntityNPC;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIRunAroundLikeCrazy extends EntityAIBase
 {

common/src/common/ai/EntityAITakePlace.java

@@ -11,8 +11,8 @@ import common.init.ItemRegistry;
 import common.item.ItemStack;
 import common.material.Material;
 import common.rng.Random;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.State;
 import common.world.World;
 

common/src/common/ai/EntityAITarget.java

@@ -7,8 +7,8 @@ import common.entity.types.IEntityOwnable;
 import common.init.Config;
 import common.pathfinding.PathEntity;
 import common.pathfinding.PathPoint;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 
 public abstract class EntityAITarget extends EntityAIBase
 {

common/src/common/ai/EntityAIWander.java

@@ -1,7 +1,7 @@
 package common.ai;
 
 import common.entity.types.EntityLiving;
-import common.world.Vec3;
+import common.util.Vec3;
 
 public class EntityAIWander extends EntityAIBase
 {

common/src/common/ai/RandomPositionGenerator.java

@@ -2,9 +2,9 @@ package common.ai;
 
 import common.entity.types.EntityLiving;
 import common.rng.Random;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
+import common.util.Vec3;
-import common.world.Vec3;
 
 public class RandomPositionGenerator
 {

common/src/common/biome/Biome.java

@@ -32,8 +32,8 @@ import common.material.Material;
 import common.rng.PerlinGen;
 import common.rng.Random;
 import common.rng.WeightedList;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.State;
 import common.world.World;
 import common.world.WorldServer;

common/src/common/biome/BiomeBlackened.java

@@ -5,7 +5,7 @@ import common.entity.npc.EntityMetalhead;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.worldgen.tree.WorldGenBaseTree;
 import common.worldgen.tree.WorldGenTree;
 

common/src/common/biome/BiomeChaos.java

@@ -6,7 +6,7 @@ import common.init.Blocks;
 import common.init.EntityRegistry;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.FeatureGenerator;
 import common.worldgen.foliage.WorldGenMushroom;

common/src/common/biome/BiomeDesert.java

@@ -3,7 +3,7 @@ package common.biome;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.feature.WorldGenDesertWells;
 

common/src/common/biome/BiomeExterminated.java

@@ -3,7 +3,7 @@ package common.biome;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 
 public class BiomeExterminated extends Biome {

common/src/common/biome/BiomeForest.java

@@ -8,8 +8,8 @@ import common.entity.npc.EntityElf;
 import common.entity.npc.EntityWoodElf;
 import common.init.Blocks;
 import common.rng.Random;
+import common.util.BlockPos;
 import common.util.ExtMath;
-import common.world.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.foliage.WorldGenBigMushroom;
 import common.worldgen.tree.WorldGenBaseTree;

common/src/common/biome/BiomeHell.java

@@ -9,7 +9,7 @@ import common.entity.npc.EntityTiefling;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.FeatureOres;
 import common.worldgen.feature.WorldGenFire;

common/src/common/biome/BiomeHills.java

@@ -2,7 +2,7 @@ package common.biome;
 
 import common.init.Blocks;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;
 import common.worldgen.FeatureOres;

common/src/common/biome/BiomeJungle.java

@@ -5,7 +5,7 @@ import common.entity.animal.EntityChicken;
 import common.entity.animal.EntityOcelot;
 import common.init.Blocks;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.WorldServer;
 import common.worldgen.FeatureGenerator;

common/src/common/biome/BiomeMesa.java

@@ -12,7 +12,7 @@ import common.material.Material;
 import common.rng.PerlinGen;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.State;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;

common/src/common/biome/BiomeMoon.java

@@ -3,7 +3,7 @@ package common.biome;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.FeatureOres;
 

common/src/common/biome/BiomeMutated.java

@@ -2,7 +2,7 @@ package common.biome;
 
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;
 import common.worldgen.tree.WorldGenTree;

common/src/common/biome/BiomeNone.java

@@ -3,7 +3,7 @@ package common.biome;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;
 

common/src/common/biome/BiomePlains.java

@@ -4,7 +4,7 @@ import common.block.BlockDoublePlant;
 import common.block.BlockFlower;
 import common.entity.animal.EntityHorse;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 
 public class BiomePlains extends Biome

common/src/common/biome/BiomeSavanna.java

@@ -5,7 +5,7 @@ import common.block.BlockDoublePlant;
 import common.entity.animal.EntityHorse;
 import common.init.Blocks;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;
 import common.worldgen.tree.WorldGenSavanna;

common/src/common/biome/BiomeSnow.java

@@ -3,7 +3,7 @@ package common.biome;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.feature.WorldGenIcePath;
 import common.worldgen.feature.WorldGenIceSpike;

common/src/common/biome/BiomeSpace.java

@@ -4,7 +4,7 @@ import common.block.BlockDirt;
 import common.init.Blocks;
 import common.rng.Random;
 import common.rng.WeightedList;
-import common.world.BlockPos;
+import common.util.BlockPos;
 import common.world.WorldServer;
 import common.worldgen.FeatureGenerator;
 import common.worldgen.feature.WorldGenAsteroid;

common/src/common/biome/BiomeSwamp.java

@@ -6,8 +6,8 @@ import common.entity.npc.EntitySlime;
 import common.init.Blocks;
 import common.material.Material;
 import common.rng.Random;
-import common.world.BlockPos;
+import common.util.BlockPos;
-import common.world.Facing;
+import common.util.Facing;
 import common.world.WorldServer;
 import common.worldgen.ChunkPrimer;
 import common.worldgen.tree.WorldGenTree;