From 6b7923cf41c985f9221ae40218fe4081edfa34d1 Mon Sep 17 00:00:00 2001 From: Sen Date: Thu, 8 May 2025 12:37:48 +0200 Subject: [PATCH] move packages --- client/src/client/Game.java | 10 ++++----- client/src/client/PlayerController.java | 6 ++--- client/src/client/gui/GuiConsole.java | 4 ++-- .../src/client/gui/container/GuiCrafting.java | 2 +- client/src/client/gui/ingame/GuiSign.java | 2 +- client/src/client/init/AnimationRegistry.java | 22 ------------------- ...enderRegistry.java => RenderRegistry.java} | 18 ++++++++++++++- client/src/client/network/ClientPlayer.java | 2 +- .../src/client/renderer/ActiveRenderInfo.java | 4 ++-- client/src/client/renderer/BlockRenderer.java | 6 ++--- .../src/client/renderer/EntityRenderer.java | 8 +++---- client/src/client/renderer/Frustum.java | 2 +- client/src/client/renderer/ItemRenderer.java | 4 ++-- .../client/renderer/RegionRenderCache.java | 6 ++--- client/src/client/renderer/RenderGlobal.java | 12 +++++----- client/src/client/renderer/ViewFrustum.java | 2 +- .../renderer/blockmodel/BakedModel.java | 2 +- .../client/renderer/blockmodel/BakedQuad.java | 2 +- .../client/renderer/blockmodel/BlockPart.java | 2 +- .../renderer/blockmodel/BlockPartFace.java | 2 +- .../blockmodel/BlockPartRotation.java | 2 +- .../renderer/blockmodel/BuiltInModel.java | 2 +- .../renderer/blockmodel/FaceBakery.java | 4 ++-- .../renderer/blockmodel/IBakedModel.java | 2 +- .../renderer/blockmodel/ModelBakery.java | 2 +- .../renderer/blockmodel/ModelBlock.java | 2 +- .../renderer/blockmodel/ModelGenerator.java | 2 +- .../client/renderer/chunk/CompiledChunk.java | 2 +- .../client/renderer/chunk/RenderChunk.java | 6 ++--- .../client/renderer/chunk/SetVisibility.java | 2 +- .../src/client/renderer/chunk/VisGraph.java | 4 ++-- client/src/client/renderer/entity/Render.java | 4 ++-- .../renderer/entity/RenderFallingBlock.java | 2 +- .../client/renderer/entity/RenderFish.java | 2 +- .../client/renderer/entity/RenderItem.java | 4 ++-- .../client/renderer/entity/RenderManager.java | 8 +++---- .../renderer/entity/RenderMinecart.java | 2 +- .../src/client/renderer/model/ModelBox.java | 4 ++-- .../renderer/model/PositionTextureVertex.java | 2 +- .../client/renderer/model/TexturedQuad.java | 2 +- .../renderer/particle/EffectRenderer.java | 4 ++-- .../renderer/particle/EntityBubbleFX.java | 2 +- .../renderer/particle/EntityDiggingFX.java | 2 +- .../renderer/particle/EntityDownfallFX.java | 2 +- .../particle/EntityDropParticleFX.java | 2 +- .../renderer/particle/EntityFirework.java | 2 +- .../renderer/particle/EntityFootStepFX.java | 2 +- .../renderer/particle/EntitySuspendFX.java | 2 +- .../client/renderer/texture/TextureMap.java | 4 ++-- .../tileentity/TileEntityBannerRenderer.java | 2 +- .../TileEntityItemStackRenderer.java | 2 +- .../tileentity/TileEntityPistonRenderer.java | 2 +- .../TileEntityRendererDispatcher.java | 2 +- .../tileentity/TileEntitySkullRenderer.java | 2 +- client/src/client/world/Converter.java | 4 ++-- common/src/common/IClient.java | 2 +- common/src/common/IServer.java | 6 ++--- common/src/common/ai/AIFireballAttack.java | 4 ++-- common/src/common/ai/AIFlyingBoxAttack.java | 2 +- .../src/common/ai/AISmallFireballAttack.java | 2 +- .../common/ai/EntityAIAttackOnCollide.java | 2 +- common/src/common/ai/EntityAIAvoidEntity.java | 2 +- .../common/ai/EntityAIControlledByPlayer.java | 2 +- .../src/common/ai/EntityAIDoorInteract.java | 2 +- common/src/common/ai/EntityAIEatGrass.java | 2 +- common/src/common/ai/EntityAIFleeSun.java | 4 ++-- .../common/ai/EntityAIHarvestFarmland.java | 2 +- .../src/common/ai/EntityAIHurtByTarget.java | 2 +- common/src/common/ai/EntityAIMoveIndoors.java | 4 ++-- .../common/ai/EntityAIMoveThroughVillage.java | 4 ++-- common/src/common/ai/EntityAIMoveToBlock.java | 2 +- .../ai/EntityAIMoveTowardsRestriction.java | 4 ++-- .../common/ai/EntityAIMoveTowardsTarget.java | 2 +- common/src/common/ai/EntityAIOcelotSit.java | 2 +- common/src/common/ai/EntityAIPanic.java | 2 +- common/src/common/ai/EntityAIPlay.java | 2 +- .../common/ai/EntityAIRestrictOpenDoor.java | 2 +- .../common/ai/EntityAIRunAroundLikeCrazy.java | 2 +- common/src/common/ai/EntityAITakePlace.java | 2 +- common/src/common/ai/EntityAITarget.java | 2 +- common/src/common/ai/EntityAIWander.java | 2 +- .../common/ai/RandomPositionGenerator.java | 4 ++-- common/src/common/biome/Biome.java | 2 +- common/src/common/biome/BiomeBlackened.java | 2 +- common/src/common/biome/BiomeChaos.java | 2 +- common/src/common/biome/BiomeDesert.java | 2 +- .../src/common/biome/BiomeExterminated.java | 2 +- common/src/common/biome/BiomeForest.java | 2 +- common/src/common/biome/BiomeHell.java | 2 +- common/src/common/biome/BiomeHills.java | 2 +- common/src/common/biome/BiomeJungle.java | 2 +- common/src/common/biome/BiomeMesa.java | 2 +- common/src/common/biome/BiomeMoon.java | 2 +- common/src/common/biome/BiomeMutated.java | 2 +- common/src/common/biome/BiomeNone.java | 2 +- common/src/common/biome/BiomePlains.java | 2 +- common/src/common/biome/BiomeSavanna.java | 2 +- common/src/common/biome/BiomeSnow.java | 2 +- common/src/common/biome/BiomeSpace.java | 2 +- common/src/common/biome/BiomeSwamp.java | 4 ++-- common/src/common/biome/BiomeTaiga.java | 2 +- common/src/common/biome/BiomeTian.java | 2 +- common/src/common/block/Block.java | 12 +++++----- common/src/common/block/BlockAir.java | 4 ++-- common/src/common/block/BlockAnvil.java | 4 ++-- common/src/common/block/BlockBanner.java | 6 ++--- .../common/block/BlockBasePressurePlate.java | 6 ++--- common/src/common/block/BlockBeacon.java | 4 ++-- common/src/common/block/BlockBed.java | 6 ++--- common/src/common/block/BlockBedrock.java | 2 +- .../src/common/block/BlockBlackenedDirt.java | 2 +- .../src/common/block/BlockBlackenedSoil.java | 2 +- common/src/common/block/BlockBlueShroom.java | 2 +- common/src/common/block/BlockBreakable.java | 4 ++-- .../src/common/block/BlockBrewingStand.java | 6 ++--- common/src/common/block/BlockBush.java | 4 ++-- common/src/common/block/BlockButton.java | 6 ++--- common/src/common/block/BlockCactus.java | 6 ++--- common/src/common/block/BlockCake.java | 6 ++--- common/src/common/block/BlockCarpet.java | 4 ++-- common/src/common/block/BlockCauldron.java | 6 ++--- common/src/common/block/BlockChest.java | 6 ++--- common/src/common/block/BlockCocoa.java | 6 ++--- .../common/block/BlockCompressedPowered.java | 4 ++-- common/src/common/block/BlockContainer.java | 4 ++-- common/src/common/block/BlockCore.java | 2 +- common/src/common/block/BlockCrops.java | 2 +- .../common/block/BlockDaylightDetector.java | 4 ++-- common/src/common/block/BlockDeadBush.java | 2 +- common/src/common/block/BlockDirectional.java | 2 +- common/src/common/block/BlockDirt.java | 2 +- common/src/common/block/BlockDispenser.java | 4 ++-- common/src/common/block/BlockDoor.java | 10 ++++----- common/src/common/block/BlockDoublePlant.java | 6 ++--- common/src/common/block/BlockDragonEgg.java | 4 ++-- common/src/common/block/BlockDropper.java | 4 ++-- .../src/common/block/BlockDynamicLiquid.java | 4 ++-- .../common/block/BlockEnchantmentTable.java | 4 ++-- common/src/common/block/BlockEventData.java | 2 +- common/src/common/block/BlockFalling.java | 2 +- common/src/common/block/BlockFarmland.java | 6 ++--- common/src/common/block/BlockFence.java | 6 ++--- common/src/common/block/BlockFenceGate.java | 6 ++--- common/src/common/block/BlockFire.java | 6 ++--- common/src/common/block/BlockFloorPortal.java | 6 ++--- common/src/common/block/BlockFlower.java | 2 +- common/src/common/block/BlockFlowerPot.java | 4 ++-- common/src/common/block/BlockFurnace.java | 4 ++-- common/src/common/block/BlockGrass.java | 2 +- common/src/common/block/BlockHay.java | 4 ++-- common/src/common/block/BlockHopper.java | 6 ++--- .../src/common/block/BlockHugeMushroom.java | 4 ++-- common/src/common/block/BlockIce.java | 2 +- common/src/common/block/BlockJukebox.java | 4 ++-- common/src/common/block/BlockLadder.java | 6 ++--- common/src/common/block/BlockLeaves.java | 2 +- common/src/common/block/BlockLever.java | 6 ++--- common/src/common/block/BlockLilyPad.java | 6 ++--- common/src/common/block/BlockLiquid.java | 8 +++---- common/src/common/block/BlockLog.java | 4 ++-- common/src/common/block/BlockMachine.java | 4 ++-- common/src/common/block/BlockMobSpawner.java | 2 +- common/src/common/block/BlockMushroom.java | 2 +- common/src/common/block/BlockMycelium.java | 2 +- common/src/common/block/BlockNote.java | 4 ++-- common/src/common/block/BlockNuke.java | 2 +- common/src/common/block/BlockOre.java | 2 +- common/src/common/block/BlockPane.java | 6 ++--- common/src/common/block/BlockPistonBase.java | 6 ++--- common/src/common/block/BlockPistonHead.java | 6 ++--- .../src/common/block/BlockPistonMoving.java | 10 ++++----- common/src/common/block/BlockPortal.java | 8 +++---- common/src/common/block/BlockPortalFrame.java | 6 ++--- common/src/common/block/BlockPotato.java | 2 +- .../src/common/block/BlockPressurePlate.java | 4 ++-- .../block/BlockPressurePlateWeighted.java | 2 +- common/src/common/block/BlockPumpkin.java | 4 ++-- common/src/common/block/BlockQuartz.java | 4 ++-- common/src/common/block/BlockRail.java | 2 +- common/src/common/block/BlockRailBase.java | 10 ++++----- .../src/common/block/BlockRailDetector.java | 6 ++--- common/src/common/block/BlockRailPowered.java | 2 +- .../common/block/BlockRedstoneComparator.java | 4 ++-- .../src/common/block/BlockRedstoneDiode.java | 4 ++-- .../src/common/block/BlockRedstoneLight.java | 2 +- common/src/common/block/BlockRedstoneOre.java | 4 ++-- .../common/block/BlockRedstoneRepeater.java | 4 ++-- .../src/common/block/BlockRedstoneTorch.java | 4 ++-- .../src/common/block/BlockRedstoneWire.java | 6 ++--- common/src/common/block/BlockReed.java | 6 ++--- .../src/common/block/BlockRotatedPillar.java | 2 +- common/src/common/block/BlockSapling.java | 2 +- common/src/common/block/BlockSign.java | 4 ++-- common/src/common/block/BlockSkull.java | 6 ++--- common/src/common/block/BlockSlab.java | 8 +++---- common/src/common/block/BlockSlime.java | 2 +- common/src/common/block/BlockSnow.java | 6 ++--- common/src/common/block/BlockSnowBlock.java | 2 +- common/src/common/block/BlockSoulSand.java | 4 ++-- common/src/common/block/BlockSourceImpl.java | 2 +- common/src/common/block/BlockStairs.java | 10 ++++----- .../src/common/block/BlockStandingSign.java | 2 +- .../src/common/block/BlockStaticLiquid.java | 4 ++-- common/src/common/block/BlockStem.java | 4 ++-- common/src/common/block/BlockTNT.java | 4 ++-- common/src/common/block/BlockTallGrass.java | 2 +- common/src/common/block/BlockTianSoil.java | 2 +- common/src/common/block/BlockTorch.java | 10 ++++----- common/src/common/block/BlockTrapDoor.java | 10 ++++----- common/src/common/block/BlockTripWire.java | 6 ++--- .../src/common/block/BlockTripWireHook.java | 6 ++--- common/src/common/block/BlockVine.java | 6 ++--- common/src/common/block/BlockWall.java | 6 ++--- common/src/common/block/BlockWallSign.java | 4 ++-- common/src/common/block/BlockWarpChest.java | 4 ++-- common/src/common/block/BlockWart.java | 2 +- common/src/common/block/BlockWeb.java | 4 ++-- common/src/common/block/BlockWorkbench.java | 4 ++-- common/src/common/block/IGrowable.java | 2 +- .../src/common/clipboard/ClipboardPlacer.java | 4 ++-- common/src/common/color/Colorizer.java | 2 +- common/src/common/dimension/Dimension.java | 2 +- .../BehaviorDefaultDispenseItem.java | 2 +- .../dispenser/BehaviorProjectileDispense.java | 2 +- common/src/common/dispenser/IBlockSource.java | 2 +- common/src/common/entity/DataWatcher.java | 2 +- common/src/common/entity/Entity.java | 14 ++++++------ .../src/common/entity/animal/EntityBat.java | 2 +- .../common/entity/animal/EntityDragon.java | 2 +- .../src/common/entity/animal/EntityHorse.java | 2 +- .../src/common/entity/animal/EntityMouse.java | 2 +- .../common/entity/animal/EntityRabbit.java | 4 ++-- .../common/entity/effect/EntityLightning.java | 4 ++-- common/src/common/entity/item/EntityBoat.java | 4 ++-- common/src/common/entity/item/EntityCart.java | 6 ++--- .../entity/item/EntityCartContainer.java | 4 ++-- .../common/entity/item/EntityChestCart.java | 2 +- .../src/common/entity/item/EntityFalling.java | 4 ++-- .../common/entity/item/EntityHopperCart.java | 2 +- common/src/common/entity/item/EntityItem.java | 4 ++-- .../common/entity/item/EntityLeashKnot.java | 4 ++-- common/src/common/entity/item/EntityOrb.java | 2 +- .../src/common/entity/item/EntityTntCart.java | 2 +- common/src/common/entity/item/EntityXp.java | 4 ++-- .../common/entity/item/EntityXpBottle.java | 4 ++-- .../common/entity/npc/EntityArachnoid.java | 2 +- .../common/entity/npc/EntityCultivator.java | 2 +- .../common/entity/npc/EntityFlyingNPC.java | 4 ++-- common/src/common/entity/npc/EntityHuman.java | 2 +- common/src/common/entity/npc/EntityNPC.java | 12 +++++----- common/src/common/entity/npc/EntitySlime.java | 2 +- .../src/common/entity/npc/EntityZombie.java | 2 +- .../common/entity/npc/PlayerCharacter.java | 2 +- .../common/entity/projectile/EntityArrow.java | 8 +++---- .../common/entity/projectile/EntityBox.java | 2 +- .../entity/projectile/EntityBullet.java | 6 ++--- .../common/entity/projectile/EntityDie.java | 2 +- .../entity/projectile/EntityDynamite.java | 2 +- .../common/entity/projectile/EntityEgg.java | 2 +- .../entity/projectile/EntityFireCharge.java | 4 ++-- .../entity/projectile/EntityFireball.java | 2 +- .../common/entity/projectile/EntityHook.java | 8 +++---- .../entity/projectile/EntityPotion.java | 6 ++--- .../entity/projectile/EntityProjectile.java | 8 +++---- .../entity/projectile/EntitySnowball.java | 2 +- .../src/common/entity/types/EntityAnimal.java | 2 +- .../src/common/entity/types/EntityLiving.java | 6 ++--- .../common/entity/types/EntityThrowable.java | 8 +++---- common/src/common/init/DispenserRegistry.java | 4 ++-- common/src/common/init/ReorderRegistry.java | 4 ++-- common/src/common/init/RotationRegistry.java | 4 ++-- common/src/common/init/UniverseRegistry.java | 2 +- .../inventory/ContainerEnchantment.java | 2 +- .../src/common/inventory/ContainerRepair.java | 2 +- .../common/inventory/ContainerWorkbench.java | 2 +- .../src/common/inventory/ISidedInventory.java | 2 +- .../src/common/inventory/InventoryHelper.java | 2 +- .../common/inventory/InventoryWarpChest.java | 2 +- common/src/common/item/Item.java | 8 +++---- common/src/common/item/ItemArmor.java | 4 ++-- common/src/common/item/ItemBanHammer.java | 4 ++-- common/src/common/item/ItemBanner.java | 4 ++-- common/src/common/item/ItemBed.java | 4 ++-- common/src/common/item/ItemBlock.java | 4 ++-- common/src/common/item/ItemBoat.java | 8 +++---- common/src/common/item/ItemBucket.java | 6 ++--- common/src/common/item/ItemCamera.java | 2 +- common/src/common/item/ItemChargedOrb.java | 4 ++-- common/src/common/item/ItemDoor.java | 4 ++-- common/src/common/item/ItemDye.java | 4 ++-- common/src/common/item/ItemEditWand.java | 2 +- common/src/common/item/ItemFireball.java | 4 ++-- common/src/common/item/ItemFirework.java | 4 ++-- common/src/common/item/ItemFlintAndSteel.java | 4 ++-- common/src/common/item/ItemGlassBottle.java | 4 ++-- common/src/common/item/ItemHoe.java | 4 ++-- common/src/common/item/ItemInfoWand.java | 4 ++-- common/src/common/item/ItemLead.java | 6 ++--- common/src/common/item/ItemLightning.java | 2 +- common/src/common/item/ItemLilyPad.java | 4 ++-- common/src/common/item/ItemMagnet.java | 4 ++-- common/src/common/item/ItemMinecart.java | 4 ++-- common/src/common/item/ItemMonsterPlacer.java | 6 ++--- common/src/common/item/ItemNpcSpawner.java | 6 ++--- common/src/common/item/ItemRedstone.java | 4 ++-- common/src/common/item/ItemReed.java | 4 ++-- common/src/common/item/ItemSeedFood.java | 4 ++-- common/src/common/item/ItemSeeds.java | 4 ++-- common/src/common/item/ItemShears.java | 2 +- common/src/common/item/ItemSign.java | 4 ++-- common/src/common/item/ItemSkull.java | 4 ++-- common/src/common/item/ItemSlab.java | 4 ++-- common/src/common/item/ItemSnow.java | 6 ++--- .../src/common/item/ItemSpaceNavigator.java | 2 +- common/src/common/item/ItemStack.java | 4 ++-- common/src/common/item/ItemSword.java | 2 +- common/src/common/item/ItemTool.java | 2 +- common/src/common/item/ItemWand.java | 6 ++--- common/src/common/model/Model.java | 2 +- common/src/common/model/ModelProvider.java | 4 ++-- common/src/common/model/ModelRotation.java | 2 +- common/src/common/network/IClientPlayer.java | 2 +- common/src/common/network/IPlayer.java | 6 ++--- common/src/common/network/PacketBuffer.java | 2 +- common/src/common/packet/CPacketBreak.java | 4 ++-- common/src/common/packet/CPacketComplete.java | 2 +- common/src/common/packet/CPacketPlace.java | 2 +- common/src/common/packet/CPacketSign.java | 2 +- .../src/common/packet/S27PacketExplosion.java | 4 ++-- common/src/common/packet/S28PacketEffect.java | 2 +- .../common/packet/S2DPacketOpenWindow.java | 2 +- .../common/packet/S33PacketUpdateSign.java | 2 +- .../packet/S35PacketUpdateTileEntity.java | 2 +- .../packet/S36PacketSignEditorOpen.java | 2 +- .../src/common/packet/SPacketBlockAction.java | 2 +- .../common/packet/SPacketBlockBreakAnim.java | 2 +- .../src/common/packet/SPacketBlockChange.java | 2 +- .../common/packet/SPacketCharacterList.java | 2 +- .../packet/SPacketMultiBlockChange.java | 4 ++-- .../src/common/packet/SPacketSpawnObject.java | 4 ++-- .../src/common/pathfinding/NodeProcessor.java | 2 +- common/src/common/pathfinding/PathCache.java | 2 +- common/src/common/pathfinding/PathEntity.java | 2 +- common/src/common/pathfinding/PathFinder.java | 2 +- .../src/common/pathfinding/PathNavigate.java | 6 ++--- .../pathfinding/PathNavigateClimber.java | 2 +- .../pathfinding/PathNavigateGround.java | 4 ++-- .../common/pathfinding/SwimNodeProcessor.java | 4 ++-- .../common/pathfinding/WalkNodeProcessor.java | 2 +- .../common/properties/PropertyDirection.java | 2 +- common/src/common/tileentity/TileEntity.java | 2 +- .../common/tileentity/TileEntityBeacon.java | 4 ++-- .../tileentity/TileEntityBrewingStand.java | 2 +- .../common/tileentity/TileEntityChest.java | 6 ++--- .../common/tileentity/TileEntityFurnace.java | 2 +- .../common/tileentity/TileEntityHopper.java | 6 ++--- .../tileentity/TileEntityMobSpawner.java | 4 ++-- .../src/common/tileentity/TileEntityNote.java | 2 +- .../common/tileentity/TileEntityPiston.java | 4 ++-- .../src/common/{world => util}/BlockPos.java | 2 +- .../common/{world => util}/BoundingBox.java | 4 ++-- .../src/common/{world => util}/ChunkPos.java | 2 +- .../ClassInheritanceMultiMap.java | 2 +- common/src/common/{world => util}/Facing.java | 4 +--- .../common/{world => util}/HitPosition.java | 2 +- .../common/{world => util}/IntHashMap.java | 2 +- .../common/{world => util}/LongHashMap.java | 2 +- .../{world => util}/NextTickListEntry.java | 2 +- .../common/{world => util}/NibbleArray.java | 2 +- .../common/{world => util}/PortalType.java | 2 +- .../src/common/{world => util}/Position.java | 2 +- common/src/common/{world => util}/Vec3.java | 4 +--- common/src/common/{world => util}/Vec3i.java | 4 +--- .../src/common/{world => util}/WorldPos.java | 2 +- common/src/common/village/Village.java | 2 +- .../src/common/village/VillageCollection.java | 4 ++-- .../src/common/village/VillageDoorInfo.java | 4 ++-- common/src/common/world/BlockArray.java | 1 + common/src/common/world/Chunk.java | 6 +++++ common/src/common/world/ChunkCache.java | 2 ++ common/src/common/world/EmptyChunk.java | 2 ++ common/src/common/world/Explosion.java | 3 +++ common/src/common/world/IBlockAccess.java | 2 ++ common/src/common/world/IWorldAccess.java | 1 + common/src/common/world/Region.java | 3 +++ common/src/common/world/Spawner.java | 2 ++ common/src/common/world/World.java | 7 ++++++ common/src/common/world/WorldClient.java | 6 ++++- common/src/common/world/WorldServer.java | 9 ++++++++ .../src/common/worldgen/BiomeGenLayered.java | 4 ++-- .../src/common/worldgen/BiomeGenSingle.java | 2 +- .../src/common/worldgen/BiomeGenerator.java | 2 +- .../src/common/worldgen/FeatureDungeons.java | 4 ++-- .../src/common/worldgen/FeatureGenerator.java | 2 +- common/src/common/worldgen/FeatureLakes.java | 2 +- .../src/common/worldgen/FeatureLiquids.java | 2 +- common/src/common/worldgen/FeatureOres.java | 2 +- .../common/worldgen/caves/MapGenCaves.java | 2 +- .../common/worldgen/caves/MapGenRavine.java | 2 +- .../feature/WorldGenAbandonedChest.java | 2 +- .../worldgen/feature/WorldGenAsteroid.java | 2 +- .../worldgen/feature/WorldGenBlockBlob.java | 2 +- .../common/worldgen/feature/WorldGenClay.java | 2 +- .../worldgen/feature/WorldGenClayExt.java | 2 +- .../worldgen/feature/WorldGenDesertWells.java | 4 ++-- .../common/worldgen/feature/WorldGenFire.java | 2 +- .../worldgen/feature/WorldGenGlowStone.java | 4 ++-- .../worldgen/feature/WorldGenHellLava.java | 2 +- .../worldgen/feature/WorldGenIcePath.java | 2 +- .../worldgen/feature/WorldGenIceSpike.java | 2 +- .../common/worldgen/feature/WorldGenSand.java | 2 +- .../worldgen/feature/WorldGenSpikes.java | 2 +- .../worldgen/foliage/FeatureDoublePlant.java | 2 +- .../worldgen/foliage/WorldGenBigMushroom.java | 2 +- .../worldgen/foliage/WorldGenCactus.java | 2 +- .../worldgen/foliage/WorldGenDeadBush.java | 2 +- .../worldgen/foliage/WorldGenFlowers.java | 2 +- .../worldgen/foliage/WorldGenMelon.java | 2 +- .../worldgen/foliage/WorldGenMushroom.java | 2 +- .../worldgen/foliage/WorldGenPumpkin.java | 4 ++-- .../common/worldgen/foliage/WorldGenReed.java | 2 +- .../worldgen/foliage/WorldGenShrub.java | 2 +- .../worldgen/foliage/WorldGenTallGrass.java | 2 +- .../worldgen/foliage/WorldGenVines.java | 4 ++-- .../worldgen/foliage/WorldGenWaterlily.java | 4 ++-- .../structure/MapGenScatteredFeature.java | 2 +- .../worldgen/structure/MapGenStructure.java | 6 ++--- .../structure/StructureBoundingBox.java | 6 ++--- .../worldgen/structure/StructureBridge.java | 4 ++-- .../structure/StructureComponent.java | 4 ++-- .../structure/StructureMineshaft.java | 4 ++-- .../structure/StructureScattered.java | 4 ++-- .../worldgen/structure/StructureStart.java | 2 +- .../structure/StructureStronghold.java | 4 ++-- .../worldgen/structure/StructureVillage.java | 4 ++-- .../worldgen/tree/WorldGenBaseTree.java | 4 ++-- .../common/worldgen/tree/WorldGenBigTree.java | 2 +- .../common/worldgen/tree/WorldGenBirch.java | 2 +- .../common/worldgen/tree/WorldGenDarkOak.java | 4 ++-- .../worldgen/tree/WorldGenHugeTree.java | 2 +- .../common/worldgen/tree/WorldGenJungle.java | 2 +- .../common/worldgen/tree/WorldGenPine.java | 2 +- .../common/worldgen/tree/WorldGenSavanna.java | 4 ++-- .../common/worldgen/tree/WorldGenSwamp.java | 2 +- .../common/worldgen/tree/WorldGenTaiga1.java | 2 +- .../common/worldgen/tree/WorldGenTaiga2.java | 2 +- .../common/worldgen/tree/WorldGenTree.java | 2 +- server/src/server/Server.java | 8 +++---- server/src/server/command/Command.java | 2 +- .../src/server/command/DimensionParser.java | 2 +- server/src/server/command/DoubleParser.java | 4 ++-- server/src/server/command/Executor.java | 4 ++-- server/src/server/command/FixedExecutor.java | 4 ++-- .../command/commands/CommandOfflinetp.java | 2 +- .../server/command/commands/CommandSpawn.java | 2 +- .../server/command/commands/CommandTele.java | 2 +- .../server/command/commands/CommandTime.java | 2 +- .../server/command/commands/CommandTp.java | 2 +- .../server/command/commands/CommandWarp.java | 2 +- .../server/command/commands/CommandWorld.java | 2 +- server/src/server/network/Player.java | 18 +++++++-------- 461 files changed, 837 insertions(+), 807 deletions(-) delete mode 100644 client/src/client/init/AnimationRegistry.java rename client/src/client/init/{EntityRenderRegistry.java => RenderRegistry.java} (91%) rename common/src/common/{world => util}/BlockPos.java (99%) rename common/src/common/{world => util}/BoundingBox.java (99%) rename common/src/common/{world => util}/ChunkPos.java (96%) rename common/src/common/{world => util}/ClassInheritanceMultiMap.java (99%) rename common/src/common/{world => util}/Facing.java (99%) rename common/src/common/{world => util}/HitPosition.java (97%) rename common/src/common/{world => util}/IntHashMap.java (99%) rename common/src/common/{world => util}/LongHashMap.java (99%) rename common/src/common/{world => util}/NextTickListEntry.java (98%) rename common/src/common/{world => util}/NibbleArray.java (97%) rename common/src/common/{world => util}/PortalType.java (86%) rename common/src/common/{world => util}/Position.java (94%) rename common/src/common/{world => util}/Vec3.java (99%) rename common/src/common/{world => util}/Vec3i.java (98%) rename common/src/common/{world => util}/WorldPos.java (97%) diff --git a/client/src/client/Game.java b/client/src/client/Game.java index f36f055..f754b50 100755 --- a/client/src/client/Game.java +++ b/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.world.BoundingBox; +import common.util.HitPosition.ObjectType; 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 ... diff --git a/client/src/client/PlayerController.java b/client/src/client/PlayerController.java index 579c38a..e6c48f4 100755 --- a/client/src/client/PlayerController.java +++ b/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.world.Facing; +import common.util.BlockPos; +import common.util.Facing; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; diff --git a/client/src/client/gui/GuiConsole.java b/client/src/client/gui/GuiConsole.java index 2bd506f..dafb2e7 100644 --- a/client/src/client/gui/GuiConsole.java +++ b/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.world.HitPosition; +import common.util.HitPosition; public class GuiConsole extends Gui implements Textbox.Callback { public static final GuiConsole INSTANCE = new GuiConsole(); diff --git a/client/src/client/gui/container/GuiCrafting.java b/client/src/client/gui/container/GuiCrafting.java index e206188..d38e913 100755 --- a/client/src/client/gui/container/GuiCrafting.java +++ b/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 diff --git a/client/src/client/gui/ingame/GuiSign.java b/client/src/client/gui/ingame/GuiSign.java index fbdfb60..457c151 100644 --- a/client/src/client/gui/ingame/GuiSign.java +++ b/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; diff --git a/client/src/client/init/AnimationRegistry.java b/client/src/client/init/AnimationRegistry.java deleted file mode 100644 index 4120fbb..0000000 --- a/client/src/client/init/AnimationRegistry.java +++ /dev/null @@ -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> 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); - } -} diff --git a/client/src/client/init/EntityRenderRegistry.java b/client/src/client/init/RenderRegistry.java similarity index 91% rename from client/src/client/init/EntityRenderRegistry.java rename to client/src/client/init/RenderRegistry.java index 2abdd41..d57d794 100644 --- a/client/src/client/init/EntityRenderRegistry.java +++ b/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, Render> map, Map 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> 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); + } } diff --git a/client/src/client/network/ClientPlayer.java b/client/src/client/network/ClientPlayer.java index 76fbc35..92b1b2e 100755 --- a/client/src/client/network/ClientPlayer.java +++ b/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; diff --git a/client/src/client/renderer/ActiveRenderInfo.java b/client/src/client/renderer/ActiveRenderInfo.java index fc8a9ef..653eff6 100755 --- a/client/src/client/renderer/ActiveRenderInfo.java +++ b/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 diff --git a/client/src/client/renderer/BlockRenderer.java b/client/src/client/renderer/BlockRenderer.java index ba4e8d1..073fcd6 100755 --- a/client/src/client/renderer/BlockRenderer.java +++ b/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.world.Facing; +import common.util.Facing; +import common.util.Vec3i; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3i; public class BlockRenderer { diff --git a/client/src/client/renderer/EntityRenderer.java b/client/src/client/renderer/EntityRenderer.java index 94152e2..7f5d177 100755 --- a/client/src/client/renderer/EntityRenderer.java +++ b/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.world.BoundingBox; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; import common.world.WorldClient; diff --git a/client/src/client/renderer/Frustum.java b/client/src/client/renderer/Frustum.java index ba0a6f5..581321b 100755 --- a/client/src/client/renderer/Frustum.java +++ b/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 { diff --git a/client/src/client/renderer/ItemRenderer.java b/client/src/client/renderer/ItemRenderer.java index 559e6a0..1a24321 100755 --- a/client/src/client/renderer/ItemRenderer.java +++ b/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 diff --git a/client/src/client/renderer/RegionRenderCache.java b/client/src/client/renderer/RegionRenderCache.java index 91c66d6..635a77a 100755 --- a/client/src/client/renderer/RegionRenderCache.java +++ b/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 diff --git a/client/src/client/renderer/RenderGlobal.java b/client/src/client/renderer/RenderGlobal.java index c1a1d9d..1dfe3a1 100755 --- a/client/src/client/renderer/RenderGlobal.java +++ b/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 diff --git a/client/src/client/renderer/ViewFrustum.java b/client/src/client/renderer/ViewFrustum.java index e4d4980..df65bd6 100755 --- a/client/src/client/renderer/ViewFrustum.java +++ b/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 diff --git a/client/src/client/renderer/blockmodel/BakedModel.java b/client/src/client/renderer/blockmodel/BakedModel.java index 5a25ef0..d383523 100755 --- a/client/src/client/renderer/blockmodel/BakedModel.java +++ b/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 { diff --git a/client/src/client/renderer/blockmodel/BakedQuad.java b/client/src/client/renderer/blockmodel/BakedQuad.java index faefddb..e50b3d0 100755 --- a/client/src/client/renderer/blockmodel/BakedQuad.java +++ b/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; diff --git a/client/src/client/renderer/blockmodel/BlockPart.java b/client/src/client/renderer/blockmodel/BlockPart.java index f3a03e7..830f491 100755 --- a/client/src/client/renderer/blockmodel/BlockPart.java +++ b/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 { diff --git a/client/src/client/renderer/blockmodel/BlockPartFace.java b/client/src/client/renderer/blockmodel/BlockPartFace.java index 9d7e0fd..03791d7 100755 --- a/client/src/client/renderer/blockmodel/BlockPartFace.java +++ b/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; diff --git a/client/src/client/renderer/blockmodel/BlockPartRotation.java b/client/src/client/renderer/blockmodel/BlockPartRotation.java index b3cfbea..7bde7ed 100755 --- a/client/src/client/renderer/blockmodel/BlockPartRotation.java +++ b/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; diff --git a/client/src/client/renderer/blockmodel/BuiltInModel.java b/client/src/client/renderer/blockmodel/BuiltInModel.java index 7c9c306..802fcc9 100755 --- a/client/src/client/renderer/blockmodel/BuiltInModel.java +++ b/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 { diff --git a/client/src/client/renderer/blockmodel/FaceBakery.java b/client/src/client/renderer/blockmodel/FaceBakery.java index 09fd515..cb73b49 100755 --- a/client/src/client/renderer/blockmodel/FaceBakery.java +++ b/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 { diff --git a/client/src/client/renderer/blockmodel/IBakedModel.java b/client/src/client/renderer/blockmodel/IBakedModel.java index 7e5b482..490f71b 100755 --- a/client/src/client/renderer/blockmodel/IBakedModel.java +++ b/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 { diff --git a/client/src/client/renderer/blockmodel/ModelBakery.java b/client/src/client/renderer/blockmodel/ModelBakery.java index ef9e54c..aaa55a3 100755 --- a/client/src/client/renderer/blockmodel/ModelBakery.java +++ b/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 diff --git a/client/src/client/renderer/blockmodel/ModelBlock.java b/client/src/client/renderer/blockmodel/ModelBlock.java index c54e391..69504fa 100755 --- a/client/src/client/renderer/blockmodel/ModelBlock.java +++ b/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() { diff --git a/client/src/client/renderer/blockmodel/ModelGenerator.java b/client/src/client/renderer/blockmodel/ModelGenerator.java index 178a13a..9e4ccc6 100755 --- a/client/src/client/renderer/blockmodel/ModelGenerator.java +++ b/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 LAYERS = Lists.newArrayList("layer0", "layer1", "layer2", "layer3", "layer4"); diff --git a/client/src/client/renderer/chunk/CompiledChunk.java b/client/src/client/renderer/chunk/CompiledChunk.java index bdd2a33..7155915 100755 --- a/client/src/client/renderer/chunk/CompiledChunk.java +++ b/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 { diff --git a/client/src/client/renderer/chunk/RenderChunk.java b/client/src/client/renderer/chunk/RenderChunk.java index c014e18..9e02136 100755 --- a/client/src/client/renderer/chunk/RenderChunk.java +++ b/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.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/client/src/client/renderer/chunk/SetVisibility.java b/client/src/client/renderer/chunk/SetVisibility.java index edbb073..3dfdebc 100755 --- a/client/src/client/renderer/chunk/SetVisibility.java +++ b/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 { diff --git a/client/src/client/renderer/chunk/VisGraph.java b/client/src/client/renderer/chunk/VisGraph.java index 2294ec1..ebca265 100755 --- a/client/src/client/renderer/chunk/VisGraph.java +++ b/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.world.Facing; +import common.util.BlockPos; +import common.util.Facing; public class VisGraph { diff --git a/client/src/client/renderer/entity/Render.java b/client/src/client/renderer/entity/Render.java index 74f181f..7c2a5e0 100755 --- a/client/src/client/renderer/entity/Render.java +++ b/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.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.World; public abstract class Render diff --git a/client/src/client/renderer/entity/RenderFallingBlock.java b/client/src/client/renderer/entity/RenderFallingBlock.java index 5f12f22..b440c26 100755 --- a/client/src/client/renderer/entity/RenderFallingBlock.java +++ b/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; diff --git a/client/src/client/renderer/entity/RenderFish.java b/client/src/client/renderer/entity/RenderFish.java index c9537ab..a053261 100755 --- a/client/src/client/renderer/entity/RenderFish.java +++ b/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 { diff --git a/client/src/client/renderer/entity/RenderItem.java b/client/src/client/renderer/entity/RenderItem.java index b881350..d1ab920 100755 --- a/client/src/client/renderer/entity/RenderItem.java +++ b/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.world.Vec3i; +import common.util.Facing; +import common.util.Vec3i; public class RenderItem { diff --git a/client/src/client/renderer/entity/RenderManager.java b/client/src/client/renderer/entity/RenderManager.java index f88738d..065cb0d 100755 --- a/client/src/client/renderer/entity/RenderManager.java +++ b/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.world.Vec3; +import common.util.BoundingBox; +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(); } diff --git a/client/src/client/renderer/entity/RenderMinecart.java b/client/src/client/renderer/entity/RenderMinecart.java index 24255f9..050e8d2 100755 --- a/client/src/client/renderer/entity/RenderMinecart.java +++ b/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 extends Render { diff --git a/client/src/client/renderer/model/ModelBox.java b/client/src/client/renderer/model/ModelBox.java index 091e341..354eaea 100755 --- a/client/src/client/renderer/model/ModelBox.java +++ b/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.world.Vec3; +import common.util.Facing; +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) { diff --git a/client/src/client/renderer/model/PositionTextureVertex.java b/client/src/client/renderer/model/PositionTextureVertex.java index 8346105..4cde066 100755 --- a/client/src/client/renderer/model/PositionTextureVertex.java +++ b/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 { diff --git a/client/src/client/renderer/model/TexturedQuad.java b/client/src/client/renderer/model/TexturedQuad.java index 53ec9a5..12da9c3 100755 --- a/client/src/client/renderer/model/TexturedQuad.java +++ b/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 { diff --git a/client/src/client/renderer/particle/EffectRenderer.java b/client/src/client/renderer/particle/EffectRenderer.java index c1624c4..5d6ea5f 100755 --- a/client/src/client/renderer/particle/EffectRenderer.java +++ b/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.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/client/src/client/renderer/particle/EntityBubbleFX.java b/client/src/client/renderer/particle/EntityBubbleFX.java index c21ba62..44c03f7 100755 --- a/client/src/client/renderer/particle/EntityBubbleFX.java +++ b/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 diff --git a/client/src/client/renderer/particle/EntityDiggingFX.java b/client/src/client/renderer/particle/EntityDiggingFX.java index 8e3e89d..84ec999 100755 --- a/client/src/client/renderer/particle/EntityDiggingFX.java +++ b/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; diff --git a/client/src/client/renderer/particle/EntityDownfallFX.java b/client/src/client/renderer/particle/EntityDownfallFX.java index c321d6b..b2bd951 100755 --- a/client/src/client/renderer/particle/EntityDownfallFX.java +++ b/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; diff --git a/client/src/client/renderer/particle/EntityDropParticleFX.java b/client/src/client/renderer/particle/EntityDropParticleFX.java index 8409e31..90542cd 100755 --- a/client/src/client/renderer/particle/EntityDropParticleFX.java +++ b/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; diff --git a/client/src/client/renderer/particle/EntityFirework.java b/client/src/client/renderer/particle/EntityFirework.java index 078c6fc..c34b444 100755 --- a/client/src/client/renderer/particle/EntityFirework.java +++ b/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; diff --git a/client/src/client/renderer/particle/EntityFootStepFX.java b/client/src/client/renderer/particle/EntityFootStepFX.java index d8d47e9..5835284 100755 --- a/client/src/client/renderer/particle/EntityFootStepFX.java +++ b/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 diff --git a/client/src/client/renderer/particle/EntitySuspendFX.java b/client/src/client/renderer/particle/EntitySuspendFX.java index aae9b5e..4047b03 100755 --- a/client/src/client/renderer/particle/EntitySuspendFX.java +++ b/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 diff --git a/client/src/client/renderer/texture/TextureMap.java b/client/src/client/renderer/texture/TextureMap.java index afe4afd..5e5c2ee 100755 --- a/client/src/client/renderer/texture/TextureMap.java +++ b/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 map = Maps.newHashMap(); Map> anim = Maps.newHashMap(); - AnimationRegistry.registerAnimations(anim); + RenderRegistry.registerAnimations(anim); for(Block block : BlockRegistry.REGISTRY) { block.getAnimatedTextures(map); } diff --git a/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java b/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java index 3e38162..bfa5ad0 100755 --- a/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java +++ b/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 { diff --git a/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java index ed89a94..df617b0 100755 --- a/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java +++ b/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 { diff --git a/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java b/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java index 9d0bfe7..eccb970 100755 --- a/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java +++ b/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; diff --git a/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java b/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java index 1bf7bdc..d491221 100755 --- a/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java +++ b/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 diff --git a/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java b/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java index 86478f3..9cd2628 100755 --- a/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java +++ b/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 diff --git a/client/src/client/world/Converter.java b/client/src/client/world/Converter.java index 6a81987..f89812d 100644 --- a/client/src/client/world/Converter.java +++ b/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.world.NibbleArray; +import common.util.Facing; +import common.util.NibbleArray; import common.world.Region; import common.world.State; import common.world.Weather; diff --git a/common/src/common/IClient.java b/common/src/common/IClient.java index 1e0ed74..6d050f4 100644 --- a/common/src/common/IClient.java +++ b/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 { diff --git a/common/src/common/IServer.java b/common/src/common/IServer.java index cd3fd18..c3fc135 100644 --- a/common/src/common/IServer.java +++ b/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.world.PortalType; -import common.world.Position; +import common.util.BlockPos; +import common.util.PortalType; +import common.util.Position; import common.world.WorldServer; public interface IServer { diff --git a/common/src/common/ai/AIFireballAttack.java b/common/src/common/ai/AIFireballAttack.java index 6790164..87a3b8d 100755 --- a/common/src/common/ai/AIFireballAttack.java +++ b/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.world.Vec3; +import common.util.BlockPos; +import common.util.Vec3; import common.world.World; public class AIFireballAttack extends EntityAIBase diff --git a/common/src/common/ai/AIFlyingBoxAttack.java b/common/src/common/ai/AIFlyingBoxAttack.java index 4477be0..444a1dd 100755 --- a/common/src/common/ai/AIFlyingBoxAttack.java +++ b/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 { diff --git a/common/src/common/ai/AISmallFireballAttack.java b/common/src/common/ai/AISmallFireballAttack.java index 9bdbd59..ed9c9b2 100755 --- a/common/src/common/ai/AISmallFireballAttack.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIAttackOnCollide.java b/common/src/common/ai/EntityAIAttackOnCollide.java index 26ab783..ba225f2 100755 --- a/common/src/common/ai/EntityAIAttackOnCollide.java +++ b/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 diff --git a/common/src/common/ai/EntityAIAvoidEntity.java b/common/src/common/ai/EntityAIAvoidEntity.java index 90cd980..2e26f2b 100755 --- a/common/src/common/ai/EntityAIAvoidEntity.java +++ b/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 extends EntityAIBase { diff --git a/common/src/common/ai/EntityAIControlledByPlayer.java b/common/src/common/ai/EntityAIControlledByPlayer.java index 4975645..320f4d1 100755 --- a/common/src/common/ai/EntityAIControlledByPlayer.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIDoorInteract.java b/common/src/common/ai/EntityAIDoorInteract.java index e45f438..c6a7538 100755 --- a/common/src/common/ai/EntityAIDoorInteract.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIEatGrass.java b/common/src/common/ai/EntityAIEatGrass.java index 5930c11..f04e8fd 100755 --- a/common/src/common/ai/EntityAIEatGrass.java +++ b/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; diff --git a/common/src/common/ai/EntityAIFleeSun.java b/common/src/common/ai/EntityAIFleeSun.java index d6e9733..0347580 100755 --- a/common/src/common/ai/EntityAIFleeSun.java +++ b/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.world.Vec3; +import common.util.BlockPos; +import common.util.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/ai/EntityAIHarvestFarmland.java b/common/src/common/ai/EntityAIHarvestFarmland.java index 3bcc9a9..9ea311b 100755 --- a/common/src/common/ai/EntityAIHarvestFarmland.java +++ b/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 diff --git a/common/src/common/ai/EntityAIHurtByTarget.java b/common/src/common/ai/EntityAIHurtByTarget.java index 096dd21..c4ae5e8 100755 --- a/common/src/common/ai/EntityAIHurtByTarget.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIMoveIndoors.java b/common/src/common/ai/EntityAIMoveIndoors.java index 609f82e..0348347 100755 --- a/common/src/common/ai/EntityAIMoveIndoors.java +++ b/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 diff --git a/common/src/common/ai/EntityAIMoveThroughVillage.java b/common/src/common/ai/EntityAIMoveThroughVillage.java index ac2428f..be583f8 100755 --- a/common/src/common/ai/EntityAIMoveThroughVillage.java +++ b/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 diff --git a/common/src/common/ai/EntityAIMoveToBlock.java b/common/src/common/ai/EntityAIMoveToBlock.java index 83f1416..2eb4c0f 100755 --- a/common/src/common/ai/EntityAIMoveToBlock.java +++ b/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 diff --git a/common/src/common/ai/EntityAIMoveTowardsRestriction.java b/common/src/common/ai/EntityAIMoveTowardsRestriction.java index daf2b9b..5df934d 100755 --- a/common/src/common/ai/EntityAIMoveTowardsRestriction.java +++ b/common/src/common/ai/EntityAIMoveTowardsRestriction.java @@ -1,8 +1,8 @@ package common.ai; import common.entity.types.EntityLiving; -import common.world.BlockPos; -import common.world.Vec3; +import common.util.BlockPos; +import common.util.Vec3; public class EntityAIMoveTowardsRestriction extends EntityAIBase { diff --git a/common/src/common/ai/EntityAIMoveTowardsTarget.java b/common/src/common/ai/EntityAIMoveTowardsTarget.java index eaff1e3..a77254d 100755 --- a/common/src/common/ai/EntityAIMoveTowardsTarget.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIOcelotSit.java b/common/src/common/ai/EntityAIOcelotSit.java index f6d329d..aa46aa0 100755 --- a/common/src/common/ai/EntityAIOcelotSit.java +++ b/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; diff --git a/common/src/common/ai/EntityAIPanic.java b/common/src/common/ai/EntityAIPanic.java index ab28240..7848752 100755 --- a/common/src/common/ai/EntityAIPanic.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIPlay.java b/common/src/common/ai/EntityAIPlay.java index 38363e6..f64d219 100755 --- a/common/src/common/ai/EntityAIPlay.java +++ b/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; diff --git a/common/src/common/ai/EntityAIRestrictOpenDoor.java b/common/src/common/ai/EntityAIRestrictOpenDoor.java index c89644b..d7a94c4 100755 --- a/common/src/common/ai/EntityAIRestrictOpenDoor.java +++ b/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 diff --git a/common/src/common/ai/EntityAIRunAroundLikeCrazy.java b/common/src/common/ai/EntityAIRunAroundLikeCrazy.java index 9b02e75..08680dd 100755 --- a/common/src/common/ai/EntityAIRunAroundLikeCrazy.java +++ b/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 { diff --git a/common/src/common/ai/EntityAITakePlace.java b/common/src/common/ai/EntityAITakePlace.java index bde8a0a..e4fc53e 100755 --- a/common/src/common/ai/EntityAITakePlace.java +++ b/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; diff --git a/common/src/common/ai/EntityAITarget.java b/common/src/common/ai/EntityAITarget.java index 7890657..2c6b33b 100755 --- a/common/src/common/ai/EntityAITarget.java +++ b/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 { diff --git a/common/src/common/ai/EntityAIWander.java b/common/src/common/ai/EntityAIWander.java index f1ae22a..79067a6 100755 --- a/common/src/common/ai/EntityAIWander.java +++ b/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 { diff --git a/common/src/common/ai/RandomPositionGenerator.java b/common/src/common/ai/RandomPositionGenerator.java index 74c03ed..54b1bae 100755 --- a/common/src/common/ai/RandomPositionGenerator.java +++ b/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.world.Vec3; +import common.util.Vec3; public class RandomPositionGenerator { diff --git a/common/src/common/biome/Biome.java b/common/src/common/biome/Biome.java index cabe35b..bfb66bb 100755 --- a/common/src/common/biome/Biome.java +++ b/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; diff --git a/common/src/common/biome/BiomeBlackened.java b/common/src/common/biome/BiomeBlackened.java index 082be75..ffe2256 100644 --- a/common/src/common/biome/BiomeBlackened.java +++ b/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; diff --git a/common/src/common/biome/BiomeChaos.java b/common/src/common/biome/BiomeChaos.java index a068043..d2353c7 100755 --- a/common/src/common/biome/BiomeChaos.java +++ b/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; diff --git a/common/src/common/biome/BiomeDesert.java b/common/src/common/biome/BiomeDesert.java index 56da83c..0890481 100755 --- a/common/src/common/biome/BiomeDesert.java +++ b/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; diff --git a/common/src/common/biome/BiomeExterminated.java b/common/src/common/biome/BiomeExterminated.java index 837aaaf..1ca72d5 100755 --- a/common/src/common/biome/BiomeExterminated.java +++ b/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 { diff --git a/common/src/common/biome/BiomeForest.java b/common/src/common/biome/BiomeForest.java index 183668b..9c30b45 100755 --- a/common/src/common/biome/BiomeForest.java +++ b/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; diff --git a/common/src/common/biome/BiomeHell.java b/common/src/common/biome/BiomeHell.java index 0591795..d19e23c 100755 --- a/common/src/common/biome/BiomeHell.java +++ b/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; diff --git a/common/src/common/biome/BiomeHills.java b/common/src/common/biome/BiomeHills.java index 125e977..578fcab 100755 --- a/common/src/common/biome/BiomeHills.java +++ b/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; diff --git a/common/src/common/biome/BiomeJungle.java b/common/src/common/biome/BiomeJungle.java index dbbc6d6..09c52dc 100755 --- a/common/src/common/biome/BiomeJungle.java +++ b/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; diff --git a/common/src/common/biome/BiomeMesa.java b/common/src/common/biome/BiomeMesa.java index 29c92b7..a42e388 100755 --- a/common/src/common/biome/BiomeMesa.java +++ b/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; diff --git a/common/src/common/biome/BiomeMoon.java b/common/src/common/biome/BiomeMoon.java index 297eabe..ded8deb 100755 --- a/common/src/common/biome/BiomeMoon.java +++ b/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; diff --git a/common/src/common/biome/BiomeMutated.java b/common/src/common/biome/BiomeMutated.java index d0d5f7b..630b885 100755 --- a/common/src/common/biome/BiomeMutated.java +++ b/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; diff --git a/common/src/common/biome/BiomeNone.java b/common/src/common/biome/BiomeNone.java index 9c84a6f..27b2a97 100755 --- a/common/src/common/biome/BiomeNone.java +++ b/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; diff --git a/common/src/common/biome/BiomePlains.java b/common/src/common/biome/BiomePlains.java index f652fb5..d74d85a 100755 --- a/common/src/common/biome/BiomePlains.java +++ b/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 diff --git a/common/src/common/biome/BiomeSavanna.java b/common/src/common/biome/BiomeSavanna.java index aae7642..fe9f069 100755 --- a/common/src/common/biome/BiomeSavanna.java +++ b/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; diff --git a/common/src/common/biome/BiomeSnow.java b/common/src/common/biome/BiomeSnow.java index 5e0e697..695ac5d 100755 --- a/common/src/common/biome/BiomeSnow.java +++ b/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; diff --git a/common/src/common/biome/BiomeSpace.java b/common/src/common/biome/BiomeSpace.java index da3953e..a2ebccb 100755 --- a/common/src/common/biome/BiomeSpace.java +++ b/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; diff --git a/common/src/common/biome/BiomeSwamp.java b/common/src/common/biome/BiomeSwamp.java index 41a39a3..b708632 100755 --- a/common/src/common/biome/BiomeSwamp.java +++ b/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.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.ChunkPrimer; import common.worldgen.tree.WorldGenTree; diff --git a/common/src/common/biome/BiomeTaiga.java b/common/src/common/biome/BiomeTaiga.java index 2281c1d..5680a75 100755 --- a/common/src/common/biome/BiomeTaiga.java +++ b/common/src/common/biome/BiomeTaiga.java @@ -6,7 +6,7 @@ import common.block.BlockTallGrass; import common.entity.animal.EntityWolf; 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.FeatureGenerator; diff --git a/common/src/common/biome/BiomeTian.java b/common/src/common/biome/BiomeTian.java index 933eaf3..eae35ef 100755 --- a/common/src/common/biome/BiomeTian.java +++ b/common/src/common/biome/BiomeTian.java @@ -8,7 +8,7 @@ import common.entity.npc.EntityCultivator; 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.WorldGenSpikes; diff --git a/common/src/common/block/Block.java b/common/src/common/block/Block.java index 92d3ab9..484a05f 100755 --- a/common/src/common/block/Block.java +++ b/common/src/common/block/Block.java @@ -36,20 +36,20 @@ import common.model.Transforms; import common.properties.IProperty; import common.rng.Random; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; +import common.util.Vec3; +import common.util.HitPosition.ObjectType; import common.world.Explosion; -import common.world.Facing; -import common.world.HitPosition; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; import common.world.WorldServer; -import common.world.HitPosition.ObjectType; public class Block { diff --git a/common/src/common/block/BlockAir.java b/common/src/common/block/BlockAir.java index f0c60bb..e0a27ff 100755 --- a/common/src/common/block/BlockAir.java +++ b/common/src/common/block/BlockAir.java @@ -1,8 +1,8 @@ package common.block; import common.material.Material; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockAnvil.java b/common/src/common/block/BlockAnvil.java index f7519e3..6b9406f 100755 --- a/common/src/common/block/BlockAnvil.java +++ b/common/src/common/block/BlockAnvil.java @@ -20,8 +20,8 @@ import common.properties.IProperty; import common.properties.PropertyDirection; import common.properties.PropertyInteger; import common.tileentity.IInteractionObject; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockBanner.java b/common/src/common/block/BlockBanner.java index 2994082..b025774 100755 --- a/common/src/common/block/BlockBanner.java +++ b/common/src/common/block/BlockBanner.java @@ -13,9 +13,9 @@ import common.properties.PropertyInteger; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityBanner; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockBasePressurePlate.java b/common/src/common/block/BlockBasePressurePlate.java index 339f4c2..d8e1366 100755 --- a/common/src/common/block/BlockBasePressurePlate.java +++ b/common/src/common/block/BlockBasePressurePlate.java @@ -7,9 +7,9 @@ import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockBeacon.java b/common/src/common/block/BlockBeacon.java index 7ac615b..2032c67 100755 --- a/common/src/common/block/BlockBeacon.java +++ b/common/src/common/block/BlockBeacon.java @@ -8,8 +8,8 @@ import common.model.Model; import common.model.ModelProvider; import common.tileentity.TileEntity; import common.tileentity.TileEntityBeacon; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockBed.java b/common/src/common/block/BlockBed.java index f602551..02e759e 100755 --- a/common/src/common/block/BlockBed.java +++ b/common/src/common/block/BlockBed.java @@ -13,13 +13,13 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; +import common.util.WorldPos; import common.world.IWorldAccess; import common.world.State; import common.world.World; -import common.world.WorldPos; public class BlockBed extends BlockDirectional { public static enum EnumPartType implements Identifyable { diff --git a/common/src/common/block/BlockBedrock.java b/common/src/common/block/BlockBedrock.java index 78c30f7..0ea00ba 100755 --- a/common/src/common/block/BlockBedrock.java +++ b/common/src/common/block/BlockBedrock.java @@ -3,7 +3,7 @@ package common.block; import common.material.Material; import common.model.ParticleType; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldClient; diff --git a/common/src/common/block/BlockBlackenedDirt.java b/common/src/common/block/BlockBlackenedDirt.java index e3552c5..ac5909c 100644 --- a/common/src/common/block/BlockBlackenedDirt.java +++ b/common/src/common/block/BlockBlackenedDirt.java @@ -5,7 +5,7 @@ import common.init.Config; import common.item.CheatTab; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/block/BlockBlackenedSoil.java b/common/src/common/block/BlockBlackenedSoil.java index 7918522..a77664e 100644 --- a/common/src/common/block/BlockBlackenedSoil.java +++ b/common/src/common/block/BlockBlackenedSoil.java @@ -8,7 +8,7 @@ import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/block/BlockBlueShroom.java b/common/src/common/block/BlockBlueShroom.java index 7e9b87c..d0097d9 100755 --- a/common/src/common/block/BlockBlueShroom.java +++ b/common/src/common/block/BlockBlueShroom.java @@ -5,7 +5,7 @@ import common.init.Config; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockBreakable.java b/common/src/common/block/BlockBreakable.java index e60acea..23a1c5d 100755 --- a/common/src/common/block/BlockBreakable.java +++ b/common/src/common/block/BlockBreakable.java @@ -2,8 +2,8 @@ package common.block; import common.init.Blocks; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockBrewingStand.java b/common/src/common/block/BlockBrewingStand.java index 4de9271..beb51cd 100755 --- a/common/src/common/block/BlockBrewingStand.java +++ b/common/src/common/block/BlockBrewingStand.java @@ -20,9 +20,9 @@ import common.properties.PropertyBool; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityBrewingStand; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/block/BlockBush.java b/common/src/common/block/BlockBush.java index 79b8a13..94ff784 100755 --- a/common/src/common/block/BlockBush.java +++ b/common/src/common/block/BlockBush.java @@ -5,8 +5,8 @@ import common.item.CheatTab; import common.material.Material; import common.model.BlockLayer; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockButton.java b/common/src/common/block/BlockButton.java index ea3415a..4c655c0 100755 --- a/common/src/common/block/BlockButton.java +++ b/common/src/common/block/BlockButton.java @@ -18,9 +18,9 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockCactus.java b/common/src/common/block/BlockCactus.java index 03777da..1ab3926 100755 --- a/common/src/common/block/BlockCactus.java +++ b/common/src/common/block/BlockCactus.java @@ -12,9 +12,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockCake.java b/common/src/common/block/BlockCake.java index 4a62734..6422758 100755 --- a/common/src/common/block/BlockCake.java +++ b/common/src/common/block/BlockCake.java @@ -10,9 +10,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockCarpet.java b/common/src/common/block/BlockCarpet.java index 8a93ae1..9b9a970 100755 --- a/common/src/common/block/BlockCarpet.java +++ b/common/src/common/block/BlockCarpet.java @@ -12,8 +12,8 @@ import common.model.ModelProvider; import common.model.Transforms; import common.properties.IProperty; import common.properties.PropertyEnum; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockCauldron.java b/common/src/common/block/BlockCauldron.java index 5ed3371..79f5739 100755 --- a/common/src/common/block/BlockCauldron.java +++ b/common/src/common/block/BlockCauldron.java @@ -19,10 +19,10 @@ import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; import common.tileentity.TileEntityBanner; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockChest.java b/common/src/common/block/BlockChest.java index 92d3821..99af70f 100755 --- a/common/src/common/block/BlockChest.java +++ b/common/src/common/block/BlockChest.java @@ -22,10 +22,10 @@ import common.tileentity.ILockableContainer; import common.tileentity.LockCode; import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockCocoa.java b/common/src/common/block/BlockCocoa.java index baad0fa..2d5cff9 100755 --- a/common/src/common/block/BlockCocoa.java +++ b/common/src/common/block/BlockCocoa.java @@ -15,9 +15,9 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockCompressedPowered.java b/common/src/common/block/BlockCompressedPowered.java index f78ab13..4168977 100755 --- a/common/src/common/block/BlockCompressedPowered.java +++ b/common/src/common/block/BlockCompressedPowered.java @@ -1,8 +1,8 @@ package common.block; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockContainer.java b/common/src/common/block/BlockContainer.java index 84bec0f..8443549 100755 --- a/common/src/common/block/BlockContainer.java +++ b/common/src/common/block/BlockContainer.java @@ -2,8 +2,8 @@ package common.block; import common.material.Material; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockCore.java b/common/src/common/block/BlockCore.java index b125c14..68bf08a 100755 --- a/common/src/common/block/BlockCore.java +++ b/common/src/common/block/BlockCore.java @@ -3,7 +3,7 @@ package common.block; import common.init.Config; import common.item.CheatTab; import common.material.Material; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/block/BlockCrops.java b/common/src/common/block/BlockCrops.java index 979ebaf..a67fb61 100755 --- a/common/src/common/block/BlockCrops.java +++ b/common/src/common/block/BlockCrops.java @@ -11,7 +11,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockDaylightDetector.java b/common/src/common/block/BlockDaylightDetector.java index 8e0a6f9..9e3110a 100755 --- a/common/src/common/block/BlockDaylightDetector.java +++ b/common/src/common/block/BlockDaylightDetector.java @@ -17,9 +17,9 @@ import common.properties.PropertyInteger; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityDaylightDetector; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.IWorldAccess; import common.world.LightType; import common.world.State; diff --git a/common/src/common/block/BlockDeadBush.java b/common/src/common/block/BlockDeadBush.java index f81d79b..3e091db 100755 --- a/common/src/common/block/BlockDeadBush.java +++ b/common/src/common/block/BlockDeadBush.java @@ -11,7 +11,7 @@ import common.model.Model; import common.model.ModelProvider; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockDirectional.java b/common/src/common/block/BlockDirectional.java index 79113df..b80351a 100755 --- a/common/src/common/block/BlockDirectional.java +++ b/common/src/common/block/BlockDirectional.java @@ -2,7 +2,7 @@ package common.block; import common.material.Material; import common.properties.PropertyDirection; -import common.world.Facing; +import common.util.Facing; public abstract class BlockDirectional extends Block { diff --git a/common/src/common/block/BlockDirt.java b/common/src/common/block/BlockDirt.java index ab9f792..11e24ab 100755 --- a/common/src/common/block/BlockDirt.java +++ b/common/src/common/block/BlockDirt.java @@ -12,8 +12,8 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyEnum; +import common.util.BlockPos; import common.util.Identifyable; -import common.world.BlockPos; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockDispenser.java b/common/src/common/block/BlockDispenser.java index 4c693c8..6f0fd6c 100755 --- a/common/src/common/block/BlockDispenser.java +++ b/common/src/common/block/BlockDispenser.java @@ -24,8 +24,8 @@ import common.properties.PropertyDirection; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityDispenser; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockDoor.java b/common/src/common/block/BlockDoor.java index d0fa735..8388100 100755 --- a/common/src/common/block/BlockDoor.java +++ b/common/src/common/block/BlockDoor.java @@ -17,15 +17,15 @@ import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; -import common.world.HitPosition; +import common.util.Vec3; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; public class BlockDoor extends Block diff --git a/common/src/common/block/BlockDoublePlant.java b/common/src/common/block/BlockDoublePlant.java index a580050..3164ea6 100755 --- a/common/src/common/block/BlockDoublePlant.java +++ b/common/src/common/block/BlockDoublePlant.java @@ -20,14 +20,14 @@ import common.properties.IProperty; import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing.Axis; import common.world.IWorldAccess; import common.world.State; import common.world.World; import common.world.WorldServer; -import common.world.Facing.Axis; public class BlockDoublePlant extends BlockBush implements IGrowable { diff --git a/common/src/common/block/BlockDragonEgg.java b/common/src/common/block/BlockDragonEgg.java index ef360b2..15dc5e2 100755 --- a/common/src/common/block/BlockDragonEgg.java +++ b/common/src/common/block/BlockDragonEgg.java @@ -8,8 +8,8 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockDropper.java b/common/src/common/block/BlockDropper.java index b939e09..ec42106 100755 --- a/common/src/common/block/BlockDropper.java +++ b/common/src/common/block/BlockDropper.java @@ -8,8 +8,8 @@ import common.tileentity.TileEntity; import common.tileentity.TileEntityDispenser; import common.tileentity.TileEntityDropper; import common.tileentity.TileEntityHopper; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class BlockDropper extends BlockDispenser diff --git a/common/src/common/block/BlockDynamicLiquid.java b/common/src/common/block/BlockDynamicLiquid.java index df8128b..48534b4 100755 --- a/common/src/common/block/BlockDynamicLiquid.java +++ b/common/src/common/block/BlockDynamicLiquid.java @@ -7,8 +7,8 @@ import common.init.Blocks; import common.init.Config; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockEnchantmentTable.java b/common/src/common/block/BlockEnchantmentTable.java index d33874e..4dfc2d3 100755 --- a/common/src/common/block/BlockEnchantmentTable.java +++ b/common/src/common/block/BlockEnchantmentTable.java @@ -12,8 +12,8 @@ import common.model.ParticleType; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityEnchantmentTable; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/block/BlockEventData.java b/common/src/common/block/BlockEventData.java index 5df52e1..e8fdcf4 100755 --- a/common/src/common/block/BlockEventData.java +++ b/common/src/common/block/BlockEventData.java @@ -1,6 +1,6 @@ package common.block; -import common.world.BlockPos; +import common.util.BlockPos; public class BlockEventData { diff --git a/common/src/common/block/BlockFalling.java b/common/src/common/block/BlockFalling.java index c80b15c..6ce696b 100755 --- a/common/src/common/block/BlockFalling.java +++ b/common/src/common/block/BlockFalling.java @@ -6,7 +6,7 @@ import common.init.Config; import common.item.CheatTab; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockFarmland.java b/common/src/common/block/BlockFarmland.java index 38f6359..66cf24a 100755 --- a/common/src/common/block/BlockFarmland.java +++ b/common/src/common/block/BlockFarmland.java @@ -12,9 +12,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockFence.java b/common/src/common/block/BlockFence.java index 37ad1a4..3bd2657 100755 --- a/common/src/common/block/BlockFence.java +++ b/common/src/common/block/BlockFence.java @@ -14,9 +14,9 @@ import common.model.ModelRotation; import common.model.Transforms; import common.properties.IProperty; import common.properties.PropertyBool; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockFenceGate.java b/common/src/common/block/BlockFenceGate.java index fbf6658..93421f8 100755 --- a/common/src/common/block/BlockFenceGate.java +++ b/common/src/common/block/BlockFenceGate.java @@ -12,9 +12,9 @@ import common.model.ModelRotation; import common.model.Transforms; import common.properties.IProperty; import common.properties.PropertyBool; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockFire.java b/common/src/common/block/BlockFire.java index 18a13bb..b2afa60 100755 --- a/common/src/common/block/BlockFire.java +++ b/common/src/common/block/BlockFire.java @@ -16,9 +16,9 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockFloorPortal.java b/common/src/common/block/BlockFloorPortal.java index 347e4e1..18b87df 100755 --- a/common/src/common/block/BlockFloorPortal.java +++ b/common/src/common/block/BlockFloorPortal.java @@ -12,9 +12,9 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockFlower.java b/common/src/common/block/BlockFlower.java index 3ce19a9..dcdebbb 100755 --- a/common/src/common/block/BlockFlower.java +++ b/common/src/common/block/BlockFlower.java @@ -16,8 +16,8 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; import common.util.Identifyable; -import common.world.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/block/BlockFlowerPot.java b/common/src/common/block/BlockFlowerPot.java index 133ea9f..da6046a 100755 --- a/common/src/common/block/BlockFlowerPot.java +++ b/common/src/common/block/BlockFlowerPot.java @@ -14,8 +14,8 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockFurnace.java b/common/src/common/block/BlockFurnace.java index 8e225cd..8d4572d 100755 --- a/common/src/common/block/BlockFurnace.java +++ b/common/src/common/block/BlockFurnace.java @@ -18,8 +18,8 @@ import common.properties.PropertyDirection; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityFurnace; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/block/BlockGrass.java b/common/src/common/block/BlockGrass.java index 95a32d1..dbf04d5 100755 --- a/common/src/common/block/BlockGrass.java +++ b/common/src/common/block/BlockGrass.java @@ -12,7 +12,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockHay.java b/common/src/common/block/BlockHay.java index c48465c..a051aa5 100755 --- a/common/src/common/block/BlockHay.java +++ b/common/src/common/block/BlockHay.java @@ -6,8 +6,8 @@ import common.item.CheatTab; import common.item.ItemStack; import common.material.Material; import common.properties.IProperty; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockHopper.java b/common/src/common/block/BlockHopper.java index 489f8f6..70438d2 100755 --- a/common/src/common/block/BlockHopper.java +++ b/common/src/common/block/BlockHopper.java @@ -20,9 +20,9 @@ import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.tileentity.TileEntity; import common.tileentity.TileEntityHopper; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockHugeMushroom.java b/common/src/common/block/BlockHugeMushroom.java index 6493036..f4d6262 100755 --- a/common/src/common/block/BlockHugeMushroom.java +++ b/common/src/common/block/BlockHugeMushroom.java @@ -9,9 +9,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockIce.java b/common/src/common/block/BlockIce.java index 1adca24..fae0c6c 100755 --- a/common/src/common/block/BlockIce.java +++ b/common/src/common/block/BlockIce.java @@ -10,7 +10,7 @@ import common.material.Material; import common.model.BlockLayer; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.LightType; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockJukebox.java b/common/src/common/block/BlockJukebox.java index f37d8b2..87f2fce 100755 --- a/common/src/common/block/BlockJukebox.java +++ b/common/src/common/block/BlockJukebox.java @@ -6,8 +6,8 @@ import common.item.CheatTab; import common.material.Material; import common.model.Model; import common.model.ModelProvider; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockLadder.java b/common/src/common/block/BlockLadder.java index f22b33f..ee9d14a 100755 --- a/common/src/common/block/BlockLadder.java +++ b/common/src/common/block/BlockLadder.java @@ -9,9 +9,9 @@ import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyDirection; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockLeaves.java b/common/src/common/block/BlockLeaves.java index e5f2d51..bfe3d39 100755 --- a/common/src/common/block/BlockLeaves.java +++ b/common/src/common/block/BlockLeaves.java @@ -22,7 +22,7 @@ import common.properties.PropertyBool; import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockLever.java b/common/src/common/block/BlockLever.java index 6766b57..a48cb6d 100755 --- a/common/src/common/block/BlockLever.java +++ b/common/src/common/block/BlockLever.java @@ -11,10 +11,10 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyEnum; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockLilyPad.java b/common/src/common/block/BlockLilyPad.java index a117b36..25e614d 100755 --- a/common/src/common/block/BlockLilyPad.java +++ b/common/src/common/block/BlockLilyPad.java @@ -11,9 +11,9 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockLiquid.java b/common/src/common/block/BlockLiquid.java index 570baaa..ef20f41 100755 --- a/common/src/common/block/BlockLiquid.java +++ b/common/src/common/block/BlockLiquid.java @@ -13,14 +13,14 @@ import common.model.ParticleType; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.Facing; +import common.util.Vec3; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; import common.world.WorldServer; diff --git a/common/src/common/block/BlockLog.java b/common/src/common/block/BlockLog.java index 9162608..234583e 100755 --- a/common/src/common/block/BlockLog.java +++ b/common/src/common/block/BlockLog.java @@ -8,9 +8,9 @@ import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyEnum; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockMachine.java b/common/src/common/block/BlockMachine.java index efe8555..d65db95 100755 --- a/common/src/common/block/BlockMachine.java +++ b/common/src/common/block/BlockMachine.java @@ -9,8 +9,8 @@ import common.material.Material; import common.properties.IProperty; import common.tileentity.TileEntity; import common.tileentity.TileEntityMachine; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockMobSpawner.java b/common/src/common/block/BlockMobSpawner.java index 9263baa..e8d4f46 100755 --- a/common/src/common/block/BlockMobSpawner.java +++ b/common/src/common/block/BlockMobSpawner.java @@ -7,7 +7,7 @@ import common.model.BlockLayer; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockMushroom.java b/common/src/common/block/BlockMushroom.java index a69d71a..3e45fab 100755 --- a/common/src/common/block/BlockMushroom.java +++ b/common/src/common/block/BlockMushroom.java @@ -5,7 +5,7 @@ import common.init.Config; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockMycelium.java b/common/src/common/block/BlockMycelium.java index 38fed42..a883235 100755 --- a/common/src/common/block/BlockMycelium.java +++ b/common/src/common/block/BlockMycelium.java @@ -11,7 +11,7 @@ import common.model.ParticleType; import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.IWorldAccess; import common.world.State; import common.world.WorldClient; diff --git a/common/src/common/block/BlockNote.java b/common/src/common/block/BlockNote.java index 9a548f9..d1711a0 100755 --- a/common/src/common/block/BlockNote.java +++ b/common/src/common/block/BlockNote.java @@ -7,8 +7,8 @@ import common.material.Material; import common.model.ParticleType; import common.tileentity.TileEntity; import common.tileentity.TileEntityNote; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockNuke.java b/common/src/common/block/BlockNuke.java index e993151..70e4c0e 100755 --- a/common/src/common/block/BlockNuke.java +++ b/common/src/common/block/BlockNuke.java @@ -7,7 +7,7 @@ import common.item.CheatTab; import common.material.Material; import common.model.Model; import common.model.ModelProvider; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.Explosion; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockOre.java b/common/src/common/block/BlockOre.java index 008fdf9..e83b028 100755 --- a/common/src/common/block/BlockOre.java +++ b/common/src/common/block/BlockOre.java @@ -7,7 +7,7 @@ import common.item.Item; import common.item.ItemStack; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPane.java b/common/src/common/block/BlockPane.java index 66db2be..5de8821 100755 --- a/common/src/common/block/BlockPane.java +++ b/common/src/common/block/BlockPane.java @@ -14,9 +14,9 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPistonBase.java b/common/src/common/block/BlockPistonBase.java index 3304a32..5fe919c 100755 --- a/common/src/common/block/BlockPistonBase.java +++ b/common/src/common/block/BlockPistonBase.java @@ -19,10 +19,10 @@ import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.tileentity.TileEntity; import common.tileentity.TileEntityPiston; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPistonHead.java b/common/src/common/block/BlockPistonHead.java index 3c8870b..07c783e 100755 --- a/common/src/common/block/BlockPistonHead.java +++ b/common/src/common/block/BlockPistonHead.java @@ -15,10 +15,10 @@ import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPistonMoving.java b/common/src/common/block/BlockPistonMoving.java index bf0792a..50fddc2 100755 --- a/common/src/common/block/BlockPistonMoving.java +++ b/common/src/common/block/BlockPistonMoving.java @@ -10,13 +10,13 @@ import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityPiston; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; +import common.util.Vec3; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockPortal.java b/common/src/common/block/BlockPortal.java index 679cdfc..14112ba 100755 --- a/common/src/common/block/BlockPortal.java +++ b/common/src/common/block/BlockPortal.java @@ -14,14 +14,14 @@ import common.properties.IProperty; import common.properties.PropertyEnum; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.Facing.Axis; import common.world.IWorldAccess; import common.world.State; import common.world.World; import common.world.WorldClient; -import common.world.Facing.Axis; public class BlockPortal extends BlockBreakable { diff --git a/common/src/common/block/BlockPortalFrame.java b/common/src/common/block/BlockPortalFrame.java index c3dbab6..2f2d61e 100755 --- a/common/src/common/block/BlockPortalFrame.java +++ b/common/src/common/block/BlockPortalFrame.java @@ -19,9 +19,9 @@ import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPotato.java b/common/src/common/block/BlockPotato.java index d1b2e33..bc74922 100755 --- a/common/src/common/block/BlockPotato.java +++ b/common/src/common/block/BlockPotato.java @@ -5,7 +5,7 @@ import common.item.Item; import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPressurePlate.java b/common/src/common/block/BlockPressurePlate.java index cd29000..3efdea7 100755 --- a/common/src/common/block/BlockPressurePlate.java +++ b/common/src/common/block/BlockPressurePlate.java @@ -7,8 +7,8 @@ import common.entity.types.EntityLiving; import common.material.Material; import common.properties.IProperty; import common.properties.PropertyBool; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPressurePlateWeighted.java b/common/src/common/block/BlockPressurePlateWeighted.java index 2468a10..be01b35 100755 --- a/common/src/common/block/BlockPressurePlateWeighted.java +++ b/common/src/common/block/BlockPressurePlateWeighted.java @@ -4,8 +4,8 @@ import common.entity.Entity; import common.material.Material; import common.properties.IProperty; import common.properties.PropertyInteger; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockPumpkin.java b/common/src/common/block/BlockPumpkin.java index 8cc3b9d..caf602a 100755 --- a/common/src/common/block/BlockPumpkin.java +++ b/common/src/common/block/BlockPumpkin.java @@ -7,8 +7,8 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockQuartz.java b/common/src/common/block/BlockQuartz.java index a6cccc3..d8e6619 100755 --- a/common/src/common/block/BlockQuartz.java +++ b/common/src/common/block/BlockQuartz.java @@ -13,9 +13,9 @@ import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyEnum; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRail.java b/common/src/common/block/BlockRail.java index 6b50f52..db02ca7 100755 --- a/common/src/common/block/BlockRail.java +++ b/common/src/common/block/BlockRail.java @@ -2,7 +2,7 @@ package common.block; import common.properties.IProperty; import common.properties.PropertyEnum; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRailBase.java b/common/src/common/block/BlockRailBase.java index ec47041..ebcab36 100755 --- a/common/src/common/block/BlockRailBase.java +++ b/common/src/common/block/BlockRailBase.java @@ -11,14 +11,14 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.IProperty; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; -import common.world.HitPosition; +import common.util.Vec3; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockRailDetector.java b/common/src/common/block/BlockRailDetector.java index 28e977c..7579307 100755 --- a/common/src/common/block/BlockRailDetector.java +++ b/common/src/common/block/BlockRailDetector.java @@ -13,9 +13,9 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyEnum; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRailPowered.java b/common/src/common/block/BlockRailPowered.java index 65e978a..5989b95 100755 --- a/common/src/common/block/BlockRailPowered.java +++ b/common/src/common/block/BlockRailPowered.java @@ -7,7 +7,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyEnum; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRedstoneComparator.java b/common/src/common/block/BlockRedstoneComparator.java index b6f3859..9f6b9d2 100755 --- a/common/src/common/block/BlockRedstoneComparator.java +++ b/common/src/common/block/BlockRedstoneComparator.java @@ -15,9 +15,9 @@ import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityComparator; +import common.util.BlockPos; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRedstoneDiode.java b/common/src/common/block/BlockRedstoneDiode.java index e12d943..4b0c3d3 100755 --- a/common/src/common/block/BlockRedstoneDiode.java +++ b/common/src/common/block/BlockRedstoneDiode.java @@ -6,8 +6,8 @@ import common.item.ItemStack; import common.material.Material; import common.model.BlockLayer; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRedstoneLight.java b/common/src/common/block/BlockRedstoneLight.java index 49cb79b..017346b 100755 --- a/common/src/common/block/BlockRedstoneLight.java +++ b/common/src/common/block/BlockRedstoneLight.java @@ -6,7 +6,7 @@ import common.item.Item; import common.item.ItemStack; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockRedstoneOre.java b/common/src/common/block/BlockRedstoneOre.java index 09aa47a..9d7f947 100755 --- a/common/src/common/block/BlockRedstoneOre.java +++ b/common/src/common/block/BlockRedstoneOre.java @@ -12,8 +12,8 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/block/BlockRedstoneRepeater.java b/common/src/common/block/BlockRedstoneRepeater.java index 30c64ec..208e723 100755 --- a/common/src/common/block/BlockRedstoneRepeater.java +++ b/common/src/common/block/BlockRedstoneRepeater.java @@ -12,8 +12,8 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRedstoneTorch.java b/common/src/common/block/BlockRedstoneTorch.java index 04cbe22..5e6bbdc 100755 --- a/common/src/common/block/BlockRedstoneTorch.java +++ b/common/src/common/block/BlockRedstoneTorch.java @@ -12,8 +12,8 @@ import common.item.CheatTab; import common.item.Item; import common.model.ParticleType; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRedstoneWire.java b/common/src/common/block/BlockRedstoneWire.java index b5aac93..e023983 100755 --- a/common/src/common/block/BlockRedstoneWire.java +++ b/common/src/common/block/BlockRedstoneWire.java @@ -19,11 +19,11 @@ import common.properties.IProperty; import common.properties.PropertyEnum; import common.properties.PropertyInteger; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockReed.java b/common/src/common/block/BlockReed.java index 816e6e7..8ac6c66 100755 --- a/common/src/common/block/BlockReed.java +++ b/common/src/common/block/BlockReed.java @@ -11,9 +11,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockRotatedPillar.java b/common/src/common/block/BlockRotatedPillar.java index a4b59a3..232db9c 100755 --- a/common/src/common/block/BlockRotatedPillar.java +++ b/common/src/common/block/BlockRotatedPillar.java @@ -5,7 +5,7 @@ import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; import common.properties.PropertyEnum; -import common.world.Facing; +import common.util.Facing; import common.world.State; public abstract class BlockRotatedPillar extends Block diff --git a/common/src/common/block/BlockSapling.java b/common/src/common/block/BlockSapling.java index 5615ffc..3a8edb1 100755 --- a/common/src/common/block/BlockSapling.java +++ b/common/src/common/block/BlockSapling.java @@ -12,7 +12,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockSign.java b/common/src/common/block/BlockSign.java index a42b21d..a440937 100755 --- a/common/src/common/block/BlockSign.java +++ b/common/src/common/block/BlockSign.java @@ -6,8 +6,8 @@ import common.material.Material; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.IBlockAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockSkull.java b/common/src/common/block/BlockSkull.java index 3730ffe..d73ccae 100755 --- a/common/src/common/block/BlockSkull.java +++ b/common/src/common/block/BlockSkull.java @@ -11,9 +11,9 @@ import common.properties.PropertyDirection; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntitySkull; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockSlab.java b/common/src/common/block/BlockSlab.java index 6ad12a3..1daa63d 100755 --- a/common/src/common/block/BlockSlab.java +++ b/common/src/common/block/BlockSlab.java @@ -14,13 +14,13 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyDirection; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.Facing.Axis; import common.world.IWorldAccess; import common.world.State; import common.world.World; -import common.world.Facing.Axis; public class BlockSlab extends Block { diff --git a/common/src/common/block/BlockSlime.java b/common/src/common/block/BlockSlime.java index 4d4a1f7..64ba03a 100755 --- a/common/src/common/block/BlockSlime.java +++ b/common/src/common/block/BlockSlime.java @@ -6,7 +6,7 @@ import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockSnow.java b/common/src/common/block/BlockSnow.java index 588918b..489585c 100755 --- a/common/src/common/block/BlockSnow.java +++ b/common/src/common/block/BlockSnow.java @@ -15,9 +15,9 @@ import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.LightType; diff --git a/common/src/common/block/BlockSnowBlock.java b/common/src/common/block/BlockSnowBlock.java index 5f8411f..a85f7cb 100755 --- a/common/src/common/block/BlockSnowBlock.java +++ b/common/src/common/block/BlockSnowBlock.java @@ -6,7 +6,7 @@ import common.item.CheatTab; import common.item.Item; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.LightType; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/block/BlockSoulSand.java b/common/src/common/block/BlockSoulSand.java index 5344f81..b9aa80a 100755 --- a/common/src/common/block/BlockSoulSand.java +++ b/common/src/common/block/BlockSoulSand.java @@ -3,8 +3,8 @@ package common.block; import common.entity.Entity; import common.item.CheatTab; import common.material.Material; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockSourceImpl.java b/common/src/common/block/BlockSourceImpl.java index 63f297b..c5e241e 100755 --- a/common/src/common/block/BlockSourceImpl.java +++ b/common/src/common/block/BlockSourceImpl.java @@ -2,7 +2,7 @@ package common.block; import common.dispenser.IBlockSource; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockStairs.java b/common/src/common/block/BlockStairs.java index 437f98f..cb917cf 100755 --- a/common/src/common/block/BlockStairs.java +++ b/common/src/common/block/BlockStairs.java @@ -18,16 +18,16 @@ import common.properties.IProperty; import common.properties.PropertyDirection; import common.properties.PropertyEnum; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.Vec3; import common.world.Explosion; -import common.world.Facing; -import common.world.HitPosition; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; import common.world.WorldServer; diff --git a/common/src/common/block/BlockStandingSign.java b/common/src/common/block/BlockStandingSign.java index 754535a..156dabe 100755 --- a/common/src/common/block/BlockStandingSign.java +++ b/common/src/common/block/BlockStandingSign.java @@ -2,7 +2,7 @@ package common.block; import common.properties.IProperty; import common.properties.PropertyInteger; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockStaticLiquid.java b/common/src/common/block/BlockStaticLiquid.java index 88791ab..b087f92 100755 --- a/common/src/common/block/BlockStaticLiquid.java +++ b/common/src/common/block/BlockStaticLiquid.java @@ -4,8 +4,8 @@ import common.init.Blocks; import common.init.Config; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockStem.java b/common/src/common/block/BlockStem.java index c6d37f8..171047a 100755 --- a/common/src/common/block/BlockStem.java +++ b/common/src/common/block/BlockStem.java @@ -16,8 +16,8 @@ import common.properties.IProperty; import common.properties.PropertyDirection; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockTNT.java b/common/src/common/block/BlockTNT.java index ceec575..7f121a1 100755 --- a/common/src/common/block/BlockTNT.java +++ b/common/src/common/block/BlockTNT.java @@ -18,9 +18,9 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyInteger; -import common.world.BlockPos; +import common.util.BlockPos; +import common.util.Facing; import common.world.Explosion; -import common.world.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockTallGrass.java b/common/src/common/block/BlockTallGrass.java index 9724595..aa2e686 100755 --- a/common/src/common/block/BlockTallGrass.java +++ b/common/src/common/block/BlockTallGrass.java @@ -18,8 +18,8 @@ import common.properties.IProperty; import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; +import common.util.BlockPos; import common.util.Identifyable; -import common.world.BlockPos; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockTianSoil.java b/common/src/common/block/BlockTianSoil.java index 339851a..ac03fd9 100755 --- a/common/src/common/block/BlockTianSoil.java +++ b/common/src/common/block/BlockTianSoil.java @@ -9,7 +9,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockTorch.java b/common/src/common/block/BlockTorch.java index 571d4c3..53d5940 100755 --- a/common/src/common/block/BlockTorch.java +++ b/common/src/common/block/BlockTorch.java @@ -14,13 +14,13 @@ import common.model.ParticleType; import common.properties.IProperty; import common.properties.PropertyDirection; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; +import common.util.Vec3; import common.world.Chunk; -import common.world.Facing; -import common.world.HitPosition; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; import common.world.WorldServer; diff --git a/common/src/common/block/BlockTrapDoor.java b/common/src/common/block/BlockTrapDoor.java index f6f9eae..c8fc2d7 100755 --- a/common/src/common/block/BlockTrapDoor.java +++ b/common/src/common/block/BlockTrapDoor.java @@ -14,15 +14,15 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.properties.PropertyEnum; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; -import common.world.HitPosition; +import common.util.Vec3; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; -import common.world.Vec3; import common.world.World; public class BlockTrapDoor extends Block diff --git a/common/src/common/block/BlockTripWire.java b/common/src/common/block/BlockTripWire.java index cbd9299..7512125 100755 --- a/common/src/common/block/BlockTripWire.java +++ b/common/src/common/block/BlockTripWire.java @@ -16,9 +16,9 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockTripWireHook.java b/common/src/common/block/BlockTripWireHook.java index fb66590..0c8afda 100755 --- a/common/src/common/block/BlockTripWireHook.java +++ b/common/src/common/block/BlockTripWireHook.java @@ -14,9 +14,9 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyDirection; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockVine.java b/common/src/common/block/BlockVine.java index 10443c8..8e82dcc 100755 --- a/common/src/common/block/BlockVine.java +++ b/common/src/common/block/BlockVine.java @@ -18,9 +18,9 @@ import common.properties.IProperty; import common.properties.PropertyBool; import common.rng.Random; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockWall.java b/common/src/common/block/BlockWall.java index de001d2..41ad2bf 100755 --- a/common/src/common/block/BlockWall.java +++ b/common/src/common/block/BlockWall.java @@ -12,10 +12,10 @@ import common.model.ModelRotation; import common.properties.IProperty; import common.properties.PropertyBool; import common.properties.PropertyEnum; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.util.Identifyable; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; import common.world.IBlockAccess; import common.world.IWorldAccess; import common.world.State; diff --git a/common/src/common/block/BlockWallSign.java b/common/src/common/block/BlockWallSign.java index 75fdc0f..29da816 100755 --- a/common/src/common/block/BlockWallSign.java +++ b/common/src/common/block/BlockWallSign.java @@ -2,8 +2,8 @@ package common.block; import common.properties.IProperty; import common.properties.PropertyDirection; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockWarpChest.java b/common/src/common/block/BlockWarpChest.java index d32b60e..32b40c9 100755 --- a/common/src/common/block/BlockWarpChest.java +++ b/common/src/common/block/BlockWarpChest.java @@ -16,8 +16,8 @@ import common.model.ParticleType; import common.properties.IProperty; import common.properties.PropertyDirection; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/block/BlockWart.java b/common/src/common/block/BlockWart.java index 380e4eb..3c576a8 100755 --- a/common/src/common/block/BlockWart.java +++ b/common/src/common/block/BlockWart.java @@ -12,7 +12,7 @@ import common.model.ModelProvider; import common.properties.IProperty; import common.properties.PropertyInteger; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/block/BlockWeb.java b/common/src/common/block/BlockWeb.java index 959cb0f..9778a73 100755 --- a/common/src/common/block/BlockWeb.java +++ b/common/src/common/block/BlockWeb.java @@ -9,8 +9,8 @@ import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; diff --git a/common/src/common/block/BlockWorkbench.java b/common/src/common/block/BlockWorkbench.java index 0489d2c..3ac24c8 100755 --- a/common/src/common/block/BlockWorkbench.java +++ b/common/src/common/block/BlockWorkbench.java @@ -9,8 +9,8 @@ import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.tileentity.IInteractionObject; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/block/IGrowable.java b/common/src/common/block/IGrowable.java index 35def7f..a3c9ca0 100755 --- a/common/src/common/block/IGrowable.java +++ b/common/src/common/block/IGrowable.java @@ -1,7 +1,7 @@ package common.block; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/clipboard/ClipboardPlacer.java b/common/src/common/clipboard/ClipboardPlacer.java index a6525c0..b2dc5a7 100755 --- a/common/src/common/clipboard/ClipboardPlacer.java +++ b/common/src/common/clipboard/ClipboardPlacer.java @@ -17,8 +17,8 @@ import common.init.Blocks; import common.init.ReorderRegistry; import common.inventory.IInventory; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.Vec3i; +import common.util.BlockPos; +import common.util.Vec3i; import common.world.WorldServer; public class ClipboardPlacer { diff --git a/common/src/common/color/Colorizer.java b/common/src/common/color/Colorizer.java index ed175a7..dcae2c9 100755 --- a/common/src/common/color/Colorizer.java +++ b/common/src/common/color/Colorizer.java @@ -1,7 +1,7 @@ package common.color; import common.biome.Biome; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.IWorldAccess; public enum Colorizer { diff --git a/common/src/common/dimension/Dimension.java b/common/src/common/dimension/Dimension.java index f8fb29b..32c7520 100755 --- a/common/src/common/dimension/Dimension.java +++ b/common/src/common/dimension/Dimension.java @@ -18,8 +18,8 @@ import common.nbt.NBTTagList; import common.nbt.NBTTagString; import common.rng.Random; import common.util.ExtMath; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.Weather; import common.worldgen.BiomeGenLayered; import common.worldgen.BiomeGenPerlin; diff --git a/common/src/common/dispenser/BehaviorDefaultDispenseItem.java b/common/src/common/dispenser/BehaviorDefaultDispenseItem.java index 937a1ec..e4aea80 100755 --- a/common/src/common/dispenser/BehaviorDefaultDispenseItem.java +++ b/common/src/common/dispenser/BehaviorDefaultDispenseItem.java @@ -3,7 +3,7 @@ package common.dispenser; import common.block.BlockDispenser; import common.entity.item.EntityItem; import common.item.ItemStack; -import common.world.Facing; +import common.util.Facing; import common.world.World; public class BehaviorDefaultDispenseItem implements IBehaviorDispenseItem diff --git a/common/src/common/dispenser/BehaviorProjectileDispense.java b/common/src/common/dispenser/BehaviorProjectileDispense.java index 71230cf..dc4dbaa 100755 --- a/common/src/common/dispenser/BehaviorProjectileDispense.java +++ b/common/src/common/dispenser/BehaviorProjectileDispense.java @@ -4,7 +4,7 @@ import common.block.BlockDispenser; import common.entity.Entity; import common.entity.types.IProjectile; import common.item.ItemStack; -import common.world.Facing; +import common.util.Facing; import common.world.World; public abstract class BehaviorProjectileDispense extends BehaviorDefaultDispenseItem diff --git a/common/src/common/dispenser/IBlockSource.java b/common/src/common/dispenser/IBlockSource.java index f6d6d8f..c56f8c3 100755 --- a/common/src/common/dispenser/IBlockSource.java +++ b/common/src/common/dispenser/IBlockSource.java @@ -1,7 +1,7 @@ package common.dispenser; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; public interface IBlockSource extends ILocatableSource { diff --git a/common/src/common/entity/DataWatcher.java b/common/src/common/entity/DataWatcher.java index 7b061b3..e4b9a7e 100755 --- a/common/src/common/entity/DataWatcher.java +++ b/common/src/common/entity/DataWatcher.java @@ -10,7 +10,7 @@ import common.collect.Lists; import common.collect.Maps; import common.item.ItemStack; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class DataWatcher { private static final Map, Integer> dataTypes = Maps., Integer>newHashMap(); diff --git a/common/src/common/entity/Entity.java b/common/src/common/entity/Entity.java index 0daa035..b142d3d 100755 --- a/common/src/common/entity/Entity.java +++ b/common/src/common/entity/Entity.java @@ -32,16 +32,16 @@ import common.nbt.NBTTagDouble; import common.nbt.NBTTagFloat; import common.nbt.NBTTagList; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.Facing; +import common.util.HitPosition; +import common.util.PortalType; +import common.util.Position; +import common.util.Vec3; import common.world.Explosion; -import common.world.Facing; -import common.world.HitPosition; -import common.world.PortalType; -import common.world.Position; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/animal/EntityBat.java b/common/src/common/entity/animal/EntityBat.java index 7f30243..a6c0d96 100755 --- a/common/src/common/entity/animal/EntityBat.java +++ b/common/src/common/entity/animal/EntityBat.java @@ -9,8 +9,8 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.SoundEvent; import common.nbt.NBTTagCompound; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; public class EntityBat extends EntityLiving diff --git a/common/src/common/entity/animal/EntityDragon.java b/common/src/common/entity/animal/EntityDragon.java index dc1953e..4b97778 100755 --- a/common/src/common/entity/animal/EntityDragon.java +++ b/common/src/common/entity/animal/EntityDragon.java @@ -14,7 +14,7 @@ import common.init.Config; import common.init.SoundEvent; import common.model.ParticleType; import common.util.ExtMath; -import common.world.Vec3; +import common.util.Vec3; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/entity/animal/EntityHorse.java b/common/src/common/entity/animal/EntityHorse.java index 041aa2a..ed9d625 100755 --- a/common/src/common/entity/animal/EntityHorse.java +++ b/common/src/common/entity/animal/EntityHorse.java @@ -36,8 +36,8 @@ import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.pathfinding.PathNavigateGround; import common.potion.Potion; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; public class EntityHorse extends EntityAnimal implements IInvBasic diff --git a/common/src/common/entity/animal/EntityMouse.java b/common/src/common/entity/animal/EntityMouse.java index 86195f2..8456057 100755 --- a/common/src/common/entity/animal/EntityMouse.java +++ b/common/src/common/entity/animal/EntityMouse.java @@ -20,7 +20,7 @@ import common.init.Blocks; import common.init.Items; import common.init.SoundEvent; import common.item.ItemStack; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class EntityMouse extends EntityAnimal { diff --git a/common/src/common/entity/animal/EntityRabbit.java b/common/src/common/entity/animal/EntityRabbit.java index 49e09cf..a8f319a 100755 --- a/common/src/common/entity/animal/EntityRabbit.java +++ b/common/src/common/entity/animal/EntityRabbit.java @@ -38,10 +38,10 @@ import common.pathfinding.PathEntity; import common.pathfinding.PathNavigateGround; import common.potion.Potion; import common.potion.PotionEffect; +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 EntityRabbit extends EntityAnimal { diff --git a/common/src/common/entity/effect/EntityLightning.java b/common/src/common/entity/effect/EntityLightning.java index 4e9eccd..e966314 100755 --- a/common/src/common/entity/effect/EntityLightning.java +++ b/common/src/common/entity/effect/EntityLightning.java @@ -9,8 +9,8 @@ import common.init.Blocks; import common.init.Config; import common.init.SoundEvent; import common.material.Material; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.World; import common.world.WorldClient; diff --git a/common/src/common/entity/item/EntityBoat.java b/common/src/common/entity/item/EntityBoat.java index 98d133c..7fb57b2 100755 --- a/common/src/common/entity/item/EntityBoat.java +++ b/common/src/common/entity/item/EntityBoat.java @@ -16,9 +16,9 @@ import common.init.Items; import common.item.Item; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; import common.world.World; public class EntityBoat extends Entity diff --git a/common/src/common/entity/item/EntityCart.java b/common/src/common/entity/item/EntityCart.java index 113d137..a9222fe 100755 --- a/common/src/common/entity/item/EntityCart.java +++ b/common/src/common/entity/item/EntityCart.java @@ -15,11 +15,11 @@ import common.item.Item; import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.tileentity.IWorldNameable; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.World; public abstract class EntityCart extends Entity implements IWorldNameable diff --git a/common/src/common/entity/item/EntityCartContainer.java b/common/src/common/entity/item/EntityCartContainer.java index daf7d7c..4afb8f5 100755 --- a/common/src/common/entity/item/EntityCartContainer.java +++ b/common/src/common/entity/item/EntityCartContainer.java @@ -11,8 +11,8 @@ import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.tileentity.ILockableContainer; import common.tileentity.LockCode; -import common.world.BlockPos; -import common.world.PortalType; +import common.util.BlockPos; +import common.util.PortalType; import common.world.World; public abstract class EntityCartContainer extends EntityCart implements ILockableContainer diff --git a/common/src/common/entity/item/EntityChestCart.java b/common/src/common/entity/item/EntityChestCart.java index 783dbc1..73d7966 100755 --- a/common/src/common/entity/item/EntityChestCart.java +++ b/common/src/common/entity/item/EntityChestCart.java @@ -9,7 +9,7 @@ import common.init.ItemRegistry; import common.inventory.Container; import common.inventory.ContainerChest; import common.inventory.InventoryPlayer; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/entity/item/EntityFalling.java b/common/src/common/entity/item/EntityFalling.java index ffb8a7b..97b135e 100755 --- a/common/src/common/entity/item/EntityFalling.java +++ b/common/src/common/entity/item/EntityFalling.java @@ -19,9 +19,9 @@ import common.material.Material; import common.nbt.NBTBase; import common.nbt.NBTTagCompound; import common.tileentity.TileEntity; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/entity/item/EntityHopperCart.java b/common/src/common/entity/item/EntityHopperCart.java index 4083659..398eccf 100755 --- a/common/src/common/entity/item/EntityHopperCart.java +++ b/common/src/common/entity/item/EntityHopperCart.java @@ -14,7 +14,7 @@ import common.inventory.InventoryPlayer; import common.nbt.NBTTagCompound; import common.tileentity.IHopper; import common.tileentity.TileEntityHopper; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/entity/item/EntityItem.java b/common/src/common/entity/item/EntityItem.java index 14abe9b..1647b97 100755 --- a/common/src/common/entity/item/EntityItem.java +++ b/common/src/common/entity/item/EntityItem.java @@ -15,9 +15,9 @@ import common.log.Log; import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.PortalType; +import common.util.PortalType; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/item/EntityLeashKnot.java b/common/src/common/entity/item/EntityLeashKnot.java index e3aebe6..764cc21 100755 --- a/common/src/common/entity/item/EntityLeashKnot.java +++ b/common/src/common/entity/item/EntityLeashKnot.java @@ -10,9 +10,9 @@ import common.init.Items; import common.item.Item; import common.item.ItemStack; import common.nbt.NBTTagCompound; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; import common.world.World; public class EntityLeashKnot extends Entity diff --git a/common/src/common/entity/item/EntityOrb.java b/common/src/common/entity/item/EntityOrb.java index 6a3ecf8..055206c 100755 --- a/common/src/common/entity/item/EntityOrb.java +++ b/common/src/common/entity/item/EntityOrb.java @@ -6,7 +6,7 @@ import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.init.Config; import common.model.ParticleType; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityOrb extends EntityThrowable diff --git a/common/src/common/entity/item/EntityTntCart.java b/common/src/common/entity/item/EntityTntCart.java index 4adfbc4..3f9005c 100755 --- a/common/src/common/entity/item/EntityTntCart.java +++ b/common/src/common/entity/item/EntityTntCart.java @@ -10,7 +10,7 @@ import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; import common.nbt.NBTTagCompound; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.Explosion; import common.world.State; import common.world.World; diff --git a/common/src/common/entity/item/EntityXp.java b/common/src/common/entity/item/EntityXp.java index ab9642c..43a5e6a 100755 --- a/common/src/common/entity/item/EntityXp.java +++ b/common/src/common/entity/item/EntityXp.java @@ -11,9 +11,9 @@ import common.init.SoundEvent; import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.PortalType; +import common.util.PortalType; import common.world.World; public class EntityXp extends Entity implements IObjectData diff --git a/common/src/common/entity/item/EntityXpBottle.java b/common/src/common/entity/item/EntityXpBottle.java index 09a969b..fdef911 100755 --- a/common/src/common/entity/item/EntityXpBottle.java +++ b/common/src/common/entity/item/EntityXpBottle.java @@ -2,8 +2,8 @@ package common.entity.item; import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; -import common.world.BlockPos; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.HitPosition; import common.world.World; public class EntityXpBottle extends EntityThrowable diff --git a/common/src/common/entity/npc/EntityArachnoid.java b/common/src/common/entity/npc/EntityArachnoid.java index f56a9bf..becd804 100755 --- a/common/src/common/entity/npc/EntityArachnoid.java +++ b/common/src/common/entity/npc/EntityArachnoid.java @@ -9,7 +9,7 @@ import common.pathfinding.PathNavigateClimber; import common.potion.Potion; import common.potion.PotionEffect; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class EntityArachnoid extends EntityNPC diff --git a/common/src/common/entity/npc/EntityCultivator.java b/common/src/common/entity/npc/EntityCultivator.java index 84206cd..2376c0a 100755 --- a/common/src/common/entity/npc/EntityCultivator.java +++ b/common/src/common/entity/npc/EntityCultivator.java @@ -7,7 +7,7 @@ import common.entity.effect.EntityLightning; import common.init.Items; import common.item.ItemStack; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class EntityCultivator extends EntityNPC { diff --git a/common/src/common/entity/npc/EntityFlyingNPC.java b/common/src/common/entity/npc/EntityFlyingNPC.java index 56dcfb3..9827f40 100755 --- a/common/src/common/entity/npc/EntityFlyingNPC.java +++ b/common/src/common/entity/npc/EntityFlyingNPC.java @@ -7,9 +7,9 @@ import common.entity.attributes.Attributes; import common.entity.types.EntityLiving; 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.world.BoundingBox; import common.world.World; public abstract class EntityFlyingNPC extends EntityNPC diff --git a/common/src/common/entity/npc/EntityHuman.java b/common/src/common/entity/npc/EntityHuman.java index 18bbea1..cedc14b 100755 --- a/common/src/common/entity/npc/EntityHuman.java +++ b/common/src/common/entity/npc/EntityHuman.java @@ -4,9 +4,9 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.item.ItemStack; import common.rng.Random; +import common.util.BlockPos; import common.util.Identifyable; import common.village.Village; -import common.world.BlockPos; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/npc/EntityNPC.java b/common/src/common/entity/npc/EntityNPC.java index 26b4075..f261a8b 100755 --- a/common/src/common/entity/npc/EntityNPC.java +++ b/common/src/common/entity/npc/EntityNPC.java @@ -86,16 +86,16 @@ import common.sound.MovingSoundMinecartRiding; import common.tileentity.IInteractionObject; import common.tileentity.LockCode; import common.tileentity.TileEntitySign; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; +import common.util.Facing; +import common.util.PortalType; +import common.util.Vec3; +import common.util.WorldPos; import common.village.MerchantRecipeList; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; -import common.world.PortalType; -import common.world.Vec3; import common.world.World; import common.world.WorldClient; -import common.world.WorldPos; import common.world.WorldServer; public abstract class EntityNPC extends EntityLiving diff --git a/common/src/common/entity/npc/EntitySlime.java b/common/src/common/entity/npc/EntitySlime.java index 0c9d04d..da31cab 100755 --- a/common/src/common/entity/npc/EntitySlime.java +++ b/common/src/common/entity/npc/EntitySlime.java @@ -13,8 +13,8 @@ import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.pathfinding.PathNavigateGround; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.Chunk; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/npc/EntityZombie.java b/common/src/common/entity/npc/EntityZombie.java index 449d5b6..bdd5734 100755 --- a/common/src/common/entity/npc/EntityZombie.java +++ b/common/src/common/entity/npc/EntityZombie.java @@ -11,8 +11,8 @@ import common.entity.attributes.Attributes; import common.entity.types.EntityLiving; import common.init.Config; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/npc/PlayerCharacter.java b/common/src/common/entity/npc/PlayerCharacter.java index 75ce463..c9e6c74 100644 --- a/common/src/common/entity/npc/PlayerCharacter.java +++ b/common/src/common/entity/npc/PlayerCharacter.java @@ -1,6 +1,6 @@ package common.entity.npc; -import common.world.BlockPos; +import common.util.BlockPos; public class PlayerCharacter { public final String name; diff --git a/common/src/common/entity/projectile/EntityArrow.java b/common/src/common/entity/projectile/EntityArrow.java index 6e3dd50..3174775 100755 --- a/common/src/common/entity/projectile/EntityArrow.java +++ b/common/src/common/entity/projectile/EntityArrow.java @@ -19,12 +19,12 @@ import common.item.ItemStack; import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; +import common.util.HitPosition; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.World; public class EntityArrow extends Entity implements IProjectile, IObjectData diff --git a/common/src/common/entity/projectile/EntityBox.java b/common/src/common/entity/projectile/EntityBox.java index 17c92d9..de13b19 100755 --- a/common/src/common/entity/projectile/EntityBox.java +++ b/common/src/common/entity/projectile/EntityBox.java @@ -6,7 +6,7 @@ import common.entity.types.EntityLiving; import common.init.Config; import common.potion.Potion; import common.potion.PotionEffect; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityBox extends EntityProjectile diff --git a/common/src/common/entity/projectile/EntityBullet.java b/common/src/common/entity/projectile/EntityBullet.java index 040336e..51f2f9a 100755 --- a/common/src/common/entity/projectile/EntityBullet.java +++ b/common/src/common/entity/projectile/EntityBullet.java @@ -12,10 +12,10 @@ import common.entity.types.IProjectile; import common.init.Config; import common.init.SoundEvent; import common.nbt.NBTTagCompound; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BoundingBox; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; public class EntityBullet extends Entity implements IProjectile, IObjectData diff --git a/common/src/common/entity/projectile/EntityDie.java b/common/src/common/entity/projectile/EntityDie.java index 80ad963..1407ba2 100755 --- a/common/src/common/entity/projectile/EntityDie.java +++ b/common/src/common/entity/projectile/EntityDie.java @@ -10,7 +10,7 @@ import common.init.SoundEvent; import common.item.ItemDie; import common.item.ItemStack; import common.nbt.NBTTagCompound; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityDie extends EntityThrowable implements IObjectData diff --git a/common/src/common/entity/projectile/EntityDynamite.java b/common/src/common/entity/projectile/EntityDynamite.java index 3c24d55..1146bdb 100755 --- a/common/src/common/entity/projectile/EntityDynamite.java +++ b/common/src/common/entity/projectile/EntityDynamite.java @@ -10,7 +10,7 @@ import common.init.ItemRegistry; import common.init.Items; import common.model.ParticleType; import common.nbt.NBTTagCompound; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityDynamite extends EntityThrowable implements IObjectData diff --git a/common/src/common/entity/projectile/EntityEgg.java b/common/src/common/entity/projectile/EntityEgg.java index 5f22a96..0f7ef77 100755 --- a/common/src/common/entity/projectile/EntityEgg.java +++ b/common/src/common/entity/projectile/EntityEgg.java @@ -8,7 +8,7 @@ import common.init.Config; import common.init.ItemRegistry; import common.init.Items; import common.model.ParticleType; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityEgg extends EntityThrowable diff --git a/common/src/common/entity/projectile/EntityFireCharge.java b/common/src/common/entity/projectile/EntityFireCharge.java index 999c561..0a27a2c 100755 --- a/common/src/common/entity/projectile/EntityFireCharge.java +++ b/common/src/common/entity/projectile/EntityFireCharge.java @@ -4,8 +4,8 @@ import common.entity.DamageSource; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.Config; -import common.world.BlockPos; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.HitPosition; import common.world.World; public class EntityFireCharge extends EntityProjectile diff --git a/common/src/common/entity/projectile/EntityFireball.java b/common/src/common/entity/projectile/EntityFireball.java index 3aa02c6..04ad023 100755 --- a/common/src/common/entity/projectile/EntityFireball.java +++ b/common/src/common/entity/projectile/EntityFireball.java @@ -4,7 +4,7 @@ import common.entity.DamageSource; import common.entity.types.EntityLiving; import common.init.Config; import common.nbt.NBTTagCompound; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntityFireball extends EntityProjectile diff --git a/common/src/common/entity/projectile/EntityHook.java b/common/src/common/entity/projectile/EntityHook.java index d348d73..318976c 100755 --- a/common/src/common/entity/projectile/EntityHook.java +++ b/common/src/common/entity/projectile/EntityHook.java @@ -19,11 +19,11 @@ import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; import common.world.WorldServer; import common.worldgen.LootConstants; diff --git a/common/src/common/entity/projectile/EntityPotion.java b/common/src/common/entity/projectile/EntityPotion.java index 93e1fbb..3d477f6 100755 --- a/common/src/common/entity/projectile/EntityPotion.java +++ b/common/src/common/entity/projectile/EntityPotion.java @@ -10,9 +10,9 @@ import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.potion.Potion; import common.potion.PotionEffect; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.HitPosition; import common.world.World; public class EntityPotion extends EntityThrowable implements IObjectData diff --git a/common/src/common/entity/projectile/EntityProjectile.java b/common/src/common/entity/projectile/EntityProjectile.java index a8ab021..32dd6d5 100755 --- a/common/src/common/entity/projectile/EntityProjectile.java +++ b/common/src/common/entity/projectile/EntityProjectile.java @@ -11,11 +11,11 @@ import common.init.BlockRegistry; import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; public abstract class EntityProjectile extends Entity diff --git a/common/src/common/entity/projectile/EntitySnowball.java b/common/src/common/entity/projectile/EntitySnowball.java index b1801de..6e4a137 100755 --- a/common/src/common/entity/projectile/EntitySnowball.java +++ b/common/src/common/entity/projectile/EntitySnowball.java @@ -5,7 +5,7 @@ import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.init.Config; import common.model.ParticleType; -import common.world.HitPosition; +import common.util.HitPosition; import common.world.World; public class EntitySnowball extends EntityThrowable diff --git a/common/src/common/entity/types/EntityAnimal.java b/common/src/common/entity/types/EntityAnimal.java index f3565c6..3cfde3a 100755 --- a/common/src/common/entity/types/EntityAnimal.java +++ b/common/src/common/entity/types/EntityAnimal.java @@ -13,8 +13,8 @@ import common.init.Items; import common.item.ItemStack; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; public abstract class EntityAnimal extends EntityLiving diff --git a/common/src/common/entity/types/EntityLiving.java b/common/src/common/entity/types/EntityLiving.java index 2bb0f27..c99cbb5 100755 --- a/common/src/common/entity/types/EntityLiving.java +++ b/common/src/common/entity/types/EntityLiving.java @@ -60,11 +60,11 @@ import common.potion.Potion; import common.potion.PotionEffect; import common.potion.PotionHelper; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/entity/types/EntityThrowable.java b/common/src/common/entity/types/EntityThrowable.java index 3eac442..2833d82 100755 --- a/common/src/common/entity/types/EntityThrowable.java +++ b/common/src/common/entity/types/EntityThrowable.java @@ -10,12 +10,12 @@ import common.init.BlockRegistry; import common.init.Blocks; import common.model.ParticleType; import common.nbt.NBTTagCompound; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; +import common.util.HitPosition; +import common.util.Vec3; import common.world.State; -import common.world.Vec3; import common.world.World; public abstract class EntityThrowable extends Entity implements IProjectile diff --git a/common/src/common/init/DispenserRegistry.java b/common/src/common/init/DispenserRegistry.java index 74a0bdb..64bc258 100755 --- a/common/src/common/init/DispenserRegistry.java +++ b/common/src/common/init/DispenserRegistry.java @@ -35,9 +35,9 @@ import common.item.ItemStack; import common.material.Material; import common.rng.Random; import common.tileentity.TileEntityDispenser; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/init/ReorderRegistry.java b/common/src/common/init/ReorderRegistry.java index 181e48c..b5796fa 100755 --- a/common/src/common/init/ReorderRegistry.java +++ b/common/src/common/init/ReorderRegistry.java @@ -9,9 +9,9 @@ import common.block.Block; import common.block.BlockBed; import common.block.BlockDoor; import common.color.DyeColor; -import common.world.Facing; +import common.util.Facing; +import common.util.Vec3i; import common.world.State; -import common.world.Vec3i; public abstract class ReorderRegistry { private static final Set PLACE_LAST = new HashSet(); diff --git a/common/src/common/init/RotationRegistry.java b/common/src/common/init/RotationRegistry.java index be4d0a9..3c6eb32 100755 --- a/common/src/common/init/RotationRegistry.java +++ b/common/src/common/init/RotationRegistry.java @@ -23,9 +23,9 @@ import common.collect.Lists; import common.collect.Maps; import common.properties.IProperty; import common.properties.PropertyDirection; -import common.world.Facing; +import common.util.Facing; +import common.util.Vec3i; import common.world.State; -import common.world.Vec3i; public abstract class RotationRegistry { private static final Map MAP = new HashMap(); diff --git a/common/src/common/init/UniverseRegistry.java b/common/src/common/init/UniverseRegistry.java index 9f8451e..4986d28 100755 --- a/common/src/common/init/UniverseRegistry.java +++ b/common/src/common/init/UniverseRegistry.java @@ -31,7 +31,7 @@ import common.nbt.NBTParser; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.rng.Random; -import common.world.PortalType; +import common.util.PortalType; import common.world.State; import common.world.Weather; diff --git a/common/src/common/inventory/ContainerEnchantment.java b/common/src/common/inventory/ContainerEnchantment.java index 551053a..f630bbe 100755 --- a/common/src/common/inventory/ContainerEnchantment.java +++ b/common/src/common/inventory/ContainerEnchantment.java @@ -9,7 +9,7 @@ import common.init.Blocks; import common.init.Items; import common.item.ItemStack; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ContainerEnchantment extends Container diff --git a/common/src/common/inventory/ContainerRepair.java b/common/src/common/inventory/ContainerRepair.java index c2fa9d2..82da6ed 100755 --- a/common/src/common/inventory/ContainerRepair.java +++ b/common/src/common/inventory/ContainerRepair.java @@ -11,7 +11,7 @@ import common.init.Blocks; import common.init.Config; import common.init.Items; import common.item.ItemStack; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/inventory/ContainerWorkbench.java b/common/src/common/inventory/ContainerWorkbench.java index 2162e9e..2dce2fc 100755 --- a/common/src/common/inventory/ContainerWorkbench.java +++ b/common/src/common/inventory/ContainerWorkbench.java @@ -4,7 +4,7 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.CraftingRegistry; import common.item.ItemStack; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ContainerWorkbench extends Container diff --git a/common/src/common/inventory/ISidedInventory.java b/common/src/common/inventory/ISidedInventory.java index ad72573..2def255 100755 --- a/common/src/common/inventory/ISidedInventory.java +++ b/common/src/common/inventory/ISidedInventory.java @@ -1,7 +1,7 @@ package common.inventory; import common.item.ItemStack; -import common.world.Facing; +import common.util.Facing; public interface ISidedInventory extends IInventory { diff --git a/common/src/common/inventory/InventoryHelper.java b/common/src/common/inventory/InventoryHelper.java index 0bfc5d8..43d6151 100755 --- a/common/src/common/inventory/InventoryHelper.java +++ b/common/src/common/inventory/InventoryHelper.java @@ -5,7 +5,7 @@ import common.entity.item.EntityItem; import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class InventoryHelper diff --git a/common/src/common/inventory/InventoryWarpChest.java b/common/src/common/inventory/InventoryWarpChest.java index 11656be..4d83f60 100755 --- a/common/src/common/inventory/InventoryWarpChest.java +++ b/common/src/common/inventory/InventoryWarpChest.java @@ -5,7 +5,7 @@ import common.init.Blocks; import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; -import common.world.BlockPos; +import common.util.BlockPos; public class InventoryWarpChest extends InventoryBasic { diff --git a/common/src/common/item/Item.java b/common/src/common/item/Item.java index a0885d9..9212ab5 100755 --- a/common/src/common/item/Item.java +++ b/common/src/common/item/Item.java @@ -18,11 +18,11 @@ import common.model.ModelProvider; import common.model.Transforms; import common.nbt.NBTTagCompound; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.Facing; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; public class Item diff --git a/common/src/common/item/ItemArmor.java b/common/src/common/item/ItemArmor.java index 8fc63a8..0529e9a 100755 --- a/common/src/common/item/ItemArmor.java +++ b/common/src/common/item/ItemArmor.java @@ -21,8 +21,8 @@ import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; import common.nbt.NBTTagCompound; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.World; public class ItemArmor extends Item diff --git a/common/src/common/item/ItemBanHammer.java b/common/src/common/item/ItemBanHammer.java index db93716..e9c61ff 100755 --- a/common/src/common/item/ItemBanHammer.java +++ b/common/src/common/item/ItemBanHammer.java @@ -6,8 +6,8 @@ import common.color.TextColor; import common.entity.DamageSource; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; -import common.world.BoundingBox; -import common.world.Vec3; +import common.util.BoundingBox; +import common.util.Vec3; import common.world.WorldServer; public class ItemBanHammer extends ItemWand { diff --git a/common/src/common/item/ItemBanner.java b/common/src/common/item/ItemBanner.java index 6a41313..dc04e64 100755 --- a/common/src/common/item/ItemBanner.java +++ b/common/src/common/item/ItemBanner.java @@ -14,9 +14,9 @@ import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.tileentity.TileEntity; import common.tileentity.TileEntityBanner; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.World; public class ItemBanner extends ItemBlock diff --git a/common/src/common/item/ItemBed.java b/common/src/common/item/ItemBed.java index 04a9b51..f2c927e 100755 --- a/common/src/common/item/ItemBed.java +++ b/common/src/common/item/ItemBed.java @@ -3,9 +3,9 @@ package common.item; import common.block.Block; import common.block.BlockBed; import common.entity.npc.EntityNPC; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemBlock.java b/common/src/common/item/ItemBlock.java index 0a2de57..b6f4928 100755 --- a/common/src/common/item/ItemBlock.java +++ b/common/src/common/item/ItemBlock.java @@ -13,8 +13,8 @@ import common.model.ModelProvider; import common.model.Transforms; import common.nbt.NBTTagCompound; import common.tileentity.TileEntity; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemBoat.java b/common/src/common/item/ItemBoat.java index 21894ed..1aa2ae3 100755 --- a/common/src/common/item/ItemBoat.java +++ b/common/src/common/item/ItemBoat.java @@ -6,11 +6,11 @@ import common.entity.Entity; import common.entity.item.EntityBoat; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.HitPosition; -import common.world.Vec3; +import common.util.HitPosition; +import common.util.Vec3; import common.world.World; public class ItemBoat extends Item diff --git a/common/src/common/item/ItemBucket.java b/common/src/common/item/ItemBucket.java index f66c84a..b718e5b 100755 --- a/common/src/common/item/ItemBucket.java +++ b/common/src/common/item/ItemBucket.java @@ -23,10 +23,10 @@ import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; -import common.world.BlockPos; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.HitPosition; +import common.util.Vec3i; import common.world.State; -import common.world.Vec3i; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/item/ItemCamera.java b/common/src/common/item/ItemCamera.java index 30fbb78..7a19ef9 100755 --- a/common/src/common/item/ItemCamera.java +++ b/common/src/common/item/ItemCamera.java @@ -1,7 +1,7 @@ package common.item; import common.entity.npc.EntityNPC; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ItemCamera extends ItemMagnetic { diff --git a/common/src/common/item/ItemChargedOrb.java b/common/src/common/item/ItemChargedOrb.java index e156296..8e93c20 100755 --- a/common/src/common/item/ItemChargedOrb.java +++ b/common/src/common/item/ItemChargedOrb.java @@ -8,8 +8,8 @@ import common.init.Blocks; import common.init.Items; import common.init.SoundEvent; import common.model.ParticleType; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemDoor.java b/common/src/common/item/ItemDoor.java index 54a41a7..ed84de0 100755 --- a/common/src/common/item/ItemDoor.java +++ b/common/src/common/item/ItemDoor.java @@ -5,8 +5,8 @@ import common.block.BlockDoor; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemDye.java b/common/src/common/item/ItemDye.java index d2fa2e2..0849a20 100755 --- a/common/src/common/item/ItemDye.java +++ b/common/src/common/item/ItemDye.java @@ -17,8 +17,8 @@ import common.model.ModelProvider; import common.model.ParticleType; import common.tileentity.TileEntity; import common.tileentity.TileEntityBeacon; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/item/ItemEditWand.java b/common/src/common/item/ItemEditWand.java index bf73170..ca542f9 100755 --- a/common/src/common/item/ItemEditWand.java +++ b/common/src/common/item/ItemEditWand.java @@ -2,7 +2,7 @@ package common.item; import common.entity.npc.EntityNPC; import common.model.Transforms; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ItemEditWand extends Item { diff --git a/common/src/common/item/ItemFireball.java b/common/src/common/item/ItemFireball.java index e3d7746..5870b25 100755 --- a/common/src/common/item/ItemFireball.java +++ b/common/src/common/item/ItemFireball.java @@ -4,8 +4,8 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.SoundEvent; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemFireball extends Item diff --git a/common/src/common/item/ItemFirework.java b/common/src/common/item/ItemFirework.java index 7adeda8..24450e4 100755 --- a/common/src/common/item/ItemFirework.java +++ b/common/src/common/item/ItemFirework.java @@ -7,8 +7,8 @@ import common.entity.item.EntityFireworks; import common.entity.npc.EntityNPC; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemFirework extends Item diff --git a/common/src/common/item/ItemFlintAndSteel.java b/common/src/common/item/ItemFlintAndSteel.java index ac5e63e..52ba772 100755 --- a/common/src/common/item/ItemFlintAndSteel.java +++ b/common/src/common/item/ItemFlintAndSteel.java @@ -4,8 +4,8 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.SoundEvent; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemFlintAndSteel extends Item diff --git a/common/src/common/item/ItemGlassBottle.java b/common/src/common/item/ItemGlassBottle.java index 84e73ed..aabb0ed 100755 --- a/common/src/common/item/ItemGlassBottle.java +++ b/common/src/common/item/ItemGlassBottle.java @@ -5,8 +5,8 @@ import common.init.Items; import common.material.Material; import common.model.Model; import common.model.ModelProvider; -import common.world.BlockPos; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.HitPosition; import common.world.World; public class ItemGlassBottle extends Item diff --git a/common/src/common/item/ItemHoe.java b/common/src/common/item/ItemHoe.java index c0cee67..d6e6678 100755 --- a/common/src/common/item/ItemHoe.java +++ b/common/src/common/item/ItemHoe.java @@ -7,8 +7,8 @@ import common.init.Blocks; import common.init.ToolMaterial; import common.material.Material; import common.model.Transforms; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemInfoWand.java b/common/src/common/item/ItemInfoWand.java index 3b93afb..8cf4c33 100755 --- a/common/src/common/item/ItemInfoWand.java +++ b/common/src/common/item/ItemInfoWand.java @@ -3,8 +3,8 @@ package common.item; import common.biome.Biome; import common.color.TextColor; import common.entity.npc.EntityNPC; -import common.world.BlockPos; -import common.world.Vec3; +import common.util.BlockPos; +import common.util.Vec3; import common.world.WorldServer; public class ItemInfoWand extends ItemWand { diff --git a/common/src/common/item/ItemLead.java b/common/src/common/item/ItemLead.java index fb8e6e8..263e5f3 100755 --- a/common/src/common/item/ItemLead.java +++ b/common/src/common/item/ItemLead.java @@ -5,9 +5,9 @@ import common.block.BlockFence; import common.entity.item.EntityLeashKnot; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.World; public class ItemLead extends Item diff --git a/common/src/common/item/ItemLightning.java b/common/src/common/item/ItemLightning.java index e3c8080..68a4779 100755 --- a/common/src/common/item/ItemLightning.java +++ b/common/src/common/item/ItemLightning.java @@ -2,7 +2,7 @@ package common.item; import common.color.TextColor; import common.entity.npc.EntityNPC; -import common.world.Vec3; +import common.util.Vec3; import common.world.WorldServer; public class ItemLightning extends ItemWand { diff --git a/common/src/common/item/ItemLilyPad.java b/common/src/common/item/ItemLilyPad.java index d56843e..6a69dc2 100755 --- a/common/src/common/item/ItemLilyPad.java +++ b/common/src/common/item/ItemLilyPad.java @@ -5,8 +5,8 @@ import common.block.BlockDirectional; import common.block.BlockLiquid; import common.entity.npc.EntityNPC; import common.init.Blocks; -import common.world.BlockPos; -import common.world.HitPosition; +import common.util.BlockPos; +import common.util.HitPosition; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemMagnet.java b/common/src/common/item/ItemMagnet.java index bf9c45a..c7dfa31 100755 --- a/common/src/common/item/ItemMagnet.java +++ b/common/src/common/item/ItemMagnet.java @@ -7,8 +7,8 @@ import common.entity.Entity; import common.entity.animal.EntityChicken; import common.entity.npc.EntityNPC; import common.model.Transforms; -import common.world.BoundingBox; -import common.world.Vec3; +import common.util.BoundingBox; +import common.util.Vec3; import common.world.World; public class ItemMagnet extends Item { diff --git a/common/src/common/item/ItemMinecart.java b/common/src/common/item/ItemMinecart.java index 66e8a4d..73ab5b6 100755 --- a/common/src/common/item/ItemMinecart.java +++ b/common/src/common/item/ItemMinecart.java @@ -9,8 +9,8 @@ import common.entity.item.EntityCart; import common.entity.npc.EntityNPC; import common.init.DispenserRegistry; import common.material.Material; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemMonsterPlacer.java b/common/src/common/item/ItemMonsterPlacer.java index f24d1d6..45a1c85 100755 --- a/common/src/common/item/ItemMonsterPlacer.java +++ b/common/src/common/item/ItemMonsterPlacer.java @@ -17,10 +17,10 @@ import common.model.Model; import common.model.ModelProvider; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; -import common.world.HitPosition; +import common.util.Facing; +import common.util.HitPosition; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemNpcSpawner.java b/common/src/common/item/ItemNpcSpawner.java index 31fa225..1f81811 100755 --- a/common/src/common/item/ItemNpcSpawner.java +++ b/common/src/common/item/ItemNpcSpawner.java @@ -16,10 +16,10 @@ import common.init.EntityRegistry; import common.init.UniverseRegistry; import common.model.Model; import common.model.ModelProvider; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; -import common.world.HitPosition; +import common.util.Facing; +import common.util.HitPosition; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemRedstone.java b/common/src/common/item/ItemRedstone.java index 53fc6be..fa090d4 100755 --- a/common/src/common/item/ItemRedstone.java +++ b/common/src/common/item/ItemRedstone.java @@ -4,8 +4,8 @@ import common.block.Block; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.init.Blocks; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemRedstone extends Item diff --git a/common/src/common/item/ItemReed.java b/common/src/common/item/ItemReed.java index 1538e73..263df61 100755 --- a/common/src/common/item/ItemReed.java +++ b/common/src/common/item/ItemReed.java @@ -5,8 +5,8 @@ import common.block.BlockSnow; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.init.Blocks; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemSeedFood.java b/common/src/common/item/ItemSeedFood.java index abe4ad1..7347a5c 100755 --- a/common/src/common/item/ItemSeedFood.java +++ b/common/src/common/item/ItemSeedFood.java @@ -2,8 +2,8 @@ package common.item; import common.block.Block; import common.entity.npc.EntityNPC; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemSeedFood extends ItemFood diff --git a/common/src/common/item/ItemSeeds.java b/common/src/common/item/ItemSeeds.java index 9cbcadf..2bf6656 100755 --- a/common/src/common/item/ItemSeeds.java +++ b/common/src/common/item/ItemSeeds.java @@ -3,8 +3,8 @@ package common.item; import common.block.Block; import common.entity.npc.EntityNPC; import common.model.Transforms; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; public class ItemSeeds extends Item diff --git a/common/src/common/item/ItemShears.java b/common/src/common/item/ItemShears.java index dc40068..515d799 100755 --- a/common/src/common/item/ItemShears.java +++ b/common/src/common/item/ItemShears.java @@ -5,7 +5,7 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ToolMaterial; import common.material.Material; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ItemShears extends Item diff --git a/common/src/common/item/ItemSign.java b/common/src/common/item/ItemSign.java index 07affb8..81719ad 100755 --- a/common/src/common/item/ItemSign.java +++ b/common/src/common/item/ItemSign.java @@ -7,9 +7,9 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.World; public class ItemSign extends Item diff --git a/common/src/common/item/ItemSkull.java b/common/src/common/item/ItemSkull.java index da83cc3..ce5443e 100755 --- a/common/src/common/item/ItemSkull.java +++ b/common/src/common/item/ItemSkull.java @@ -9,9 +9,9 @@ import common.model.ModelProvider; import common.model.Transforms; import common.tileentity.TileEntity; import common.tileentity.TileEntitySkull; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemSlab.java b/common/src/common/item/ItemSlab.java index fa3d824..4b171ba 100755 --- a/common/src/common/item/ItemSlab.java +++ b/common/src/common/item/ItemSlab.java @@ -3,8 +3,8 @@ package common.item; import common.block.Block; import common.block.BlockSlab; import common.entity.npc.EntityNPC; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemSnow.java b/common/src/common/item/ItemSnow.java index 4dbd517..d98bc65 100755 --- a/common/src/common/item/ItemSnow.java +++ b/common/src/common/item/ItemSnow.java @@ -3,9 +3,9 @@ package common.item; import common.block.Block; import common.block.BlockSnow; import common.entity.npc.EntityNPC; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; import common.world.World; diff --git a/common/src/common/item/ItemSpaceNavigator.java b/common/src/common/item/ItemSpaceNavigator.java index 5702a15..5c256ad 100755 --- a/common/src/common/item/ItemSpaceNavigator.java +++ b/common/src/common/item/ItemSpaceNavigator.java @@ -5,7 +5,7 @@ import java.util.List; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.UniverseRegistry; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ItemSpaceNavigator extends ItemMagnetic { diff --git a/common/src/common/item/ItemStack.java b/common/src/common/item/ItemStack.java index a24ad02..a25e49c 100755 --- a/common/src/common/item/ItemStack.java +++ b/common/src/common/item/ItemStack.java @@ -23,8 +23,8 @@ import common.nbt.NBTBase; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.World; import java.util.Set; diff --git a/common/src/common/item/ItemSword.java b/common/src/common/item/ItemSword.java index fb9c576..9ae7bc8 100755 --- a/common/src/common/item/ItemSword.java +++ b/common/src/common/item/ItemSword.java @@ -14,7 +14,7 @@ import common.init.Blocks; import common.init.ToolMaterial; import common.material.Material; import common.model.Transforms; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class ItemSword extends Item diff --git a/common/src/common/item/ItemTool.java b/common/src/common/item/ItemTool.java index 039ca45..4c58202 100755 --- a/common/src/common/item/ItemTool.java +++ b/common/src/common/item/ItemTool.java @@ -11,7 +11,7 @@ import common.entity.attributes.Attributes; import common.entity.types.EntityLiving; import common.init.ToolMaterial; import common.model.Transforms; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public abstract class ItemTool extends Item diff --git a/common/src/common/item/ItemWand.java b/common/src/common/item/ItemWand.java index 34eb6f6..880f6c8 100755 --- a/common/src/common/item/ItemWand.java +++ b/common/src/common/item/ItemWand.java @@ -5,10 +5,10 @@ import java.util.List; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.model.Transforms; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; -import common.world.Vec3; +import common.util.Facing; +import common.util.Vec3; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/model/Model.java b/common/src/common/model/Model.java index 378a18a..8affcad 100644 --- a/common/src/common/model/Model.java +++ b/common/src/common/model/Model.java @@ -1,6 +1,6 @@ package common.model; -import common.world.Facing; +import common.util.Facing; public abstract class Model { public abstract Model noOcclude(); diff --git a/common/src/common/model/ModelProvider.java b/common/src/common/model/ModelProvider.java index 5805eaf..f4cb0bf 100644 --- a/common/src/common/model/ModelProvider.java +++ b/common/src/common/model/ModelProvider.java @@ -1,7 +1,7 @@ package common.model; -import common.world.Facing; -import common.world.Facing.Axis; +import common.util.Facing; +import common.util.Facing.Axis; public interface ModelProvider { Model getModel(String primary); diff --git a/common/src/common/model/ModelRotation.java b/common/src/common/model/ModelRotation.java index 0329240..b4c1973 100755 --- a/common/src/common/model/ModelRotation.java +++ b/common/src/common/model/ModelRotation.java @@ -4,9 +4,9 @@ import java.util.Map; import common.collect.Maps; import common.util.ExtMath; +import common.util.Facing; import common.util.Matrix4f; import common.util.Vector3f; -import common.world.Facing; public enum ModelRotation { diff --git a/common/src/common/network/IClientPlayer.java b/common/src/common/network/IClientPlayer.java index 881d9cb..c5ff27d 100644 --- a/common/src/common/network/IClientPlayer.java +++ b/common/src/common/network/IClientPlayer.java @@ -65,7 +65,7 @@ import common.packet.SPacketTrades; import common.packet.SPacketUpdateHealth; import common.packet.SPacketWorld; import common.tileentity.IInteractionObject; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public interface IClientPlayer { diff --git a/common/src/common/network/IPlayer.java b/common/src/common/network/IPlayer.java index e819468..a78d4fb 100644 --- a/common/src/common/network/IPlayer.java +++ b/common/src/common/network/IPlayer.java @@ -26,10 +26,10 @@ import common.packet.CPacketSkin; import common.potion.PotionEffect; import common.tileentity.IInteractionObject; import common.tileentity.TileEntitySign; +import common.util.BlockPos; import common.util.CharValidator; -import common.world.BlockPos; -import common.world.ChunkPos; -import common.world.PortalType; +import common.util.ChunkPos; +import common.util.PortalType; public interface IPlayer { public static class UserValidator implements CharValidator { diff --git a/common/src/common/network/PacketBuffer.java b/common/src/common/network/PacketBuffer.java index a845416..4d0df41 100755 --- a/common/src/common/network/PacketBuffer.java +++ b/common/src/common/network/PacketBuffer.java @@ -8,7 +8,7 @@ import common.item.ItemStack; import common.nbt.NBTLoader; import common.nbt.NBTSizeTracker; import common.nbt.NBTTagCompound; -import common.world.BlockPos; +import common.util.BlockPos; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.ByteBufOutputStream; diff --git a/common/src/common/packet/CPacketBreak.java b/common/src/common/packet/CPacketBreak.java index 1de2c0b..64dc2e4 100755 --- a/common/src/common/packet/CPacketBreak.java +++ b/common/src/common/packet/CPacketBreak.java @@ -5,8 +5,8 @@ import java.io.IOException; import common.network.IPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; public class CPacketBreak implements Packet { diff --git a/common/src/common/packet/CPacketComplete.java b/common/src/common/packet/CPacketComplete.java index 74190cc..31b0cc6 100755 --- a/common/src/common/packet/CPacketComplete.java +++ b/common/src/common/packet/CPacketComplete.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class CPacketComplete implements Packet { diff --git a/common/src/common/packet/CPacketPlace.java b/common/src/common/packet/CPacketPlace.java index 9c91b4b..c082f6e 100755 --- a/common/src/common/packet/CPacketPlace.java +++ b/common/src/common/packet/CPacketPlace.java @@ -6,7 +6,7 @@ import common.item.ItemStack; import common.network.IPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class CPacketPlace implements Packet { diff --git a/common/src/common/packet/CPacketSign.java b/common/src/common/packet/CPacketSign.java index 3158172..3653f78 100755 --- a/common/src/common/packet/CPacketSign.java +++ b/common/src/common/packet/CPacketSign.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class CPacketSign implements Packet { diff --git a/common/src/common/packet/S27PacketExplosion.java b/common/src/common/packet/S27PacketExplosion.java index 4d76e68..85f90ee 100755 --- a/common/src/common/packet/S27PacketExplosion.java +++ b/common/src/common/packet/S27PacketExplosion.java @@ -8,8 +8,8 @@ import common.collect.Lists; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; -import common.world.Vec3; +import common.util.BlockPos; +import common.util.Vec3; public class S27PacketExplosion implements Packet { diff --git a/common/src/common/packet/S28PacketEffect.java b/common/src/common/packet/S28PacketEffect.java index 6e9915f..cd826e2 100755 --- a/common/src/common/packet/S28PacketEffect.java +++ b/common/src/common/packet/S28PacketEffect.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class S28PacketEffect implements Packet { private int soundType; diff --git a/common/src/common/packet/S2DPacketOpenWindow.java b/common/src/common/packet/S2DPacketOpenWindow.java index 38246fe..6fb2370 100755 --- a/common/src/common/packet/S2DPacketOpenWindow.java +++ b/common/src/common/packet/S2DPacketOpenWindow.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class S2DPacketOpenWindow implements Packet { diff --git a/common/src/common/packet/S33PacketUpdateSign.java b/common/src/common/packet/S33PacketUpdateSign.java index dc8b266..8c75e28 100755 --- a/common/src/common/packet/S33PacketUpdateSign.java +++ b/common/src/common/packet/S33PacketUpdateSign.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.World; public class S33PacketUpdateSign implements Packet diff --git a/common/src/common/packet/S35PacketUpdateTileEntity.java b/common/src/common/packet/S35PacketUpdateTileEntity.java index 7c0aa3d..c44844c 100755 --- a/common/src/common/packet/S35PacketUpdateTileEntity.java +++ b/common/src/common/packet/S35PacketUpdateTileEntity.java @@ -8,7 +8,7 @@ import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; import common.tileentity.TileEntity; -import common.world.BlockPos; +import common.util.BlockPos; public class S35PacketUpdateTileEntity implements Packet { diff --git a/common/src/common/packet/S36PacketSignEditorOpen.java b/common/src/common/packet/S36PacketSignEditorOpen.java index 29d3f03..1059d0c 100755 --- a/common/src/common/packet/S36PacketSignEditorOpen.java +++ b/common/src/common/packet/S36PacketSignEditorOpen.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class S36PacketSignEditorOpen implements Packet { diff --git a/common/src/common/packet/SPacketBlockAction.java b/common/src/common/packet/SPacketBlockAction.java index 5de2cac..239d6eb 100755 --- a/common/src/common/packet/SPacketBlockAction.java +++ b/common/src/common/packet/SPacketBlockAction.java @@ -7,7 +7,7 @@ import common.init.BlockRegistry; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class SPacketBlockAction implements Packet { diff --git a/common/src/common/packet/SPacketBlockBreakAnim.java b/common/src/common/packet/SPacketBlockBreakAnim.java index d6f613c..ccebc7e 100755 --- a/common/src/common/packet/SPacketBlockBreakAnim.java +++ b/common/src/common/packet/SPacketBlockBreakAnim.java @@ -5,7 +5,7 @@ import java.io.IOException; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class SPacketBlockBreakAnim implements Packet { diff --git a/common/src/common/packet/SPacketBlockChange.java b/common/src/common/packet/SPacketBlockChange.java index d60fd10..9ab2a01 100755 --- a/common/src/common/packet/SPacketBlockChange.java +++ b/common/src/common/packet/SPacketBlockChange.java @@ -6,7 +6,7 @@ import common.init.BlockRegistry; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/packet/SPacketCharacterList.java b/common/src/common/packet/SPacketCharacterList.java index b5b13b8..8978d9d 100644 --- a/common/src/common/packet/SPacketCharacterList.java +++ b/common/src/common/packet/SPacketCharacterList.java @@ -12,7 +12,7 @@ import common.network.IClientPlayer; import common.network.IPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; public class SPacketCharacterList implements Packet { private final Map players = Maps.newHashMap(); diff --git a/common/src/common/packet/SPacketMultiBlockChange.java b/common/src/common/packet/SPacketMultiBlockChange.java index 8769e0a..97d5e60 100755 --- a/common/src/common/packet/SPacketMultiBlockChange.java +++ b/common/src/common/packet/SPacketMultiBlockChange.java @@ -6,9 +6,9 @@ import common.init.BlockRegistry; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; -import common.world.BlockPos; +import common.util.BlockPos; +import common.util.ChunkPos; import common.world.Chunk; -import common.world.ChunkPos; import common.world.State; public class SPacketMultiBlockChange implements Packet diff --git a/common/src/common/packet/SPacketSpawnObject.java b/common/src/common/packet/SPacketSpawnObject.java index 5058f62..6af450a 100755 --- a/common/src/common/packet/SPacketSpawnObject.java +++ b/common/src/common/packet/SPacketSpawnObject.java @@ -10,9 +10,9 @@ import common.init.EntityRegistry; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Vec3; +import common.util.Vec3; public class SPacketSpawnObject implements Packet { diff --git a/common/src/common/pathfinding/NodeProcessor.java b/common/src/common/pathfinding/NodeProcessor.java index 8dc172e..ba397bc 100755 --- a/common/src/common/pathfinding/NodeProcessor.java +++ b/common/src/common/pathfinding/NodeProcessor.java @@ -2,7 +2,7 @@ package common.pathfinding; import common.entity.Entity; import common.util.ExtMath; -import common.world.IntHashMap; +import common.util.IntHashMap; public abstract class NodeProcessor { diff --git a/common/src/common/pathfinding/PathCache.java b/common/src/common/pathfinding/PathCache.java index 1dc0239..3af36a8 100755 --- a/common/src/common/pathfinding/PathCache.java +++ b/common/src/common/pathfinding/PathCache.java @@ -1,7 +1,7 @@ package common.pathfinding; import common.init.Blocks; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.Chunk; import common.world.ChunkCache; import common.world.IBlockAccess; diff --git a/common/src/common/pathfinding/PathEntity.java b/common/src/common/pathfinding/PathEntity.java index 593e6e3..85f8e74 100755 --- a/common/src/common/pathfinding/PathEntity.java +++ b/common/src/common/pathfinding/PathEntity.java @@ -1,7 +1,7 @@ package common.pathfinding; import common.entity.Entity; -import common.world.Vec3; +import common.util.Vec3; public class PathEntity { diff --git a/common/src/common/pathfinding/PathFinder.java b/common/src/common/pathfinding/PathFinder.java index db9798e..52b4569 100755 --- a/common/src/common/pathfinding/PathFinder.java +++ b/common/src/common/pathfinding/PathFinder.java @@ -1,7 +1,7 @@ package common.pathfinding; import common.entity.Entity; -import common.world.BlockPos; +import common.util.BlockPos; public class PathFinder { diff --git a/common/src/common/pathfinding/PathNavigate.java b/common/src/common/pathfinding/PathNavigate.java index fb749ca..ee406dd 100755 --- a/common/src/common/pathfinding/PathNavigate.java +++ b/common/src/common/pathfinding/PathNavigate.java @@ -6,10 +6,10 @@ import common.entity.Entity; import common.entity.attributes.AttributeInstance; import common.entity.attributes.Attributes; import common.entity.types.EntityLiving; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Vec3; +import common.util.Vec3; import common.world.World; public abstract class PathNavigate diff --git a/common/src/common/pathfinding/PathNavigateClimber.java b/common/src/common/pathfinding/PathNavigateClimber.java index 02388f6..0632fe2 100755 --- a/common/src/common/pathfinding/PathNavigateClimber.java +++ b/common/src/common/pathfinding/PathNavigateClimber.java @@ -2,8 +2,8 @@ package common.pathfinding; import common.entity.Entity; import common.entity.types.EntityLiving; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; public class PathNavigateClimber extends PathNavigateGround diff --git a/common/src/common/pathfinding/PathNavigateGround.java b/common/src/common/pathfinding/PathNavigateGround.java index 0fd0d79..f12b1c8 100755 --- a/common/src/common/pathfinding/PathNavigateGround.java +++ b/common/src/common/pathfinding/PathNavigateGround.java @@ -5,9 +5,9 @@ import common.entity.animal.EntityChicken; import common.entity.npc.EntityZombie; import common.entity.types.EntityLiving; import common.material.Material; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Vec3; +import common.util.Vec3; import common.world.World; public class PathNavigateGround extends PathNavigate diff --git a/common/src/common/pathfinding/SwimNodeProcessor.java b/common/src/common/pathfinding/SwimNodeProcessor.java index 57e13ae..cebffbb 100755 --- a/common/src/common/pathfinding/SwimNodeProcessor.java +++ b/common/src/common/pathfinding/SwimNodeProcessor.java @@ -2,9 +2,9 @@ package common.pathfinding; import common.block.Block; import common.entity.Entity; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.Facing; +import common.util.Facing; public class SwimNodeProcessor extends NodeProcessor { diff --git a/common/src/common/pathfinding/WalkNodeProcessor.java b/common/src/common/pathfinding/WalkNodeProcessor.java index 1f6a96e..1233bcd 100755 --- a/common/src/common/pathfinding/WalkNodeProcessor.java +++ b/common/src/common/pathfinding/WalkNodeProcessor.java @@ -9,8 +9,8 @@ import common.block.BlockWall; import common.entity.Entity; import common.init.Blocks; import common.material.Material; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.IBlockAccess; public class WalkNodeProcessor extends NodeProcessor diff --git a/common/src/common/properties/PropertyDirection.java b/common/src/common/properties/PropertyDirection.java index 4c08522..88ba891 100755 --- a/common/src/common/properties/PropertyDirection.java +++ b/common/src/common/properties/PropertyDirection.java @@ -5,8 +5,8 @@ import java.util.function.Predicate; import common.collect.Filter; import common.collect.Lists; +import common.util.Facing; import common.util.Predicates; -import common.world.Facing; public class PropertyDirection extends PropertyEnum { diff --git a/common/src/common/tileentity/TileEntity.java b/common/src/common/tileentity/TileEntity.java index ea72613..45c47a9 100755 --- a/common/src/common/tileentity/TileEntity.java +++ b/common/src/common/tileentity/TileEntity.java @@ -6,7 +6,7 @@ import common.init.TileRegistry; import common.log.Log; import common.nbt.NBTTagCompound; import common.network.Packet; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.World; diff --git a/common/src/common/tileentity/TileEntityBeacon.java b/common/src/common/tileentity/TileEntityBeacon.java index 23ecca3..97ffe57 100755 --- a/common/src/common/tileentity/TileEntityBeacon.java +++ b/common/src/common/tileentity/TileEntityBeacon.java @@ -11,8 +11,8 @@ import common.network.Packet; import common.packet.S35PacketUpdateTileEntity; import common.potion.Potion; import common.potion.PotionEffect; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.State; import common.world.World; import common.world.WorldServer; diff --git a/common/src/common/tileentity/TileEntityBrewingStand.java b/common/src/common/tileentity/TileEntityBrewingStand.java index 8af4271..3ae0f5e 100755 --- a/common/src/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/common/tileentity/TileEntityBrewingStand.java @@ -17,7 +17,7 @@ import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.potion.PotionEffect; import common.potion.PotionHelper; -import common.world.Facing; +import common.util.Facing; import common.world.State; public class TileEntityBrewingStand extends TileEntityLockable implements ITickable, ISidedInventory diff --git a/common/src/common/tileentity/TileEntityChest.java b/common/src/common/tileentity/TileEntityChest.java index c1e465f..b85965f 100755 --- a/common/src/common/tileentity/TileEntityChest.java +++ b/common/src/common/tileentity/TileEntityChest.java @@ -12,9 +12,9 @@ import common.inventory.InventoryPlayer; import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.Facing; public class TileEntityChest extends TileEntityLockable implements ITickable, IInventory { diff --git a/common/src/common/tileentity/TileEntityFurnace.java b/common/src/common/tileentity/TileEntityFurnace.java index f2dae36..af1c0f3 100755 --- a/common/src/common/tileentity/TileEntityFurnace.java +++ b/common/src/common/tileentity/TileEntityFurnace.java @@ -26,7 +26,7 @@ import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.util.ExtMath; -import common.world.Facing; +import common.util.Facing; public class TileEntityFurnace extends TileEntityLockable implements ITickable, ISidedInventory { diff --git a/common/src/common/tileentity/TileEntityHopper.java b/common/src/common/tileentity/TileEntityHopper.java index 736bc88..60db278 100755 --- a/common/src/common/tileentity/TileEntityHopper.java +++ b/common/src/common/tileentity/TileEntityHopper.java @@ -18,10 +18,10 @@ import common.inventory.InventoryPlayer; import common.item.ItemStack; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; -import common.world.BlockPos; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.Facing; import common.world.World; public class TileEntityHopper extends TileEntityLockable implements IHopper, ITickable diff --git a/common/src/common/tileentity/TileEntityMobSpawner.java b/common/src/common/tileentity/TileEntityMobSpawner.java index 1105fa3..0847f04 100755 --- a/common/src/common/tileentity/TileEntityMobSpawner.java +++ b/common/src/common/tileentity/TileEntityMobSpawner.java @@ -9,8 +9,8 @@ import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.network.Packet; import common.packet.S35PacketUpdateTileEntity; -import common.world.BlockPos; -import common.world.BoundingBox; +import common.util.BlockPos; +import common.util.BoundingBox; import common.world.World; public class TileEntityMobSpawner extends TileEntity implements ITickable diff --git a/common/src/common/tileentity/TileEntityNote.java b/common/src/common/tileentity/TileEntityNote.java index c3d4238..214d94c 100755 --- a/common/src/common/tileentity/TileEntityNote.java +++ b/common/src/common/tileentity/TileEntityNote.java @@ -3,8 +3,8 @@ package common.tileentity; import common.init.Blocks; import common.material.Material; import common.nbt.NBTTagCompound; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.World; public class TileEntityNote extends TileEntity diff --git a/common/src/common/tileentity/TileEntityPiston.java b/common/src/common/tileentity/TileEntityPiston.java index e84301f..d4cc931 100755 --- a/common/src/common/tileentity/TileEntityPiston.java +++ b/common/src/common/tileentity/TileEntityPiston.java @@ -7,8 +7,8 @@ import common.entity.Entity; import common.init.BlockRegistry; import common.init.Blocks; import common.nbt.NBTTagCompound; -import common.world.BoundingBox; -import common.world.Facing; +import common.util.BoundingBox; +import common.util.Facing; import common.world.State; public class TileEntityPiston extends TileEntity implements ITickable diff --git a/common/src/common/world/BlockPos.java b/common/src/common/util/BlockPos.java similarity index 99% rename from common/src/common/world/BlockPos.java rename to common/src/common/util/BlockPos.java index 1288f53..493452c 100755 --- a/common/src/common/world/BlockPos.java +++ b/common/src/common/util/BlockPos.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; import java.util.Iterator; diff --git a/common/src/common/world/BoundingBox.java b/common/src/common/util/BoundingBox.java similarity index 99% rename from common/src/common/world/BoundingBox.java rename to common/src/common/util/BoundingBox.java index c7b02c1..15206f5 100755 --- a/common/src/common/world/BoundingBox.java +++ b/common/src/common/util/BoundingBox.java @@ -1,6 +1,6 @@ -package common.world; +package common.util; -import common.world.HitPosition.ObjectType; +import common.util.HitPosition.ObjectType; public class BoundingBox { diff --git a/common/src/common/world/ChunkPos.java b/common/src/common/util/ChunkPos.java similarity index 96% rename from common/src/common/world/ChunkPos.java rename to common/src/common/util/ChunkPos.java index 0e8fc2e..32a1c8e 100755 --- a/common/src/common/world/ChunkPos.java +++ b/common/src/common/util/ChunkPos.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class ChunkPos { public final int x; diff --git a/common/src/common/world/ClassInheritanceMultiMap.java b/common/src/common/util/ClassInheritanceMultiMap.java similarity index 99% rename from common/src/common/world/ClassInheritanceMultiMap.java rename to common/src/common/util/ClassInheritanceMultiMap.java index c5f9e93..78b03ec 100755 --- a/common/src/common/world/ClassInheritanceMultiMap.java +++ b/common/src/common/util/ClassInheritanceMultiMap.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; import java.util.AbstractSet; import java.util.Collections; diff --git a/common/src/common/world/Facing.java b/common/src/common/util/Facing.java similarity index 99% rename from common/src/common/world/Facing.java rename to common/src/common/util/Facing.java index 66d901a..47e093b 100755 --- a/common/src/common/world/Facing.java +++ b/common/src/common/util/Facing.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; import java.util.Iterator; import java.util.Map; @@ -7,8 +7,6 @@ import java.util.function.Predicate; import common.collect.Iterators; import common.collect.Maps; import common.rng.Random; -import common.util.ExtMath; -import common.util.Identifyable; public enum Facing implements Identifyable { diff --git a/common/src/common/world/HitPosition.java b/common/src/common/util/HitPosition.java similarity index 97% rename from common/src/common/world/HitPosition.java rename to common/src/common/util/HitPosition.java index 940d092..74e90e1 100755 --- a/common/src/common/world/HitPosition.java +++ b/common/src/common/util/HitPosition.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; import common.entity.Entity; diff --git a/common/src/common/world/IntHashMap.java b/common/src/common/util/IntHashMap.java similarity index 99% rename from common/src/common/world/IntHashMap.java rename to common/src/common/util/IntHashMap.java index 12e3470..885b3a2 100755 --- a/common/src/common/world/IntHashMap.java +++ b/common/src/common/util/IntHashMap.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class IntHashMap { diff --git a/common/src/common/world/LongHashMap.java b/common/src/common/util/LongHashMap.java similarity index 99% rename from common/src/common/world/LongHashMap.java rename to common/src/common/util/LongHashMap.java index 35fad96..89aba64 100755 --- a/common/src/common/world/LongHashMap.java +++ b/common/src/common/util/LongHashMap.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class LongHashMap { diff --git a/common/src/common/world/NextTickListEntry.java b/common/src/common/util/NextTickListEntry.java similarity index 98% rename from common/src/common/world/NextTickListEntry.java rename to common/src/common/util/NextTickListEntry.java index d208b2f..6f492ad 100755 --- a/common/src/common/world/NextTickListEntry.java +++ b/common/src/common/util/NextTickListEntry.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; import common.block.Block; import common.init.BlockRegistry; diff --git a/common/src/common/world/NibbleArray.java b/common/src/common/util/NibbleArray.java similarity index 97% rename from common/src/common/world/NibbleArray.java rename to common/src/common/util/NibbleArray.java index 3a53b8d..629be8d 100755 --- a/common/src/common/world/NibbleArray.java +++ b/common/src/common/util/NibbleArray.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class NibbleArray { private final byte[] data; diff --git a/common/src/common/world/PortalType.java b/common/src/common/util/PortalType.java similarity index 86% rename from common/src/common/world/PortalType.java rename to common/src/common/util/PortalType.java index 06e214f..91b7cd4 100755 --- a/common/src/common/world/PortalType.java +++ b/common/src/common/util/PortalType.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public enum PortalType { STAND_BLACK, STAND_RED, STAND_YELLOW, STAND_GREEN, STAND_CYAN, STAND_BLUE, STAND_MAGENTA, STAND_WHITE, FLOOR, VOID; diff --git a/common/src/common/world/Position.java b/common/src/common/util/Position.java similarity index 94% rename from common/src/common/world/Position.java rename to common/src/common/util/Position.java index 59eaf24..8d7aa6c 100755 --- a/common/src/common/world/Position.java +++ b/common/src/common/util/Position.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class Position { public final double x; diff --git a/common/src/common/world/Vec3.java b/common/src/common/util/Vec3.java similarity index 99% rename from common/src/common/world/Vec3.java rename to common/src/common/util/Vec3.java index 88b95ed..e183bf1 100755 --- a/common/src/common/world/Vec3.java +++ b/common/src/common/util/Vec3.java @@ -1,6 +1,4 @@ -package common.world; - -import common.util.ExtMath; +package common.util; public class Vec3 { diff --git a/common/src/common/world/Vec3i.java b/common/src/common/util/Vec3i.java similarity index 98% rename from common/src/common/world/Vec3i.java rename to common/src/common/util/Vec3i.java index fa1cd58..87ad35e 100755 --- a/common/src/common/world/Vec3i.java +++ b/common/src/common/util/Vec3i.java @@ -1,6 +1,4 @@ -package common.world; - -import common.util.ExtMath; +package common.util; public class Vec3i implements Comparable { diff --git a/common/src/common/world/WorldPos.java b/common/src/common/util/WorldPos.java similarity index 97% rename from common/src/common/world/WorldPos.java rename to common/src/common/util/WorldPos.java index 8c5608b..c23895c 100755 --- a/common/src/common/world/WorldPos.java +++ b/common/src/common/util/WorldPos.java @@ -1,4 +1,4 @@ -package common.world; +package common.util; public class WorldPos extends BlockPos { private final int dim; diff --git a/common/src/common/village/Village.java b/common/src/common/village/Village.java index 9185f6a..adc573f 100755 --- a/common/src/common/village/Village.java +++ b/common/src/common/village/Village.java @@ -9,7 +9,7 @@ import common.collect.Lists; import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; public class Village diff --git a/common/src/common/village/VillageCollection.java b/common/src/common/village/VillageCollection.java index 6872619..ecc2d9f 100755 --- a/common/src/common/village/VillageCollection.java +++ b/common/src/common/village/VillageCollection.java @@ -9,8 +9,8 @@ import common.collect.Lists; import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; public class VillageCollection diff --git a/common/src/common/village/VillageDoorInfo.java b/common/src/common/village/VillageDoorInfo.java index 69b229e..530d309 100755 --- a/common/src/common/village/VillageDoorInfo.java +++ b/common/src/common/village/VillageDoorInfo.java @@ -1,7 +1,7 @@ package common.village; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; public class VillageDoorInfo { diff --git a/common/src/common/world/BlockArray.java b/common/src/common/world/BlockArray.java index cd89a55..44fba70 100755 --- a/common/src/common/world/BlockArray.java +++ b/common/src/common/world/BlockArray.java @@ -3,6 +3,7 @@ package common.world; import common.block.Block; import common.init.BlockRegistry; import common.init.Blocks; +import common.util.NibbleArray; public class BlockArray { private int yBase; diff --git a/common/src/common/world/Chunk.java b/common/src/common/world/Chunk.java index 9f4be01..68f14f5 100755 --- a/common/src/common/world/Chunk.java +++ b/common/src/common/world/Chunk.java @@ -16,7 +16,13 @@ import common.log.Log; import common.material.Material; import common.rng.Random; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.ChunkPos; +import common.util.ClassInheritanceMultiMap; import common.util.ExtMath; +import common.util.Facing; +import common.util.NibbleArray; import common.worldgen.BiomeGenerator; import common.worldgen.ChunkPrimer; import common.worldgen.GeneratorDebug; diff --git a/common/src/common/world/ChunkCache.java b/common/src/common/world/ChunkCache.java index e213ba5..d495ab1 100755 --- a/common/src/common/world/ChunkCache.java +++ b/common/src/common/world/ChunkCache.java @@ -1,5 +1,7 @@ package common.world; +import common.util.BlockPos; + public class ChunkCache { protected final int chunkX; diff --git a/common/src/common/world/EmptyChunk.java b/common/src/common/world/EmptyChunk.java index 29bc0c0..66ef16f 100755 --- a/common/src/common/world/EmptyChunk.java +++ b/common/src/common/world/EmptyChunk.java @@ -7,6 +7,8 @@ import common.block.Block; import common.entity.Entity; import common.init.Blocks; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.BoundingBox; public class EmptyChunk extends Chunk { public EmptyChunk(WorldClient world) { diff --git a/common/src/common/world/Explosion.java b/common/src/common/world/Explosion.java index 04fbc1c..c2830a2 100755 --- a/common/src/common/world/Explosion.java +++ b/common/src/common/world/Explosion.java @@ -20,7 +20,10 @@ import common.init.SoundEvent; import common.material.Material; import common.model.ParticleType; import common.rng.Random; +import common.util.BlockPos; +import common.util.BoundingBox; import common.util.ExtMath; +import common.util.Vec3; public class Explosion { diff --git a/common/src/common/world/IBlockAccess.java b/common/src/common/world/IBlockAccess.java index 2b0fb24..11fa2ab 100755 --- a/common/src/common/world/IBlockAccess.java +++ b/common/src/common/world/IBlockAccess.java @@ -1,5 +1,7 @@ package common.world; +import common.util.BlockPos; + public interface IBlockAccess { State getState(BlockPos pos); diff --git a/common/src/common/world/IWorldAccess.java b/common/src/common/world/IWorldAccess.java index b06a2fa..b798152 100755 --- a/common/src/common/world/IWorldAccess.java +++ b/common/src/common/world/IWorldAccess.java @@ -2,6 +2,7 @@ package common.world; import common.biome.Biome; import common.tileentity.TileEntity; +import common.util.BlockPos; public interface IWorldAccess extends IBlockAccess { diff --git a/common/src/common/world/Region.java b/common/src/common/world/Region.java index 6990839..06bbb84 100755 --- a/common/src/common/world/Region.java +++ b/common/src/common/world/Region.java @@ -30,6 +30,9 @@ import common.nbt.NBTLoader; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.NextTickListEntry; +import common.util.NibbleArray; public class Region { public static enum SaveVersion { diff --git a/common/src/common/world/Spawner.java b/common/src/common/world/Spawner.java index b9e323a..b4a5468 100755 --- a/common/src/common/world/Spawner.java +++ b/common/src/common/world/Spawner.java @@ -13,6 +13,8 @@ import common.init.Blocks; import common.init.Config; import common.rng.Random; import common.rng.WeightedList; +import common.util.BlockPos; +import common.util.ChunkPos; import common.util.ExtMath; public abstract class Spawner { diff --git a/common/src/common/world/World.java b/common/src/common/world/World.java index d651ac2..519dc36 100755 --- a/common/src/common/world/World.java +++ b/common/src/common/world/World.java @@ -29,7 +29,14 @@ import common.model.ParticleType; import common.rng.Random; import common.tileentity.ITickable; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.ChunkPos; import common.util.ExtMath; +import common.util.Facing; +import common.util.HitPosition; +import common.util.IntHashMap; +import common.util.Vec3; public abstract class World implements IWorldAccess { public static final float[][] BRIGHTNESS = new float[16][16]; diff --git a/common/src/common/world/WorldClient.java b/common/src/common/world/WorldClient.java index 0365190..998a254 100755 --- a/common/src/common/world/WorldClient.java +++ b/common/src/common/world/WorldClient.java @@ -26,8 +26,12 @@ import common.rng.Random; import common.sound.MovingSoundMinecart; import common.sound.PositionedSound; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.ChunkPos; import common.util.ExtMath; -import common.world.BlockPos.MutableBlockPos; +import common.util.LongHashMap; +import common.util.Vec3; +import common.util.BlockPos.MutableBlockPos; public class WorldClient extends World { diff --git a/common/src/common/world/WorldServer.java b/common/src/common/world/WorldServer.java index 9b8d8dc..934b9ee 100755 --- a/common/src/common/world/WorldServer.java +++ b/common/src/common/world/WorldServer.java @@ -63,8 +63,17 @@ import common.packet.SPacketMultiBlockChange; import common.rng.Random; import common.rng.WeightedList; import common.tileentity.TileEntity; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.ChunkPos; import common.util.ExtMath; import common.util.FileUtils; +import common.util.IntHashMap; +import common.util.LongHashMap; +import common.util.NextTickListEntry; +import common.util.PortalType; +import common.util.Position; +import common.util.Vec3; import common.village.Village; import common.village.VillageCollection; import common.worldgen.BiomeGenSingle; diff --git a/common/src/common/worldgen/BiomeGenLayered.java b/common/src/common/worldgen/BiomeGenLayered.java index d5e0230..152ba93 100755 --- a/common/src/common/worldgen/BiomeGenLayered.java +++ b/common/src/common/worldgen/BiomeGenLayered.java @@ -5,8 +5,8 @@ import java.util.Set; import common.biome.Biome; import common.collect.Lists; -import common.world.BlockPos; -import common.world.LongHashMap; +import common.util.BlockPos; +import common.util.LongHashMap; import common.worldgen.layer.GenLayer; import common.worldgen.layer.GenLayerAddAreas; import common.worldgen.layer.GenLayerAddExtra; diff --git a/common/src/common/worldgen/BiomeGenSingle.java b/common/src/common/worldgen/BiomeGenSingle.java index aad396d..1dd6493 100755 --- a/common/src/common/worldgen/BiomeGenSingle.java +++ b/common/src/common/worldgen/BiomeGenSingle.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Set; import common.biome.Biome; -import common.world.BlockPos; +import common.util.BlockPos; public class BiomeGenSingle implements BiomeGenerator { private final Biome biome; diff --git a/common/src/common/worldgen/BiomeGenerator.java b/common/src/common/worldgen/BiomeGenerator.java index d975d42..b6ef4e9 100755 --- a/common/src/common/worldgen/BiomeGenerator.java +++ b/common/src/common/worldgen/BiomeGenerator.java @@ -3,7 +3,7 @@ package common.worldgen; import java.util.Set; import common.biome.Biome; -import common.world.BlockPos; +import common.util.BlockPos; public interface BiomeGenerator { public void genFactors(double[] factors, int xPos, int zPos, int sizeX, int sizeZ); diff --git a/common/src/common/worldgen/FeatureDungeons.java b/common/src/common/worldgen/FeatureDungeons.java index 3f22b7a..5e01ee4 100755 --- a/common/src/common/worldgen/FeatureDungeons.java +++ b/common/src/common/worldgen/FeatureDungeons.java @@ -10,8 +10,8 @@ import common.rng.WeightedList; import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; import common.tileentity.TileEntityMobSpawner; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; public class FeatureDungeons diff --git a/common/src/common/worldgen/FeatureGenerator.java b/common/src/common/worldgen/FeatureGenerator.java index d93b260..19beb30 100755 --- a/common/src/common/worldgen/FeatureGenerator.java +++ b/common/src/common/worldgen/FeatureGenerator.java @@ -1,7 +1,7 @@ package common.worldgen; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/FeatureLakes.java b/common/src/common/worldgen/FeatureLakes.java index 3bb47d4..658d7d0 100755 --- a/common/src/common/worldgen/FeatureLakes.java +++ b/common/src/common/worldgen/FeatureLakes.java @@ -5,7 +5,7 @@ import common.block.Block; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.LightType; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/FeatureLiquids.java b/common/src/common/worldgen/FeatureLiquids.java index bd050b8..900c594 100755 --- a/common/src/common/worldgen/FeatureLiquids.java +++ b/common/src/common/worldgen/FeatureLiquids.java @@ -3,7 +3,7 @@ package common.worldgen; import common.block.Block; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/FeatureOres.java b/common/src/common/worldgen/FeatureOres.java index bb30028..091d34b 100755 --- a/common/src/common/worldgen/FeatureOres.java +++ b/common/src/common/worldgen/FeatureOres.java @@ -2,8 +2,8 @@ package common.worldgen; import common.block.Block; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/caves/MapGenCaves.java b/common/src/common/worldgen/caves/MapGenCaves.java index 6f2a15e..405603b 100755 --- a/common/src/common/worldgen/caves/MapGenCaves.java +++ b/common/src/common/worldgen/caves/MapGenCaves.java @@ -6,8 +6,8 @@ import common.block.BlockSand; import common.color.DyeColor; import common.init.Blocks; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.ChunkPrimer; diff --git a/common/src/common/worldgen/caves/MapGenRavine.java b/common/src/common/worldgen/caves/MapGenRavine.java index 13d30c0..02646d1 100755 --- a/common/src/common/worldgen/caves/MapGenRavine.java +++ b/common/src/common/worldgen/caves/MapGenRavine.java @@ -3,8 +3,8 @@ package common.worldgen.caves; import common.block.Block; import common.init.Blocks; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.ChunkPrimer; diff --git a/common/src/common/worldgen/feature/WorldGenAbandonedChest.java b/common/src/common/worldgen/feature/WorldGenAbandonedChest.java index 79206eb..c724150 100755 --- a/common/src/common/worldgen/feature/WorldGenAbandonedChest.java +++ b/common/src/common/worldgen/feature/WorldGenAbandonedChest.java @@ -8,7 +8,7 @@ import common.rng.Random; import common.rng.WeightedList; import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; import common.worldgen.LootConstants; diff --git a/common/src/common/worldgen/feature/WorldGenAsteroid.java b/common/src/common/worldgen/feature/WorldGenAsteroid.java index 35c2fea..fdc1eef 100755 --- a/common/src/common/worldgen/feature/WorldGenAsteroid.java +++ b/common/src/common/worldgen/feature/WorldGenAsteroid.java @@ -1,7 +1,7 @@ package common.worldgen.feature; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenBlockBlob.java b/common/src/common/worldgen/feature/WorldGenBlockBlob.java index 98e6f18..06929da 100755 --- a/common/src/common/worldgen/feature/WorldGenBlockBlob.java +++ b/common/src/common/worldgen/feature/WorldGenBlockBlob.java @@ -3,7 +3,7 @@ package common.worldgen.feature; import common.block.Block; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenClay.java b/common/src/common/worldgen/feature/WorldGenClay.java index 1be9142..9888fbc 100755 --- a/common/src/common/worldgen/feature/WorldGenClay.java +++ b/common/src/common/worldgen/feature/WorldGenClay.java @@ -3,7 +3,7 @@ package common.worldgen.feature; import common.block.Block; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenClayExt.java b/common/src/common/worldgen/feature/WorldGenClayExt.java index 9f9499e..c7fc80e 100755 --- a/common/src/common/worldgen/feature/WorldGenClayExt.java +++ b/common/src/common/worldgen/feature/WorldGenClayExt.java @@ -3,8 +3,8 @@ package common.worldgen.feature; import common.block.Block; import common.init.Blocks; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.WorldServer; public class WorldGenClayExt extends WorldGenClay { diff --git a/common/src/common/worldgen/feature/WorldGenDesertWells.java b/common/src/common/worldgen/feature/WorldGenDesertWells.java index 3412134..75fab6b 100755 --- a/common/src/common/worldgen/feature/WorldGenDesertWells.java +++ b/common/src/common/worldgen/feature/WorldGenDesertWells.java @@ -5,9 +5,9 @@ import common.block.BlockSlab; import common.init.Blocks; import common.pattern.BlockStateHelper; import common.rng.Random; +import common.util.BlockPos; +import common.util.Facing; import common.util.Predicates; -import common.world.BlockPos; -import common.world.Facing; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenFire.java b/common/src/common/worldgen/feature/WorldGenFire.java index 09e1665..4623f68 100755 --- a/common/src/common/worldgen/feature/WorldGenFire.java +++ b/common/src/common/worldgen/feature/WorldGenFire.java @@ -2,7 +2,7 @@ package common.worldgen.feature; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenGlowStone.java b/common/src/common/worldgen/feature/WorldGenGlowStone.java index 3dd6047..a87146c 100755 --- a/common/src/common/worldgen/feature/WorldGenGlowStone.java +++ b/common/src/common/worldgen/feature/WorldGenGlowStone.java @@ -3,8 +3,8 @@ package common.worldgen.feature; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenHellLava.java b/common/src/common/worldgen/feature/WorldGenHellLava.java index a878c5c..7aee1b8 100755 --- a/common/src/common/worldgen/feature/WorldGenHellLava.java +++ b/common/src/common/worldgen/feature/WorldGenHellLava.java @@ -4,7 +4,7 @@ import common.block.Block; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenIcePath.java b/common/src/common/worldgen/feature/WorldGenIcePath.java index f0b26ba..69b9aac 100755 --- a/common/src/common/worldgen/feature/WorldGenIcePath.java +++ b/common/src/common/worldgen/feature/WorldGenIcePath.java @@ -3,7 +3,7 @@ package common.worldgen.feature; import common.block.Block; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenIceSpike.java b/common/src/common/worldgen/feature/WorldGenIceSpike.java index 3f78db2..8d7aaf1 100755 --- a/common/src/common/worldgen/feature/WorldGenIceSpike.java +++ b/common/src/common/worldgen/feature/WorldGenIceSpike.java @@ -4,8 +4,8 @@ import common.block.Block; import common.init.Blocks; import common.material.Material; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenSand.java b/common/src/common/worldgen/feature/WorldGenSand.java index 178abdd..657a276 100755 --- a/common/src/common/worldgen/feature/WorldGenSand.java +++ b/common/src/common/worldgen/feature/WorldGenSand.java @@ -3,7 +3,7 @@ package common.worldgen.feature; import common.block.Block; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/feature/WorldGenSpikes.java b/common/src/common/worldgen/feature/WorldGenSpikes.java index c22daf1..76b6f07 100755 --- a/common/src/common/worldgen/feature/WorldGenSpikes.java +++ b/common/src/common/worldgen/feature/WorldGenSpikes.java @@ -4,7 +4,7 @@ import common.block.Block; import common.entity.Entity; import common.entity.item.EntityCrystal; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/FeatureDoublePlant.java b/common/src/common/worldgen/foliage/FeatureDoublePlant.java index 9d61b5b..2e00419 100755 --- a/common/src/common/worldgen/foliage/FeatureDoublePlant.java +++ b/common/src/common/worldgen/foliage/FeatureDoublePlant.java @@ -3,7 +3,7 @@ package common.worldgen.foliage; import common.block.BlockDoublePlant; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; public class FeatureDoublePlant diff --git a/common/src/common/worldgen/foliage/WorldGenBigMushroom.java b/common/src/common/worldgen/foliage/WorldGenBigMushroom.java index 09b707e..96005ec 100755 --- a/common/src/common/worldgen/foliage/WorldGenBigMushroom.java +++ b/common/src/common/worldgen/foliage/WorldGenBigMushroom.java @@ -5,7 +5,7 @@ import common.block.BlockHugeMushroom; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenCactus.java b/common/src/common/worldgen/foliage/WorldGenCactus.java index a148c2e..500a5ea 100755 --- a/common/src/common/worldgen/foliage/WorldGenCactus.java +++ b/common/src/common/worldgen/foliage/WorldGenCactus.java @@ -2,7 +2,7 @@ package common.worldgen.foliage; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenDeadBush.java b/common/src/common/worldgen/foliage/WorldGenDeadBush.java index 4bff100..6e7bb2d 100755 --- a/common/src/common/worldgen/foliage/WorldGenDeadBush.java +++ b/common/src/common/worldgen/foliage/WorldGenDeadBush.java @@ -4,7 +4,7 @@ import common.block.Block; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenFlowers.java b/common/src/common/worldgen/foliage/WorldGenFlowers.java index b8ab2da..9adc8b2 100755 --- a/common/src/common/worldgen/foliage/WorldGenFlowers.java +++ b/common/src/common/worldgen/foliage/WorldGenFlowers.java @@ -2,7 +2,7 @@ package common.worldgen.foliage; import common.block.BlockFlower; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenMelon.java b/common/src/common/worldgen/foliage/WorldGenMelon.java index b48dedf..fff25dc 100755 --- a/common/src/common/worldgen/foliage/WorldGenMelon.java +++ b/common/src/common/worldgen/foliage/WorldGenMelon.java @@ -2,7 +2,7 @@ package common.worldgen.foliage; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenMushroom.java b/common/src/common/worldgen/foliage/WorldGenMushroom.java index a23509c..00d38a8 100755 --- a/common/src/common/worldgen/foliage/WorldGenMushroom.java +++ b/common/src/common/worldgen/foliage/WorldGenMushroom.java @@ -2,7 +2,7 @@ package common.worldgen.foliage; import common.block.BlockBush; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenPumpkin.java b/common/src/common/worldgen/foliage/WorldGenPumpkin.java index e15fec5..45f3daf 100755 --- a/common/src/common/worldgen/foliage/WorldGenPumpkin.java +++ b/common/src/common/worldgen/foliage/WorldGenPumpkin.java @@ -3,8 +3,8 @@ package common.worldgen.foliage; import common.block.BlockPumpkin; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenReed.java b/common/src/common/worldgen/foliage/WorldGenReed.java index 5162668..f85469c 100755 --- a/common/src/common/worldgen/foliage/WorldGenReed.java +++ b/common/src/common/worldgen/foliage/WorldGenReed.java @@ -3,7 +3,7 @@ package common.worldgen.foliage; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenShrub.java b/common/src/common/worldgen/foliage/WorldGenShrub.java index 1ae5474..00b7d71 100755 --- a/common/src/common/worldgen/foliage/WorldGenShrub.java +++ b/common/src/common/worldgen/foliage/WorldGenShrub.java @@ -5,7 +5,7 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.tree.WorldGenBaseTree; diff --git a/common/src/common/worldgen/foliage/WorldGenTallGrass.java b/common/src/common/worldgen/foliage/WorldGenTallGrass.java index 2bfeb28..52bf305 100755 --- a/common/src/common/worldgen/foliage/WorldGenTallGrass.java +++ b/common/src/common/worldgen/foliage/WorldGenTallGrass.java @@ -5,7 +5,7 @@ import common.block.BlockTallGrass; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenVines.java b/common/src/common/worldgen/foliage/WorldGenVines.java index 7b42cf0..eaf09b1 100755 --- a/common/src/common/worldgen/foliage/WorldGenVines.java +++ b/common/src/common/worldgen/foliage/WorldGenVines.java @@ -3,8 +3,8 @@ package common.worldgen.foliage; import common.block.BlockVine; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/foliage/WorldGenWaterlily.java b/common/src/common/worldgen/foliage/WorldGenWaterlily.java index 333505f..c7496c9 100755 --- a/common/src/common/worldgen/foliage/WorldGenWaterlily.java +++ b/common/src/common/worldgen/foliage/WorldGenWaterlily.java @@ -3,8 +3,8 @@ package common.worldgen.foliage; import common.block.BlockDirectional; import common.init.Blocks; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/common/src/common/worldgen/structure/MapGenScatteredFeature.java b/common/src/common/worldgen/structure/MapGenScatteredFeature.java index 16c54e2..8de6711 100755 --- a/common/src/common/worldgen/structure/MapGenScatteredFeature.java +++ b/common/src/common/worldgen/structure/MapGenScatteredFeature.java @@ -5,7 +5,7 @@ import java.util.List; import common.biome.Biome; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; public class MapGenScatteredFeature extends MapGenStructure diff --git a/common/src/common/worldgen/structure/MapGenStructure.java b/common/src/common/worldgen/structure/MapGenStructure.java index 5cd21bf..d339850 100755 --- a/common/src/common/worldgen/structure/MapGenStructure.java +++ b/common/src/common/worldgen/structure/MapGenStructure.java @@ -7,9 +7,9 @@ import common.collect.Maps; import common.nbt.NBTBase; import common.nbt.NBTTagCompound; import common.rng.Random; -import common.world.BlockPos; -import common.world.ChunkPos; -import common.world.LongHashMap; +import common.util.BlockPos; +import common.util.ChunkPos; +import common.util.LongHashMap; import common.world.World; import common.world.WorldServer; import common.world.WorldServer.WorldSavedData; diff --git a/common/src/common/worldgen/structure/StructureBoundingBox.java b/common/src/common/worldgen/structure/StructureBoundingBox.java index 418f011..482873c 100755 --- a/common/src/common/worldgen/structure/StructureBoundingBox.java +++ b/common/src/common/worldgen/structure/StructureBoundingBox.java @@ -1,9 +1,9 @@ package common.worldgen.structure; import common.nbt.NBTTagIntArray; -import common.world.BlockPos; -import common.world.Facing; -import common.world.Vec3i; +import common.util.BlockPos; +import common.util.Facing; +import common.util.Vec3i; public class StructureBoundingBox { diff --git a/common/src/common/worldgen/structure/StructureBridge.java b/common/src/common/worldgen/structure/StructureBridge.java index ab35d0e..0970247 100755 --- a/common/src/common/worldgen/structure/StructureBridge.java +++ b/common/src/common/worldgen/structure/StructureBridge.java @@ -8,8 +8,8 @@ import common.nbt.NBTTagCompound; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.LootConstants; diff --git a/common/src/common/worldgen/structure/StructureComponent.java b/common/src/common/worldgen/structure/StructureComponent.java index b01bff9..bd76ec3 100755 --- a/common/src/common/worldgen/structure/StructureComponent.java +++ b/common/src/common/worldgen/structure/StructureComponent.java @@ -15,8 +15,8 @@ import common.rng.WeightedList; import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; import common.tileentity.TileEntityDispenser; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/structure/StructureMineshaft.java b/common/src/common/worldgen/structure/StructureMineshaft.java index cadc388..21f5335 100755 --- a/common/src/common/worldgen/structure/StructureMineshaft.java +++ b/common/src/common/worldgen/structure/StructureMineshaft.java @@ -14,8 +14,8 @@ import common.rng.Random; import common.rng.WeightedList; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; import common.worldgen.LootConstants; diff --git a/common/src/common/worldgen/structure/StructureScattered.java b/common/src/common/worldgen/structure/StructureScattered.java index b031a72..e3b3bd4 100755 --- a/common/src/common/worldgen/structure/StructureScattered.java +++ b/common/src/common/worldgen/structure/StructureScattered.java @@ -15,8 +15,8 @@ import common.init.Items; import common.item.RngLoot; import common.nbt.NBTTagCompound; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.LootConstants; diff --git a/common/src/common/worldgen/structure/StructureStart.java b/common/src/common/worldgen/structure/StructureStart.java index 5cee450..bbf98f0 100755 --- a/common/src/common/worldgen/structure/StructureStart.java +++ b/common/src/common/worldgen/structure/StructureStart.java @@ -6,7 +6,7 @@ import java.util.LinkedList; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.rng.Random; -import common.world.ChunkPos; +import common.util.ChunkPos; import common.world.WorldServer; public abstract class StructureStart diff --git a/common/src/common/worldgen/structure/StructureStronghold.java b/common/src/common/worldgen/structure/StructureStronghold.java index 3d10553..75f87c0 100755 --- a/common/src/common/worldgen/structure/StructureStronghold.java +++ b/common/src/common/worldgen/structure/StructureStronghold.java @@ -14,8 +14,8 @@ import common.nbt.NBTTagCompound; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.WorldServer; import common.worldgen.LootConstants; diff --git a/common/src/common/worldgen/structure/StructureVillage.java b/common/src/common/worldgen/structure/StructureVillage.java index aa850da..5d25145 100755 --- a/common/src/common/worldgen/structure/StructureVillage.java +++ b/common/src/common/worldgen/structure/StructureVillage.java @@ -19,8 +19,8 @@ import common.init.Config; import common.material.Material; import common.nbt.NBTTagCompound; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; import common.worldgen.BiomeGenerator; diff --git a/common/src/common/worldgen/tree/WorldGenBaseTree.java b/common/src/common/worldgen/tree/WorldGenBaseTree.java index c1e3017..e3653c9 100755 --- a/common/src/common/worldgen/tree/WorldGenBaseTree.java +++ b/common/src/common/worldgen/tree/WorldGenBaseTree.java @@ -8,8 +8,8 @@ import common.init.Blocks; import common.material.Material; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenBigTree.java b/common/src/common/worldgen/tree/WorldGenBigTree.java index 8a5580c..8f16b8a 100755 --- a/common/src/common/worldgen/tree/WorldGenBigTree.java +++ b/common/src/common/worldgen/tree/WorldGenBigTree.java @@ -9,8 +9,8 @@ import common.collect.Lists; import common.init.Blocks; 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.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenBirch.java b/common/src/common/worldgen/tree/WorldGenBirch.java index d0c4af8..9c4cebb 100755 --- a/common/src/common/worldgen/tree/WorldGenBirch.java +++ b/common/src/common/worldgen/tree/WorldGenBirch.java @@ -5,7 +5,7 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenDarkOak.java b/common/src/common/worldgen/tree/WorldGenDarkOak.java index 43cf4bc..75e40a9 100755 --- a/common/src/common/worldgen/tree/WorldGenDarkOak.java +++ b/common/src/common/worldgen/tree/WorldGenDarkOak.java @@ -5,8 +5,8 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenHugeTree.java b/common/src/common/worldgen/tree/WorldGenHugeTree.java index bd57382..2830025 100755 --- a/common/src/common/worldgen/tree/WorldGenHugeTree.java +++ b/common/src/common/worldgen/tree/WorldGenHugeTree.java @@ -5,7 +5,7 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenJungle.java b/common/src/common/worldgen/tree/WorldGenJungle.java index d9fef45..b034df5 100755 --- a/common/src/common/worldgen/tree/WorldGenJungle.java +++ b/common/src/common/worldgen/tree/WorldGenJungle.java @@ -4,8 +4,8 @@ import common.block.BlockVine; import common.init.Blocks; import common.properties.PropertyBool; import common.rng.Random; +import common.util.BlockPos; import common.util.ExtMath; -import common.world.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenPine.java b/common/src/common/worldgen/tree/WorldGenPine.java index c7000ed..84552a5 100755 --- a/common/src/common/worldgen/tree/WorldGenPine.java +++ b/common/src/common/worldgen/tree/WorldGenPine.java @@ -5,8 +5,8 @@ import common.block.BlockDirt; import common.init.Blocks; 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.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenSavanna.java b/common/src/common/worldgen/tree/WorldGenSavanna.java index f4b98d2..068b0d7 100755 --- a/common/src/common/worldgen/tree/WorldGenSavanna.java +++ b/common/src/common/worldgen/tree/WorldGenSavanna.java @@ -5,8 +5,8 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; -import common.world.Facing; +import common.util.BlockPos; +import common.util.Facing; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenSwamp.java b/common/src/common/worldgen/tree/WorldGenSwamp.java index 264c763..cb4ebcb 100755 --- a/common/src/common/worldgen/tree/WorldGenSwamp.java +++ b/common/src/common/worldgen/tree/WorldGenSwamp.java @@ -7,7 +7,7 @@ import common.init.Blocks; import common.material.Material; import common.properties.PropertyBool; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenTaiga1.java b/common/src/common/worldgen/tree/WorldGenTaiga1.java index f5f6b85..f940439 100755 --- a/common/src/common/worldgen/tree/WorldGenTaiga1.java +++ b/common/src/common/worldgen/tree/WorldGenTaiga1.java @@ -5,7 +5,7 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenTaiga2.java b/common/src/common/worldgen/tree/WorldGenTaiga2.java index f085cdb..014bda7 100755 --- a/common/src/common/worldgen/tree/WorldGenTaiga2.java +++ b/common/src/common/worldgen/tree/WorldGenTaiga2.java @@ -5,7 +5,7 @@ import common.block.BlockLeaves; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.State; import common.world.WorldServer; diff --git a/common/src/common/worldgen/tree/WorldGenTree.java b/common/src/common/worldgen/tree/WorldGenTree.java index 1ea362b..82bf0fc 100755 --- a/common/src/common/worldgen/tree/WorldGenTree.java +++ b/common/src/common/worldgen/tree/WorldGenTree.java @@ -6,7 +6,7 @@ import common.block.BlockSapling; import common.init.Blocks; import common.material.Material; import common.rng.Random; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import common.worldgen.FeatureGenerator; diff --git a/server/src/server/Server.java b/server/src/server/Server.java index 7781080..728a53d 100755 --- a/server/src/server/Server.java +++ b/server/src/server/Server.java @@ -63,16 +63,16 @@ import common.packet.SPacketSkin; import common.packet.SPacketTimeUpdate; import common.packet.SPacketWorld; import common.potion.PotionEffect; +import common.util.BlockPos; import common.util.ExtMath; import common.util.LazyLoadBase; +import common.util.PortalType; +import common.util.Position; import common.util.Tuple; import common.util.Util; -import common.world.BlockPos; -import common.world.PortalType; -import common.world.Position; +import common.util.WorldPos; import common.world.Region; import common.world.World; -import common.world.WorldPos; import common.world.WorldServer; import common.world.Region.FolderInfo; import io.netty.bootstrap.ServerBootstrap; diff --git a/server/src/server/command/Command.java b/server/src/server/command/Command.java index 2598c0f..56750cc 100644 --- a/server/src/server/command/Command.java +++ b/server/src/server/command/Command.java @@ -7,7 +7,7 @@ import java.util.Map; import common.collect.Lists; import common.collect.Maps; -import common.world.Vec3; +import common.util.Vec3; import common.world.World; import server.command.DoubleParser.DefType; diff --git a/server/src/server/command/DimensionParser.java b/server/src/server/command/DimensionParser.java index 523f4b9..30f9121 100644 --- a/server/src/server/command/DimensionParser.java +++ b/server/src/server/command/DimensionParser.java @@ -4,7 +4,7 @@ import java.util.Collection; import common.dimension.Dimension; import common.init.UniverseRegistry; -import common.world.Position; +import common.util.Position; public class DimensionParser extends CompletingParser { private final boolean useSender; diff --git a/server/src/server/command/DoubleParser.java b/server/src/server/command/DoubleParser.java index cb071b4..353b4be 100644 --- a/server/src/server/command/DoubleParser.java +++ b/server/src/server/command/DoubleParser.java @@ -3,8 +3,8 @@ package server.command; import java.util.Collection; import common.collect.Lists; -import common.world.BlockPos; -import common.world.Position; +import common.util.BlockPos; +import common.util.Position; public class DoubleParser extends DefaultingParser { public static enum DefType { diff --git a/server/src/server/command/Executor.java b/server/src/server/command/Executor.java index 02207b4..d3888eb 100644 --- a/server/src/server/command/Executor.java +++ b/server/src/server/command/Executor.java @@ -1,8 +1,8 @@ package server.command; import common.entity.Entity; -import common.world.BlockPos; -import common.world.Position; +import common.util.BlockPos; +import common.util.Position; public interface Executor { void logConsole(String msg); diff --git a/server/src/server/command/FixedExecutor.java b/server/src/server/command/FixedExecutor.java index df9e3fb..5f7d2cf 100644 --- a/server/src/server/command/FixedExecutor.java +++ b/server/src/server/command/FixedExecutor.java @@ -1,8 +1,8 @@ package server.command; import common.entity.Entity; -import common.world.BlockPos; -import common.world.Position; +import common.util.BlockPos; +import common.util.Position; import server.Server; public class FixedExecutor implements Executor { diff --git a/server/src/server/command/commands/CommandOfflinetp.java b/server/src/server/command/commands/CommandOfflinetp.java index 6966524..7d3e339 100644 --- a/server/src/server/command/commands/CommandOfflinetp.java +++ b/server/src/server/command/commands/CommandOfflinetp.java @@ -6,7 +6,7 @@ import java.util.List; import common.collect.Lists; import common.entity.Entity; import common.init.UniverseRegistry; -import common.world.Position; +import common.util.Position; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandSpawn.java b/server/src/server/command/commands/CommandSpawn.java index 93e522e..2534793 100644 --- a/server/src/server/command/commands/CommandSpawn.java +++ b/server/src/server/command/commands/CommandSpawn.java @@ -10,7 +10,7 @@ import common.entity.types.EntityLiving; import common.init.EntityRegistry; import common.nbt.NBTTagCompound; import common.util.Util; -import common.world.Vec3; +import common.util.Vec3; import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; diff --git a/server/src/server/command/commands/CommandTele.java b/server/src/server/command/commands/CommandTele.java index 19766bf..e2f735a 100644 --- a/server/src/server/command/commands/CommandTele.java +++ b/server/src/server/command/commands/CommandTele.java @@ -4,7 +4,7 @@ import java.util.List; import common.dimension.Dimension; import common.entity.Entity; -import common.world.Vec3; +import common.util.Vec3; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandTime.java b/server/src/server/command/commands/CommandTime.java index 1a4676e..1f3561f 100644 --- a/server/src/server/command/commands/CommandTime.java +++ b/server/src/server/command/commands/CommandTime.java @@ -2,7 +2,7 @@ package server.command.commands; import common.dimension.Dimension; import common.item.ItemSpaceNavigator; -import common.world.Position; +import common.util.Position; import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; diff --git a/server/src/server/command/commands/CommandTp.java b/server/src/server/command/commands/CommandTp.java index e300ae7..f6a09f6 100644 --- a/server/src/server/command/commands/CommandTp.java +++ b/server/src/server/command/commands/CommandTp.java @@ -4,7 +4,7 @@ import java.util.List; import common.entity.Entity; import common.init.UniverseRegistry; -import common.world.Position; +import common.util.Position; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandWarp.java b/server/src/server/command/commands/CommandWarp.java index 987e9de..e33dd3b 100644 --- a/server/src/server/command/commands/CommandWarp.java +++ b/server/src/server/command/commands/CommandWarp.java @@ -5,7 +5,7 @@ import java.util.List; import common.entity.Entity; import common.init.UniverseRegistry; -import common.world.Position; +import common.util.Position; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandWorld.java b/server/src/server/command/commands/CommandWorld.java index 3b02edb..6257e46 100644 --- a/server/src/server/command/commands/CommandWorld.java +++ b/server/src/server/command/commands/CommandWorld.java @@ -3,7 +3,7 @@ package server.command.commands; import java.util.List; import common.entity.Entity; -import common.world.BlockPos; +import common.util.BlockPos; import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; diff --git a/server/src/server/network/Player.java b/server/src/server/network/Player.java index 544e4ef..6a418d3 100755 --- a/server/src/server/network/Player.java +++ b/server/src/server/network/Player.java @@ -114,21 +114,21 @@ import common.tileentity.ILockableContainer; import common.tileentity.TileEntity; import common.tileentity.TileEntityMachine; import common.tileentity.TileEntitySign; +import common.util.BlockPos; +import common.util.BoundingBox; +import common.util.ChunkPos; import common.util.ExtMath; +import common.util.Facing; +import common.util.IntHashMap; +import common.util.PortalType; +import common.util.Position; +import common.util.Vec3i; +import common.util.WorldPos; import common.village.MerchantRecipeList; -import common.world.BlockPos; -import common.world.BoundingBox; import common.world.Chunk; -import common.world.ChunkPos; -import common.world.Facing; -import common.world.IntHashMap; -import common.world.PortalType; -import common.world.Position; import common.world.Region; import common.world.State; -import common.world.Vec3i; import common.world.World; -import common.world.WorldPos; import common.world.WorldServer; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener;