From d08d0e11fcb4bd724cebf2bc9a42d0ed2a6cf67d Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 7 May 2025 18:19:24 +0200 Subject: [PATCH] change package names --- client/src/client/Game.java | 162 ++++++------ client/src/client/PerfSection.java | 2 +- client/src/client/PlayerController.java | 40 +-- client/src/client/SkinConverter.java | 2 +- client/src/client/audio/AudioInterface.java | 7 +- client/src/client/audio/SoundManager.java | 24 +- client/src/client/audio/Volume.java | 8 +- client/src/client/gui/Font.java | 4 +- client/src/client/gui/Gui.java | 2 +- client/src/client/gui/GuiConnect.java | 14 +- client/src/client/gui/GuiConsole.java | 18 +- client/src/client/gui/GuiConvert.java | 16 +- client/src/client/gui/GuiInfo.java | 6 +- client/src/client/gui/GuiMenu.java | 8 +- client/src/client/gui/GuiServer.java | 10 +- client/src/client/gui/Style.java | 10 +- client/src/client/gui/character/GuiChar.java | 56 ++-- .../client/gui/character/GuiCharacters.java | 6 +- client/src/client/gui/character/GuiClass.java | 2 +- .../src/client/gui/character/GuiSpecies.java | 8 +- .../src/client/gui/container/GuiBrewing.java | 6 +- client/src/client/gui/container/GuiChest.java | 4 +- .../client/gui/container/GuiContainer.java | 20 +- .../src/client/gui/container/GuiCrafting.java | 8 +- .../client/gui/container/GuiDispenser.java | 6 +- .../src/client/gui/container/GuiEnchant.java | 14 +- .../src/client/gui/container/GuiFurnace.java | 8 +- .../src/client/gui/container/GuiHopper.java | 6 +- client/src/client/gui/container/GuiHorse.java | 6 +- .../client/gui/container/GuiInventory.java | 2 +- .../src/client/gui/container/GuiMachine.java | 8 +- .../src/client/gui/container/GuiMerchant.java | 14 +- .../src/client/gui/container/GuiRepair.java | 14 +- client/src/client/gui/element/Bar.java | 4 +- client/src/client/gui/element/Dropdown.java | 6 +- client/src/client/gui/element/Element.java | 8 +- client/src/client/gui/element/GuiList.java | 4 +- client/src/client/gui/element/Label.java | 2 +- client/src/client/gui/element/NavButton.java | 2 +- .../client/gui/element/SelectableButton.java | 2 +- client/src/client/gui/element/Slider.java | 4 +- client/src/client/gui/element/Switch.java | 4 +- client/src/client/gui/element/Textbox.java | 6 +- client/src/client/gui/element/Toggle.java | 2 +- client/src/client/gui/ingame/GuiGameOver.java | 2 +- client/src/client/gui/ingame/GuiSign.java | 4 +- client/src/client/gui/options/GuiBinds.java | 2 +- client/src/client/gui/options/GuiDisplay.java | 2 +- client/src/client/gui/options/GuiStyle.java | 4 +- .../src/client/init/EntityRenderRegistry.java | 88 +++---- .../client/network/ClientLoginHandler.java | 14 +- client/src/client/network/ClientPlayer.java | 222 ++++++++-------- .../src/client/renderer/ActiveRenderInfo.java | 18 +- client/src/client/renderer/BlockRenderer.java | 28 +- client/src/client/renderer/Drawing.java | 6 +- .../src/client/renderer/EntityRenderer.java | 40 +-- client/src/client/renderer/Frustum.java | 4 +- .../src/client/renderer/ItemModelMesher.java | 12 +- client/src/client/renderer/ItemRenderer.java | 24 +- .../client/renderer/RegionRenderCache.java | 24 +- .../renderer/RegionRenderCacheBuilder.java | 2 +- client/src/client/renderer/RenderBuffer.java | 4 +- client/src/client/renderer/RenderGlobal.java | 56 ++-- client/src/client/renderer/VertexFormat.java | 4 +- .../client/renderer/VertexFormatElement.java | 2 +- client/src/client/renderer/ViewFrustum.java | 6 +- .../renderer/blockmodel/BakedModel.java | 6 +- .../client/renderer/blockmodel/BakedQuad.java | 2 +- .../client/renderer/blockmodel/BlockPart.java | 4 +- .../renderer/blockmodel/BlockPartFace.java | 2 +- .../blockmodel/BlockPartRotation.java | 4 +- .../renderer/blockmodel/BuiltInModel.java | 4 +- .../renderer/blockmodel/FaceBakery.java | 14 +- .../renderer/blockmodel/IBakedModel.java | 4 +- .../renderer/blockmodel/ModelBakery.java | 26 +- .../renderer/blockmodel/ModelBlock.java | 16 +- .../renderer/blockmodel/ModelGenerator.java | 10 +- .../renderer/blockmodel/ModelManager.java | 18 +- .../renderer/blockmodel/MultiStateMap.java | 10 +- .../renderer/blockmodel/SingleStateMap.java | 4 +- .../client/renderer/blockmodel/StateMap.java | 8 +- .../chunk/ChunkCompileTaskGenerator.java | 2 +- .../renderer/chunk/ChunkRenderDispatcher.java | 12 +- .../renderer/chunk/ChunkRenderWorker.java | 14 +- .../client/renderer/chunk/CompiledChunk.java | 8 +- .../client/renderer/chunk/RenderChunk.java | 20 +- .../client/renderer/chunk/SetVisibility.java | 2 +- .../src/client/renderer/chunk/VisGraph.java | 4 +- client/src/client/renderer/entity/Render.java | 10 +- .../renderer/entity/RenderArachnoid.java | 2 +- .../client/renderer/entity/RenderArrow.java | 4 +- .../src/client/renderer/entity/RenderBat.java | 4 +- .../renderer/entity/RenderBlockEntity.java | 4 +- .../client/renderer/entity/RenderBoat.java | 4 +- .../client/renderer/entity/RenderBullet.java | 2 +- .../client/renderer/entity/RenderChicken.java | 4 +- .../src/client/renderer/entity/RenderCow.java | 2 +- .../client/renderer/entity/RenderCrystal.java | 4 +- .../src/client/renderer/entity/RenderDie.java | 4 +- .../client/renderer/entity/RenderDragon.java | 4 +- .../renderer/entity/RenderDynamite.java | 6 +- .../client/renderer/entity/RenderEntity.java | 2 +- .../renderer/entity/RenderEntityItem.java | 12 +- .../renderer/entity/RenderFallingBlock.java | 10 +- .../renderer/entity/RenderFireball.java | 4 +- .../client/renderer/entity/RenderFish.java | 6 +- .../renderer/entity/RenderFlyingBox.java | 2 +- .../client/renderer/entity/RenderHorse.java | 4 +- .../renderer/entity/RenderHumanoid.java | 6 +- .../client/renderer/entity/RenderItem.java | 18 +- .../renderer/entity/RenderItemEntity.java | 8 +- .../renderer/entity/RenderLeashKnot.java | 2 +- .../renderer/entity/RenderLightning.java | 4 +- .../client/renderer/entity/RenderLiving.java | 6 +- .../client/renderer/entity/RenderManager.java | 14 +- .../renderer/entity/RenderMinecart.java | 8 +- .../renderer/entity/RenderMooshroom.java | 2 +- .../client/renderer/entity/RenderMouse.java | 2 +- .../src/client/renderer/entity/RenderNpc.java | 4 +- .../client/renderer/entity/RenderOcelot.java | 2 +- .../src/client/renderer/entity/RenderPig.java | 2 +- .../client/renderer/entity/RenderPotion.java | 6 +- .../client/renderer/entity/RenderRabbit.java | 4 +- .../client/renderer/entity/RenderSheep.java | 2 +- .../client/renderer/entity/RenderSlime.java | 4 +- .../renderer/entity/RenderSpaceMarine.java | 6 +- .../client/renderer/entity/RenderSquid.java | 2 +- .../renderer/entity/RenderTntMinecart.java | 8 +- .../renderer/entity/RenderTntPrimed.java | 8 +- .../client/renderer/entity/RenderWolf.java | 2 +- .../client/renderer/entity/RenderXpOrb.java | 4 +- .../renderer/entity/RendererLivingEntity.java | 16 +- .../client/renderer/layers/LayerArmor.java | 6 +- .../client/renderer/layers/LayerArrow.java | 10 +- .../src/client/renderer/layers/LayerCape.java | 4 +- .../client/renderer/layers/LayerCharge.java | 2 +- .../renderer/layers/LayerEnderDragonEyes.java | 2 +- .../renderer/layers/LayerEntityBreak.java | 4 +- .../client/renderer/layers/LayerExtra.java | 6 +- .../client/renderer/layers/LayerHeldItem.java | 14 +- .../layers/LayerMooshroomMushroom.java | 4 +- .../renderer/layers/LayerPowerRods.java | 4 +- .../client/renderer/layers/LayerRenderer.java | 2 +- .../client/renderer/layers/LayerSaddle.java | 2 +- .../renderer/layers/LayerSheepWool.java | 2 +- .../client/renderer/layers/LayerSlimeGel.java | 2 +- .../renderer/layers/LayerWolfCollar.java | 6 +- .../client/renderer/model/ModelArachnoid.java | 4 +- .../src/client/renderer/model/ModelBase.java | 10 +- .../src/client/renderer/model/ModelBat.java | 6 +- .../src/client/renderer/model/ModelBiped.java | 6 +- .../src/client/renderer/model/ModelBoat.java | 2 +- .../src/client/renderer/model/ModelBox.java | 4 +- .../client/renderer/model/ModelCharge.java | 2 +- .../client/renderer/model/ModelChicken.java | 4 +- .../client/renderer/model/ModelCrystal.java | 2 +- .../src/client/renderer/model/ModelDie.java | 2 +- .../client/renderer/model/ModelDragon.java | 6 +- .../src/client/renderer/model/ModelHead.java | 2 +- .../src/client/renderer/model/ModelHorse.java | 8 +- .../client/renderer/model/ModelHumanoid.java | 4 +- .../renderer/model/ModelHumanoidHead.java | 2 +- .../client/renderer/model/ModelLeashKnot.java | 2 +- .../client/renderer/model/ModelMinecart.java | 2 +- .../src/client/renderer/model/ModelMouse.java | 6 +- .../client/renderer/model/ModelOcelot.java | 8 +- .../client/renderer/model/ModelQuadruped.java | 4 +- .../client/renderer/model/ModelRabbit.java | 8 +- .../client/renderer/model/ModelRenderer.java | 2 +- .../client/renderer/model/ModelSheep1.java | 6 +- .../client/renderer/model/ModelSheep2.java | 6 +- .../src/client/renderer/model/ModelSlime.java | 2 +- .../src/client/renderer/model/ModelSquid.java | 2 +- .../src/client/renderer/model/ModelWolf.java | 8 +- .../renderer/model/PositionTextureVertex.java | 2 +- .../client/renderer/model/TexturedQuad.java | 2 +- .../renderer/particle/EffectRenderer.java | 24 +- .../renderer/particle/EntityAuraFX.java | 2 +- .../renderer/particle/EntityBlockDustFX.java | 6 +- .../renderer/particle/EntityBreakingFX.java | 10 +- .../renderer/particle/EntityBubbleFX.java | 6 +- .../renderer/particle/EntityCloudFX.java | 8 +- .../renderer/particle/EntityCrit2FX.java | 6 +- .../renderer/particle/EntityCritFX.java | 2 +- .../renderer/particle/EntityDiggingFX.java | 14 +- .../renderer/particle/EntityDownfallFX.java | 14 +- .../particle/EntityDropParticleFX.java | 14 +- .../EntityEnchantmentTableParticleFX.java | 2 +- .../renderer/particle/EntityExplodeFX.java | 2 +- .../client/renderer/particle/EntityFX.java | 12 +- .../renderer/particle/EntityFirework.java | 18 +- .../renderer/particle/EntityFishWakeFX.java | 2 +- .../renderer/particle/EntityFlameFX.java | 6 +- .../renderer/particle/EntityFootStepFX.java | 6 +- .../renderer/particle/EntityHeartFX.java | 6 +- .../particle/EntityHugeExplodeFX.java | 6 +- .../particle/EntityLargeExplodeFX.java | 4 +- .../renderer/particle/EntityLavaFX.java | 8 +- .../renderer/particle/EntityNoteFX.java | 6 +- .../particle/EntityParticleEmitter.java | 8 +- .../renderer/particle/EntityPickupFX.java | 4 +- .../renderer/particle/EntityPortalFX.java | 4 +- .../renderer/particle/EntityReddustFX.java | 6 +- .../renderer/particle/EntitySmokeFX.java | 6 +- .../renderer/particle/EntitySnowShovelFX.java | 6 +- .../particle/EntitySpellParticleFX.java | 8 +- .../renderer/particle/EntitySplashFX.java | 2 +- .../renderer/particle/EntitySuspendFX.java | 6 +- .../renderer/particle/IParticleFactory.java | 2 +- .../renderer/texture/ColormapLoader.java | 4 +- .../renderer/texture/EntityTexManager.java | 16 +- .../texture/LayeredColorMaskTexture.java | 6 +- .../renderer/texture/LayeredTexture.java | 6 +- .../renderer/texture/SimpleTexture.java | 2 +- .../src/client/renderer/texture/Stitcher.java | 4 +- .../renderer/texture/TextureAtlasSprite.java | 2 +- .../renderer/texture/TextureManager.java | 4 +- .../client/renderer/texture/TextureMap.java | 14 +- .../client/renderer/texture/TextureUtil.java | 2 +- .../client/renderer/ticked/TextureLavaFX.java | 2 +- .../renderer/ticked/TextureLavaFlowFX.java | 2 +- .../tileentity/TileEntityBannerRenderer.java | 14 +- .../tileentity/TileEntityChestRenderer.java | 6 +- .../TileEntityItemStackRenderer.java | 16 +- .../TileEntityMobSpawnerRenderer.java | 4 +- .../tileentity/TileEntityPistonRenderer.java | 18 +- .../TileEntityRendererDispatcher.java | 22 +- .../tileentity/TileEntitySignRenderer.java | 6 +- .../tileentity/TileEntitySkullRenderer.java | 4 +- .../tileentity/TileEntitySpecialRenderer.java | 4 +- client/src/{game => client}/vars/BaseVar.java | 2 +- client/src/{game => client}/vars/BoolVar.java | 6 +- client/src/{game => client}/vars/CVar.java | 4 +- .../{game => client}/vars/CVarCategory.java | 4 +- .../src/{game => client}/vars/ColorVar.java | 6 +- client/src/{game => client}/vars/EnumVar.java | 8 +- .../src/{game => client}/vars/FloatVar.java | 6 +- client/src/{game => client}/vars/IntVar.java | 8 +- .../src/{game => client}/vars/StringVar.java | 6 +- .../src/{game => client}/vars/Variable.java | 6 +- client/src/client/window/Bind.java | 10 +- client/src/client/window/Input.java | 4 +- client/src/client/window/Window.java | 2 +- .../src/{game => client}/world/Converter.java | 150 +++++------ java/src/{game => common}/IClient.java | 18 +- java/src/{game => common}/IServer.java | 18 +- .../{game => common}/ai/AIFireballAttack.java | 18 +- .../ai/AIFlyingBoxAttack.java | 10 +- .../{game => common}/ai/AIRangedAttack.java | 8 +- .../ai/AISmallFireballAttack.java | 10 +- .../ai/EntityAIAttackOnCollide.java | 12 +- .../ai/EntityAIAvoidEntity.java | 14 +- .../src/{game => common}/ai/EntityAIBase.java | 2 +- java/src/{game => common}/ai/EntityAIBeg.java | 12 +- .../ai/EntityAIControlledByPlayer.java | 24 +- .../ai/EntityAIDoorInteract.java | 18 +- .../{game => common}/ai/EntityAIEatGrass.java | 22 +- .../{game => common}/ai/EntityAIExplode.java | 6 +- .../ai/EntityAIFindEntityNearest.java | 8 +- .../{game => common}/ai/EntityAIFleeSun.java | 14 +- .../ai/EntityAIFollowOwner.java | 12 +- .../ai/EntityAIFollowParent.java | 4 +- .../ai/EntityAIHarvestFarmland.java | 8 +- .../ai/EntityAIHurtByTarget.java | 6 +- .../ai/EntityAILeapAtTarget.java | 6 +- .../ai/EntityAILookAtTalkingPlayer.java | 4 +- .../{game => common}/ai/EntityAILookIdle.java | 4 +- .../src/{game => common}/ai/EntityAIMate.java | 18 +- .../ai/EntityAIMoveIndoors.java | 14 +- .../ai/EntityAIMoveThroughVillage.java | 22 +- .../ai/EntityAIMoveToBlock.java | 8 +- .../ai/EntityAIMoveTowardsRestriction.java | 8 +- .../ai/EntityAIMoveTowardsTarget.java | 6 +- .../ai/EntityAINagPlayer.java | 6 +- .../ai/EntityAINearestAttackableTarget.java | 6 +- .../ai/EntityAINpcInteract.java | 4 +- .../{game => common}/ai/EntityAINpcMate.java | 10 +- .../ai/EntityAIOcelotAttack.java | 6 +- .../ai/EntityAIOcelotSit.java | 20 +- .../{game => common}/ai/EntityAIOpenDoor.java | 4 +- .../ai/EntityAIOwnerHurtByTarget.java | 6 +- .../ai/EntityAIOwnerHurtTarget.java | 6 +- .../{game => common}/ai/EntityAIPanic.java | 6 +- .../src/{game => common}/ai/EntityAIPlay.java | 8 +- .../ai/EntityAIRestrictOpenDoor.java | 14 +- .../ai/EntityAIRestrictSun.java | 8 +- .../ai/EntityAIRunAroundLikeCrazy.java | 10 +- .../ai/EntityAIShareItems.java | 16 +- java/src/{game => common}/ai/EntityAISit.java | 6 +- .../{game => common}/ai/EntityAISwimming.java | 6 +- .../ai/EntityAITakePlace.java | 28 +- .../{game => common}/ai/EntityAITarget.java | 20 +- .../ai/EntityAITargetNonTamed.java | 6 +- .../{game => common}/ai/EntityAITasks.java | 4 +- .../{game => common}/ai/EntityAITempt.java | 12 +- .../{game => common}/ai/EntityAIWander.java | 6 +- .../ai/EntityAIWatchClosest.java | 8 +- .../ai/EntityAIWatchClosest2.java | 6 +- .../{game => common}/ai/EntityJumpHelper.java | 4 +- .../{game => common}/ai/EntityLookHelper.java | 8 +- .../{game => common}/ai/EntityMoveHelper.java | 8 +- .../src/{game => common}/ai/EntitySenses.java | 8 +- .../ai/RandomPositionGenerator.java | 12 +- java/src/{game => common}/biome/Biome.java | 108 ++++---- .../{game => common}/biome/BiomeBeach.java | 6 +- .../biome/BiomeBlackened.java | 18 +- .../{game => common}/biome/BiomeChaos.java | 22 +- .../{game => common}/biome/BiomeDesert.java | 14 +- .../biome/BiomeExterminated.java | 12 +- .../{game => common}/biome/BiomeForest.java | 36 +-- .../src/{game => common}/biome/BiomeHell.java | 34 +-- .../{game => common}/biome/BiomeHills.java | 18 +- .../{game => common}/biome/BiomeJungle.java | 34 +-- .../src/{game => common}/biome/BiomeMesa.java | 32 +-- .../src/{game => common}/biome/BiomeMoon.java | 14 +- .../{game => common}/biome/BiomeMushroom.java | 8 +- .../{game => common}/biome/BiomeMutated.java | 14 +- .../src/{game => common}/biome/BiomeNone.java | 14 +- .../{game => common}/biome/BiomePlains.java | 14 +- .../{game => common}/biome/BiomeSavanna.java | 22 +- .../src/{game => common}/biome/BiomeSnow.java | 20 +- .../{game => common}/biome/BiomeSnowLand.java | 10 +- .../{game => common}/biome/BiomeSpace.java | 18 +- .../biome/BiomeStoneBeach.java | 6 +- .../{game => common}/biome/BiomeSwamp.java | 24 +- .../{game => common}/biome/BiomeTaiga.java | 34 +-- .../src/{game => common}/biome/BiomeTian.java | 34 +-- .../{game => common}/biome/BiomeWater.java | 6 +- java/src/{game => common}/biome/RngSpawn.java | 6 +- java/src/{game => common}/biome/Scaling.java | 2 +- .../{game => common}/biome/Temperature.java | 2 +- java/src/{game => common}/block/Block.java | 80 +++--- java/src/{game => common}/block/BlockAir.java | 12 +- .../{game => common}/block/BlockAnvil.java | 48 ++-- .../{game => common}/block/BlockBanner.java | 42 +-- .../block/BlockBaseFlower.java | 2 +- .../block/BlockBasePressurePlate.java | 32 +-- .../{game => common}/block/BlockBeacon.java | 26 +- java/src/{game => common}/block/BlockBed.java | 42 +-- .../{game => common}/block/BlockBedrock.java | 14 +- .../block/BlockBlackenedDirt.java | 18 +- .../block/BlockBlackenedSoil.java | 24 +- .../block/BlockBlackenedStone.java | 16 +- .../block/BlockBlueShroom.java | 20 +- .../block/BlockBookshelf.java | 18 +- .../block/BlockBreakable.java | 14 +- .../block/BlockBrewingStand.java | 52 ++-- .../src/{game => common}/block/BlockBush.java | 22 +- .../{game => common}/block/BlockButton.java | 48 ++-- .../{game => common}/block/BlockCactus.java | 38 +-- .../src/{game => common}/block/BlockCake.java | 34 +-- .../{game => common}/block/BlockCarpet.java | 32 +-- .../{game => common}/block/BlockCarrot.java | 12 +- .../{game => common}/block/BlockCauldron.java | 48 ++-- .../{game => common}/block/BlockChest.java | 62 ++--- .../src/{game => common}/block/BlockClay.java | 14 +- .../{game => common}/block/BlockCocoa.java | 46 ++-- .../{game => common}/block/BlockColored.java | 22 +- .../block/BlockCompressedPowered.java | 12 +- .../block/BlockContainer.java | 16 +- .../src/{game => common}/block/BlockCore.java | 14 +- .../{game => common}/block/BlockCrops.java | 32 +-- .../block/BlockDaylightDetector.java | 48 ++-- .../{game => common}/block/BlockDeadBush.java | 30 +-- .../block/BlockDirectional.java | 8 +- .../src/{game => common}/block/BlockDirt.java | 32 +-- .../block/BlockDispenser.java | 60 ++--- .../src/{game => common}/block/BlockDoor.java | 52 ++-- .../block/BlockDoublePlant.java | 54 ++-- .../block/BlockDragonEgg.java | 30 +-- .../{game => common}/block/BlockDropper.java | 24 +- .../block/BlockDryLeaves.java | 14 +- .../block/BlockDynamicLiquid.java | 20 +- .../block/BlockEnchantmentTable.java | 36 +-- .../block/BlockEventData.java | 4 +- .../{game => common}/block/BlockFalling.java | 22 +- .../{game => common}/block/BlockFarmland.java | 40 +-- .../{game => common}/block/BlockFence.java | 40 +-- .../block/BlockFenceGate.java | 40 +-- .../src/{game => common}/block/BlockFire.java | 48 ++-- .../block/BlockFloorPortal.java | 32 +-- .../{game => common}/block/BlockFlower.java | 34 +-- .../block/BlockFlowerPot.java | 40 +-- .../{game => common}/block/BlockFurnace.java | 50 ++-- .../{game => common}/block/BlockGlass.java | 10 +- .../block/BlockGlowstone.java | 16 +- .../{game => common}/block/BlockGrass.java | 36 +-- .../{game => common}/block/BlockGravel.java | 14 +- .../block/BlockHardenedClay.java | 6 +- java/src/{game => common}/block/BlockHay.java | 22 +- .../{game => common}/block/BlockHellRock.java | 6 +- .../{game => common}/block/BlockHopper.java | 50 ++-- .../block/BlockHugeMushroom.java | 30 +-- java/src/{game => common}/block/BlockIce.java | 32 +-- .../{game => common}/block/BlockJukebox.java | 22 +- .../{game => common}/block/BlockLadder.java | 32 +-- .../{game => common}/block/BlockLeaves.java | 54 ++-- .../block/BlockLeavesBase.java | 6 +- .../{game => common}/block/BlockLever.java | 40 +-- .../{game => common}/block/BlockLilyPad.java | 32 +-- .../{game => common}/block/BlockLiquid.java | 50 ++-- java/src/{game => common}/block/BlockLog.java | 30 +-- .../{game => common}/block/BlockMachine.java | 30 +-- .../{game => common}/block/BlockMelon.java | 18 +- .../block/BlockMobSpawner.java | 22 +- .../{game => common}/block/BlockMushroom.java | 24 +- .../{game => common}/block/BlockMycelium.java | 34 +-- .../src/{game => common}/block/BlockNote.java | 24 +- .../src/{game => common}/block/BlockNuke.java | 26 +- .../{game => common}/block/BlockObsidian.java | 16 +- java/src/{game => common}/block/BlockOre.java | 22 +- .../block/BlockPackedIce.java | 8 +- .../src/{game => common}/block/BlockPane.java | 38 +-- .../block/BlockPistonBase.java | 52 ++-- .../block/BlockPistonHead.java | 44 ++-- .../block/BlockPistonMoving.java | 40 +-- .../{game => common}/block/BlockPortal.java | 42 +-- .../block/BlockPortalFrame.java | 46 ++-- .../{game => common}/block/BlockPotato.java | 18 +- .../block/BlockPressurePlate.java | 20 +- .../block/BlockPressurePlateWeighted.java | 18 +- .../{game => common}/block/BlockPumpkin.java | 24 +- .../{game => common}/block/BlockQuartz.java | 34 +-- .../src/{game => common}/block/BlockRail.java | 12 +- .../{game => common}/block/BlockRailBase.java | 40 +-- .../block/BlockRailDetector.java | 36 +-- .../block/BlockRailPowered.java | 18 +- .../block/BlockRedstoneComparator.java | 46 ++-- .../block/BlockRedstoneDiode.java | 26 +- .../block/BlockRedstoneLight.java | 22 +- .../block/BlockRedstoneOre.java | 38 +-- .../block/BlockRedstoneRepeater.java | 40 +-- .../block/BlockRedstoneTorch.java | 34 +-- .../block/BlockRedstoneWire.java | 54 ++-- .../src/{game => common}/block/BlockReed.java | 38 +-- .../src/{game => common}/block/BlockRock.java | 20 +- .../block/BlockRotatedPillar.java | 16 +- .../src/{game => common}/block/BlockSand.java | 20 +- .../block/BlockSandStone.java | 22 +- .../{game => common}/block/BlockSapling.java | 48 ++-- .../src/{game => common}/block/BlockSign.java | 24 +- .../{game => common}/block/BlockSkull.java | 38 +-- .../src/{game => common}/block/BlockSlab.java | 40 +-- .../{game => common}/block/BlockSlime.java | 20 +- .../src/{game => common}/block/BlockSnow.java | 50 ++-- .../block/BlockSnowBlock.java | 22 +- .../{game => common}/block/BlockSoulSand.java | 16 +- .../block/BlockSourceImpl.java | 12 +- .../block/BlockStainedGlass.java | 26 +- .../block/BlockStainedGlassPane.java | 20 +- .../{game => common}/block/BlockStairs.java | 58 ++--- .../block/BlockStandingSign.java | 12 +- .../block/BlockStaticLiquid.java | 20 +- .../src/{game => common}/block/BlockStem.java | 42 +-- .../{game => common}/block/BlockStone.java | 16 +- .../block/BlockStoneBrick.java | 22 +- java/src/{game => common}/block/BlockTNT.java | 46 ++-- .../block/BlockTallGrass.java | 46 ++-- .../block/BlockTianReactor.java | 16 +- .../{game => common}/block/BlockTianSoil.java | 26 +- .../{game => common}/block/BlockTorch.java | 46 ++-- .../{game => common}/block/BlockTrapDoor.java | 50 ++-- .../{game => common}/block/BlockTreasure.java | 4 +- .../{game => common}/block/BlockTripWire.java | 46 ++-- .../block/BlockTripWireHook.java | 44 ++-- .../src/{game => common}/block/BlockVine.java | 52 ++-- .../src/{game => common}/block/BlockWall.java | 38 +-- .../{game => common}/block/BlockWallSign.java | 16 +- .../block/BlockWarpChest.java | 44 ++-- .../src/{game => common}/block/BlockWart.java | 34 +-- java/src/{game => common}/block/BlockWeb.java | 28 +- .../block/BlockWorkbench.java | 28 +- .../src/{game => common}/block/IGrowable.java | 12 +- .../block/ITileEntityProvider.java | 6 +- .../{game => common}/block/LeavesType.java | 4 +- .../src/{game => common}/block/SoundType.java | 4 +- .../clipboard/BlockTransform.java | 2 +- .../clipboard/ClipboardBlock.java | 8 +- .../clipboard/ClipboardPlacer.java | 26 +- .../{game => common}/clipboard/Rotation.java | 2 +- .../clipboard/RotationValue.java | 2 +- .../{game => common}/clipboard/Vector.java | 2 +- .../collect/AbstractBiMap.java | 8 +- .../collect/AbstractIndexedListIterator.java | 4 +- .../collect/AbstractIterator.java | 4 +- .../collect/AbstractMapEntry.java | 2 +- .../collect/AbstractTable.java | 2 +- java/src/{game => common}/collect/BiMap.java | 2 +- .../collect/CollectPreconditions.java | 4 +- .../collect/DenseImmutableTable.java | 4 +- .../collect/EmptyImmutableMap.java | 2 +- .../collect/EmptyImmutableSet.java | 2 +- java/src/{game => common}/collect/Filter.java | 14 +- .../collect/ForwardingCollection.java | 2 +- .../collect/ForwardingMap.java | 2 +- .../collect/ForwardingMapEntry.java | 2 +- .../collect/ForwardingObject.java | 2 +- .../collect/ForwardingSet.java | 4 +- .../{game => common}/collect/HashBiMap.java | 8 +- .../src/{game => common}/collect/Hashing.java | 2 +- .../collect/ImmutableAsList.java | 2 +- .../collect/ImmutableCollection.java | 8 +- .../collect/ImmutableEntry.java | 2 +- .../collect/ImmutableEnumMap.java | 4 +- .../collect/ImmutableEnumSet.java | 2 +- .../collect/ImmutableList.java | 12 +- .../collect/ImmutableMap.java | 6 +- .../collect/ImmutableMapEntry.java | 4 +- .../collect/ImmutableMapEntrySet.java | 2 +- .../collect/ImmutableMapKeySet.java | 2 +- .../collect/ImmutableMapValues.java | 2 +- .../collect/ImmutableSet.java | 6 +- .../collect/ImmutableTable.java | 4 +- .../{game => common}/collect/Iterables.java | 4 +- .../{game => common}/collect/Iterators.java | 16 +- java/src/{game => common}/collect/Lists.java | 2 +- java/src/{game => common}/collect/Maps.java | 8 +- .../collect/ObjectArrays.java | 2 +- .../collect/Preconditions.java | 2 +- .../collect/RegularImmutableAsList.java | 2 +- .../collect/RegularImmutableList.java | 2 +- .../collect/RegularImmutableMap.java | 6 +- .../collect/RegularImmutableSet.java | 2 +- .../collect/RegularImmutableTable.java | 4 +- java/src/{game => common}/collect/Sets.java | 4 +- .../collect/SparseImmutableTable.java | 2 +- .../collect/StandardTable.java | 20 +- java/src/{game => common}/collect/Table.java | 2 +- .../collect/TransformedIterator.java | 4 +- .../collect/UnmodifiableIterator.java | 2 +- .../collect/UnmodifiableListIterator.java | 2 +- .../src/{game => common}/color/Colorizer.java | 8 +- java/src/{game => common}/color/DyeColor.java | 6 +- .../src/{game => common}/color/TextColor.java | 4 +- java/src/{game => common}/dimension/Area.java | 2 +- .../{game => common}/dimension/DimType.java | 4 +- .../{game => common}/dimension/Dimension.java | 82 +++--- .../{game => common}/dimension/Domain.java | 4 +- .../{game => common}/dimension/Galaxy.java | 4 +- java/src/{game => common}/dimension/Moon.java | 2 +- .../{game => common}/dimension/Nameable.java | 4 +- .../{game => common}/dimension/Planet.java | 4 +- .../{game => common}/dimension/Sector.java | 4 +- java/src/{game => common}/dimension/Semi.java | 2 +- .../src/{game => common}/dimension/Space.java | 4 +- java/src/{game => common}/dimension/Star.java | 6 +- .../BehaviorDefaultDispenseItem.java | 12 +- .../dispenser/BehaviorProjectileDispense.java | 14 +- .../dispenser/IBehaviorDispenseItem.java | 4 +- .../dispenser/IBlockSource.java | 6 +- .../dispenser/ILocatableSource.java | 2 +- .../{game => common}/dispenser/ILocation.java | 4 +- .../{game => common}/dispenser/IPosition.java | 2 +- .../dispenser/PositionImpl.java | 2 +- .../enchantment/Enchantment.java | 14 +- .../enchantment/EnchantmentArrowDamage.java | 2 +- .../enchantment/EnchantmentArrowFire.java | 2 +- .../enchantment/EnchantmentArrowInfinite.java | 2 +- .../EnchantmentArrowKnockback.java | 2 +- .../enchantment/EnchantmentDamage.java | 6 +- .../enchantment/EnchantmentDigging.java | 6 +- .../enchantment/EnchantmentDraining.java | 12 +- .../enchantment/EnchantmentDurability.java | 8 +- .../enchantment/EnchantmentFireAspect.java | 2 +- .../enchantment/EnchantmentFishingSpeed.java | 2 +- .../enchantment/EnchantmentHelper.java | 26 +- .../enchantment/EnchantmentKnockback.java | 2 +- .../enchantment/EnchantmentLootBonus.java | 2 +- .../enchantment/EnchantmentProtection.java | 8 +- .../enchantment/EnchantmentThorns.java | 16 +- .../enchantment/EnchantmentUntouching.java | 6 +- .../enchantment/EnumEnchantmentType.java | 14 +- .../enchantment/RngEnchantment.java | 4 +- .../{game => common}/entity/DamageSource.java | 10 +- .../{game => common}/entity/DataWatcher.java | 12 +- java/src/{game => common}/entity/Entity.java | 86 +++--- .../entity/EntityDamageSource.java | 8 +- .../entity/EntityDamageSourceIndirect.java | 8 +- .../entity/EntityTrackerEntry.java | 52 ++-- .../{game => common}/entity/EntityType.java | 4 +- .../entity/animal/EntityBat.java | 26 +- .../entity/animal/EntityChicken.java | 42 +-- .../entity/animal/EntityCow.java | 38 +-- .../entity/animal/EntityDragon.java | 32 +-- .../entity/animal/EntityDragonPart.java | 12 +- .../entity/animal/EntityHorse.java | 76 +++--- .../entity/animal/EntityMooshroom.java | 22 +- .../entity/animal/EntityMouse.java | 42 +-- .../entity/animal/EntityOcelot.java | 56 ++-- .../entity/animal/EntityPig.java | 42 +-- .../entity/animal/EntityRabbit.java | 84 +++--- .../entity/animal/EntitySheep.java | 66 ++--- .../entity/animal/EntitySquid.java | 22 +- .../entity/animal/EntityWolf.java | 68 ++--- .../entity/attributes/Attribute.java | 6 +- .../entity/attributes/AttributeInstance.java | 8 +- .../entity/attributes/AttributeMap.java | 9 +- .../entity/attributes/AttributeModifier.java | 4 +- .../entity/attributes/Attributes.java | 8 +- .../entity/attributes/LowerStringMap.java | 4 +- .../entity/effect/EntityLightning.java | 24 +- .../entity/item/EntityBoat.java | 38 +-- .../entity/item/EntityCart.java | 44 ++-- .../entity/item/EntityCartContainer.java | 30 +-- .../entity/item/EntityChestCart.java | 26 +- .../entity/item/EntityCrystal.java | 12 +- .../entity/item/EntityExplosion.java | 12 +- .../entity/item/EntityFalling.java | 46 ++-- .../entity/item/EntityFireworks.java | 20 +- .../entity/item/EntityHopperCart.java | 30 +-- .../entity/item/EntityItem.java | 42 +-- .../entity/item/EntityLeashKnot.java | 30 +-- .../entity/item/EntityMinecart.java | 8 +- .../entity/item/EntityNuke.java | 12 +- .../entity/item/EntityOrb.java | 18 +- .../entity/item/EntityTnt.java | 16 +- .../entity/item/EntityTntCart.java | 30 +-- .../entity/item/EntityXp.java | 32 +-- .../entity/item/EntityXpBottle.java | 12 +- .../entity/npc/Alignment.java | 6 +- .../entity/npc/CharacterInfo.java | 6 +- .../entity/npc/ClassInfo.java | 2 +- .../{game => common}/entity/npc/Energy.java | 2 +- .../entity/npc/EntityArachnoid.java | 24 +- .../entity/npc/EntityBloodElf.java | 12 +- .../entity/npc/EntityChaosMarine.java | 18 +- .../entity/npc/EntityCpu.java | 10 +- .../entity/npc/EntityCultivator.java | 20 +- .../entity/npc/EntityDarkMage.java | 14 +- .../entity/npc/EntityDwarf.java | 8 +- .../entity/npc/EntityElf.java | 14 +- .../entity/npc/EntityFireDemon.java | 12 +- .../entity/npc/EntityFlyingNPC.java | 24 +- .../entity/npc/EntityGargoyle.java | 20 +- .../entity/npc/EntityGoblin.java | 10 +- .../entity/npc/EntityHaunter.java | 28 +- .../entity/npc/EntityHoveringNPC.java | 10 +- .../entity/npc/EntityHuman.java | 20 +- .../entity/npc/EntityMage.java | 22 +- .../entity/npc/EntityMagma.java | 6 +- .../entity/npc/EntityMetalhead.java | 14 +- .../entity/npc/EntityMobNPC.java | 18 +- .../entity/npc/EntityNPC.java | 188 +++++++------- .../entity/npc/EntityOrc.java | 8 +- .../entity/npc/EntityPrimarch.java | 12 +- .../entity/npc/EntitySlime.java | 38 +-- .../entity/npc/EntitySpaceMarine.java | 18 +- .../entity/npc/EntitySpirit.java | 10 +- .../entity/npc/EntityTiefling.java | 8 +- .../entity/npc/EntityUndead.java | 20 +- .../entity/npc/EntityVampire.java | 10 +- .../entity/npc/EntityWoodElf.java | 14 +- .../entity/npc/EntityZombie.java | 26 +- .../{game => common}/entity/npc/NpcInfo.java | 4 +- .../entity/npc/PlayerCharacter.java | 4 +- .../entity/npc/SpeciesInfo.java | 16 +- .../entity/projectile/EntityArrow.java | 50 ++-- .../entity/projectile/EntityBox.java | 18 +- .../entity/projectile/EntityBullet.java | 32 +-- .../entity/projectile/EntityDie.java | 26 +- .../entity/projectile/EntityDynamite.java | 26 +- .../entity/projectile/EntityEgg.java | 22 +- .../entity/projectile/EntityFireCharge.java | 16 +- .../entity/projectile/EntityFireball.java | 14 +- .../entity/projectile/EntityHook.java | 52 ++-- .../entity/projectile/EntityPotion.java | 26 +- .../entity/projectile/EntityProjectile.java | 32 +-- .../entity/projectile/EntitySnowball.java | 16 +- .../entity/projectile/RngFishable.java | 10 +- .../entity/types/CombatEntry.java | 4 +- .../entity/types/EntityAnimal.java | 30 +-- .../entity/types/EntityBodyHelper.java | 4 +- .../entity/types/EntityLiving.java | 124 ++++----- .../entity/types/EntityTameable.java | 10 +- .../entity/types/EntityThrowable.java | 32 +-- .../entity/types/EntityWaterMob.java | 12 +- .../entity/types/EntityWeatherEffect.java | 10 +- .../entity/types/IEntityFX.java | 2 +- .../entity/types/IEntityMultiPart.java | 8 +- .../entity/types/IEntityOwnable.java | 4 +- .../entity/types/IObjectData.java | 2 +- .../entity/types/IProjectile.java | 2 +- .../future/AbstractFuture.java | 2 +- .../future/ExecutionError.java | 2 +- .../future/ExecutionList.java | 2 +- .../future/FutureCallback.java | 2 +- java/src/{game => common}/future/Futures.java | 6 +- .../future/ListenableFuture.java | 2 +- .../future/ListenableFutureTask.java | 2 +- .../future/MoreExecutors.java | 2 +- .../future/ThreadFactoryBuilder.java | 2 +- .../future/UncheckedExecutionException.java | 2 +- .../{game => common}/init/BlockRegistry.java | 14 +- java/src/{game => common}/init/Blocks.java | 76 +++--- java/src/{game => common}/init/Config.java | 10 +- .../init/CraftingRegistry.java | 48 ++-- java/src/{game => common}/init/DecoType.java | 2 +- .../init/DispenserRegistry.java | 82 +++--- .../{game => common}/init/EntityEggInfo.java | 2 +- .../{game => common}/init/EntityRegistry.java | 98 +++---- .../init/FlammabilityRegistry.java | 4 +- .../{game => common}/init/FluidRegistry.java | 16 +- .../init/IObjectIntIterable.java | 2 +- java/src/{game => common}/init/IRegistry.java | 2 +- .../{game => common}/init/ItemRegistry.java | 242 ++++++++--------- java/src/{game => common}/init/Items.java | 18 +- java/src/{game => common}/init/MetalType.java | 4 +- .../{game => common}/init/NameRegistry.java | 4 +- .../init/ObjectIntIdentityMap.java | 8 +- java/src/{game => common}/init/OreType.java | 2 +- java/src/{game => common}/init/Registry.java | 4 +- .../init/RegistryDefaulted.java | 2 +- .../init/RegistryNamespaced.java | 6 +- .../RegistryNamespacedDefaultedByKey.java | 2 +- .../{game => common}/init/RegistrySimple.java | 4 +- .../init/ReorderRegistry.java | 16 +- .../init/RotationRegistry.java | 48 ++-- .../init/SmeltingRegistry.java | 19 +- .../src/{game => common}/init/SoundEvent.java | 2 +- .../init/SpeciesRegistry.java | 64 ++--- .../{game => common}/init/TileRegistry.java | 40 +-- .../{game => common}/init/ToolMaterial.java | 6 +- java/src/{game => common}/init/ToolType.java | 2 +- .../{game => common}/init/TradeRegistry.java | 20 +- .../init/UniverseRegistry.java | 65 ++--- java/src/{game => common}/init/WoodType.java | 4 +- .../inventory/AnimalChest.java | 2 +- .../{game => common}/inventory/Container.java | 16 +- .../inventory/ContainerBrewingStand.java | 8 +- .../inventory/ContainerChest.java | 6 +- .../inventory/ContainerDispenser.java | 6 +- .../inventory/ContainerEnchantment.java | 20 +- .../inventory/ContainerFurnace.java | 10 +- .../inventory/ContainerHopper.java | 6 +- .../inventory/ContainerHorseInventory.java | 10 +- .../inventory/ContainerLocalMenu.java | 10 +- .../inventory/ContainerMachine.java | 10 +- .../inventory/ContainerMerchant.java | 8 +- .../inventory/ContainerPlayer.java | 14 +- .../inventory/ContainerRepair.java | 24 +- .../inventory/ContainerWorkbench.java | 14 +- .../{game => common}/inventory/ICrafting.java | 4 +- .../{game => common}/inventory/IInvBasic.java | 2 +- .../inventory/IInventory.java | 8 +- .../inventory/ISidedInventory.java | 6 +- .../inventory/InventoryBasic.java | 8 +- .../inventory/InventoryCraftResult.java | 6 +- .../inventory/InventoryCrafting.java | 6 +- .../inventory/InventoryHelper.java | 16 +- .../inventory/InventoryLargeChest.java | 12 +- .../inventory/InventoryMerchant.java | 10 +- .../inventory/InventoryPlayer.java | 16 +- .../inventory/InventoryWarpChest.java | 14 +- java/src/{game => common}/inventory/Slot.java | 6 +- .../inventory/SlotCrafting.java | 8 +- .../inventory/SlotFurnaceFuel.java | 8 +- .../inventory/SlotFurnaceOutput.java | 14 +- .../inventory/SlotMerchantResult.java | 8 +- java/src/{game => common}/item/CheatTab.java | 8 +- java/src/{game => common}/item/Item.java | 42 +-- .../src/{game => common}/item/ItemAction.java | 2 +- java/src/{game => common}/item/ItemAmmo.java | 2 +- .../{game => common}/item/ItemAnvilBlock.java | 4 +- .../{game => common}/item/ItemAppleGold.java | 12 +- java/src/{game => common}/item/ItemArmor.java | 40 +-- java/src/{game => common}/item/ItemAxe.java | 6 +- .../{game => common}/item/ItemBanHammer.java | 16 +- .../src/{game => common}/item/ItemBanner.java | 34 +-- java/src/{game => common}/item/ItemBed.java | 18 +- java/src/{game => common}/item/ItemBlock.java | 32 +-- java/src/{game => common}/item/ItemBoat.java | 22 +- .../{game => common}/item/ItemBoltgun.java | 4 +- java/src/{game => common}/item/ItemBook.java | 2 +- java/src/{game => common}/item/ItemBow.java | 22 +- .../src/{game => common}/item/ItemBucket.java | 46 ++-- .../{game => common}/item/ItemBucketMilk.java | 16 +- .../src/{game => common}/item/ItemButton.java | 8 +- .../src/{game => common}/item/ItemCamera.java | 8 +- .../item/ItemCarrotOnAStick.java | 12 +- .../{game => common}/item/ItemChargedOrb.java | 26 +- java/src/{game => common}/item/ItemChest.java | 10 +- java/src/{game => common}/item/ItemCloth.java | 10 +- java/src/{game => common}/item/ItemCoal.java | 6 +- .../{game => common}/item/ItemColored.java | 4 +- .../{game => common}/item/ItemControl.java | 2 +- java/src/{game => common}/item/ItemDie.java | 20 +- .../{game => common}/item/ItemDispenser.java | 4 +- java/src/{game => common}/item/ItemDoor.java | 20 +- .../item/ItemDoublePlant.java | 14 +- java/src/{game => common}/item/ItemDye.java | 42 +-- .../{game => common}/item/ItemDynamite.java | 14 +- .../{game => common}/item/ItemEditWand.java | 10 +- .../src/{game => common}/item/ItemEffect.java | 2 +- java/src/{game => common}/item/ItemEgg.java | 10 +- .../item/ItemEnchantedBook.java | 22 +- .../{game => common}/item/ItemExpBottle.java | 10 +- .../item/ItemExterminator.java | 14 +- java/src/{game => common}/item/ItemFence.java | 10 +- .../{game => common}/item/ItemFireball.java | 16 +- .../{game => common}/item/ItemFirework.java | 18 +- .../item/ItemFireworkCharge.java | 16 +- .../{game => common}/item/ItemFishFood.java | 18 +- .../{game => common}/item/ItemFishingRod.java | 16 +- .../item/ItemFlintAndSteel.java | 16 +- java/src/{game => common}/item/ItemFood.java | 12 +- .../{game => common}/item/ItemFragile.java | 2 +- .../item/ItemGlassBottle.java | 18 +- .../{game => common}/item/ItemGunBase.java | 16 +- java/src/{game => common}/item/ItemHoe.java | 24 +- .../{game => common}/item/ItemHorseArmor.java | 4 +- .../item/ItemHugeMushroom.java | 4 +- .../{game => common}/item/ItemInfoWand.java | 14 +- java/src/{game => common}/item/ItemKey.java | 4 +- java/src/{game => common}/item/ItemLead.java | 20 +- .../src/{game => common}/item/ItemLeaves.java | 6 +- .../{game => common}/item/ItemLightning.java | 10 +- .../{game => common}/item/ItemLilyPad.java | 20 +- .../src/{game => common}/item/ItemMagnet.java | 16 +- .../{game => common}/item/ItemMagnetic.java | 2 +- java/src/{game => common}/item/ItemMetal.java | 16 +- .../{game => common}/item/ItemMetalBlock.java | 18 +- .../{game => common}/item/ItemMinecart.java | 28 +- .../item/ItemMonsterPlacer.java | 44 ++-- .../item/ItemMultiTexture.java | 4 +- .../{game => common}/item/ItemNameTag.java | 6 +- .../{game => common}/item/ItemNpcSpawner.java | 40 +-- .../src/{game => common}/item/ItemNugget.java | 4 +- .../{game => common}/item/ItemPickaxe.java | 6 +- .../src/{game => common}/item/ItemPiston.java | 10 +- .../src/{game => common}/item/ItemPotion.java | 37 +-- .../item/ItemPressurePlate.java | 10 +- .../src/{game => common}/item/ItemRecord.java | 6 +- .../{game => common}/item/ItemRedstone.java | 16 +- java/src/{game => common}/item/ItemReed.java | 20 +- java/src/{game => common}/item/ItemRod.java | 4 +- .../src/{game => common}/item/ItemSaddle.java | 8 +- .../{game => common}/item/ItemSeedFood.java | 12 +- java/src/{game => common}/item/ItemSeeds.java | 14 +- .../src/{game => common}/item/ItemShears.java | 16 +- java/src/{game => common}/item/ItemSign.java | 24 +- java/src/{game => common}/item/ItemSkull.java | 30 +-- java/src/{game => common}/item/ItemSlab.java | 16 +- java/src/{game => common}/item/ItemSmall.java | 4 +- java/src/{game => common}/item/ItemSnow.java | 18 +- .../{game => common}/item/ItemSnowball.java | 10 +- java/src/{game => common}/item/ItemSoup.java | 10 +- .../item/ItemSpaceNavigator.java | 12 +- java/src/{game => common}/item/ItemSpade.java | 8 +- java/src/{game => common}/item/ItemStack.java | 47 ++-- java/src/{game => common}/item/ItemStick.java | 4 +- java/src/{game => common}/item/ItemSword.java | 28 +- java/src/{game => common}/item/ItemTNT.java | 6 +- java/src/{game => common}/item/ItemTiny.java | 4 +- java/src/{game => common}/item/ItemTool.java | 22 +- java/src/{game => common}/item/ItemWall.java | 10 +- java/src/{game => common}/item/ItemWand.java | 20 +- .../item/ItemWeatherToken.java | 14 +- java/src/{game => common}/item/RngLoot.java | 12 +- java/src/{game => common}/log/Log.java | 12 +- java/src/{game => common}/log/LogLevel.java | 8 +- java/src/{game => common}/log/Message.java | 2 +- .../src/{game => common}/log/NettyLogger.java | 2 +- .../{game => common}/material/Material.java | 2 +- .../material/MaterialColdFluid.java | 2 +- .../material/MaterialHotFluid.java | 2 +- .../material/MaterialLogic.java | 2 +- .../material/MaterialPortal.java | 2 +- .../material/MaterialTransparent.java | 2 +- .../{game => common}/model/BlockLayer.java | 2 +- .../model/ItemMeshDefinition.java | 4 +- java/src/{game => common}/model/Model.java | 4 +- .../{game => common}/model/ModelProvider.java | 6 +- .../{game => common}/model/ModelRotation.java | 12 +- .../{game => common}/model/ParticleType.java | 6 +- .../src/{game => common}/model/Transform.java | 4 +- .../{game => common}/model/Transforms.java | 2 +- java/src/{game => common}/nbt/NBTBase.java | 2 +- .../{game => common}/nbt/NBTException.java | 2 +- java/src/{game => common}/nbt/NBTLoader.java | 2 +- java/src/{game => common}/nbt/NBTParser.java | 4 +- .../{game => common}/nbt/NBTSizeTracker.java | 2 +- java/src/{game => common}/nbt/NBTTagByte.java | 2 +- .../{game => common}/nbt/NBTTagByteArray.java | 2 +- .../{game => common}/nbt/NBTTagCompound.java | 7 +- .../{game => common}/nbt/NBTTagDouble.java | 4 +- java/src/{game => common}/nbt/NBTTagEnd.java | 2 +- .../src/{game => common}/nbt/NBTTagFloat.java | 4 +- java/src/{game => common}/nbt/NBTTagInt.java | 2 +- .../{game => common}/nbt/NBTTagIntArray.java | 2 +- java/src/{game => common}/nbt/NBTTagList.java | 6 +- java/src/{game => common}/nbt/NBTTagLong.java | 2 +- .../src/{game => common}/nbt/NBTTagShort.java | 2 +- .../{game => common}/nbt/NBTTagString.java | 2 +- java/src/{game => common}/nbt/NBTUtil.java | 2 +- .../network/IClientLoginHandler.java | 8 +- .../network/IClientPlayer.java | 136 +++++----- .../network/IHandshakeHandler.java | 4 +- .../network/ILoginHandler.java | 4 +- .../src/{game => common}/network/IPlayer.java | 58 ++--- .../network/IThreadListener.java | 4 +- .../network/NetConnection.java | 10 +- .../{game => common}/network/NetHandler.java | 2 +- .../network/NettyCompressionDecoder.java | 2 +- .../network/NettyCompressionEncoder.java | 2 +- java/src/{game => common}/network/Packet.java | 2 +- .../network/PacketBuffer.java | 14 +- .../network/PacketDecoder.java | 2 +- .../network/PacketEncoder.java | 4 +- .../network/PacketPrepender.java | 2 +- .../network/PacketRegistry.java | 166 ++++++------ .../network/PacketSplitter.java | 2 +- .../{game => common}/packet/APacketEmpty.java | 6 +- .../packet/APacketVarInt.java | 6 +- .../packet/CPacketAction.java | 8 +- .../{game => common}/packet/CPacketBook.java | 8 +- .../{game => common}/packet/CPacketBreak.java | 12 +- .../{game => common}/packet/CPacketCheat.java | 10 +- .../{game => common}/packet/CPacketClick.java | 10 +- .../packet/CPacketComplete.java | 10 +- .../{game => common}/packet/CPacketInput.java | 8 +- .../packet/CPacketKeepAlive.java | 4 +- .../packet/CPacketMessage.java | 8 +- .../{game => common}/packet/CPacketPlace.java | 12 +- .../packet/CPacketPlayer.java | 8 +- .../{game => common}/packet/CPacketSign.java | 10 +- .../{game => common}/packet/CPacketSkin.java | 8 +- .../packet/HPacketHandshake.java | 8 +- .../packet/LPacketPasswordResponse.java | 10 +- .../packet/RPacketDisconnect.java | 8 +- .../packet/RPacketEnableCompression.java | 4 +- .../packet/RPacketLoginSuccess.java | 4 +- .../packet/S14PacketEntity.java | 12 +- .../packet/S18PacketEntityTeleport.java | 12 +- .../packet/S19PacketEntityHeadLook.java | 12 +- .../packet/S1APacketEntityStatus.java | 12 +- .../packet/S1BPacketEntityAttach.java | 10 +- .../packet/S1CPacketEntityMetadata.java | 10 +- .../packet/S1DPacketEntityEffect.java | 12 +- .../packet/S1EPacketRemoveEntityEffect.java | 12 +- .../packet/S20PacketEntityProperties.java | 14 +- .../packet/S27PacketExplosion.java | 14 +- .../packet/S28PacketEffect.java | 10 +- .../packet/S29PacketSoundEffect.java | 10 +- .../packet/S2APacketParticles.java | 10 +- .../packet/S2BPacketChangeGameState.java | 10 +- .../packet/S2CPacketSpawnGlobalEntity.java | 12 +- .../packet/S2DPacketOpenWindow.java | 10 +- .../packet/S2EPacketCloseWindow.java | 8 +- .../packet/S2FPacketSetSlot.java | 10 +- .../packet/S30PacketWindowItems.java | 10 +- .../packet/S31PacketWindowProperty.java | 8 +- .../packet/S32PacketConfirmTransaction.java | 8 +- .../packet/S33PacketUpdateSign.java | 12 +- .../packet/S35PacketUpdateTileEntity.java | 16 +- .../packet/S36PacketSignEditorOpen.java | 10 +- .../packet/S38PacketPlayerListItem.java | 12 +- .../packet/S39PacketPlayerAbilities.java | 10 +- .../packet/S3APacketTabComplete.java | 8 +- .../packet/S43PacketUpdateEntityNBT.java | 14 +- .../packet/SPacketAnimation.java | 10 +- .../packet/SPacketBiomes.java | 8 +- .../packet/SPacketBlockAction.java | 14 +- .../packet/SPacketBlockBreakAnim.java | 10 +- .../packet/SPacketBlockChange.java | 16 +- .../packet/SPacketCamera.java | 12 +- .../packet/SPacketCharacterList.java | 18 +- .../packet/SPacketChunkData.java | 14 +- .../packet/SPacketCollectItem.java | 8 +- .../packet/SPacketDestroyEntities.java | 8 +- .../packet/SPacketDimensionName.java | 10 +- .../packet/SPacketDisconnect.java | 8 +- .../packet/SPacketEntityEquipment.java | 10 +- .../packet/SPacketEntityVelocity.java | 10 +- .../packet/SPacketHeldItemChange.java | 8 +- .../packet/SPacketJoinGame.java | 12 +- .../packet/SPacketKeepAlive.java | 4 +- .../packet/SPacketLoading.java | 8 +- .../packet/SPacketMapChunkBulk.java | 10 +- .../packet/SPacketMessage.java | 8 +- .../packet/SPacketMultiBlockChange.java | 18 +- .../packet/SPacketPlayerPosLook.java | 8 +- .../packet/SPacketRespawn.java | 12 +- .../packet/SPacketServerTick.java | 8 +- .../packet/SPacketSetExperience.java | 8 +- .../{game => common}/packet/SPacketSkin.java | 14 +- .../packet/SPacketSpawnMob.java | 16 +- .../packet/SPacketSpawnObject.java | 24 +- .../packet/SPacketSpawnPlayer.java | 22 +- .../packet/SPacketTimeUpdate.java | 8 +- .../packet/SPacketTrades.java | 14 +- .../packet/SPacketUpdateHealth.java | 8 +- .../{game => common}/packet/SPacketWorld.java | 8 +- .../pathfinding/NodeProcessor.java | 8 +- .../{game => common}/pathfinding/Path.java | 2 +- .../pathfinding/PathCache.java | 16 +- .../pathfinding/PathEntity.java | 6 +- .../pathfinding/PathFinder.java | 6 +- .../pathfinding/PathNavigate.java | 20 +- .../pathfinding/PathNavigateClimber.java | 12 +- .../pathfinding/PathNavigateGround.java | 20 +- .../pathfinding/PathPoint.java | 4 +- .../pathfinding/SwimNodeProcessor.java | 12 +- .../pathfinding/WalkNodeProcessor.java | 26 +- .../pattern/BlockStateHelper.java | 10 +- java/src/{game => common}/potion/Potion.java | 22 +- .../{game => common}/potion/PotionEffect.java | 8 +- .../{game => common}/potion/PotionHelper.java | 6 +- .../properties/IProperty.java | 2 +- .../properties/PropertyBool.java | 4 +- .../properties/PropertyDirection.java | 10 +- .../properties/PropertyEnum.java | 14 +- .../properties/PropertyHelper.java | 2 +- .../properties/PropertyInteger.java | 6 +- .../src/{game => common}/rng/ImprovedGen.java | 2 +- .../{game => common}/rng/ImprovedGenOld.java | 2 +- java/src/{game => common}/rng/NoiseGen.java | 2 +- java/src/{game => common}/rng/OctaveGen.java | 2 +- .../{game => common}/rng/OctaveGenOld.java | 2 +- java/src/{game => common}/rng/PerlinGen.java | 2 +- .../{game => common}/rng/PerlinGenOld.java | 2 +- java/src/{game => common}/rng/Random.java | 2 +- java/src/{game => common}/rng/RngItem.java | 2 +- java/src/{game => common}/rng/SimplexGen.java | 2 +- .../{game => common}/rng/SimplexGenOld.java | 2 +- .../{game => common}/rng/WeightedList.java | 2 +- .../src/{game => common}/sound/EventType.java | 2 +- .../{game => common}/sound/MovingSound.java | 4 +- .../sound/MovingSoundMinecart.java | 8 +- .../sound/MovingSoundMinecartRiding.java | 10 +- .../sound/PositionedSound.java | 4 +- java/src/{game => common}/sound/Sound.java | 4 +- .../{game => common}/tileentity/IHopper.java | 6 +- .../tileentity/IInteractionObject.java | 8 +- .../tileentity/ILockableContainer.java | 4 +- .../tileentity/ITickable.java | 2 +- .../tileentity/IWorldNameable.java | 2 +- .../LocalBlockIntercommunication.java | 8 +- .../{game => common}/tileentity/LockCode.java | 4 +- .../tileentity/MachineResource.java | 4 +- .../tileentity/TileEntity.java | 20 +- .../tileentity/TileEntityBanner.java | 22 +- .../tileentity/TileEntityBeacon.java | 30 +-- .../tileentity/TileEntityBrewingStand.java | 34 +-- .../tileentity/TileEntityChest.java | 32 +-- .../tileentity/TileEntityComparator.java | 4 +- .../TileEntityDaylightDetector.java | 6 +- .../tileentity/TileEntityDispenser.java | 20 +- .../tileentity/TileEntityDropper.java | 2 +- .../TileEntityEnchantmentTable.java | 16 +- .../tileentity/TileEntityFurnace.java | 56 ++-- .../tileentity/TileEntityHopper.java | 42 +-- .../tileentity/TileEntityLockable.java | 4 +- .../tileentity/TileEntityMachine.java | 26 +- .../tileentity/TileEntityMobSpawner.java | 26 +- .../tileentity/TileEntityNote.java | 14 +- .../tileentity/TileEntityPiston.java | 18 +- .../tileentity/TileEntitySign.java | 10 +- .../tileentity/TileEntitySkull.java | 8 +- .../tileentity/TileEntityTianReactor.java | 12 +- .../{game => common}/util/CharValidator.java | 2 +- java/src/{game => common}/util/DC32.java | 2 +- .../{game => common}/util/Displayable.java | 2 +- java/src/{game => common}/util/ExtMath.java | 2 +- java/src/{game => common}/util/FileUtils.java | 4 +- .../{game => common}/util/Identifyable.java | 2 +- .../{game => common}/util/LazyLoadBase.java | 2 +- java/src/{game => common}/util/Matrix4f.java | 2 +- .../src/{game => common}/util/Predicates.java | 2 +- java/src/{game => common}/util/Tuple.java | 2 +- java/src/{game => common}/util/Util.java | 8 +- java/src/{game => common}/util/Vector.java | 2 +- java/src/{game => common}/util/Vector3f.java | 2 +- java/src/{game => common}/util/Vector4f.java | 2 +- .../village/MerchantRecipe.java | 8 +- .../village/MerchantRecipeList.java | 10 +- .../src/{game => common}/village/Village.java | 18 +- .../village/VillageCollection.java | 20 +- .../village/VillageDoorInfo.java | 6 +- .../{game => common}/world/BlockArray.java | 8 +- java/src/{game => common}/world/BlockPos.java | 6 +- .../{game => common}/world/BoundingBox.java | 4 +- java/src/{game => common}/world/Chunk.java | 30 +-- .../{game => common}/world/ChunkCache.java | 2 +- java/src/{game => common}/world/ChunkPos.java | 2 +- .../world/ClassInheritanceMultiMap.java | 8 +- .../{game => common}/world/EmptyChunk.java | 10 +- .../src/{game => common}/world/Explosion.java | 36 +-- java/src/{game => common}/world/Facing.java | 12 +- .../{game => common}/world/HitPosition.java | 4 +- .../{game => common}/world/IBlockAccess.java | 2 +- .../{game => common}/world/IWorldAccess.java | 6 +- .../{game => common}/world/IntHashMap.java | 2 +- .../src/{game => common}/world/LightType.java | 2 +- .../{game => common}/world/LongHashMap.java | 2 +- .../world/NextTickListEntry.java | 6 +- .../{game => common}/world/NibbleArray.java | 2 +- .../{game => common}/world/PortalType.java | 2 +- java/src/{game => common}/world/Position.java | 2 +- java/src/{game => common}/world/Region.java | 28 +- java/src/{game => common}/world/Spawner.java | 26 +- java/src/{game => common}/world/State.java | 20 +- java/src/{game => common}/world/Vec3.java | 4 +- java/src/{game => common}/world/Vec3i.java | 4 +- java/src/{game => common}/world/Weather.java | 10 +- java/src/{game => common}/world/World.java | 50 ++-- .../{game => common}/world/WorldClient.java | 52 ++-- java/src/{game => common}/world/WorldPos.java | 2 +- .../{game => common}/world/WorldServer.java | 150 +++++------ .../worldgen/BiomeGenLayered.java | 50 ++-- .../worldgen/BiomeGenPerlin.java | 6 +- .../worldgen/BiomeGenSingle.java | 6 +- .../worldgen/BiomeGenerator.java | 6 +- .../worldgen/BlockReplacer.java | 8 +- .../worldgen/ChunkGenerator.java | 4 +- .../worldgen/ChunkPrimer.java | 8 +- .../worldgen/FeatureDungeons.java | 28 +- .../worldgen/FeatureGenerator.java | 10 +- .../worldgen/FeatureLakes.java | 20 +- .../worldgen/FeatureLiquids.java | 14 +- .../worldgen/FeatureOres.java | 14 +- .../worldgen/GeneratorCavern.java | 12 +- .../worldgen/GeneratorDebug.java | 14 +- .../worldgen/GeneratorDestroyed.java | 10 +- .../worldgen/GeneratorFlat.java | 6 +- .../worldgen/GeneratorIsland.java | 12 +- .../worldgen/GeneratorPerlin.java | 18 +- .../worldgen/GeneratorSimple.java | 12 +- .../worldgen/LootConstants.java | 32 +-- .../worldgen/ReplacerAltBiome.java | 18 +- .../worldgen/ReplacerAltSurface.java | 16 +- .../worldgen/ReplacerBiome.java | 10 +- .../worldgen/ReplacerTopLayer.java | 16 +- .../worldgen/caves/MapGenBase.java | 8 +- .../worldgen/caves/MapGenBigCaves.java | 16 +- .../worldgen/caves/MapGenCaves.java | 24 +- .../worldgen/caves/MapGenRavine.java | 18 +- .../feature/WorldGenAbandonedChest.java | 26 +- .../worldgen/feature/WorldGenAsteroid.java | 12 +- .../worldgen/feature/WorldGenBlockBlob.java | 14 +- .../worldgen/feature/WorldGenClay.java | 14 +- .../worldgen/feature/WorldGenClayExt.java | 14 +- .../worldgen/feature/WorldGenDesertWells.java | 24 +- .../worldgen/feature/WorldGenFire.java | 12 +- .../worldgen/feature/WorldGenGlowStone.java | 16 +- .../worldgen/feature/WorldGenHellLava.java | 16 +- .../worldgen/feature/WorldGenIcePath.java | 14 +- .../worldgen/feature/WorldGenIceSpike.java | 18 +- .../worldgen/feature/WorldGenSand.java | 14 +- .../worldgen/feature/WorldGenSpikes.java | 18 +- .../worldgen/foliage/FeatureDoublePlant.java | 12 +- .../worldgen/foliage/WorldGenBigMushroom.java | 18 +- .../worldgen/foliage/WorldGenCactus.java | 12 +- .../worldgen/foliage/WorldGenDeadBush.java | 16 +- .../worldgen/foliage/WorldGenFlowers.java | 14 +- .../worldgen/foliage/WorldGenMelon.java | 12 +- .../worldgen/foliage/WorldGenMushroom.java | 12 +- .../worldgen/foliage/WorldGenPumpkin.java | 16 +- .../worldgen/foliage/WorldGenReed.java | 14 +- .../worldgen/foliage/WorldGenShrub.java | 20 +- .../worldgen/foliage/WorldGenTallGrass.java | 20 +- .../worldgen/foliage/WorldGenVines.java | 18 +- .../worldgen/foliage/WorldGenWaterlily.java | 16 +- .../worldgen/layer/GenLayer.java | 4 +- .../worldgen/layer/GenLayerAddAreas.java | 2 +- .../worldgen/layer/GenLayerAddExtra.java | 4 +- .../worldgen/layer/GenLayerAddSea.java | 4 +- .../worldgen/layer/GenLayerAddSnow.java | 2 +- .../worldgen/layer/GenLayerBase.java | 2 +- .../worldgen/layer/GenLayerBiome.java | 4 +- .../worldgen/layer/GenLayerBiomeEdge.java | 6 +- .../worldgen/layer/GenLayerEdge.java | 2 +- .../worldgen/layer/GenLayerFuzzyZoom.java | 2 +- .../worldgen/layer/GenLayerHills.java | 6 +- .../worldgen/layer/GenLayerRemoveEmpty.java | 2 +- .../worldgen/layer/GenLayerRiver.java | 4 +- .../worldgen/layer/GenLayerRiverInit.java | 2 +- .../worldgen/layer/GenLayerRiverMix.java | 4 +- .../worldgen/layer/GenLayerShore.java | 6 +- .../worldgen/layer/GenLayerSmooth.java | 2 +- .../worldgen/layer/GenLayerVoronoiZoom.java | 2 +- .../worldgen/layer/GenLayerZoom.java | 2 +- .../worldgen/layer/IntCache.java | 4 +- .../worldgen/structure/MapGenBridge.java | 6 +- .../worldgen/structure/MapGenMineshaft.java | 2 +- .../structure/MapGenScatteredFeature.java | 10 +- .../worldgen/structure/MapGenStronghold.java | 6 +- .../worldgen/structure/MapGenStructure.java | 26 +- .../worldgen/structure/MapGenStructureIO.java | 10 +- .../worldgen/structure/MapGenVillage.java | 12 +- .../structure/StructureBoundingBox.java | 10 +- .../worldgen/structure/StructureBridge.java | 22 +- .../structure/StructureComponent.java | 36 +-- .../structure/StructureMineshaft.java | 34 +-- .../structure/StructureMineshaftStart.java | 6 +- .../structure/StructureScattered.java | 40 +-- .../worldgen/structure/StructureStart.java | 12 +- .../structure/StructureStronghold.java | 32 +-- .../worldgen/structure/StructureVillage.java | 46 ++-- .../worldgen/tree/WorldGenBaseTree.java | 26 +- .../worldgen/tree/WorldGenBigTree.java | 24 +- .../worldgen/tree/WorldGenBirch.java | 18 +- .../worldgen/tree/WorldGenDarkOak.java | 20 +- .../worldgen/tree/WorldGenHugeTree.java | 18 +- .../worldgen/tree/WorldGenJungle.java | 18 +- .../worldgen/tree/WorldGenPine.java | 20 +- .../worldgen/tree/WorldGenSavanna.java | 20 +- .../worldgen/tree/WorldGenSwamp.java | 22 +- .../worldgen/tree/WorldGenTaiga1.java | 18 +- .../worldgen/tree/WorldGenTaiga2.java | 18 +- .../worldgen/tree/WorldGenTree.java | 20 +- server/src/server/Server.java | 114 ++++---- server/src/server/command/ArgumentParser.java | 2 +- .../src/server/command/ArgumentSplitter.java | 6 +- .../src/server/command/CachedExecutable.java | 4 +- server/src/server/command/ColorParser.java | 2 +- server/src/server/command/Command.java | 8 +- .../server/command/CommandEnvironment.java | 10 +- .../src/server/command/DimensionParser.java | 6 +- server/src/server/command/DoubleParser.java | 6 +- .../src/server/command/EntityListParser.java | 14 +- server/src/server/command/EntityParser.java | 8 +- server/src/server/command/EnumParser.java | 2 +- server/src/server/command/Executor.java | 6 +- server/src/server/command/FixedExecutor.java | 6 +- .../command/PlayerEntityListParser.java | 8 +- .../server/command/PlayerEntityParser.java | 2 +- .../src/server/command/PlayerListParser.java | 4 +- server/src/server/command/StringParser.java | 2 +- server/src/server/command/TagParser.java | 6 +- server/src/server/command/WorldParser.java | 6 +- .../server/command/commands/CommandHelp.java | 4 +- .../command/commands/CommandMessage.java | 2 +- .../server/command/commands/CommandMilk.java | 6 +- .../command/commands/CommandOfflinetp.java | 8 +- .../command/commands/CommandPotion.java | 6 +- .../command/commands/CommandRemove.java | 2 +- .../server/command/commands/CommandSpawn.java | 18 +- .../server/command/commands/CommandTele.java | 6 +- .../server/command/commands/CommandTime.java | 8 +- .../server/command/commands/CommandTp.java | 6 +- .../server/command/commands/CommandWarp.java | 6 +- .../command/commands/CommandWeather.java | 4 +- .../server/command/commands/CommandWorld.java | 6 +- .../src/server/network/HandshakeHandler.java | 14 +- server/src/server/network/LoginHandler.java | 18 +- server/src/server/network/Player.java | 244 +++++++++--------- 1246 files changed, 9285 insertions(+), 9272 deletions(-) rename client/src/{game => client}/vars/BaseVar.java (97%) rename client/src/{game => client}/vars/BoolVar.java (95%) rename client/src/{game => client}/vars/CVar.java (86%) rename client/src/{game => client}/vars/CVarCategory.java (89%) rename client/src/{game => client}/vars/ColorVar.java (95%) rename client/src/{game => client}/vars/EnumVar.java (96%) rename client/src/{game => client}/vars/FloatVar.java (97%) rename client/src/{game => client}/vars/IntVar.java (95%) rename client/src/{game => client}/vars/StringVar.java (96%) rename client/src/{game => client}/vars/Variable.java (88%) rename client/src/{game => client}/world/Converter.java (95%) rename java/src/{game => common}/IClient.java (78%) rename java/src/{game => common}/IServer.java (69%) rename java/src/{game => common}/ai/AIFireballAttack.java (92%) rename java/src/{game => common}/ai/AIFlyingBoxAttack.java (94%) rename java/src/{game => common}/ai/AIRangedAttack.java (96%) rename java/src/{game => common}/ai/AISmallFireballAttack.java (94%) rename java/src/{game => common}/ai/EntityAIAttackOnCollide.java (96%) rename java/src/{game => common}/ai/EntityAIAvoidEntity.java (94%) rename java/src/{game => common}/ai/EntityAIBase.java (98%) rename java/src/{game => common}/ai/EntityAIBeg.java (92%) rename java/src/{game => common}/ai/EntityAIControlledByPlayer.java (94%) rename java/src/{game => common}/ai/EntityAIDoorInteract.java (92%) rename java/src/{game => common}/ai/EntityAIEatGrass.java (90%) rename java/src/{game => common}/ai/EntityAIExplode.java (93%) rename java/src/{game => common}/ai/EntityAIFindEntityNearest.java (95%) rename java/src/{game => common}/ai/EntityAIFleeSun.java (92%) rename java/src/{game => common}/ai/EntityAIFollowOwner.java (93%) rename java/src/{game => common}/ai/EntityAIFollowParent.java (97%) rename java/src/{game => common}/ai/EntityAIHarvestFarmland.java (97%) rename java/src/{game => common}/ai/EntityAIHurtByTarget.java (96%) rename java/src/{game => common}/ai/EntityAILeapAtTarget.java (95%) rename java/src/{game => common}/ai/EntityAILookAtTalkingPlayer.java (90%) rename java/src/{game => common}/ai/EntityAILookIdle.java (96%) rename java/src/{game => common}/ai/EntityAIMate.java (94%) rename java/src/{game => common}/ai/EntityAIMoveIndoors.java (93%) rename java/src/{game => common}/ai/EntityAIMoveThroughVillage.java (93%) rename java/src/{game => common}/ai/EntityAIMoveToBlock.java (97%) rename java/src/{game => common}/ai/EntityAIMoveTowardsRestriction.java (93%) rename java/src/{game => common}/ai/EntityAIMoveTowardsTarget.java (96%) rename java/src/{game => common}/ai/EntityAINagPlayer.java (91%) rename java/src/{game => common}/ai/EntityAINearestAttackableTarget.java (98%) rename java/src/{game => common}/ai/EntityAINpcInteract.java (95%) rename java/src/{game => common}/ai/EntityAINpcMate.java (95%) rename java/src/{game => common}/ai/EntityAIOcelotAttack.java (96%) rename java/src/{game => common}/ai/EntityAIOcelotSit.java (88%) rename java/src/{game => common}/ai/EntityAIOpenDoor.java (95%) rename java/src/{game => common}/ai/EntityAIOwnerHurtByTarget.java (94%) rename java/src/{game => common}/ai/EntityAIOwnerHurtTarget.java (93%) rename java/src/{game => common}/ai/EntityAIPanic.java (94%) rename java/src/{game => common}/ai/EntityAIPlay.java (93%) rename java/src/{game => common}/ai/EntityAIRestrictOpenDoor.java (90%) rename java/src/{game => common}/ai/EntityAIRestrictSun.java (84%) rename java/src/{game => common}/ai/EntityAIRunAroundLikeCrazy.java (94%) rename java/src/{game => common}/ai/EntityAIShareItems.java (93%) rename java/src/{game => common}/ai/EntityAISit.java (93%) rename java/src/{game => common}/ai/EntityAISwimming.java (87%) rename java/src/{game => common}/ai/EntityAITakePlace.java (93%) rename java/src/{game => common}/ai/EntityAITarget.java (95%) rename java/src/{game => common}/ai/EntityAITargetNonTamed.java (86%) rename java/src/{game => common}/ai/EntityAITasks.java (99%) rename java/src/{game => common}/ai/EntityAITempt.java (96%) rename java/src/{game => common}/ai/EntityAIWander.java (96%) rename java/src/{game => common}/ai/EntityAIWatchClosest.java (96%) rename java/src/{game => common}/ai/EntityAIWatchClosest2.java (78%) rename java/src/{game => common}/ai/EntityJumpHelper.java (88%) rename java/src/{game => common}/ai/EntityLookHelper.java (96%) rename java/src/{game => common}/ai/EntityMoveHelper.java (95%) rename java/src/{game => common}/ai/EntitySenses.java (91%) rename java/src/{game => common}/ai/RandomPositionGenerator.java (96%) rename java/src/{game => common}/biome/Biome.java (93%) rename java/src/{game => common}/biome/BiomeBeach.java (83%) rename java/src/{game => common}/biome/BiomeBlackened.java (70%) rename java/src/{game => common}/biome/BiomeChaos.java (73%) rename java/src/{game => common}/biome/BiomeDesert.java (79%) rename java/src/{game => common}/biome/BiomeExterminated.java (73%) rename java/src/{game => common}/biome/BiomeForest.java (93%) rename java/src/{game => common}/biome/BiomeHell.java (87%) rename java/src/{game => common}/biome/BiomeHills.java (91%) rename java/src/{game => common}/biome/BiomeJungle.java (78%) rename java/src/{game => common}/biome/BiomeMesa.java (95%) rename java/src/{game => common}/biome/BiomeMoon.java (70%) rename java/src/{game => common}/biome/BiomeMushroom.java (79%) rename java/src/{game => common}/biome/BiomeMutated.java (92%) rename java/src/{game => common}/biome/BiomeNone.java (71%) rename java/src/{game => common}/biome/BiomePlains.java (94%) rename java/src/{game => common}/biome/BiomeSavanna.java (87%) rename java/src/{game => common}/biome/BiomeSnow.java (82%) rename java/src/{game => common}/biome/BiomeSnowLand.java (73%) rename java/src/{game => common}/biome/BiomeSpace.java (74%) rename java/src/{game => common}/biome/BiomeStoneBeach.java (84%) rename java/src/{game => common}/biome/BiomeSwamp.java (85%) rename java/src/{game => common}/biome/BiomeTaiga.java (85%) rename java/src/{game => common}/biome/BiomeTian.java (80%) rename java/src/{game => common}/biome/BiomeWater.java (80%) rename java/src/{game => common}/biome/RngSpawn.java (77%) rename java/src/{game => common}/biome/Scaling.java (96%) rename java/src/{game => common}/biome/Temperature.java (71%) rename java/src/{game => common}/block/Block.java (96%) rename java/src/{game => common}/block/BlockAir.java (86%) rename java/src/{game => common}/block/BlockAnvil.java (88%) rename java/src/{game => common}/block/BlockBanner.java (91%) rename java/src/{game => common}/block/BlockBaseFlower.java (88%) rename java/src/{game => common}/block/BlockBasePressurePlate.java (93%) rename java/src/{game => common}/block/BlockBeacon.java (89%) rename java/src/{game => common}/block/BlockBed.java (91%) rename java/src/{game => common}/block/BlockBedrock.java (68%) rename java/src/{game => common}/block/BlockBlackenedDirt.java (83%) rename java/src/{game => common}/block/BlockBlackenedSoil.java (83%) rename java/src/{game => common}/block/BlockBlackenedStone.java (56%) rename java/src/{game => common}/block/BlockBlueShroom.java (89%) rename java/src/{game => common}/block/BlockBookshelf.java (72%) rename java/src/{game => common}/block/BlockBreakable.java (83%) rename java/src/{game => common}/block/BlockBrewingStand.java (96%) rename java/src/{game => common}/block/BlockBush.java (87%) rename java/src/{game => common}/block/BlockButton.java (94%) rename java/src/{game => common}/block/BlockCactus.java (89%) rename java/src/{game => common}/block/BlockCake.java (93%) rename java/src/{game => common}/block/BlockCarpet.java (89%) rename java/src/{game => common}/block/BlockCarrot.java (70%) rename java/src/{game => common}/block/BlockCauldron.java (96%) rename java/src/{game => common}/block/BlockChest.java (94%) rename java/src/{game => common}/block/BlockClay.java (72%) rename java/src/{game => common}/block/BlockCocoa.java (92%) rename java/src/{game => common}/block/BlockColored.java (85%) rename java/src/{game => common}/block/BlockCompressedPowered.java (75%) rename java/src/{game => common}/block/BlockContainer.java (87%) rename java/src/{game => common}/block/BlockCore.java (66%) rename java/src/{game => common}/block/BlockCrops.java (93%) rename java/src/{game => common}/block/BlockDaylightDetector.java (87%) rename java/src/{game => common}/block/BlockDeadBush.java (80%) rename java/src/{game => common}/block/BlockDirectional.java (67%) rename java/src/{game => common}/block/BlockDirt.java (91%) rename java/src/{game => common}/block/BlockDispenser.java (90%) rename java/src/{game => common}/block/BlockDoor.java (95%) rename java/src/{game => common}/block/BlockDoublePlant.java (95%) rename java/src/{game => common}/block/BlockDragonEgg.java (93%) rename java/src/{game => common}/block/BlockDropper.java (85%) rename java/src/{game => common}/block/BlockDryLeaves.java (88%) rename java/src/{game => common}/block/BlockDynamicLiquid.java (96%) rename java/src/{game => common}/block/BlockEnchantmentTable.java (87%) rename java/src/{game => common}/block/BlockEventData.java (96%) rename java/src/{game => common}/block/BlockFalling.java (88%) rename java/src/{game => common}/block/BlockFarmland.java (89%) rename java/src/{game => common}/block/BlockFence.java (95%) rename java/src/{game => common}/block/BlockFenceGate.java (95%) rename java/src/{game => common}/block/BlockFire.java (98%) rename java/src/{game => common}/block/BlockFloorPortal.java (90%) rename java/src/{game => common}/block/BlockFlower.java (93%) rename java/src/{game => common}/block/BlockFlowerPot.java (95%) rename java/src/{game => common}/block/BlockFurnace.java (91%) rename java/src/{game => common}/block/BlockGlass.java (80%) rename java/src/{game => common}/block/BlockGlowstone.java (82%) rename java/src/{game => common}/block/BlockGrass.java (91%) rename java/src/{game => common}/block/BlockGravel.java (74%) rename java/src/{game => common}/block/BlockHardenedClay.java (80%) rename java/src/{game => common}/block/BlockHay.java (84%) rename java/src/{game => common}/block/BlockHellRock.java (83%) rename java/src/{game => common}/block/BlockHopper.java (92%) rename java/src/{game => common}/block/BlockHugeMushroom.java (93%) rename java/src/{game => common}/block/BlockIce.java (81%) rename java/src/{game => common}/block/BlockJukebox.java (64%) rename java/src/{game => common}/block/BlockLadder.java (90%) rename java/src/{game => common}/block/BlockLeaves.java (93%) rename java/src/{game => common}/block/BlockLeavesBase.java (91%) rename java/src/{game => common}/block/BlockLever.java (94%) rename java/src/{game => common}/block/BlockLilyPad.java (86%) rename java/src/{game => common}/block/BlockLiquid.java (94%) rename java/src/{game => common}/block/BlockLog.java (90%) rename java/src/{game => common}/block/BlockMachine.java (85%) rename java/src/{game => common}/block/BlockMelon.java (78%) rename java/src/{game => common}/block/BlockMobSpawner.java (84%) rename java/src/{game => common}/block/BlockMushroom.java (90%) rename java/src/{game => common}/block/BlockMycelium.java (86%) rename java/src/{game => common}/block/BlockNote.java (90%) rename java/src/{game => common}/block/BlockNuke.java (81%) rename java/src/{game => common}/block/BlockObsidian.java (72%) rename java/src/{game => common}/block/BlockOre.java (93%) rename java/src/{game => common}/block/BlockPackedIce.java (76%) rename java/src/{game => common}/block/BlockPane.java (96%) rename java/src/{game => common}/block/BlockPistonBase.java (96%) rename java/src/{game => common}/block/BlockPistonHead.java (93%) rename java/src/{game => common}/block/BlockPistonMoving.java (93%) rename java/src/{game => common}/block/BlockPortal.java (96%) rename java/src/{game => common}/block/BlockPortalFrame.java (87%) rename java/src/{game => common}/block/BlockPotato.java (78%) rename java/src/{game => common}/block/BlockPressurePlate.java (88%) rename java/src/{game => common}/block/BlockPressurePlateWeighted.java (88%) rename java/src/{game => common}/block/BlockPumpkin.java (95%) rename java/src/{game => common}/block/BlockQuartz.java (92%) rename java/src/{game => common}/block/BlockRail.java (88%) rename java/src/{game => common}/block/BlockRailBase.java (97%) rename java/src/{game => common}/block/BlockRailDetector.java (92%) rename java/src/{game => common}/block/BlockRailPowered.java (96%) rename java/src/{game => common}/block/BlockRedstoneComparator.java (95%) rename java/src/{game => common}/block/BlockRedstoneDiode.java (95%) rename java/src/{game => common}/block/BlockRedstoneLight.java (87%) rename java/src/{game => common}/block/BlockRedstoneOre.java (90%) rename java/src/{game => common}/block/BlockRedstoneRepeater.java (97%) rename java/src/{game => common}/block/BlockRedstoneTorch.java (93%) rename java/src/{game => common}/block/BlockRedstoneWire.java (97%) rename java/src/{game => common}/block/BlockReed.java (89%) rename java/src/{game => common}/block/BlockRock.java (76%) rename java/src/{game => common}/block/BlockRotatedPillar.java (78%) rename java/src/{game => common}/block/BlockSand.java (91%) rename java/src/{game => common}/block/BlockSandStone.java (92%) rename java/src/{game => common}/block/BlockSapling.java (92%) rename java/src/{game => common}/block/BlockSign.java (88%) rename java/src/{game => common}/block/BlockSkull.java (86%) rename java/src/{game => common}/block/BlockSlab.java (95%) rename java/src/{game => common}/block/BlockSlime.java (88%) rename java/src/{game => common}/block/BlockSnow.java (87%) rename java/src/{game => common}/block/BlockSnowBlock.java (73%) rename java/src/{game => common}/block/BlockSoulSand.java (75%) rename java/src/{game => common}/block/BlockSourceImpl.java (84%) rename java/src/{game => common}/block/BlockStainedGlass.java (87%) rename java/src/{game => common}/block/BlockStainedGlassPane.java (90%) rename java/src/{game => common}/block/BlockStairs.java (96%) rename java/src/{game => common}/block/BlockStandingSign.java (87%) rename java/src/{game => common}/block/BlockStaticLiquid.java (91%) rename java/src/{game => common}/block/BlockStem.java (94%) rename java/src/{game => common}/block/BlockStone.java (54%) rename java/src/{game => common}/block/BlockStoneBrick.java (92%) rename java/src/{game => common}/block/BlockTNT.java (89%) rename java/src/{game => common}/block/BlockTallGrass.java (90%) rename java/src/{game => common}/block/BlockTianReactor.java (70%) rename java/src/{game => common}/block/BlockTianSoil.java (76%) rename java/src/{game => common}/block/BlockTorch.java (93%) rename java/src/{game => common}/block/BlockTrapDoor.java (92%) rename java/src/{game => common}/block/BlockTreasure.java (75%) rename java/src/{game => common}/block/BlockTripWire.java (97%) rename java/src/{game => common}/block/BlockTripWireHook.java (97%) rename java/src/{game => common}/block/BlockVine.java (96%) rename java/src/{game => common}/block/BlockWall.java (95%) rename java/src/{game => common}/block/BlockWallSign.java (90%) rename java/src/{game => common}/block/BlockWarpChest.java (86%) rename java/src/{game => common}/block/BlockWart.java (86%) rename java/src/{game => common}/block/BlockWeb.java (74%) rename java/src/{game => common}/block/BlockWorkbench.java (79%) rename java/src/{game => common}/block/IGrowable.java (62%) rename java/src/{game => common}/block/ITileEntityProvider.java (71%) rename java/src/{game => common}/block/LeavesType.java (91%) rename java/src/{game => common}/block/SoundType.java (91%) rename java/src/{game => common}/clipboard/BlockTransform.java (99%) rename java/src/{game => common}/clipboard/ClipboardBlock.java (82%) rename java/src/{game => common}/clipboard/ClipboardPlacer.java (93%) rename java/src/{game => common}/clipboard/Rotation.java (97%) rename java/src/{game => common}/clipboard/RotationValue.java (95%) rename java/src/{game => common}/clipboard/Vector.java (99%) rename java/src/{game => common}/collect/AbstractBiMap.java (98%) rename java/src/{game => common}/collect/AbstractIndexedListIterator.java (97%) rename java/src/{game => common}/collect/AbstractIterator.java (98%) rename java/src/{game => common}/collect/AbstractMapEntry.java (98%) rename java/src/{game => common}/collect/AbstractTable.java (99%) rename java/src/{game => common}/collect/BiMap.java (99%) rename java/src/{game => common}/collect/CollectPreconditions.java (94%) rename java/src/{game => common}/collect/DenseImmutableTable.java (98%) rename java/src/{game => common}/collect/EmptyImmutableMap.java (99%) rename java/src/{game => common}/collect/EmptyImmutableSet.java (98%) rename java/src/{game => common}/collect/Filter.java (98%) rename java/src/{game => common}/collect/ForwardingCollection.java (99%) rename java/src/{game => common}/collect/ForwardingMap.java (99%) rename java/src/{game => common}/collect/ForwardingMapEntry.java (99%) rename java/src/{game => common}/collect/ForwardingObject.java (99%) rename java/src/{game => common}/collect/ForwardingSet.java (97%) rename java/src/{game => common}/collect/HashBiMap.java (98%) rename java/src/{game => common}/collect/Hashing.java (98%) rename java/src/{game => common}/collect/ImmutableAsList.java (98%) rename java/src/{game => common}/collect/ImmutableCollection.java (97%) rename java/src/{game => common}/collect/ImmutableEntry.java (98%) rename java/src/{game => common}/collect/ImmutableEnumMap.java (97%) rename java/src/{game => common}/collect/ImmutableEnumSet.java (99%) rename java/src/{game => common}/collect/ImmutableList.java (98%) rename java/src/{game => common}/collect/ImmutableMap.java (99%) rename java/src/{game => common}/collect/ImmutableMapEntry.java (95%) rename java/src/{game => common}/collect/ImmutableMapEntrySet.java (98%) rename java/src/{game => common}/collect/ImmutableMapKeySet.java (98%) rename java/src/{game => common}/collect/ImmutableMapValues.java (98%) rename java/src/{game => common}/collect/ImmutableSet.java (99%) rename java/src/{game => common}/collect/ImmutableTable.java (99%) rename java/src/{game => common}/collect/Iterables.java (99%) rename java/src/{game => common}/collect/Iterators.java (99%) rename java/src/{game => common}/collect/Lists.java (98%) rename java/src/{game => common}/collect/Maps.java (99%) rename java/src/{game => common}/collect/ObjectArrays.java (99%) rename java/src/{game => common}/collect/Preconditions.java (99%) rename java/src/{game => common}/collect/RegularImmutableAsList.java (98%) rename java/src/{game => common}/collect/RegularImmutableList.java (99%) rename java/src/{game => common}/collect/RegularImmutableMap.java (97%) rename java/src/{game => common}/collect/RegularImmutableSet.java (98%) rename java/src/{game => common}/collect/RegularImmutableTable.java (98%) rename java/src/{game => common}/collect/Sets.java (99%) rename java/src/{game => common}/collect/SparseImmutableTable.java (99%) rename java/src/{game => common}/collect/StandardTable.java (98%) rename java/src/{game => common}/collect/Table.java (99%) rename java/src/{game => common}/collect/TransformedIterator.java (94%) rename java/src/{game => common}/collect/UnmodifiableIterator.java (98%) rename java/src/{game => common}/collect/UnmodifiableListIterator.java (98%) rename java/src/{game => common}/color/Colorizer.java (95%) rename java/src/{game => common}/color/DyeColor.java (98%) rename java/src/{game => common}/color/TextColor.java (97%) rename java/src/{game => common}/dimension/Area.java (93%) rename java/src/{game => common}/dimension/DimType.java (96%) rename java/src/{game => common}/dimension/Dimension.java (97%) rename java/src/{game => common}/dimension/Domain.java (90%) rename java/src/{game => common}/dimension/Galaxy.java (90%) rename java/src/{game => common}/dimension/Moon.java (95%) rename java/src/{game => common}/dimension/Nameable.java (95%) rename java/src/{game => common}/dimension/Planet.java (96%) rename java/src/{game => common}/dimension/Sector.java (90%) rename java/src/{game => common}/dimension/Semi.java (95%) rename java/src/{game => common}/dimension/Space.java (98%) rename java/src/{game => common}/dimension/Star.java (96%) rename java/src/{game => common}/dispenser/BehaviorDefaultDispenseItem.java (93%) rename java/src/{game => common}/dispenser/BehaviorProjectileDispense.java (86%) rename java/src/{game => common}/dispenser/IBehaviorDispenseItem.java (87%) rename java/src/{game => common}/dispenser/IBlockSource.java (71%) rename java/src/{game => common}/dispenser/ILocatableSource.java (68%) rename java/src/{game => common}/dispenser/ILocation.java (57%) rename java/src/{game => common}/dispenser/IPosition.java (77%) rename java/src/{game => common}/dispenser/PositionImpl.java (94%) rename java/src/{game => common}/enchantment/Enchantment.java (97%) rename java/src/{game => common}/enchantment/EnchantmentArrowDamage.java (96%) rename java/src/{game => common}/enchantment/EnchantmentArrowFire.java (96%) rename java/src/{game => common}/enchantment/EnchantmentArrowInfinite.java (96%) rename java/src/{game => common}/enchantment/EnchantmentArrowKnockback.java (96%) rename java/src/{game => common}/enchantment/EnchantmentDamage.java (96%) rename java/src/{game => common}/enchantment/EnchantmentDigging.java (92%) rename java/src/{game => common}/enchantment/EnchantmentDraining.java (85%) rename java/src/{game => common}/enchantment/EnchantmentDurability.java (93%) rename java/src/{game => common}/enchantment/EnchantmentFireAspect.java (96%) rename java/src/{game => common}/enchantment/EnchantmentFishingSpeed.java (96%) rename java/src/{game => common}/enchantment/EnchantmentHelper.java (97%) rename java/src/{game => common}/enchantment/EnchantmentKnockback.java (96%) rename java/src/{game => common}/enchantment/EnchantmentLootBonus.java (98%) rename java/src/{game => common}/enchantment/EnchantmentProtection.java (97%) rename java/src/{game => common}/enchantment/EnchantmentThorns.java (90%) rename java/src/{game => common}/enchantment/EnchantmentUntouching.java (93%) rename java/src/{game => common}/enchantment/EnumEnchantmentType.java (86%) rename java/src/{game => common}/enchantment/RngEnchantment.java (89%) rename java/src/{game => common}/entity/DamageSource.java (98%) rename java/src/{game => common}/entity/DataWatcher.java (98%) rename java/src/{game => common}/entity/Entity.java (98%) rename java/src/{game => common}/entity/EntityDamageSource.java (94%) rename java/src/{game => common}/entity/EntityDamageSourceIndirect.java (92%) rename java/src/{game => common}/entity/EntityTrackerEntry.java (93%) rename java/src/{game => common}/entity/EntityType.java (93%) rename java/src/{game => common}/entity/animal/EntityBat.java (95%) rename java/src/{game => common}/entity/animal/EntityChicken.java (90%) rename java/src/{game => common}/entity/animal/EntityCow.java (85%) rename java/src/{game => common}/entity/animal/EntityDragon.java (97%) rename java/src/{game => common}/entity/animal/EntityDragonPart.java (89%) rename java/src/{game => common}/entity/animal/EntityHorse.java (97%) rename java/src/{game => common}/entity/animal/EntityMooshroom.java (88%) rename java/src/{game => common}/entity/animal/EntityMouse.java (80%) rename java/src/{game => common}/entity/animal/EntityOcelot.java (92%) rename java/src/{game => common}/entity/animal/EntityPig.java (90%) rename java/src/{game => common}/entity/animal/EntityRabbit.java (92%) rename java/src/{game => common}/entity/animal/EntitySheep.java (91%) rename java/src/{game => common}/entity/animal/EntitySquid.java (96%) rename java/src/{game => common}/entity/animal/EntityWolf.java (94%) rename java/src/{game => common}/entity/attributes/Attribute.java (95%) rename java/src/{game => common}/entity/attributes/AttributeInstance.java (97%) rename java/src/{game => common}/entity/attributes/AttributeMap.java (98%) rename java/src/{game => common}/entity/attributes/AttributeModifier.java (98%) rename java/src/{game => common}/entity/attributes/Attributes.java (98%) rename java/src/{game => common}/entity/attributes/LowerStringMap.java (96%) rename java/src/{game => common}/entity/effect/EntityLightning.java (87%) rename java/src/{game => common}/entity/item/EntityBoat.java (97%) rename java/src/{game => common}/entity/item/EntityCart.java (98%) rename java/src/{game => common}/entity/item/EntityCartContainer.java (93%) rename java/src/{game => common}/entity/item/EntityChestCart.java (74%) rename java/src/{game => common}/entity/item/EntityCrystal.java (94%) rename java/src/{game => common}/entity/item/EntityExplosion.java (91%) rename java/src/{game => common}/entity/item/EntityFalling.java (93%) rename java/src/{game => common}/entity/item/EntityFireworks.java (95%) rename java/src/{game => common}/entity/item/EntityHopperCart.java (91%) rename java/src/{game => common}/entity/item/EntityItem.java (96%) rename java/src/{game => common}/entity/item/EntityLeashKnot.java (96%) rename java/src/{game => common}/entity/item/EntityMinecart.java (93%) rename java/src/{game => common}/entity/item/EntityNuke.java (94%) rename java/src/{game => common}/entity/item/EntityOrb.java (93%) rename java/src/{game => common}/entity/item/EntityTnt.java (93%) rename java/src/{game => common}/entity/item/EntityTntCart.java (92%) rename java/src/{game => common}/entity/item/EntityXp.java (95%) rename java/src/{game => common}/entity/item/EntityXpBottle.java (86%) rename java/src/{game => common}/entity/npc/Alignment.java (95%) rename java/src/{game => common}/entity/npc/CharacterInfo.java (86%) rename java/src/{game => common}/entity/npc/ClassInfo.java (80%) rename java/src/{game => common}/entity/npc/Energy.java (96%) rename java/src/{game => common}/entity/npc/EntityArachnoid.java (94%) rename java/src/{game => common}/entity/npc/EntityBloodElf.java (91%) rename java/src/{game => common}/entity/npc/EntityChaosMarine.java (91%) rename java/src/{game => common}/entity/npc/EntityCpu.java (89%) rename java/src/{game => common}/entity/npc/EntityCultivator.java (91%) rename java/src/{game => common}/entity/npc/EntityDarkMage.java (90%) rename java/src/{game => common}/entity/npc/EntityDwarf.java (92%) rename java/src/{game => common}/entity/npc/EntityElf.java (89%) rename java/src/{game => common}/entity/npc/EntityFireDemon.java (89%) rename java/src/{game => common}/entity/npc/EntityFlyingNPC.java (95%) rename java/src/{game => common}/entity/npc/EntityGargoyle.java (95%) rename java/src/{game => common}/entity/npc/EntityGoblin.java (87%) rename java/src/{game => common}/entity/npc/EntityHaunter.java (95%) rename java/src/{game => common}/entity/npc/EntityHoveringNPC.java (97%) rename java/src/{game => common}/entity/npc/EntityHuman.java (91%) rename java/src/{game => common}/entity/npc/EntityMage.java (92%) rename java/src/{game => common}/entity/npc/EntityMagma.java (97%) rename java/src/{game => common}/entity/npc/EntityMetalhead.java (89%) rename java/src/{game => common}/entity/npc/EntityMobNPC.java (96%) rename java/src/{game => common}/entity/npc/EntityNPC.java (97%) rename java/src/{game => common}/entity/npc/EntityOrc.java (92%) rename java/src/{game => common}/entity/npc/EntityPrimarch.java (96%) rename java/src/{game => common}/entity/npc/EntitySlime.java (97%) rename java/src/{game => common}/entity/npc/EntitySpaceMarine.java (91%) rename java/src/{game => common}/entity/npc/EntitySpirit.java (92%) rename java/src/{game => common}/entity/npc/EntityTiefling.java (92%) rename java/src/{game => common}/entity/npc/EntityUndead.java (87%) rename java/src/{game => common}/entity/npc/EntityVampire.java (90%) rename java/src/{game => common}/entity/npc/EntityWoodElf.java (88%) rename java/src/{game => common}/entity/npc/EntityZombie.java (96%) rename java/src/{game => common}/entity/npc/NpcInfo.java (89%) rename java/src/{game => common}/entity/npc/PlayerCharacter.java (89%) rename java/src/{game => common}/entity/npc/SpeciesInfo.java (92%) rename java/src/{game => common}/entity/projectile/EntityArrow.java (96%) rename java/src/{game => common}/entity/projectile/EntityBox.java (94%) rename java/src/{game => common}/entity/projectile/EntityBullet.java (96%) rename java/src/{game => common}/entity/projectile/EntityDie.java (89%) rename java/src/{game => common}/entity/projectile/EntityDynamite.java (82%) rename java/src/{game => common}/entity/projectile/EntityEgg.java (82%) rename java/src/{game => common}/entity/projectile/EntityFireCharge.java (91%) rename java/src/{game => common}/entity/projectile/EntityFireball.java (89%) rename java/src/{game => common}/entity/projectile/EntityHook.java (96%) rename java/src/{game => common}/entity/projectile/EntityPotion.java (92%) rename java/src/{game => common}/entity/projectile/EntityProjectile.java (96%) rename java/src/{game => common}/entity/projectile/EntitySnowball.java (80%) rename java/src/{game => common}/entity/projectile/RngFishable.java (88%) rename java/src/{game => common}/entity/types/CombatEntry.java (91%) rename java/src/{game => common}/entity/types/EntityAnimal.java (94%) rename java/src/{game => common}/entity/types/EntityBodyHelper.java (97%) rename java/src/{game => common}/entity/types/EntityLiving.java (97%) rename java/src/{game => common}/entity/types/EntityTameable.java (97%) rename java/src/{game => common}/entity/types/EntityThrowable.java (96%) rename java/src/{game => common}/entity/types/EntityWaterMob.java (92%) rename java/src/{game => common}/entity/types/EntityWeatherEffect.java (81%) rename java/src/{game => common}/entity/types/IEntityFX.java (84%) rename java/src/{game => common}/entity/types/IEntityMultiPart.java (54%) rename java/src/{game => common}/entity/types/IEntityOwnable.java (60%) rename java/src/{game => common}/entity/types/IObjectData.java (65%) rename java/src/{game => common}/entity/types/IProjectile.java (81%) rename java/src/{game => common}/future/AbstractFuture.java (99%) rename java/src/{game => common}/future/ExecutionError.java (98%) rename java/src/{game => common}/future/ExecutionList.java (99%) rename java/src/{game => common}/future/FutureCallback.java (98%) rename java/src/{game => common}/future/Futures.java (99%) rename java/src/{game => common}/future/ListenableFuture.java (99%) rename java/src/{game => common}/future/ListenableFutureTask.java (99%) rename java/src/{game => common}/future/MoreExecutors.java (99%) rename java/src/{game => common}/future/ThreadFactoryBuilder.java (99%) rename java/src/{game => common}/future/UncheckedExecutionException.java (98%) rename java/src/{game => common}/init/BlockRegistry.java (97%) rename java/src/{game => common}/init/Blocks.java (94%) rename java/src/{game => common}/init/Config.java (99%) rename java/src/{game => common}/init/CraftingRegistry.java (99%) rename java/src/{game => common}/init/DecoType.java (95%) rename java/src/{game => common}/init/DispenserRegistry.java (91%) rename java/src/{game => common}/init/EntityEggInfo.java (94%) rename java/src/{game => common}/init/EntityRegistry.java (84%) rename java/src/{game => common}/init/FlammabilityRegistry.java (96%) rename java/src/{game => common}/init/FluidRegistry.java (89%) rename java/src/{game => common}/init/IObjectIntIterable.java (75%) rename java/src/{game => common}/init/IRegistry.java (89%) rename java/src/{game => common}/init/ItemRegistry.java (88%) rename java/src/{game => common}/init/Items.java (98%) rename java/src/{game => common}/init/MetalType.java (98%) rename java/src/{game => common}/init/NameRegistry.java (99%) rename java/src/{game => common}/init/ObjectIntIdentityMap.java (89%) rename java/src/{game => common}/init/OreType.java (98%) rename java/src/{game => common}/init/Registry.java (98%) rename java/src/{game => common}/init/RegistryDefaulted.java (95%) rename java/src/{game => common}/init/RegistryNamespaced.java (96%) rename java/src/{game => common}/init/RegistryNamespacedDefaultedByKey.java (98%) rename java/src/{game => common}/init/RegistrySimple.java (96%) rename java/src/{game => common}/init/ReorderRegistry.java (97%) rename java/src/{game => common}/init/RotationRegistry.java (81%) rename java/src/{game => common}/init/SmeltingRegistry.java (95%) rename java/src/{game => common}/init/SoundEvent.java (99%) rename java/src/{game => common}/init/SpeciesRegistry.java (85%) rename java/src/{game => common}/init/TileRegistry.java (69%) rename java/src/{game => common}/init/ToolMaterial.java (98%) rename java/src/{game => common}/init/ToolType.java (97%) rename java/src/{game => common}/init/TradeRegistry.java (96%) rename java/src/{game => common}/init/UniverseRegistry.java (97%) rename java/src/{game => common}/init/WoodType.java (96%) rename java/src/{game => common}/inventory/AnimalChest.java (92%) rename java/src/{game => common}/inventory/Container.java (99%) rename java/src/{game => common}/inventory/ContainerBrewingStand.java (98%) rename java/src/{game => common}/inventory/ContainerChest.java (96%) rename java/src/{game => common}/inventory/ContainerDispenser.java (95%) rename java/src/{game => common}/inventory/ContainerEnchantment.java (97%) rename java/src/{game => common}/inventory/ContainerFurnace.java (96%) rename java/src/{game => common}/inventory/ContainerHopper.java (96%) rename java/src/{game => common}/inventory/ContainerHorseInventory.java (96%) rename java/src/{game => common}/inventory/ContainerLocalMenu.java (87%) rename java/src/{game => common}/inventory/ContainerMachine.java (95%) rename java/src/{game => common}/inventory/ContainerMerchant.java (97%) rename java/src/{game => common}/inventory/ContainerPlayer.java (96%) rename java/src/{game => common}/inventory/ContainerRepair.java (97%) rename java/src/{game => common}/inventory/ContainerWorkbench.java (95%) rename java/src/{game => common}/inventory/ICrafting.java (87%) rename java/src/{game => common}/inventory/IInvBasic.java (87%) rename java/src/{game => common}/inventory/IInventory.java (92%) rename java/src/{game => common}/inventory/ISidedInventory.java (86%) rename java/src/{game => common}/inventory/InventoryBasic.java (98%) rename java/src/{game => common}/inventory/InventoryCraftResult.java (97%) rename java/src/{game => common}/inventory/InventoryCrafting.java (98%) rename java/src/{game => common}/inventory/InventoryHelper.java (89%) rename java/src/{game => common}/inventory/InventoryLargeChest.java (96%) rename java/src/{game => common}/inventory/InventoryMerchant.java (97%) rename java/src/{game => common}/inventory/InventoryPlayer.java (98%) rename java/src/{game => common}/inventory/InventoryWarpChest.java (91%) rename java/src/{game => common}/inventory/Slot.java (97%) rename java/src/{game => common}/inventory/SlotCrafting.java (97%) rename java/src/{game => common}/inventory/SlotFurnaceFuel.java (85%) rename java/src/{game => common}/inventory/SlotFurnaceOutput.java (93%) rename java/src/{game => common}/inventory/SlotMerchantResult.java (96%) rename java/src/{game => common}/item/CheatTab.java (96%) rename java/src/{game => common}/item/Item.java (96%) rename java/src/{game => common}/item/ItemAction.java (74%) rename java/src/{game => common}/item/ItemAmmo.java (95%) rename java/src/{game => common}/item/ItemAnvilBlock.java (92%) rename java/src/{game => common}/item/ItemAppleGold.java (89%) rename java/src/{game => common}/item/ItemArmor.java (93%) rename java/src/{game => common}/item/ItemAxe.java (88%) rename java/src/{game => common}/item/ItemBanHammer.java (78%) rename java/src/{game => common}/item/ItemBanner.java (92%) rename java/src/{game => common}/item/ItemBed.java (90%) rename java/src/{game => common}/item/ItemBlock.java (93%) rename java/src/{game => common}/item/ItemBoat.java (92%) rename java/src/{game => common}/item/ItemBoltgun.java (80%) rename java/src/{game => common}/item/ItemBook.java (94%) rename java/src/{game => common}/item/ItemBow.java (91%) rename java/src/{game => common}/item/ItemBucket.java (94%) rename java/src/{game => common}/item/ItemBucketMilk.java (87%) rename java/src/{game => common}/item/ItemButton.java (81%) rename java/src/{game => common}/item/ItemCamera.java (85%) rename java/src/{game => common}/item/ItemCarrotOnAStick.java (90%) rename java/src/{game => common}/item/ItemChargedOrb.java (93%) rename java/src/{game => common}/item/ItemChest.java (70%) rename java/src/{game => common}/item/ItemCloth.java (90%) rename java/src/{game => common}/item/ItemCoal.java (92%) rename java/src/{game => common}/item/ItemColored.java (97%) rename java/src/{game => common}/item/ItemControl.java (77%) rename java/src/{game => common}/item/ItemDie.java (85%) rename java/src/{game => common}/item/ItemDispenser.java (78%) rename java/src/{game => common}/item/ItemDoor.java (91%) rename java/src/{game => common}/item/ItemDoublePlant.java (81%) rename java/src/{game => common}/item/ItemDye.java (91%) rename java/src/{game => common}/item/ItemDynamite.java (87%) rename java/src/{game => common}/item/ItemEditWand.java (88%) rename java/src/{game => common}/item/ItemEffect.java (85%) rename java/src/{game => common}/item/ItemEgg.java (83%) rename java/src/{game => common}/item/ItemEnchantedBook.java (94%) rename java/src/{game => common}/item/ItemExpBottle.java (84%) rename java/src/{game => common}/item/ItemExterminator.java (84%) rename java/src/{game => common}/item/ItemFence.java (90%) rename java/src/{game => common}/item/ItemFireball.java (83%) rename java/src/{game => common}/item/ItemFirework.java (89%) rename java/src/{game => common}/item/ItemFireworkCharge.java (95%) rename java/src/{game => common}/item/ItemFishFood.java (94%) rename java/src/{game => common}/item/ItemFishingRod.java (90%) rename java/src/{game => common}/item/ItemFlintAndSteel.java (81%) rename java/src/{game => common}/item/ItemFood.java (94%) rename java/src/{game => common}/item/ItemFragile.java (82%) rename java/src/{game => common}/item/ItemGlassBottle.java (88%) rename java/src/{game => common}/item/ItemGunBase.java (88%) rename java/src/{game => common}/item/ItemHoe.java (89%) rename java/src/{game => common}/item/ItemHorseArmor.java (87%) rename java/src/{game => common}/item/ItemHugeMushroom.java (79%) rename java/src/{game => common}/item/ItemInfoWand.java (76%) rename java/src/{game => common}/item/ItemKey.java (69%) rename java/src/{game => common}/item/ItemLead.java (84%) rename java/src/{game => common}/item/ItemLeaves.java (93%) rename java/src/{game => common}/item/ItemLightning.java (77%) rename java/src/{game => common}/item/ItemLilyPad.java (86%) rename java/src/{game => common}/item/ItemMagnet.java (88%) rename java/src/{game => common}/item/ItemMagnetic.java (82%) rename java/src/{game => common}/item/ItemMetal.java (82%) rename java/src/{game => common}/item/ItemMetalBlock.java (83%) rename java/src/{game => common}/item/ItemMinecart.java (91%) rename java/src/{game => common}/item/ItemMonsterPlacer.java (92%) rename java/src/{game => common}/item/ItemMultiTexture.java (97%) rename java/src/{game => common}/item/ItemNameTag.java (89%) rename java/src/{game => common}/item/ItemNpcSpawner.java (90%) rename java/src/{game => common}/item/ItemNugget.java (69%) rename java/src/{game => common}/item/ItemPickaxe.java (96%) rename java/src/{game => common}/item/ItemPiston.java (84%) rename java/src/{game => common}/item/ItemPotion.java (96%) rename java/src/{game => common}/item/ItemPressurePlate.java (78%) rename java/src/{game => common}/item/ItemRecord.java (75%) rename java/src/{game => common}/item/ItemRedstone.java (85%) rename java/src/{game => common}/item/ItemReed.java (88%) rename java/src/{game => common}/item/ItemRod.java (68%) rename java/src/{game => common}/item/ItemSaddle.java (89%) rename java/src/{game => common}/item/ItemSeedFood.java (87%) rename java/src/{game => common}/item/ItemSeeds.java (85%) rename java/src/{game => common}/item/ItemShears.java (88%) rename java/src/{game => common}/item/ItemSign.java (85%) rename java/src/{game => common}/item/ItemSkull.java (91%) rename java/src/{game => common}/item/ItemSlab.java (96%) rename java/src/{game => common}/item/ItemSmall.java (68%) rename java/src/{game => common}/item/ItemSnow.java (89%) rename java/src/{game => common}/item/ItemSnowball.java (82%) rename java/src/{game => common}/item/ItemSoup.java (81%) rename java/src/{game => common}/item/ItemSpaceNavigator.java (91%) rename java/src/{game => common}/item/ItemSpade.java (86%) rename java/src/{game => common}/item/ItemStack.java (98%) rename java/src/{game => common}/item/ItemStick.java (68%) rename java/src/{game => common}/item/ItemSword.java (90%) rename java/src/{game => common}/item/ItemTNT.java (88%) rename java/src/{game => common}/item/ItemTiny.java (68%) rename java/src/{game => common}/item/ItemTool.java (89%) rename java/src/{game => common}/item/ItemWall.java (86%) rename java/src/{game => common}/item/ItemWand.java (89%) rename java/src/{game => common}/item/ItemWeatherToken.java (83%) rename java/src/{game => common}/item/RngLoot.java (94%) rename java/src/{game => common}/log/Log.java (97%) rename java/src/{game => common}/log/LogLevel.java (87%) rename java/src/{game => common}/log/Message.java (89%) rename java/src/{game => common}/log/NettyLogger.java (99%) rename java/src/{game => common}/material/Material.java (99%) rename java/src/{game => common}/material/MaterialColdFluid.java (93%) rename java/src/{game => common}/material/MaterialHotFluid.java (93%) rename java/src/{game => common}/material/MaterialLogic.java (95%) rename java/src/{game => common}/material/MaterialPortal.java (95%) rename java/src/{game => common}/material/MaterialTransparent.java (96%) rename java/src/{game => common}/model/BlockLayer.java (93%) rename java/src/{game => common}/model/ItemMeshDefinition.java (62%) rename java/src/{game => common}/model/Model.java (99%) rename java/src/{game => common}/model/ModelProvider.java (95%) rename java/src/{game => common}/model/ModelRotation.java (95%) rename java/src/{game => common}/model/ParticleType.java (97%) rename java/src/{game => common}/model/Transform.java (95%) rename java/src/{game => common}/model/Transforms.java (99%) rename java/src/{game => common}/nbt/NBTBase.java (99%) rename java/src/{game => common}/nbt/NBTException.java (86%) rename java/src/{game => common}/nbt/NBTLoader.java (99%) rename java/src/{game => common}/nbt/NBTParser.java (99%) rename java/src/{game => common}/nbt/NBTSizeTracker.java (97%) rename java/src/{game => common}/nbt/NBTTagByte.java (98%) rename java/src/{game => common}/nbt/NBTTagByteArray.java (98%) rename java/src/{game => common}/nbt/NBTTagCompound.java (99%) rename java/src/{game => common}/nbt/NBTTagDouble.java (97%) rename java/src/{game => common}/nbt/NBTTagEnd.java (97%) rename java/src/{game => common}/nbt/NBTTagFloat.java (97%) rename java/src/{game => common}/nbt/NBTTagInt.java (98%) rename java/src/{game => common}/nbt/NBTTagIntArray.java (98%) rename java/src/{game => common}/nbt/NBTTagList.java (99%) rename java/src/{game => common}/nbt/NBTTagLong.java (98%) rename java/src/{game => common}/nbt/NBTTagShort.java (98%) rename java/src/{game => common}/nbt/NBTTagString.java (98%) rename java/src/{game => common}/nbt/NBTUtil.java (99%) rename java/src/{game => common}/network/IClientLoginHandler.java (58%) rename java/src/{game => common}/network/IClientPlayer.java (76%) rename java/src/{game => common}/network/IHandshakeHandler.java (58%) rename java/src/{game => common}/network/ILoginHandler.java (58%) rename java/src/{game => common}/network/IPlayer.java (77%) rename java/src/{game => common}/network/IThreadListener.java (73%) rename java/src/{game => common}/network/NetConnection.java (98%) rename java/src/{game => common}/network/NetHandler.java (97%) rename java/src/{game => common}/network/NettyCompressionDecoder.java (98%) rename java/src/{game => common}/network/NettyCompressionEncoder.java (98%) rename java/src/{game => common}/network/Packet.java (90%) rename java/src/{game => common}/network/PacketBuffer.java (98%) rename java/src/{game => common}/network/PacketDecoder.java (98%) rename java/src/{game => common}/network/PacketEncoder.java (96%) rename java/src/{game => common}/network/PacketPrepender.java (97%) rename java/src/{game => common}/network/PacketRegistry.java (69%) rename java/src/{game => common}/network/PacketSplitter.java (98%) rename java/src/{game => common}/packet/APacketEmpty.java (73%) rename java/src/{game => common}/packet/APacketVarInt.java (84%) rename java/src/{game => common}/packet/CPacketAction.java (94%) rename java/src/{game => common}/packet/CPacketBook.java (89%) rename java/src/{game => common}/packet/CPacketBreak.java (89%) rename java/src/{game => common}/packet/CPacketCheat.java (86%) rename java/src/{game => common}/packet/CPacketClick.java (93%) rename java/src/{game => common}/packet/CPacketComplete.java (89%) rename java/src/{game => common}/packet/CPacketInput.java (92%) rename java/src/{game => common}/packet/CPacketKeepAlive.java (83%) rename java/src/{game => common}/packet/CPacketMessage.java (91%) rename java/src/{game => common}/packet/CPacketPlace.java (92%) rename java/src/{game => common}/packet/CPacketPlayer.java (97%) rename java/src/{game => common}/packet/CPacketSign.java (90%) rename java/src/{game => common}/packet/CPacketSkin.java (90%) rename java/src/{game => common}/packet/HPacketHandshake.java (85%) rename java/src/{game => common}/packet/LPacketPasswordResponse.java (90%) rename java/src/{game => common}/packet/RPacketDisconnect.java (87%) rename java/src/{game => common}/packet/RPacketEnableCompression.java (83%) rename java/src/{game => common}/packet/RPacketLoginSuccess.java (74%) rename java/src/{game => common}/packet/S14PacketEntity.java (96%) rename java/src/{game => common}/packet/S18PacketEntityTeleport.java (93%) rename java/src/{game => common}/packet/S19PacketEntityHeadLook.java (86%) rename java/src/{game => common}/packet/S1APacketEntityStatus.java (86%) rename java/src/{game => common}/packet/S1BPacketEntityAttach.java (90%) rename java/src/{game => common}/packet/S1CPacketEntityMetadata.java (90%) rename java/src/{game => common}/packet/S1DPacketEntityEffect.java (92%) rename java/src/{game => common}/packet/S1EPacketRemoveEntityEffect.java (86%) rename java/src/{game => common}/packet/S20PacketEntityProperties.java (93%) rename java/src/{game => common}/packet/S27PacketExplosion.java (94%) rename java/src/{game => common}/packet/S28PacketEffect.java (86%) rename java/src/{game => common}/packet/S29PacketSoundEffect.java (92%) rename java/src/{game => common}/packet/S2APacketParticles.java (96%) rename java/src/{game => common}/packet/S2BPacketChangeGameState.java (90%) rename java/src/{game => common}/packet/S2CPacketSpawnGlobalEntity.java (91%) rename java/src/{game => common}/packet/S2DPacketOpenWindow.java (95%) rename java/src/{game => common}/packet/S2EPacketCloseWindow.java (87%) rename java/src/{game => common}/packet/S2FPacketSetSlot.java (89%) rename java/src/{game => common}/packet/S30PacketWindowItems.java (91%) rename java/src/{game => common}/packet/S31PacketWindowProperty.java (91%) rename java/src/{game => common}/packet/S32PacketConfirmTransaction.java (92%) rename java/src/{game => common}/packet/S33PacketUpdateSign.java (91%) rename java/src/{game => common}/packet/S35PacketUpdateTileEntity.java (85%) rename java/src/{game => common}/packet/S36PacketSignEditorOpen.java (86%) rename java/src/{game => common}/packet/S38PacketPlayerListItem.java (87%) rename java/src/{game => common}/packet/S39PacketPlayerAbilities.java (84%) rename java/src/{game => common}/packet/S3APacketTabComplete.java (90%) rename java/src/{game => common}/packet/S43PacketUpdateEntityNBT.java (85%) rename java/src/{game => common}/packet/SPacketAnimation.java (89%) rename java/src/{game => common}/packet/SPacketBiomes.java (87%) rename java/src/{game => common}/packet/SPacketBlockAction.java (89%) rename java/src/{game => common}/packet/SPacketBlockBreakAnim.java (90%) rename java/src/{game => common}/packet/SPacketBlockChange.java (84%) rename java/src/{game => common}/packet/SPacketCamera.java (80%) rename java/src/{game => common}/packet/SPacketCharacterList.java (89%) rename java/src/{game => common}/packet/SPacketChunkData.java (95%) rename java/src/{game => common}/packet/SPacketCollectItem.java (91%) rename java/src/{game => common}/packet/SPacketDestroyEntities.java (90%) rename java/src/{game => common}/packet/SPacketDimensionName.java (86%) rename java/src/{game => common}/packet/SPacketDisconnect.java (77%) rename java/src/{game => common}/packet/SPacketEntityEquipment.java (90%) rename java/src/{game => common}/packet/SPacketEntityVelocity.java (93%) rename java/src/{game => common}/packet/SPacketHeldItemChange.java (88%) rename java/src/{game => common}/packet/SPacketJoinGame.java (86%) rename java/src/{game => common}/packet/SPacketKeepAlive.java (83%) rename java/src/{game => common}/packet/SPacketLoading.java (92%) rename java/src/{game => common}/packet/SPacketMapChunkBulk.java (95%) rename java/src/{game => common}/packet/SPacketMessage.java (86%) rename java/src/{game => common}/packet/SPacketMultiBlockChange.java (91%) rename java/src/{game => common}/packet/SPacketPlayerPosLook.java (96%) rename java/src/{game => common}/packet/SPacketRespawn.java (86%) rename java/src/{game => common}/packet/SPacketServerTick.java (81%) rename java/src/{game => common}/packet/SPacketSetExperience.java (92%) rename java/src/{game => common}/packet/SPacketSkin.java (86%) rename java/src/{game => common}/packet/SPacketSpawnMob.java (93%) rename java/src/{game => common}/packet/SPacketSpawnObject.java (91%) rename java/src/{game => common}/packet/SPacketSpawnPlayer.java (90%) rename java/src/{game => common}/packet/SPacketTimeUpdate.java (86%) rename java/src/{game => common}/packet/SPacketTrades.java (91%) rename java/src/{game => common}/packet/SPacketUpdateHealth.java (82%) rename java/src/{game => common}/packet/SPacketWorld.java (89%) rename java/src/{game => common}/pathfinding/NodeProcessor.java (93%) rename java/src/{game => common}/pathfinding/Path.java (99%) rename java/src/{game => common}/pathfinding/PathCache.java (76%) rename java/src/{game => common}/pathfinding/PathEntity.java (97%) rename java/src/{game => common}/pathfinding/PathFinder.java (98%) rename java/src/{game => common}/pathfinding/PathNavigate.java (96%) rename java/src/{game => common}/pathfinding/PathNavigateClimber.java (92%) rename java/src/{game => common}/pathfinding/PathNavigateGround.java (96%) rename java/src/{game => common}/pathfinding/PathPoint.java (97%) rename java/src/{game => common}/pathfinding/SwimNodeProcessor.java (94%) rename java/src/{game => common}/pathfinding/WalkNodeProcessor.java (96%) rename java/src/{game => common}/pattern/BlockStateHelper.java (91%) rename java/src/{game => common}/potion/Potion.java (95%) rename java/src/{game => common}/potion/PotionEffect.java (97%) rename java/src/{game => common}/potion/PotionHelper.java (99%) rename java/src/{game => common}/properties/IProperty.java (90%) rename java/src/{game => common}/properties/PropertyBool.java (91%) rename java/src/{game => common}/properties/PropertyDirection.java (87%) rename java/src/{game => common}/properties/PropertyEnum.java (89%) rename java/src/{game => common}/properties/PropertyHelper.java (97%) rename java/src/{game => common}/properties/PropertyInteger.java (95%) rename java/src/{game => common}/rng/ImprovedGen.java (99%) rename java/src/{game => common}/rng/ImprovedGenOld.java (96%) rename java/src/{game => common}/rng/NoiseGen.java (95%) rename java/src/{game => common}/rng/OctaveGen.java (98%) rename java/src/{game => common}/rng/OctaveGenOld.java (94%) rename java/src/{game => common}/rng/PerlinGen.java (98%) rename java/src/{game => common}/rng/PerlinGenOld.java (94%) rename java/src/{game => common}/rng/Random.java (99%) rename java/src/{game => common}/rng/RngItem.java (84%) rename java/src/{game => common}/rng/SimplexGen.java (99%) rename java/src/{game => common}/rng/SimplexGenOld.java (95%) rename java/src/{game => common}/rng/WeightedList.java (99%) rename java/src/{game => common}/sound/EventType.java (71%) rename java/src/{game => common}/sound/MovingSound.java (84%) rename java/src/{game => common}/sound/MovingSoundMinecart.java (90%) rename java/src/{game => common}/sound/MovingSoundMinecartRiding.java (87%) rename java/src/{game => common}/sound/PositionedSound.java (92%) rename java/src/{game => common}/sound/Sound.java (94%) rename java/src/{game => common}/tileentity/IHopper.java (82%) rename java/src/{game => common}/tileentity/IInteractionObject.java (55%) rename java/src/{game => common}/tileentity/ILockableContainer.java (73%) rename java/src/{game => common}/tileentity/ITickable.java (65%) rename java/src/{game => common}/tileentity/IWorldNameable.java (70%) rename java/src/{game => common}/tileentity/LocalBlockIntercommunication.java (87%) rename java/src/{game => common}/tileentity/LockCode.java (92%) rename java/src/{game => common}/tileentity/MachineResource.java (97%) rename java/src/{game => common}/tileentity/TileEntity.java (94%) rename java/src/{game => common}/tileentity/TileEntityBanner.java (97%) rename java/src/{game => common}/tileentity/TileEntityBeacon.java (97%) rename java/src/{game => common}/tileentity/TileEntityBrewingStand.java (95%) rename java/src/{game => common}/tileentity/TileEntityChest.java (96%) rename java/src/{game => common}/tileentity/TileEntityComparator.java (91%) rename java/src/{game => common}/tileentity/TileEntityDaylightDetector.java (86%) rename java/src/{game => common}/tileentity/TileEntityDispenser.java (94%) rename java/src/{game => common}/tileentity/TileEntityDropper.java (92%) rename java/src/{game => common}/tileentity/TileEntityEnchantmentTable.java (94%) rename java/src/{game => common}/tileentity/TileEntityFurnace.java (94%) rename java/src/{game => common}/tileentity/TileEntityHopper.java (96%) rename java/src/{game => common}/tileentity/TileEntityLockable.java (94%) rename java/src/{game => common}/tileentity/TileEntityMachine.java (94%) rename java/src/{game => common}/tileentity/TileEntityMobSpawner.java (94%) rename java/src/{game => common}/tileentity/TileEntityNote.java (88%) rename java/src/{game => common}/tileentity/TileEntityPiston.java (96%) rename java/src/{game => common}/tileentity/TileEntitySign.java (95%) rename java/src/{game => common}/tileentity/TileEntitySkull.java (91%) rename java/src/{game => common}/tileentity/TileEntityTianReactor.java (88%) rename java/src/{game => common}/util/CharValidator.java (95%) rename java/src/{game => common}/util/DC32.java (99%) rename java/src/{game => common}/util/Displayable.java (75%) rename java/src/{game => common}/util/ExtMath.java (99%) rename java/src/{game => common}/util/FileUtils.java (97%) rename java/src/{game => common}/util/Identifyable.java (73%) rename java/src/{game => common}/util/LazyLoadBase.java (93%) rename java/src/{game => common}/util/Matrix4f.java (99%) rename java/src/{game => common}/util/Predicates.java (99%) rename java/src/{game => common}/util/Tuple.java (88%) rename java/src/{game => common}/util/Util.java (99%) rename java/src/{game => common}/util/Vector.java (99%) rename java/src/{game => common}/util/Vector3f.java (99%) rename java/src/{game => common}/util/Vector4f.java (99%) rename java/src/{game => common}/village/MerchantRecipe.java (94%) rename java/src/{game => common}/village/MerchantRecipeList.java (97%) rename java/src/{game => common}/village/Village.java (96%) rename java/src/{game => common}/village/VillageCollection.java (96%) rename java/src/{game => common}/village/VillageDoorInfo.java (97%) rename java/src/{game => common}/world/BlockArray.java (95%) rename java/src/{game => common}/world/BlockPos.java (99%) rename java/src/{game => common}/world/BoundingBox.java (99%) rename java/src/{game => common}/world/Chunk.java (98%) rename java/src/{game => common}/world/ChunkCache.java (97%) rename java/src/{game => common}/world/ChunkPos.java (96%) rename java/src/{game => common}/world/ClassInheritanceMultiMap.java (97%) rename java/src/{game => common}/world/EmptyChunk.java (91%) rename java/src/{game => common}/world/Explosion.java (96%) rename java/src/{game => common}/world/Facing.java (98%) rename java/src/{game => common}/world/HitPosition.java (93%) rename java/src/{game => common}/world/IBlockAccess.java (75%) rename java/src/{game => common}/world/IWorldAccess.java (70%) rename java/src/{game => common}/world/IntHashMap.java (99%) rename java/src/{game => common}/world/LightType.java (85%) rename java/src/{game => common}/world/LongHashMap.java (99%) rename java/src/{game => common}/world/NextTickListEntry.java (96%) rename java/src/{game => common}/world/NibbleArray.java (97%) rename java/src/{game => common}/world/PortalType.java (86%) rename java/src/{game => common}/world/Position.java (94%) rename java/src/{game => common}/world/Region.java (98%) rename java/src/{game => common}/world/Spawner.java (94%) rename java/src/{game => common}/world/State.java (92%) rename java/src/{game => common}/world/Vec3.java (99%) rename java/src/{game => common}/world/Vec3i.java (98%) rename java/src/{game => common}/world/Weather.java (96%) rename java/src/{game => common}/world/World.java (98%) rename java/src/{game => common}/world/WorldClient.java (97%) rename java/src/{game => common}/world/WorldPos.java (97%) rename java/src/{game => common}/world/WorldServer.java (97%) rename java/src/{game => common}/worldgen/BiomeGenLayered.java (89%) rename java/src/{game => common}/worldgen/BiomeGenPerlin.java (93%) rename java/src/{game => common}/worldgen/BiomeGenSingle.java (94%) rename java/src/{game => common}/worldgen/BiomeGenerator.java (87%) rename java/src/{game => common}/worldgen/BlockReplacer.java (55%) rename java/src/{game => common}/worldgen/ChunkGenerator.java (69%) rename java/src/{game => common}/worldgen/ChunkPrimer.java (82%) rename java/src/{game => common}/worldgen/FeatureDungeons.java (93%) rename java/src/{game => common}/worldgen/FeatureGenerator.java (81%) rename java/src/{game => common}/worldgen/FeatureLakes.java (96%) rename java/src/{game => common}/worldgen/FeatureLiquids.java (94%) rename java/src/{game => common}/worldgen/FeatureOres.java (97%) rename java/src/{game => common}/worldgen/GeneratorCavern.java (97%) rename java/src/{game => common}/worldgen/GeneratorDebug.java (82%) rename java/src/{game => common}/worldgen/GeneratorDestroyed.java (86%) rename java/src/{game => common}/worldgen/GeneratorFlat.java (90%) rename java/src/{game => common}/worldgen/GeneratorIsland.java (97%) rename java/src/{game => common}/worldgen/GeneratorPerlin.java (97%) rename java/src/{game => common}/worldgen/GeneratorSimple.java (95%) rename java/src/{game => common}/worldgen/LootConstants.java (94%) rename java/src/{game => common}/worldgen/ReplacerAltBiome.java (93%) rename java/src/{game => common}/worldgen/ReplacerAltSurface.java (95%) rename java/src/{game => common}/worldgen/ReplacerBiome.java (84%) rename java/src/{game => common}/worldgen/ReplacerTopLayer.java (90%) rename java/src/{game => common}/worldgen/caves/MapGenBase.java (90%) rename java/src/{game => common}/worldgen/caves/MapGenBigCaves.java (97%) rename java/src/{game => common}/worldgen/caves/MapGenCaves.java (97%) rename java/src/{game => common}/worldgen/caves/MapGenRavine.java (97%) rename java/src/{game => common}/worldgen/feature/WorldGenAbandonedChest.java (79%) rename java/src/{game => common}/worldgen/feature/WorldGenAsteroid.java (91%) rename java/src/{game => common}/worldgen/feature/WorldGenBlockBlob.java (90%) rename java/src/{game => common}/worldgen/feature/WorldGenClay.java (87%) rename java/src/{game => common}/worldgen/feature/WorldGenClayExt.java (90%) rename java/src/{game => common}/worldgen/feature/WorldGenDesertWells.java (89%) rename java/src/{game => common}/worldgen/feature/WorldGenFire.java (75%) rename java/src/{game => common}/worldgen/feature/WorldGenGlowStone.java (85%) rename java/src/{game => common}/worldgen/feature/WorldGenHellLava.java (90%) rename java/src/{game => common}/worldgen/feature/WorldGenIcePath.java (88%) rename java/src/{game => common}/worldgen/feature/WorldGenIceSpike.java (93%) rename java/src/{game => common}/worldgen/feature/WorldGenSand.java (88%) rename java/src/{game => common}/worldgen/feature/WorldGenSpikes.java (90%) rename java/src/{game => common}/worldgen/foliage/FeatureDoublePlant.java (81%) rename java/src/{game => common}/worldgen/foliage/WorldGenBigMushroom.java (96%) rename java/src/{game => common}/worldgen/foliage/WorldGenCactus.java (80%) rename java/src/{game => common}/worldgen/foliage/WorldGenDeadBush.java (77%) rename java/src/{game => common}/worldgen/foliage/WorldGenFlowers.java (83%) rename java/src/{game => common}/worldgen/foliage/WorldGenMelon.java (76%) rename java/src/{game => common}/worldgen/foliage/WorldGenMushroom.java (80%) rename java/src/{game => common}/worldgen/foliage/WorldGenPumpkin.java (73%) rename java/src/{game => common}/worldgen/foliage/WorldGenReed.java (84%) rename java/src/{game => common}/worldgen/foliage/WorldGenShrub.java (86%) rename java/src/{game => common}/worldgen/foliage/WorldGenTallGrass.java (77%) rename java/src/{game => common}/worldgen/foliage/WorldGenVines.java (81%) rename java/src/{game => common}/worldgen/foliage/WorldGenWaterlily.java (74%) rename java/src/{game => common}/worldgen/layer/GenLayer.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerAddAreas.java (99%) rename java/src/{game => common}/worldgen/layer/GenLayerAddExtra.java (96%) rename java/src/{game => common}/worldgen/layer/GenLayerAddSea.java (97%) rename java/src/{game => common}/worldgen/layer/GenLayerAddSnow.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerBase.java (95%) rename java/src/{game => common}/worldgen/layer/GenLayerBiome.java (97%) rename java/src/{game => common}/worldgen/layer/GenLayerBiomeEdge.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerEdge.java (99%) rename java/src/{game => common}/worldgen/layer/GenLayerFuzzyZoom.java (94%) rename java/src/{game => common}/worldgen/layer/GenLayerHills.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerRemoveEmpty.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerRiver.java (96%) rename java/src/{game => common}/worldgen/layer/GenLayerRiverInit.java (96%) rename java/src/{game => common}/worldgen/layer/GenLayerRiverMix.java (97%) rename java/src/{game => common}/worldgen/layer/GenLayerShore.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerSmooth.java (98%) rename java/src/{game => common}/worldgen/layer/GenLayerVoronoiZoom.java (99%) rename java/src/{game => common}/worldgen/layer/GenLayerZoom.java (98%) rename java/src/{game => common}/worldgen/layer/IntCache.java (97%) rename java/src/{game => common}/worldgen/structure/MapGenBridge.java (94%) rename java/src/{game => common}/worldgen/structure/MapGenMineshaft.java (96%) rename java/src/{game => common}/worldgen/structure/MapGenScatteredFeature.java (96%) rename java/src/{game => common}/worldgen/structure/MapGenStronghold.java (98%) rename java/src/{game => common}/worldgen/structure/MapGenStructure.java (94%) rename java/src/{game => common}/worldgen/structure/MapGenStructureIO.java (96%) rename java/src/{game => common}/worldgen/structure/MapGenVillage.java (96%) rename java/src/{game => common}/worldgen/structure/StructureBoundingBox.java (98%) rename java/src/{game => common}/worldgen/structure/StructureBridge.java (99%) rename java/src/{game => common}/worldgen/structure/StructureComponent.java (97%) rename java/src/{game => common}/worldgen/structure/StructureMineshaft.java (98%) rename java/src/{game => common}/worldgen/structure/StructureMineshaftStart.java (87%) rename java/src/{game => common}/worldgen/structure/StructureScattered.java (98%) rename java/src/{game => common}/worldgen/structure/StructureStart.java (96%) rename java/src/{game => common}/worldgen/structure/StructureStronghold.java (99%) rename java/src/{game => common}/worldgen/structure/StructureVillage.java (99%) rename java/src/{game => common}/worldgen/tree/WorldGenBaseTree.java (96%) rename java/src/{game => common}/worldgen/tree/WorldGenBigTree.java (97%) rename java/src/{game => common}/worldgen/tree/WorldGenBirch.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenDarkOak.java (96%) rename java/src/{game => common}/worldgen/tree/WorldGenHugeTree.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenJungle.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenPine.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenSavanna.java (96%) rename java/src/{game => common}/worldgen/tree/WorldGenSwamp.java (95%) rename java/src/{game => common}/worldgen/tree/WorldGenTaiga1.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenTaiga2.java (94%) rename java/src/{game => common}/worldgen/tree/WorldGenTree.java (73%) diff --git a/client/src/client/Game.java b/client/src/client/Game.java index 48ac915..f36f055 100755 --- a/client/src/client/Game.java +++ b/client/src/client/Game.java @@ -70,6 +70,22 @@ import client.renderer.texture.ColormapLoader; import client.renderer.texture.EntityTexManager; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; +import client.vars.BoolVar; +import client.vars.CVar; +import client.vars.CVarCategory; +import client.vars.ColorVar; +import client.vars.EnumVar; +import client.vars.FloatVar; +import client.vars.IntVar; +import client.vars.StringVar; +import client.vars.Variable; +import client.vars.BaseVar.VarFunction; +import client.vars.BoolVar.BoolFunction; +import client.vars.EnumVar.EnumFunction; +import client.vars.FloatVar.FloatFunction; +import client.vars.IntVar.IntFunction; +import client.vars.StringVar.StringFunction; +import client.vars.Variable.IntType; import client.window.Bind; import client.window.Button; import client.window.DisplayMode; @@ -78,87 +94,71 @@ import client.window.Keysym; import client.window.Wheel; import client.window.Window; import client.window.WindowEvent; -import game.IClient; -import game.biome.Biome; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.color.TextColor; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.npc.Energy; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.entity.types.IEntityFX; -import game.future.Futures; -import game.future.ListenableFuture; -import game.future.ListenableFutureTask; -import game.init.BlockRegistry; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.Registry; -import game.init.SoundEvent; -import game.inventory.InventoryPlayer; -import game.item.Item; -import game.item.ItemBlock; -import game.item.ItemControl; -import game.item.ItemStack; -import game.log.Log; -import game.log.LogLevel; -import game.log.Message; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.network.IThreadListener; -import game.network.NetConnection; -import game.network.NetHandler.ThreadQuickExitException; -import game.packet.CPacketAction; -import game.packet.CPacketAction.Action; -import game.packet.CPacketCheat; -import game.packet.CPacketMessage; -import game.packet.HPacketHandshake; -import game.packet.LPacketPasswordResponse; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.potion.PotionHelper; -import game.properties.IProperty; -import game.rng.Random; -import game.sound.EventType; -import game.sound.PositionedSound; -import game.sound.Sound; -import game.util.CharValidator; -import game.util.ExtMath; -import game.util.FileUtils; -import game.util.Util; -import game.vars.BaseVar.VarFunction; -import game.vars.BoolVar; -import game.vars.BoolVar.BoolFunction; -import game.vars.CVar; -import game.vars.CVarCategory; -import game.vars.ColorVar; -import game.vars.EnumVar; -import game.vars.EnumVar.EnumFunction; -import game.vars.FloatVar; -import game.vars.FloatVar.FloatFunction; -import game.vars.IntVar; -import game.vars.IntVar.IntFunction; -import game.vars.StringVar; -import game.vars.StringVar.StringFunction; -import game.vars.Variable; -import game.vars.Variable.IntType; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Chunk; -import game.world.Facing; -import game.world.HitPosition; -import game.world.HitPosition.ObjectType; -import game.world.LightType; -import game.world.Region; -import game.world.State; -import game.world.World; -import game.world.WorldClient; +import common.IClient; +import common.biome.Biome; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.color.TextColor; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.npc.Energy; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.entity.types.IEntityFX; +import common.future.Futures; +import common.future.ListenableFuture; +import common.future.ListenableFutureTask; +import common.init.BlockRegistry; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.Registry; +import common.init.SoundEvent; +import common.inventory.InventoryPlayer; +import common.item.Item; +import common.item.ItemBlock; +import common.item.ItemControl; +import common.item.ItemStack; +import common.log.Log; +import common.log.LogLevel; +import common.log.Message; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.network.IThreadListener; +import common.network.NetConnection; +import common.network.NetHandler.ThreadQuickExitException; +import common.packet.CPacketAction; +import common.packet.CPacketCheat; +import common.packet.CPacketMessage; +import common.packet.HPacketHandshake; +import common.packet.LPacketPasswordResponse; +import common.packet.CPacketAction.Action; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.potion.PotionHelper; +import common.properties.IProperty; +import common.rng.Random; +import common.sound.EventType; +import common.sound.PositionedSound; +import common.sound.Sound; +import common.util.CharValidator; +import common.util.ExtMath; +import common.util.FileUtils; +import common.util.Util; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Chunk; +import common.world.Facing; +import common.world.HitPosition; +import common.world.LightType; +import common.world.Region; +import common.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.HitPosition.ObjectType; /* Een net ganz funktionierndes Programm ... diff --git a/client/src/client/PerfSection.java b/client/src/client/PerfSection.java index f1f9bf5..ba9599f 100644 --- a/client/src/client/PerfSection.java +++ b/client/src/client/PerfSection.java @@ -1,6 +1,6 @@ package client; -import game.util.Util; +import common.util.Util; public enum PerfSection { TIMING("Timing"), diff --git a/client/src/client/PlayerController.java b/client/src/client/PlayerController.java index d12dd90..579c38a 100755 --- a/client/src/client/PlayerController.java +++ b/client/src/client/PlayerController.java @@ -1,26 +1,26 @@ package client; import client.network.ClientPlayer; -import game.block.Block; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.BlockRegistry; -import game.init.EntityRegistry; -import game.item.ItemBlock; -import game.item.ItemControl; -import game.item.ItemStack; -import game.material.Material; -import game.packet.CPacketAction; -import game.packet.CPacketBreak; -import game.packet.CPacketClick; -import game.packet.CPacketPlace; -import game.sound.PositionedSound; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; +import common.block.Block; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.init.BlockRegistry; +import common.init.EntityRegistry; +import common.item.ItemBlock; +import common.item.ItemControl; +import common.item.ItemStack; +import common.material.Material; +import common.packet.CPacketAction; +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.world.State; +import common.world.Vec3; +import common.world.World; +import common.world.WorldClient; public class PlayerController { diff --git a/client/src/client/SkinConverter.java b/client/src/client/SkinConverter.java index c787066..6c7695e 100755 --- a/client/src/client/SkinConverter.java +++ b/client/src/client/SkinConverter.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.imageio.ImageIO; -import game.log.Log; +import common.log.Log; public abstract class SkinConverter { private static BufferedImage convertSkin(BufferedImage image) { diff --git a/client/src/client/audio/AudioInterface.java b/client/src/client/audio/AudioInterface.java index a1f8654..2e7c105 100644 --- a/client/src/client/audio/AudioInterface.java +++ b/client/src/client/audio/AudioInterface.java @@ -7,12 +7,13 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine.Info; + +import common.collect.Lists; +import common.log.Log; + import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -import game.collect.Lists; -import game.log.Log; - public class AudioInterface implements Runnable { private static class Channel { short[] buffer; diff --git a/client/src/client/audio/SoundManager.java b/client/src/client/audio/SoundManager.java index dfd1474..062682c 100755 --- a/client/src/client/audio/SoundManager.java +++ b/client/src/client/audio/SoundManager.java @@ -11,18 +11,18 @@ import java.util.Map; import java.util.Map.Entry; import client.Game; -import game.collect.BiMap; -import game.collect.HashBiMap; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.log.Log; -import game.rng.Random; -import game.sound.MovingSound; -import game.sound.Sound; -import game.util.ExtMath; -import game.util.FileUtils; +import common.collect.BiMap; +import common.collect.HashBiMap; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.log.Log; +import common.rng.Random; +import common.sound.MovingSound; +import common.sound.Sound; +import common.util.ExtMath; +import common.util.FileUtils; public class SoundManager { private class Source { diff --git a/client/src/client/audio/Volume.java b/client/src/client/audio/Volume.java index d41e319..a879b91 100644 --- a/client/src/client/audio/Volume.java +++ b/client/src/client/audio/Volume.java @@ -2,10 +2,10 @@ package client.audio; import client.Game; import client.gui.element.Slider; -import game.color.TextColor; -import game.sound.EventType; -import game.vars.CVar; -import game.vars.CVarCategory; +import client.vars.CVar; +import client.vars.CVarCategory; +import common.color.TextColor; +import common.sound.EventType; public enum Volume implements CVar { MASTER("master", "Gesamt"), diff --git a/client/src/client/gui/Font.java b/client/src/client/gui/Font.java index adfe7fc..51fa18b 100644 --- a/client/src/client/gui/Font.java +++ b/client/src/client/gui/Font.java @@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.texture.TextureUtil; -import game.log.Log; -import game.util.FileUtils; +import common.log.Log; +import common.util.FileUtils; public class Font { public static final FontChar[] SIZES = new FontChar[256]; diff --git a/client/src/client/gui/Gui.java b/client/src/client/gui/Gui.java index cb39cb5..36c7810 100644 --- a/client/src/client/gui/Gui.java +++ b/client/src/client/gui/Gui.java @@ -13,7 +13,7 @@ import client.renderer.GlState; import client.window.Bind; import client.window.Button; import client.window.Keysym; -import game.collect.Lists; +import common.collect.Lists; public abstract class Gui { public static final String DIRT_BACKGROUND = "textures/background.png"; diff --git a/client/src/client/gui/GuiConnect.java b/client/src/client/gui/GuiConnect.java index 568343f..339a92e 100644 --- a/client/src/client/gui/GuiConnect.java +++ b/client/src/client/gui/GuiConnect.java @@ -11,13 +11,13 @@ import client.gui.element.GuiList; import client.gui.element.ListEntry; import client.gui.element.NavButton; import client.renderer.Drawing; -import game.color.TextColor; -import game.init.Config; -import game.log.Log; -import game.network.IPlayer; -import game.util.FileUtils; -import game.util.Tuple; -import game.util.Util; +import common.color.TextColor; +import common.init.Config; +import common.log.Log; +import common.network.IPlayer; +import common.util.FileUtils; +import common.util.Tuple; +import common.util.Util; public class GuiConnect extends GuiList implements ActButton.Callback { public class ServerInfo implements Comparable, ListEntry { diff --git a/client/src/client/gui/GuiConsole.java b/client/src/client/gui/GuiConsole.java index d4023e7..2bd506f 100644 --- a/client/src/client/gui/GuiConsole.java +++ b/client/src/client/gui/GuiConsole.java @@ -8,17 +8,17 @@ import client.gui.element.Fill; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; import client.network.ClientPlayer; +import client.vars.BoolVar; +import client.vars.CVar; import client.gui.element.TransparentBox; import client.window.Keysym; -import game.collect.Lists; -import game.color.TextColor; -import game.network.IPlayer; -import game.packet.CPacketComplete; -import game.util.ExtMath; -import game.vars.BoolVar; -import game.vars.CVar; -import game.world.BlockPos; -import game.world.HitPosition; +import common.collect.Lists; +import common.color.TextColor; +import common.network.IPlayer; +import common.packet.CPacketComplete; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.HitPosition; public class GuiConsole extends Gui implements Textbox.Callback { public static final GuiConsole INSTANCE = new GuiConsole(); diff --git a/client/src/client/gui/GuiConvert.java b/client/src/client/gui/GuiConvert.java index 4097025..8799b51 100755 --- a/client/src/client/gui/GuiConvert.java +++ b/client/src/client/gui/GuiConvert.java @@ -13,14 +13,14 @@ import client.gui.element.GuiList; import client.gui.element.ListEntry; import client.gui.element.NavButton; import client.renderer.Drawing; -import game.color.TextColor; -import game.dimension.Space; -import game.log.Log; -import game.world.Converter; -import game.world.Region; -import game.world.Region.FolderInfo; -import game.world.Region.SaveVersion; -import game.world.World; +import client.world.Converter; +import common.color.TextColor; +import common.dimension.Space; +import common.log.Log; +import common.world.Region; +import common.world.World; +import common.world.Region.FolderInfo; +import common.world.Region.SaveVersion; public class GuiConvert extends GuiList implements ActButton.Callback { diff --git a/client/src/client/gui/GuiInfo.java b/client/src/client/gui/GuiInfo.java index 243e111..eadf6dd 100644 --- a/client/src/client/gui/GuiInfo.java +++ b/client/src/client/gui/GuiInfo.java @@ -2,9 +2,9 @@ package client.gui; import client.gui.element.NavButton; import client.gui.element.TransparentBox; -import game.color.TextColor; -import game.init.Config; -import game.log.Log; +import common.color.TextColor; +import common.init.Config; +import common.log.Log; public class GuiInfo extends Gui { private static final String VER = diff --git a/client/src/client/gui/GuiMenu.java b/client/src/client/gui/GuiMenu.java index 9037467..40002ad 100644 --- a/client/src/client/gui/GuiMenu.java +++ b/client/src/client/gui/GuiMenu.java @@ -11,10 +11,10 @@ import client.gui.element.Textbox; import client.gui.options.GuiOptions; import client.renderer.Drawing; import client.window.Keysym; -import game.color.TextColor; -import game.init.Config; -import game.rng.Random; -import game.util.ExtMath; +import common.color.TextColor; +import common.init.Config; +import common.rng.Random; +import common.util.ExtMath; public class GuiMenu extends Gui { public static final GuiMenu INSTANCE = new GuiMenu(); diff --git a/client/src/client/gui/GuiServer.java b/client/src/client/gui/GuiServer.java index 45833a1..ca80fa0 100644 --- a/client/src/client/gui/GuiServer.java +++ b/client/src/client/gui/GuiServer.java @@ -6,11 +6,11 @@ import client.gui.element.Label; import client.gui.element.NavButton; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; -import game.color.TextColor; -import game.init.Config; -import game.network.IPlayer; -import game.vars.CVarCategory; -import game.vars.Variable; +import client.vars.CVarCategory; +import client.vars.Variable; +import common.color.TextColor; +import common.init.Config; +import common.network.IPlayer; public class GuiServer extends Gui implements Textbox.Callback { public static final GuiServer INSTANCE = new GuiServer(null); diff --git a/client/src/client/gui/Style.java b/client/src/client/gui/Style.java index 841b495..db7435f 100644 --- a/client/src/client/gui/Style.java +++ b/client/src/client/gui/Style.java @@ -1,10 +1,10 @@ package client.gui; -import game.util.Displayable; -import game.util.Identifyable; -import game.vars.CVarCategory; -import game.vars.Variable; -import game.vars.Variable.IntType; +import client.vars.CVarCategory; +import client.vars.Variable; +import client.vars.Variable.IntType; +import common.util.Displayable; +import common.util.Identifyable; public enum Style implements Identifyable, Displayable { DEFAULT("default", "Standard"), SHINY("shiny", "Glänzend"), GRAY("gray", "Grau"), BLUE("blue", "Blau"), CUSTOM("custom", "Angepasst"); diff --git a/client/src/client/gui/character/GuiChar.java b/client/src/client/gui/character/GuiChar.java index 7fc0645..806ec6e 100755 --- a/client/src/client/gui/character/GuiChar.java +++ b/client/src/client/gui/character/GuiChar.java @@ -35,35 +35,35 @@ import client.renderer.GlState; import client.renderer.ItemRenderer; import client.renderer.entity.RenderManager; import client.renderer.texture.EntityTexManager; +import client.vars.CVarCategory; +import client.vars.EnumVar; +import client.vars.Variable; +import client.vars.EnumVar.EnumFunction; import client.window.Button; -import game.collect.Lists; -import game.dimension.DimType; -import game.dimension.Dimension; -import game.entity.npc.Alignment; -import game.entity.npc.CharacterInfo; -import game.entity.npc.EntityHuman; -import game.entity.npc.EntityNPC; -import game.entity.npc.SpeciesInfo; -import game.entity.types.EntityLiving; -import game.init.EntityEggInfo; -import game.init.EntityRegistry; -import game.init.SpeciesRegistry; -import game.init.SpeciesRegistry.ModelType; -import game.init.UniverseRegistry; -import game.log.Log; -import game.network.IPlayer; -import game.packet.CPacketAction; -import game.packet.CPacketMessage; -import game.packet.CPacketSkin; -import game.rng.Random; -import game.util.Displayable; -import game.util.FileUtils; -import game.util.Identifyable; -import game.util.Util; -import game.vars.CVarCategory; -import game.vars.EnumVar; -import game.vars.EnumVar.EnumFunction; -import game.vars.Variable; +import common.collect.Lists; +import common.dimension.DimType; +import common.dimension.Dimension; +import common.entity.npc.Alignment; +import common.entity.npc.CharacterInfo; +import common.entity.npc.EntityHuman; +import common.entity.npc.EntityNPC; +import common.entity.npc.SpeciesInfo; +import common.entity.types.EntityLiving; +import common.init.EntityEggInfo; +import common.init.EntityRegistry; +import common.init.SpeciesRegistry; +import common.init.UniverseRegistry; +import common.init.SpeciesRegistry.ModelType; +import common.log.Log; +import common.network.IPlayer; +import common.packet.CPacketAction; +import common.packet.CPacketMessage; +import common.packet.CPacketSkin; +import common.rng.Random; +import common.util.Displayable; +import common.util.FileUtils; +import common.util.Identifyable; +import common.util.Util; public class GuiChar extends GuiList { diff --git a/client/src/client/gui/character/GuiCharacters.java b/client/src/client/gui/character/GuiCharacters.java index f6614b4..cd94394 100644 --- a/client/src/client/gui/character/GuiCharacters.java +++ b/client/src/client/gui/character/GuiCharacters.java @@ -9,9 +9,9 @@ import client.gui.element.ListEntry; import client.gui.element.NavButton; import client.gui.element.TransparentBox; import client.renderer.Drawing; -import game.color.TextColor; -import game.entity.npc.PlayerCharacter; -import game.packet.CPacketAction; +import common.color.TextColor; +import common.entity.npc.PlayerCharacter; +import common.packet.CPacketAction; public class GuiCharacters extends GuiList implements ActButton.Callback { diff --git a/client/src/client/gui/character/GuiClass.java b/client/src/client/gui/character/GuiClass.java index f3e6559..c1ca519 100644 --- a/client/src/client/gui/character/GuiClass.java +++ b/client/src/client/gui/character/GuiClass.java @@ -6,7 +6,7 @@ import client.gui.element.GuiList; import client.gui.element.ListEntry; import client.gui.element.NavButton; import client.renderer.Drawing; -import game.packet.CPacketAction; +import common.packet.CPacketAction; public class GuiClass extends GuiList implements ActButton.Callback { diff --git a/client/src/client/gui/character/GuiSpecies.java b/client/src/client/gui/character/GuiSpecies.java index 385f5be..af9b9bd 100644 --- a/client/src/client/gui/character/GuiSpecies.java +++ b/client/src/client/gui/character/GuiSpecies.java @@ -6,10 +6,10 @@ import client.gui.element.GuiList; import client.gui.element.ListEntry; import client.gui.element.NavButton; import client.renderer.Drawing; -import game.entity.npc.SpeciesInfo; -import game.init.EntityRegistry; -import game.init.SpeciesRegistry; -import game.packet.CPacketAction; +import common.entity.npc.SpeciesInfo; +import common.init.EntityRegistry; +import common.init.SpeciesRegistry; +import common.packet.CPacketAction; public class GuiSpecies extends GuiList implements ActButton.Callback { diff --git a/client/src/client/gui/container/GuiBrewing.java b/client/src/client/gui/container/GuiBrewing.java index 73f2b15..45690d6 100755 --- a/client/src/client/gui/container/GuiBrewing.java +++ b/client/src/client/gui/container/GuiBrewing.java @@ -1,8 +1,8 @@ package client.gui.container; -import game.inventory.ContainerBrewingStand; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; +import common.inventory.ContainerBrewingStand; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; public class GuiBrewing extends GuiContainer diff --git a/client/src/client/gui/container/GuiChest.java b/client/src/client/gui/container/GuiChest.java index 1f7e912..e2bea30 100755 --- a/client/src/client/gui/container/GuiChest.java +++ b/client/src/client/gui/container/GuiChest.java @@ -1,8 +1,8 @@ package client.gui.container; import client.Game; -import game.inventory.ContainerChest; -import game.inventory.IInventory; +import common.inventory.ContainerChest; +import common.inventory.IInventory; public class GuiChest extends GuiContainer diff --git a/client/src/client/gui/container/GuiContainer.java b/client/src/client/gui/container/GuiContainer.java index 69dc168..7f5051d 100755 --- a/client/src/client/gui/container/GuiContainer.java +++ b/client/src/client/gui/container/GuiContainer.java @@ -13,16 +13,16 @@ import client.renderer.GlState; import client.renderer.ItemRenderer; import client.renderer.entity.RenderItem; import client.window.Button; -import game.collect.Lists; -import game.collect.Sets; -import game.color.TextColor; -import game.inventory.Container; -import game.inventory.InventoryPlayer; -import game.inventory.Slot; -import game.item.CheatTab; -import game.item.ItemStack; -import game.packet.CPacketCheat; -import game.util.ExtMath; +import common.collect.Lists; +import common.collect.Sets; +import common.color.TextColor; +import common.inventory.Container; +import common.inventory.InventoryPlayer; +import common.inventory.Slot; +import common.item.CheatTab; +import common.item.ItemStack; +import common.packet.CPacketCheat; +import common.util.ExtMath; public abstract class GuiContainer extends Gui { diff --git a/client/src/client/gui/container/GuiCrafting.java b/client/src/client/gui/container/GuiCrafting.java index b9fb6e2..e206188 100755 --- a/client/src/client/gui/container/GuiCrafting.java +++ b/client/src/client/gui/container/GuiCrafting.java @@ -1,9 +1,9 @@ package client.gui.container; -import game.inventory.ContainerWorkbench; -import game.inventory.InventoryPlayer; -import game.world.BlockPos; -import game.world.World; +import common.inventory.ContainerWorkbench; +import common.inventory.InventoryPlayer; +import common.world.BlockPos; +import common.world.World; public class GuiCrafting extends GuiContainer { diff --git a/client/src/client/gui/container/GuiDispenser.java b/client/src/client/gui/container/GuiDispenser.java index 8e94c00..00184b5 100755 --- a/client/src/client/gui/container/GuiDispenser.java +++ b/client/src/client/gui/container/GuiDispenser.java @@ -1,8 +1,8 @@ package client.gui.container; -import game.inventory.ContainerDispenser; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; +import common.inventory.ContainerDispenser; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; public class GuiDispenser extends GuiContainer diff --git a/client/src/client/gui/container/GuiEnchant.java b/client/src/client/gui/container/GuiEnchant.java index 31ef687..5dce728 100755 --- a/client/src/client/gui/container/GuiEnchant.java +++ b/client/src/client/gui/container/GuiEnchant.java @@ -1,12 +1,12 @@ package client.gui.container; -import game.color.TextColor; -import game.enchantment.Enchantment; -import game.inventory.ContainerEnchantment; -import game.inventory.InventoryPlayer; -import game.rng.Random; -import game.tileentity.IWorldNameable; -import game.world.World; +import common.color.TextColor; +import common.enchantment.Enchantment; +import common.inventory.ContainerEnchantment; +import common.inventory.InventoryPlayer; +import common.rng.Random; +import common.tileentity.IWorldNameable; +import common.world.World; public class GuiEnchant extends GuiContainer { diff --git a/client/src/client/gui/container/GuiFurnace.java b/client/src/client/gui/container/GuiFurnace.java index 3972317..c3aad9a 100755 --- a/client/src/client/gui/container/GuiFurnace.java +++ b/client/src/client/gui/container/GuiFurnace.java @@ -1,9 +1,9 @@ package client.gui.container; -import game.inventory.ContainerFurnace; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.tileentity.TileEntityFurnace; +import common.inventory.ContainerFurnace; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.tileentity.TileEntityFurnace; public class GuiFurnace extends GuiContainer diff --git a/client/src/client/gui/container/GuiHopper.java b/client/src/client/gui/container/GuiHopper.java index 753593e..400105a 100755 --- a/client/src/client/gui/container/GuiHopper.java +++ b/client/src/client/gui/container/GuiHopper.java @@ -1,9 +1,9 @@ package client.gui.container; import client.Game; -import game.inventory.ContainerHopper; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; +import common.inventory.ContainerHopper; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; public class GuiHopper extends GuiContainer diff --git a/client/src/client/gui/container/GuiHorse.java b/client/src/client/gui/container/GuiHorse.java index bb56765..966bf1e 100755 --- a/client/src/client/gui/container/GuiHorse.java +++ b/client/src/client/gui/container/GuiHorse.java @@ -1,9 +1,9 @@ package client.gui.container; import client.Game; -import game.entity.animal.EntityHorse; -import game.inventory.ContainerHorseInventory; -import game.inventory.IInventory; +import common.entity.animal.EntityHorse; +import common.inventory.ContainerHorseInventory; +import common.inventory.IInventory; public class GuiHorse extends GuiContainer diff --git a/client/src/client/gui/container/GuiInventory.java b/client/src/client/gui/container/GuiInventory.java index b47e81b..3dd33f0 100755 --- a/client/src/client/gui/container/GuiInventory.java +++ b/client/src/client/gui/container/GuiInventory.java @@ -1,6 +1,6 @@ package client.gui.container; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class GuiInventory extends GuiContainer { diff --git a/client/src/client/gui/container/GuiMachine.java b/client/src/client/gui/container/GuiMachine.java index b61ba3d..679131a 100755 --- a/client/src/client/gui/container/GuiMachine.java +++ b/client/src/client/gui/container/GuiMachine.java @@ -1,10 +1,10 @@ package client.gui.container; import client.Game; -import game.inventory.ContainerMachine; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.tileentity.TileEntityMachine; +import common.inventory.ContainerMachine; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.tileentity.TileEntityMachine; public class GuiMachine extends GuiContainer diff --git a/client/src/client/gui/container/GuiMerchant.java b/client/src/client/gui/container/GuiMerchant.java index 8f56250..0b1543e 100755 --- a/client/src/client/gui/container/GuiMerchant.java +++ b/client/src/client/gui/container/GuiMerchant.java @@ -4,13 +4,13 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.ItemRenderer; -import game.inventory.ContainerMerchant; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.packet.CPacketAction; -import game.village.MerchantRecipe; -import game.village.MerchantRecipeList; -import game.world.World; +import common.inventory.ContainerMerchant; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.packet.CPacketAction; +import common.village.MerchantRecipe; +import common.village.MerchantRecipeList; +import common.world.World; public class GuiMerchant extends GuiContainer { diff --git a/client/src/client/gui/container/GuiRepair.java b/client/src/client/gui/container/GuiRepair.java index fec404d..85e4099 100755 --- a/client/src/client/gui/container/GuiRepair.java +++ b/client/src/client/gui/container/GuiRepair.java @@ -3,13 +3,13 @@ package client.gui.container; import java.util.List; import client.Game; -import game.inventory.Container; -import game.inventory.ContainerRepair; -import game.inventory.ICrafting; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.world.World; +import common.inventory.Container; +import common.inventory.ContainerRepair; +import common.inventory.ICrafting; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.world.World; public class GuiRepair extends GuiContainer implements ICrafting { diff --git a/client/src/client/gui/element/Bar.java b/client/src/client/gui/element/Bar.java index bb1a457..649fb21 100644 --- a/client/src/client/gui/element/Bar.java +++ b/client/src/client/gui/element/Bar.java @@ -1,8 +1,8 @@ package client.gui.element; import client.renderer.Drawing; -import game.util.ExtMath; -import game.util.Util; +import common.util.ExtMath; +import common.util.Util; public class Bar extends Fill { private int color = 0x00ff00; diff --git a/client/src/client/gui/element/Dropdown.java b/client/src/client/gui/element/Dropdown.java index 010bac6..6ba417f 100644 --- a/client/src/client/gui/element/Dropdown.java +++ b/client/src/client/gui/element/Dropdown.java @@ -5,9 +5,9 @@ import client.gui.Formatter; import client.gui.Gui; import client.renderer.Drawing; import client.window.Button; -import game.util.Displayable; -import game.util.ExtMath; -import game.util.Util; +import common.util.Displayable; +import common.util.ExtMath; +import common.util.Util; public class Dropdown extends Element { public class Handle extends Element { diff --git a/client/src/client/gui/element/Element.java b/client/src/client/gui/element/Element.java index b3dcd56..86acf19 100644 --- a/client/src/client/gui/element/Element.java +++ b/client/src/client/gui/element/Element.java @@ -9,10 +9,10 @@ import client.renderer.Drawing; import client.renderer.Drawing.Vec2i; import client.window.Button; import client.window.Keysym; -import game.init.SoundEvent; -import game.sound.EventType; -import game.sound.PositionedSound; -import game.util.Util; +import common.init.SoundEvent; +import common.sound.EventType; +import common.sound.PositionedSound; +import common.util.Util; public abstract class Element { protected final Game gm = Game.getGame(); diff --git a/client/src/client/gui/element/GuiList.java b/client/src/client/gui/element/GuiList.java index 0dd8ab6..1f4ac01 100755 --- a/client/src/client/gui/element/GuiList.java +++ b/client/src/client/gui/element/GuiList.java @@ -11,8 +11,8 @@ import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.window.Button; -import game.collect.Lists; -import game.util.ExtMath; +import common.collect.Lists; +import common.util.ExtMath; public abstract class GuiList extends Gui { diff --git a/client/src/client/gui/element/Label.java b/client/src/client/gui/element/Label.java index 52bb201..7420a1d 100644 --- a/client/src/client/gui/element/Label.java +++ b/client/src/client/gui/element/Label.java @@ -1,7 +1,7 @@ package client.gui.element; import client.renderer.Drawing; -import game.util.Util; +import common.util.Util; public class Label extends Fill { public Label(int x, int y, int w, int h, String text, boolean top, boolean left) { diff --git a/client/src/client/gui/element/NavButton.java b/client/src/client/gui/element/NavButton.java index 224216b..2b16df9 100644 --- a/client/src/client/gui/element/NavButton.java +++ b/client/src/client/gui/element/NavButton.java @@ -3,7 +3,7 @@ package client.gui.element; import client.Game; import client.gui.Gui; import client.renderer.Drawing; -import game.util.Util; +import common.util.Util; public class NavButton extends ActButton { private final Gui navGui; diff --git a/client/src/client/gui/element/SelectableButton.java b/client/src/client/gui/element/SelectableButton.java index 0ad31d6..699121d 100644 --- a/client/src/client/gui/element/SelectableButton.java +++ b/client/src/client/gui/element/SelectableButton.java @@ -1,7 +1,7 @@ package client.gui.element; import client.renderer.Drawing; -import game.util.Util; +import common.util.Util; public class SelectableButton extends ActButton { private boolean selected; diff --git a/client/src/client/gui/element/Slider.java b/client/src/client/gui/element/Slider.java index e6fd0d8..45bb1e7 100644 --- a/client/src/client/gui/element/Slider.java +++ b/client/src/client/gui/element/Slider.java @@ -3,8 +3,8 @@ package client.gui.element; import client.gui.Formatter; import client.renderer.Drawing; import client.window.Button; -import game.util.ExtMath; -import game.util.Util; +import common.util.ExtMath; +import common.util.Util; public class Slider extends Element { public static interface Callback { diff --git a/client/src/client/gui/element/Switch.java b/client/src/client/gui/element/Switch.java index dc1e902..6053cd2 100644 --- a/client/src/client/gui/element/Switch.java +++ b/client/src/client/gui/element/Switch.java @@ -2,8 +2,8 @@ package client.gui.element; import client.gui.Formatter; import client.window.Button; -import game.util.Displayable; -import game.util.Util; +import common.util.Displayable; +import common.util.Util; public class Switch extends Element { public static interface Callback { diff --git a/client/src/client/gui/element/Textbox.java b/client/src/client/gui/element/Textbox.java index a57e583..533e160 100644 --- a/client/src/client/gui/element/Textbox.java +++ b/client/src/client/gui/element/Textbox.java @@ -10,9 +10,9 @@ import client.renderer.Drawing.Vec2i; import client.window.Button; import client.window.Keysym; import client.window.Window; -import game.util.CharValidator; -import game.util.ExtMath; -import game.util.Util; +import common.util.CharValidator; +import common.util.ExtMath; +import common.util.Util; public class Textbox extends Element { public static enum Action { diff --git a/client/src/client/gui/element/Toggle.java b/client/src/client/gui/element/Toggle.java index 2c38f8b..5c4be8b 100644 --- a/client/src/client/gui/element/Toggle.java +++ b/client/src/client/gui/element/Toggle.java @@ -3,7 +3,7 @@ package client.gui.element; import client.gui.Formatter; import client.renderer.Drawing; import client.window.Button; -import game.util.Util; +import common.util.Util; public class Toggle extends Element { public static interface Callback { diff --git a/client/src/client/gui/ingame/GuiGameOver.java b/client/src/client/gui/ingame/GuiGameOver.java index 4ed36d0..8b79563 100755 --- a/client/src/client/gui/ingame/GuiGameOver.java +++ b/client/src/client/gui/ingame/GuiGameOver.java @@ -3,8 +3,8 @@ package client.gui.ingame; import client.gui.Gui; import client.gui.element.ActButton; import client.gui.element.ActButton.Mode; +import common.color.TextColor; import client.gui.element.Label; -import game.color.TextColor; public class GuiGameOver extends Gui { public static final GuiGameOver INSTANCE = new GuiGameOver(); diff --git a/client/src/client/gui/ingame/GuiSign.java b/client/src/client/gui/ingame/GuiSign.java index 4678e86..fbdfb60 100644 --- a/client/src/client/gui/ingame/GuiSign.java +++ b/client/src/client/gui/ingame/GuiSign.java @@ -5,8 +5,8 @@ import client.gui.element.NavButton; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; import client.network.ClientPlayer; -import game.packet.CPacketSign; -import game.world.BlockPos; +import common.packet.CPacketSign; +import common.world.BlockPos; public class GuiSign extends Gui implements Textbox.Callback { private final BlockPos position; diff --git a/client/src/client/gui/options/GuiBinds.java b/client/src/client/gui/options/GuiBinds.java index 01bb639..1c1ab7a 100644 --- a/client/src/client/gui/options/GuiBinds.java +++ b/client/src/client/gui/options/GuiBinds.java @@ -5,7 +5,7 @@ import client.gui.element.ActButton; import client.gui.element.ActButton.Mode; import client.gui.element.Label; import client.window.Bind; -import game.color.TextColor; +import common.color.TextColor; public class GuiBinds extends GuiOptions { protected GuiBinds() { diff --git a/client/src/client/gui/options/GuiDisplay.java b/client/src/client/gui/options/GuiDisplay.java index 1d5d69b..68febe0 100644 --- a/client/src/client/gui/options/GuiDisplay.java +++ b/client/src/client/gui/options/GuiDisplay.java @@ -9,7 +9,7 @@ import client.gui.element.Toggle; import client.window.Button; import client.window.DisplayMode; import client.window.Window; -import game.color.TextColor; +import common.color.TextColor; public class GuiDisplay extends GuiOptions { private static final String[] DISTANCES = new String[] {"Gruselig", "Winzig", "Gering", "Normal", "Weit"}; diff --git a/client/src/client/gui/options/GuiStyle.java b/client/src/client/gui/options/GuiStyle.java index 66cd703..6d374ee 100644 --- a/client/src/client/gui/options/GuiStyle.java +++ b/client/src/client/gui/options/GuiStyle.java @@ -10,9 +10,9 @@ import client.gui.element.Slider; import client.gui.element.Switch; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; +import client.vars.CVar; +import client.vars.ColorVar; import client.gui.element.Toggle; -import game.vars.CVar; -import game.vars.ColorVar; public class GuiStyle extends GuiOptions implements Dropdown.Callback, ActButton.Callback, Toggle.Callback, Switch.Callback, Slider.Callback, Textbox.Callback { private static final String[] STYLE_CVARS = { diff --git a/client/src/client/init/EntityRenderRegistry.java b/client/src/client/init/EntityRenderRegistry.java index b8df0a0..2abdd41 100644 --- a/client/src/client/init/EntityRenderRegistry.java +++ b/client/src/client/init/EntityRenderRegistry.java @@ -54,50 +54,50 @@ import client.renderer.model.ModelRabbit; import client.renderer.model.ModelSheep2; import client.renderer.model.ModelSquid; import client.renderer.model.ModelWolf; -import game.entity.Entity; -import game.entity.animal.EntityBat; -import game.entity.animal.EntityChicken; -import game.entity.animal.EntityCow; -import game.entity.animal.EntityDragon; -import game.entity.animal.EntityHorse; -import game.entity.animal.EntityMooshroom; -import game.entity.animal.EntityMouse; -import game.entity.animal.EntityOcelot; -import game.entity.animal.EntityPig; -import game.entity.animal.EntityRabbit; -import game.entity.animal.EntitySheep; -import game.entity.animal.EntitySquid; -import game.entity.animal.EntityWolf; -import game.entity.effect.EntityLightning; -import game.entity.item.EntityBoat; -import game.entity.item.EntityCart; -import game.entity.item.EntityCrystal; -import game.entity.item.EntityFalling; -import game.entity.item.EntityFireworks; -import game.entity.item.EntityItem; -import game.entity.item.EntityLeashKnot; -import game.entity.item.EntityNuke; -import game.entity.item.EntityOrb; -import game.entity.item.EntityTnt; -import game.entity.item.EntityTntCart; -import game.entity.item.EntityXp; -import game.entity.item.EntityXpBottle; -import game.entity.npc.SpeciesInfo; -import game.entity.projectile.EntityArrow; -import game.entity.projectile.EntityBox; -import game.entity.projectile.EntityBullet; -import game.entity.projectile.EntityDie; -import game.entity.projectile.EntityDynamite; -import game.entity.projectile.EntityEgg; -import game.entity.projectile.EntityFireCharge; -import game.entity.projectile.EntityFireball; -import game.entity.projectile.EntityHook; -import game.entity.projectile.EntityPotion; -import game.entity.projectile.EntitySnowball; -import game.init.Blocks; -import game.init.Items; -import game.init.SpeciesRegistry; -import game.init.SpeciesRegistry.ModelType; +import common.entity.Entity; +import common.entity.animal.EntityBat; +import common.entity.animal.EntityChicken; +import common.entity.animal.EntityCow; +import common.entity.animal.EntityDragon; +import common.entity.animal.EntityHorse; +import common.entity.animal.EntityMooshroom; +import common.entity.animal.EntityMouse; +import common.entity.animal.EntityOcelot; +import common.entity.animal.EntityPig; +import common.entity.animal.EntityRabbit; +import common.entity.animal.EntitySheep; +import common.entity.animal.EntitySquid; +import common.entity.animal.EntityWolf; +import common.entity.effect.EntityLightning; +import common.entity.item.EntityBoat; +import common.entity.item.EntityCart; +import common.entity.item.EntityCrystal; +import common.entity.item.EntityFalling; +import common.entity.item.EntityFireworks; +import common.entity.item.EntityItem; +import common.entity.item.EntityLeashKnot; +import common.entity.item.EntityNuke; +import common.entity.item.EntityOrb; +import common.entity.item.EntityTnt; +import common.entity.item.EntityTntCart; +import common.entity.item.EntityXp; +import common.entity.item.EntityXpBottle; +import common.entity.npc.SpeciesInfo; +import common.entity.projectile.EntityArrow; +import common.entity.projectile.EntityBox; +import common.entity.projectile.EntityBullet; +import common.entity.projectile.EntityDie; +import common.entity.projectile.EntityDynamite; +import common.entity.projectile.EntityEgg; +import common.entity.projectile.EntityFireCharge; +import common.entity.projectile.EntityFireball; +import common.entity.projectile.EntityHook; +import common.entity.projectile.EntityPotion; +import common.entity.projectile.EntitySnowball; +import common.init.Blocks; +import common.init.Items; +import common.init.SpeciesRegistry; +import common.init.SpeciesRegistry.ModelType; public abstract class EntityRenderRegistry { public static void registerRenderers(Map, Render> map, diff --git a/client/src/client/network/ClientLoginHandler.java b/client/src/client/network/ClientLoginHandler.java index b699978..c7b66e8 100755 --- a/client/src/client/network/ClientLoginHandler.java +++ b/client/src/client/network/ClientLoginHandler.java @@ -1,13 +1,13 @@ package client.network; import client.Game; -import game.network.IClientLoginHandler; -import game.network.NetConnection; -import game.network.NetHandler; -import game.network.PacketRegistry; -import game.packet.RPacketDisconnect; -import game.packet.RPacketEnableCompression; -import game.packet.RPacketLoginSuccess; +import common.network.IClientLoginHandler; +import common.network.NetConnection; +import common.network.NetHandler; +import common.network.PacketRegistry; +import common.packet.RPacketDisconnect; +import common.packet.RPacketEnableCompression; +import common.packet.RPacketLoginSuccess; public class ClientLoginHandler extends NetHandler implements IClientLoginHandler { private final Game gm; diff --git a/client/src/client/network/ClientPlayer.java b/client/src/client/network/ClientPlayer.java index dff2c2f..76fbc35 100755 --- a/client/src/client/network/ClientPlayer.java +++ b/client/src/client/network/ClientPlayer.java @@ -27,117 +27,117 @@ import client.gui.container.GuiRepair; import client.gui.ingame.GuiSign; import client.renderer.particle.EntityPickupFX; import client.renderer.texture.EntityTexManager; -import game.collect.Lists; -import game.collect.Maps; -import game.dimension.Dimension; -import game.entity.DataWatcher; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.AttributeMap; -import game.entity.attributes.AttributeModifier; -import game.entity.effect.EntityLightning; -import game.entity.item.EntityBoat; -import game.entity.item.EntityXp; -import game.entity.npc.EntityNPC; -import game.entity.npc.PlayerCharacter; -import game.entity.projectile.EntityProjectile; -import game.entity.types.EntityLiving; -import game.init.EntityRegistry; -import game.init.ItemRegistry; -import game.init.SoundEvent; -import game.inventory.AnimalChest; -import game.inventory.Container; -import game.inventory.ContainerLocalMenu; -import game.inventory.IInventory; -import game.inventory.InventoryBasic; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.log.Log; -import game.model.ParticleType; -import game.network.IClientPlayer; -import game.network.NetConnection; -import game.network.NetHandler; -import game.network.Packet; -import game.packet.CPacketAction; -import game.packet.CPacketKeepAlive; -import game.packet.CPacketPlayer; -import game.packet.S14PacketEntity; -import game.packet.S18PacketEntityTeleport; -import game.packet.S19PacketEntityHeadLook; -import game.packet.S1APacketEntityStatus; -import game.packet.S1BPacketEntityAttach; -import game.packet.S1CPacketEntityMetadata; -import game.packet.S1DPacketEntityEffect; -import game.packet.S1EPacketRemoveEntityEffect; -import game.packet.S20PacketEntityProperties; -import game.packet.S27PacketExplosion; -import game.packet.S28PacketEffect; -import game.packet.S29PacketSoundEffect; -import game.packet.S2APacketParticles; -import game.packet.S2BPacketChangeGameState; -import game.packet.S2CPacketSpawnGlobalEntity; -import game.packet.S2DPacketOpenWindow; -import game.packet.S2EPacketCloseWindow; -import game.packet.S2FPacketSetSlot; -import game.packet.S30PacketWindowItems; -import game.packet.S31PacketWindowProperty; -import game.packet.S32PacketConfirmTransaction; -import game.packet.S33PacketUpdateSign; -import game.packet.S35PacketUpdateTileEntity; -import game.packet.S36PacketSignEditorOpen; -import game.packet.S38PacketPlayerListItem; -import game.packet.S39PacketPlayerAbilities; -import game.packet.S3APacketTabComplete; -import game.packet.S43PacketUpdateEntityNBT; -import game.packet.SPacketAnimation; -import game.packet.SPacketBiomes; -import game.packet.SPacketBlockAction; -import game.packet.SPacketBlockBreakAnim; -import game.packet.SPacketBlockChange; -import game.packet.SPacketCamera; -import game.packet.SPacketCharacterList; -import game.packet.SPacketChunkData; -import game.packet.SPacketCollectItem; -import game.packet.SPacketDestroyEntities; -import game.packet.SPacketDimensionName; -import game.packet.SPacketDisconnect; -import game.packet.SPacketEntityEquipment; -import game.packet.SPacketEntityVelocity; -import game.packet.SPacketHeldItemChange; -import game.packet.SPacketJoinGame; -import game.packet.SPacketKeepAlive; -import game.packet.SPacketLoading; -import game.packet.SPacketMapChunkBulk; -import game.packet.SPacketMessage; -import game.packet.SPacketMultiBlockChange; -import game.packet.SPacketPlayerPosLook; -import game.packet.SPacketRespawn; -import game.packet.SPacketServerTick; -import game.packet.SPacketSetExperience; -import game.packet.SPacketSkin; -import game.packet.SPacketSpawnMob; -import game.packet.SPacketSpawnObject; -import game.packet.SPacketSpawnPlayer; -import game.packet.SPacketTimeUpdate; -import game.packet.SPacketTrades; -import game.packet.SPacketUpdateHealth; -import game.packet.SPacketWorld; -import game.potion.PotionEffect; -import game.rng.Random; -import game.tileentity.IInteractionObject; -import game.tileentity.LocalBlockIntercommunication; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMachine; -import game.tileentity.TileEntitySign; -import game.village.MerchantRecipeList; -import game.world.BlockPos; -import game.world.Chunk; -import game.world.Explosion; -import game.world.Weather; -import game.world.World; -import game.world.WorldClient; +import common.collect.Lists; +import common.collect.Maps; +import common.dimension.Dimension; +import common.entity.DataWatcher; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.AttributeMap; +import common.entity.attributes.AttributeModifier; +import common.entity.effect.EntityLightning; +import common.entity.item.EntityBoat; +import common.entity.item.EntityXp; +import common.entity.npc.EntityNPC; +import common.entity.npc.PlayerCharacter; +import common.entity.projectile.EntityProjectile; +import common.entity.types.EntityLiving; +import common.init.EntityRegistry; +import common.init.ItemRegistry; +import common.init.SoundEvent; +import common.inventory.AnimalChest; +import common.inventory.Container; +import common.inventory.ContainerLocalMenu; +import common.inventory.IInventory; +import common.inventory.InventoryBasic; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.log.Log; +import common.model.ParticleType; +import common.network.IClientPlayer; +import common.network.NetConnection; +import common.network.NetHandler; +import common.network.Packet; +import common.packet.CPacketAction; +import common.packet.CPacketKeepAlive; +import common.packet.CPacketPlayer; +import common.packet.S14PacketEntity; +import common.packet.S18PacketEntityTeleport; +import common.packet.S19PacketEntityHeadLook; +import common.packet.S1APacketEntityStatus; +import common.packet.S1BPacketEntityAttach; +import common.packet.S1CPacketEntityMetadata; +import common.packet.S1DPacketEntityEffect; +import common.packet.S1EPacketRemoveEntityEffect; +import common.packet.S20PacketEntityProperties; +import common.packet.S27PacketExplosion; +import common.packet.S28PacketEffect; +import common.packet.S29PacketSoundEffect; +import common.packet.S2APacketParticles; +import common.packet.S2BPacketChangeGameState; +import common.packet.S2CPacketSpawnGlobalEntity; +import common.packet.S2DPacketOpenWindow; +import common.packet.S2EPacketCloseWindow; +import common.packet.S2FPacketSetSlot; +import common.packet.S30PacketWindowItems; +import common.packet.S31PacketWindowProperty; +import common.packet.S32PacketConfirmTransaction; +import common.packet.S33PacketUpdateSign; +import common.packet.S35PacketUpdateTileEntity; +import common.packet.S36PacketSignEditorOpen; +import common.packet.S38PacketPlayerListItem; +import common.packet.S39PacketPlayerAbilities; +import common.packet.S3APacketTabComplete; +import common.packet.S43PacketUpdateEntityNBT; +import common.packet.SPacketAnimation; +import common.packet.SPacketBiomes; +import common.packet.SPacketBlockAction; +import common.packet.SPacketBlockBreakAnim; +import common.packet.SPacketBlockChange; +import common.packet.SPacketCamera; +import common.packet.SPacketCharacterList; +import common.packet.SPacketChunkData; +import common.packet.SPacketCollectItem; +import common.packet.SPacketDestroyEntities; +import common.packet.SPacketDimensionName; +import common.packet.SPacketDisconnect; +import common.packet.SPacketEntityEquipment; +import common.packet.SPacketEntityVelocity; +import common.packet.SPacketHeldItemChange; +import common.packet.SPacketJoinGame; +import common.packet.SPacketKeepAlive; +import common.packet.SPacketLoading; +import common.packet.SPacketMapChunkBulk; +import common.packet.SPacketMessage; +import common.packet.SPacketMultiBlockChange; +import common.packet.SPacketPlayerPosLook; +import common.packet.SPacketRespawn; +import common.packet.SPacketServerTick; +import common.packet.SPacketSetExperience; +import common.packet.SPacketSkin; +import common.packet.SPacketSpawnMob; +import common.packet.SPacketSpawnObject; +import common.packet.SPacketSpawnPlayer; +import common.packet.SPacketTimeUpdate; +import common.packet.SPacketTrades; +import common.packet.SPacketUpdateHealth; +import common.packet.SPacketWorld; +import common.potion.PotionEffect; +import common.rng.Random; +import common.tileentity.IInteractionObject; +import common.tileentity.LocalBlockIntercommunication; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityMachine; +import common.tileentity.TileEntitySign; +import common.village.MerchantRecipeList; +import common.world.BlockPos; +import common.world.Chunk; +import common.world.Explosion; +import common.world.Weather; +import common.world.World; +import common.world.WorldClient; public class ClientPlayer extends NetHandler implements IClientPlayer { diff --git a/client/src/client/renderer/ActiveRenderInfo.java b/client/src/client/renderer/ActiveRenderInfo.java index b9e7ecd..fc8a9ef 100755 --- a/client/src/client/renderer/ActiveRenderInfo.java +++ b/client/src/client/renderer/ActiveRenderInfo.java @@ -7,15 +7,15 @@ import java.nio.IntBuffer; import org.lwjgl.opengl.GL11; -import game.block.Block; -import game.block.BlockLiquid; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.block.BlockLiquid; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.util.ExtMath; +import common.world.BlockPos; +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 cb78895..ba4e8d1 100755 --- a/client/src/client/renderer/BlockRenderer.java +++ b/client/src/client/renderer/BlockRenderer.java @@ -14,20 +14,20 @@ import client.renderer.blockmodel.ModelManager; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; import client.renderer.tileentity.TileEntityItemStackRenderer; -import game.block.Block; -import game.block.BlockLiquid; -import game.collect.Maps; -import game.init.BlockRegistry; -import game.init.FluidRegistry; -import game.item.ItemStack; -import game.material.Material; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3i; +import common.block.Block; +import common.block.BlockLiquid; +import common.collect.Maps; +import common.init.BlockRegistry; +import common.init.FluidRegistry; +import common.item.ItemStack; +import common.material.Material; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +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/Drawing.java b/client/src/client/renderer/Drawing.java index d4a2002..d4056c4 100644 --- a/client/src/client/renderer/Drawing.java +++ b/client/src/client/renderer/Drawing.java @@ -5,9 +5,9 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.gui.Font; import client.gui.FontChar; -import game.color.TextColor; -import game.log.Log; -import game.util.Util; +import common.color.TextColor; +import common.log.Log; +import common.util.Util; public abstract class Drawing { public static class Vec2i { diff --git a/client/src/client/renderer/EntityRenderer.java b/client/src/client/renderer/EntityRenderer.java index 0ca4578..94152e2 100755 --- a/client/src/client/renderer/EntityRenderer.java +++ b/client/src/client/renderer/EntityRenderer.java @@ -13,26 +13,26 @@ import client.Game; import client.renderer.particle.EffectRenderer; import client.renderer.texture.DynamicTexture; import client.renderer.texture.TextureMap; -import game.biome.Biome; -import game.block.Block; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.SoundEvent; -import game.material.Material; -import game.model.BlockLayer; -import game.model.ParticleType; -import game.potion.Potion; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; +import common.biome.Biome; +import common.block.Block; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.SoundEvent; +import common.material.Material; +import common.model.BlockLayer; +import common.model.ParticleType; +import common.potion.Potion; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; +import common.world.WorldClient; public class EntityRenderer { private static final String locationMoltenPng = "textures/world/molten.png"; diff --git a/client/src/client/renderer/Frustum.java b/client/src/client/renderer/Frustum.java index 9b3478d..ba0a6f5 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 game.util.ExtMath; -import game.world.BoundingBox; +import common.util.ExtMath; +import common.world.BoundingBox; public class Frustum { private static class ClippingHelper { diff --git a/client/src/client/renderer/ItemModelMesher.java b/client/src/client/renderer/ItemModelMesher.java index 69fd18c..b242df1 100755 --- a/client/src/client/renderer/ItemModelMesher.java +++ b/client/src/client/renderer/ItemModelMesher.java @@ -6,12 +6,12 @@ import java.util.Map; import client.renderer.blockmodel.IBakedModel; import client.renderer.blockmodel.ModelManager; import client.renderer.texture.TextureAtlasSprite; -import game.collect.Lists; -import game.collect.Maps; -import game.init.ItemRegistry; -import game.item.Item; -import game.item.ItemStack; -import game.model.ItemMeshDefinition; +import common.collect.Lists; +import common.collect.Maps; +import common.init.ItemRegistry; +import common.item.Item; +import common.item.ItemStack; +import common.model.ItemMeshDefinition; public class ItemModelMesher { diff --git a/client/src/client/renderer/ItemRenderer.java b/client/src/client/renderer/ItemRenderer.java index c3ac2e1..559e6a0 100755 --- a/client/src/client/renderer/ItemRenderer.java +++ b/client/src/client/renderer/ItemRenderer.java @@ -14,18 +14,18 @@ import client.renderer.entity.RenderNpc; import client.renderer.texture.EntityTexManager; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.item.Item; -import game.item.ItemAction; -import game.item.ItemStack; -import game.model.BlockLayer; -import game.model.Transforms; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.Vec3; +import common.block.Block; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; +import common.model.BlockLayer; +import common.model.Transforms; +import common.util.ExtMath; +import common.world.BlockPos; +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 ceeae17..91c66d6 100755 --- a/client/src/client/renderer/RegionRenderCache.java +++ b/client/src/client/renderer/RegionRenderCache.java @@ -2,18 +2,18 @@ package client.renderer; import java.util.Arrays; -import game.biome.Biome; -import game.init.Blocks; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.Chunk; -import game.world.ChunkCache; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.LightType; -import game.world.State; -import game.world.Vec3i; -import game.world.World; +import common.biome.Biome; +import common.init.Blocks; +import common.tileentity.TileEntity; +import common.world.BlockPos; +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/RegionRenderCacheBuilder.java b/client/src/client/renderer/RegionRenderCacheBuilder.java index 3bdd7be..7318dc3 100755 --- a/client/src/client/renderer/RegionRenderCacheBuilder.java +++ b/client/src/client/renderer/RegionRenderCacheBuilder.java @@ -1,6 +1,6 @@ package client.renderer; -import game.model.BlockLayer; +import common.model.BlockLayer; public class RegionRenderCacheBuilder { diff --git a/client/src/client/renderer/RenderBuffer.java b/client/src/client/renderer/RenderBuffer.java index 8889951..b5cb077 100755 --- a/client/src/client/renderer/RenderBuffer.java +++ b/client/src/client/renderer/RenderBuffer.java @@ -9,8 +9,8 @@ import java.util.Arrays; import java.util.BitSet; import java.util.Comparator; -import game.log.Log; -import game.util.ExtMath; +import common.log.Log; +import common.util.ExtMath; public class RenderBuffer { diff --git a/client/src/client/renderer/RenderGlobal.java b/client/src/client/renderer/RenderGlobal.java index 2376f3c..c1a1d9d 100755 --- a/client/src/client/renderer/RenderGlobal.java +++ b/client/src/client/renderer/RenderGlobal.java @@ -25,34 +25,34 @@ import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; import client.renderer.tileentity.TileEntityRendererDispatcher; -import game.block.Block; -import game.block.BlockChest; -import game.block.BlockSign; -import game.block.BlockSkull; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityBox; -import game.entity.types.EntityLiving; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; -import game.sound.Sound; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.util.ExtMath; -import game.util.Vector3f; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Chunk; -import game.world.ClassInheritanceMultiMap; -import game.world.Facing; -import game.world.HitPosition; -import game.world.State; -import game.world.Vec3; -import game.world.WorldClient; +import common.block.Block; +import common.block.BlockChest; +import common.block.BlockSign; +import common.block.BlockSkull; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityBox; +import common.entity.types.EntityLiving; +import common.material.Material; +import common.model.BlockLayer; +import common.rng.Random; +import common.sound.Sound; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityChest; +import common.util.ExtMath; +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/VertexFormat.java b/client/src/client/renderer/VertexFormat.java index 8b06b07..d8c6e93 100755 --- a/client/src/client/renderer/VertexFormat.java +++ b/client/src/client/renderer/VertexFormat.java @@ -2,8 +2,8 @@ package client.renderer; import java.util.List; -import game.collect.Lists; -import game.log.Log; +import common.collect.Lists; +import common.log.Log; public class VertexFormat { diff --git a/client/src/client/renderer/VertexFormatElement.java b/client/src/client/renderer/VertexFormatElement.java index 3c19fca..4ff2116 100755 --- a/client/src/client/renderer/VertexFormatElement.java +++ b/client/src/client/renderer/VertexFormatElement.java @@ -2,7 +2,7 @@ package client.renderer; import org.lwjgl.opengl.GL11; -import game.log.Log; +import common.log.Log; public class VertexFormatElement { diff --git a/client/src/client/renderer/ViewFrustum.java b/client/src/client/renderer/ViewFrustum.java index 4b9856c..e4d4980 100755 --- a/client/src/client/renderer/ViewFrustum.java +++ b/client/src/client/renderer/ViewFrustum.java @@ -1,9 +1,9 @@ package client.renderer; import client.renderer.chunk.RenderChunk; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +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 9f4ed4c..5a25ef0 100755 --- a/client/src/client/renderer/blockmodel/BakedModel.java +++ b/client/src/client/renderer/blockmodel/BakedModel.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import client.renderer.texture.TextureAtlasSprite; -import game.collect.Lists; -import game.model.Transforms; -import game.world.Facing; +import common.collect.Lists; +import common.model.Transforms; +import common.world.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 50e1498..faefddb 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 game.world.Facing; +import common.world.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 d52b5fd..f3a03e7 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 game.util.Vector3f; -import game.world.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 601f36a..9d7e0fd 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 game.world.Facing; +import common.world.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 250034f..b3cfbea 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 game.util.Vector3f; -import game.world.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 4176e2c..7c9c306 100755 --- a/client/src/client/renderer/blockmodel/BuiltInModel.java +++ b/client/src/client/renderer/blockmodel/BuiltInModel.java @@ -3,8 +3,8 @@ package client.renderer.blockmodel; import java.util.List; import client.renderer.texture.TextureAtlasSprite; -import game.model.Transforms; -import game.world.Facing; +import common.model.Transforms; +import common.world.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 6576b8f..09fd515 100755 --- a/client/src/client/renderer/blockmodel/FaceBakery.java +++ b/client/src/client/renderer/blockmodel/FaceBakery.java @@ -1,13 +1,13 @@ package client.renderer.blockmodel; import client.renderer.texture.TextureAtlasSprite; -import game.model.ModelRotation; -import game.util.ExtMath; -import game.util.Matrix4f; -import game.util.Vector3f; -import game.util.Vector4f; -import game.world.Facing; -import game.world.Vec3i; +import common.model.ModelRotation; +import common.util.ExtMath; +import common.util.Matrix4f; +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 89db333..7e5b482 100755 --- a/client/src/client/renderer/blockmodel/IBakedModel.java +++ b/client/src/client/renderer/blockmodel/IBakedModel.java @@ -3,8 +3,8 @@ package client.renderer.blockmodel; import java.util.List; import client.renderer.texture.TextureAtlasSprite; -import game.model.Transforms; -import game.world.Facing; +import common.model.Transforms; +import common.world.Facing; public interface IBakedModel { diff --git a/client/src/client/renderer/blockmodel/ModelBakery.java b/client/src/client/renderer/blockmodel/ModelBakery.java index ea62808..ef9e54c 100755 --- a/client/src/client/renderer/blockmodel/ModelBakery.java +++ b/client/src/client/renderer/blockmodel/ModelBakery.java @@ -10,19 +10,19 @@ import java.util.Set; import client.renderer.texture.IIconCreator; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.init.BlockRegistry; -import game.init.FluidRegistry; -import game.init.IRegistry; -import game.init.ItemRegistry; -import game.init.RegistrySimple; -import game.item.Item; -import game.item.ItemStack; -import game.model.ModelRotation; -import game.world.Facing; -import game.world.State; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.init.BlockRegistry; +import common.init.FluidRegistry; +import common.init.IRegistry; +import common.init.ItemRegistry; +import common.init.RegistrySimple; +import common.item.Item; +import common.item.ItemStack; +import common.model.ModelRotation; +import common.world.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 c7e4400..c54e391 100755 --- a/client/src/client/renderer/blockmodel/ModelBlock.java +++ b/client/src/client/renderer/blockmodel/ModelBlock.java @@ -3,14 +3,14 @@ package client.renderer.blockmodel; import java.util.List; import client.renderer.texture.TextureMap; -import game.collect.Lists; -import game.collect.Maps; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.util.Vector3f; -import game.world.Facing; +import common.collect.Lists; +import common.collect.Maps; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.Transforms; +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 60eb36b..178a13a 100755 --- a/client/src/client/renderer/blockmodel/ModelGenerator.java +++ b/client/src/client/renderer/blockmodel/ModelGenerator.java @@ -8,11 +8,11 @@ import client.renderer.model.ModelBox; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; import client.renderer.texture.TextureUtil; -import game.collect.Lists; -import game.collect.Maps; -import game.log.Log; -import game.util.Vector3f; -import game.world.Facing; +import common.collect.Lists; +import common.collect.Maps; +import common.log.Log; +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/blockmodel/ModelManager.java b/client/src/client/renderer/blockmodel/ModelManager.java index a82aa95..810b25d 100755 --- a/client/src/client/renderer/blockmodel/ModelManager.java +++ b/client/src/client/renderer/blockmodel/ModelManager.java @@ -7,15 +7,15 @@ import java.util.Set; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.block.BlockLiquid; -import game.collect.Maps; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.FluidRegistry; -import game.init.IRegistry; -import game.properties.IProperty; -import game.world.State; +import common.block.Block; +import common.block.BlockLiquid; +import common.collect.Maps; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.FluidRegistry; +import common.init.IRegistry; +import common.properties.IProperty; +import common.world.State; public class ModelManager { diff --git a/client/src/client/renderer/blockmodel/MultiStateMap.java b/client/src/client/renderer/blockmodel/MultiStateMap.java index 667d3ad..1461f83 100755 --- a/client/src/client/renderer/blockmodel/MultiStateMap.java +++ b/client/src/client/renderer/blockmodel/MultiStateMap.java @@ -4,11 +4,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; -import game.init.BlockRegistry; -import game.properties.IProperty; -import game.world.State; +import common.collect.Lists; +import common.collect.Maps; +import common.init.BlockRegistry; +import common.properties.IProperty; +import common.world.State; public class MultiStateMap extends StateMap { diff --git a/client/src/client/renderer/blockmodel/SingleStateMap.java b/client/src/client/renderer/blockmodel/SingleStateMap.java index 69c9880..6ad21d9 100755 --- a/client/src/client/renderer/blockmodel/SingleStateMap.java +++ b/client/src/client/renderer/blockmodel/SingleStateMap.java @@ -1,7 +1,7 @@ package client.renderer.blockmodel; -import game.init.BlockRegistry; -import game.world.State; +import common.init.BlockRegistry; +import common.world.State; public class SingleStateMap extends StateMap diff --git a/client/src/client/renderer/blockmodel/StateMap.java b/client/src/client/renderer/blockmodel/StateMap.java index ba64c28..d85f8a1 100755 --- a/client/src/client/renderer/blockmodel/StateMap.java +++ b/client/src/client/renderer/blockmodel/StateMap.java @@ -3,10 +3,10 @@ package client.renderer.blockmodel; import java.util.Map; import java.util.Map.Entry; -import game.block.Block; -import game.collect.Maps; -import game.properties.IProperty; -import game.world.State; +import common.block.Block; +import common.collect.Maps; +import common.properties.IProperty; +import common.world.State; public abstract class StateMap { diff --git a/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java b/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java index fb91119..d8244ea 100755 --- a/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java +++ b/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.concurrent.locks.ReentrantLock; import client.renderer.RegionRenderCacheBuilder; -import game.collect.Lists; +import common.collect.Lists; public class ChunkCompileTaskGenerator { diff --git a/client/src/client/renderer/chunk/ChunkRenderDispatcher.java b/client/src/client/renderer/chunk/ChunkRenderDispatcher.java index cf5f759..0258888 100755 --- a/client/src/client/renderer/chunk/ChunkRenderDispatcher.java +++ b/client/src/client/renderer/chunk/ChunkRenderDispatcher.java @@ -11,12 +11,12 @@ import client.Game; import client.renderer.RegionRenderCacheBuilder; import client.renderer.RenderBuffer; import client.renderer.VertexBuffer; -import game.collect.Lists; -import game.future.Futures; -import game.future.ListenableFuture; -import game.future.ListenableFutureTask; -import game.future.ThreadFactoryBuilder; -import game.model.BlockLayer; +import common.collect.Lists; +import common.future.Futures; +import common.future.ListenableFuture; +import common.future.ListenableFutureTask; +import common.future.ThreadFactoryBuilder; +import common.model.BlockLayer; public class ChunkRenderDispatcher { diff --git a/client/src/client/renderer/chunk/ChunkRenderWorker.java b/client/src/client/renderer/chunk/ChunkRenderWorker.java index 6c99786..c140f7d 100755 --- a/client/src/client/renderer/chunk/ChunkRenderWorker.java +++ b/client/src/client/renderer/chunk/ChunkRenderWorker.java @@ -6,13 +6,13 @@ import java.util.concurrent.CancellationException; import client.Game; import client.renderer.RegionRenderCacheBuilder; -import game.collect.Lists; -import game.entity.Entity; -import game.future.FutureCallback; -import game.future.Futures; -import game.future.ListenableFuture; -import game.log.Log; -import game.model.BlockLayer; +import common.collect.Lists; +import common.entity.Entity; +import common.future.FutureCallback; +import common.future.Futures; +import common.future.ListenableFuture; +import common.log.Log; +import common.model.BlockLayer; public class ChunkRenderWorker implements Runnable { diff --git a/client/src/client/renderer/chunk/CompiledChunk.java b/client/src/client/renderer/chunk/CompiledChunk.java index a9add33..bdd2a33 100755 --- a/client/src/client/renderer/chunk/CompiledChunk.java +++ b/client/src/client/renderer/chunk/CompiledChunk.java @@ -3,10 +3,10 @@ package client.renderer.chunk; import java.util.List; import client.renderer.RenderBuffer; -import game.collect.Lists; -import game.model.BlockLayer; -import game.tileentity.TileEntity; -import game.world.Facing; +import common.collect.Lists; +import common.model.BlockLayer; +import common.tileentity.TileEntity; +import common.world.Facing; public class CompiledChunk { diff --git a/client/src/client/renderer/chunk/RenderChunk.java b/client/src/client/renderer/chunk/RenderChunk.java index b2f8654..c014e18 100755 --- a/client/src/client/renderer/chunk/RenderChunk.java +++ b/client/src/client/renderer/chunk/RenderChunk.java @@ -19,16 +19,16 @@ import client.renderer.RenderGlobal; import client.renderer.VertexBuffer; import client.renderer.tileentity.TileEntityRendererDispatcher; import client.renderer.tileentity.TileEntitySpecialRenderer; -import game.block.Block; -import game.collect.Maps; -import game.collect.Sets; -import game.model.BlockLayer; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +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.world.State; +import common.world.World; public class RenderChunk { diff --git a/client/src/client/renderer/chunk/SetVisibility.java b/client/src/client/renderer/chunk/SetVisibility.java index 9071bb4..edbb073 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 game.world.Facing; +import common.world.Facing; public class SetVisibility { diff --git a/client/src/client/renderer/chunk/VisGraph.java b/client/src/client/renderer/chunk/VisGraph.java index 8c6c300..2294ec1 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 game.world.BlockPos; -import game.world.Facing; +import common.world.BlockPos; +import common.world.Facing; public class VisGraph { diff --git a/client/src/client/renderer/entity/Render.java b/client/src/client/renderer/entity/Render.java index 3553c7a..74f181f 100755 --- a/client/src/client/renderer/entity/Render.java +++ b/client/src/client/renderer/entity/Render.java @@ -11,11 +11,11 @@ import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.entity.Entity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.block.Block; +import common.entity.Entity; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.World; public abstract class Render { diff --git a/client/src/client/renderer/entity/RenderArachnoid.java b/client/src/client/renderer/entity/RenderArachnoid.java index 34d54a2..1a35652 100755 --- a/client/src/client/renderer/entity/RenderArachnoid.java +++ b/client/src/client/renderer/entity/RenderArachnoid.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import client.renderer.layers.LayerArachnoidArmor; import client.renderer.model.ModelArachnoid; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class RenderArachnoid extends RenderHumanoid diff --git a/client/src/client/renderer/entity/RenderArrow.java b/client/src/client/renderer/entity/RenderArrow.java index defe30b..59b26ab 100755 --- a/client/src/client/renderer/entity/RenderArrow.java +++ b/client/src/client/renderer/entity/RenderArrow.java @@ -6,8 +6,8 @@ import client.renderer.DefaultVertexFormats; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.entity.projectile.EntityArrow; -import game.util.ExtMath; +import common.entity.projectile.EntityArrow; +import common.util.ExtMath; public class RenderArrow extends Render diff --git a/client/src/client/renderer/entity/RenderBat.java b/client/src/client/renderer/entity/RenderBat.java index 9aebbeb..0aa6c4a 100755 --- a/client/src/client/renderer/entity/RenderBat.java +++ b/client/src/client/renderer/entity/RenderBat.java @@ -3,8 +3,8 @@ package client.renderer.entity; import org.lwjgl.opengl.GL11; import client.renderer.model.ModelBat; -import game.entity.animal.EntityBat; -import game.util.ExtMath; +import common.entity.animal.EntityBat; +import common.util.ExtMath; public class RenderBat extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderBlockEntity.java b/client/src/client/renderer/entity/RenderBlockEntity.java index d66f02e..1adf24c 100755 --- a/client/src/client/renderer/entity/RenderBlockEntity.java +++ b/client/src/client/renderer/entity/RenderBlockEntity.java @@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.renderer.BlockRenderer; import client.renderer.texture.TextureMap; -import game.entity.Entity; -import game.world.State; +import common.entity.Entity; +import common.world.State; public class RenderBlockEntity extends Render diff --git a/client/src/client/renderer/entity/RenderBoat.java b/client/src/client/renderer/entity/RenderBoat.java index dc07399..a9fafca 100755 --- a/client/src/client/renderer/entity/RenderBoat.java +++ b/client/src/client/renderer/entity/RenderBoat.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.model.ModelBase; import client.renderer.model.ModelBoat; -import game.entity.item.EntityBoat; -import game.util.ExtMath; +import common.entity.item.EntityBoat; +import common.util.ExtMath; public class RenderBoat extends Render diff --git a/client/src/client/renderer/entity/RenderBullet.java b/client/src/client/renderer/entity/RenderBullet.java index db19e7a..c143312 100755 --- a/client/src/client/renderer/entity/RenderBullet.java +++ b/client/src/client/renderer/entity/RenderBullet.java @@ -6,7 +6,7 @@ import client.renderer.DefaultVertexFormats; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.entity.projectile.EntityBullet; +import common.entity.projectile.EntityBullet; public class RenderBullet extends Render diff --git a/client/src/client/renderer/entity/RenderChicken.java b/client/src/client/renderer/entity/RenderChicken.java index f3ca5bb..9afeff9 100755 --- a/client/src/client/renderer/entity/RenderChicken.java +++ b/client/src/client/renderer/entity/RenderChicken.java @@ -1,8 +1,8 @@ package client.renderer.entity; import client.renderer.model.ModelBase; -import game.entity.animal.EntityChicken; -import game.util.ExtMath; +import common.entity.animal.EntityChicken; +import common.util.ExtMath; public class RenderChicken extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderCow.java b/client/src/client/renderer/entity/RenderCow.java index 5fa89d7..b6280ab 100755 --- a/client/src/client/renderer/entity/RenderCow.java +++ b/client/src/client/renderer/entity/RenderCow.java @@ -1,7 +1,7 @@ package client.renderer.entity; import client.renderer.model.ModelBase; -import game.entity.animal.EntityCow; +import common.entity.animal.EntityCow; public class RenderCow extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderCrystal.java b/client/src/client/renderer/entity/RenderCrystal.java index e2cafd5..d5642b1 100755 --- a/client/src/client/renderer/entity/RenderCrystal.java +++ b/client/src/client/renderer/entity/RenderCrystal.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.model.ModelBase; import client.renderer.model.ModelCrystal; -import game.entity.item.EntityCrystal; -import game.util.ExtMath; +import common.entity.item.EntityCrystal; +import common.util.ExtMath; public class RenderCrystal extends Render diff --git a/client/src/client/renderer/entity/RenderDie.java b/client/src/client/renderer/entity/RenderDie.java index 005243d..51a6cf1 100755 --- a/client/src/client/renderer/entity/RenderDie.java +++ b/client/src/client/renderer/entity/RenderDie.java @@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.renderer.model.ModelDie; import client.renderer.texture.TextureMap; -import game.entity.projectile.EntityDie; -import game.model.Transforms.Camera; +import common.entity.projectile.EntityDie; +import common.model.Transforms.Camera; public class RenderDie extends Render { diff --git a/client/src/client/renderer/entity/RenderDragon.java b/client/src/client/renderer/entity/RenderDragon.java index 5195eb1..e76f636 100755 --- a/client/src/client/renderer/entity/RenderDragon.java +++ b/client/src/client/renderer/entity/RenderDragon.java @@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.layers.LayerEnderDragonEyes; import client.renderer.model.ModelDragon; -import game.entity.animal.EntityDragon; -import game.util.ExtMath; +import common.entity.animal.EntityDragon; +import common.util.ExtMath; public class RenderDragon extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderDynamite.java b/client/src/client/renderer/entity/RenderDynamite.java index 095e81c..376e2ae 100755 --- a/client/src/client/renderer/entity/RenderDynamite.java +++ b/client/src/client/renderer/entity/RenderDynamite.java @@ -1,8 +1,8 @@ package client.renderer.entity; -import game.entity.projectile.EntityDynamite; -import game.item.Item; -import game.item.ItemStack; +import common.entity.projectile.EntityDynamite; +import common.item.Item; +import common.item.ItemStack; public class RenderDynamite extends RenderItemEntity { public RenderDynamite(RenderManager renderManagerIn, Item itemIn, RenderItem renderItemIn) { diff --git a/client/src/client/renderer/entity/RenderEntity.java b/client/src/client/renderer/entity/RenderEntity.java index 35df7e4..40f7baa 100755 --- a/client/src/client/renderer/entity/RenderEntity.java +++ b/client/src/client/renderer/entity/RenderEntity.java @@ -2,7 +2,7 @@ package client.renderer.entity; import org.lwjgl.opengl.GL11; -import game.entity.Entity; +import common.entity.Entity; public class RenderEntity extends Render diff --git a/client/src/client/renderer/entity/RenderEntityItem.java b/client/src/client/renderer/entity/RenderEntityItem.java index 4afd417..21e8fd5 100755 --- a/client/src/client/renderer/entity/RenderEntityItem.java +++ b/client/src/client/renderer/entity/RenderEntityItem.java @@ -5,12 +5,12 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.blockmodel.IBakedModel; import client.renderer.texture.TextureMap; -import game.entity.item.EntityItem; -import game.item.Item; -import game.item.ItemStack; -import game.model.Transforms; -import game.rng.Random; -import game.util.ExtMath; +import common.entity.item.EntityItem; +import common.item.Item; +import common.item.ItemStack; +import common.model.Transforms; +import common.rng.Random; +import common.util.ExtMath; public class RenderEntityItem extends Render { diff --git a/client/src/client/renderer/entity/RenderFallingBlock.java b/client/src/client/renderer/entity/RenderFallingBlock.java index 0693bff..5f12f22 100755 --- a/client/src/client/renderer/entity/RenderFallingBlock.java +++ b/client/src/client/renderer/entity/RenderFallingBlock.java @@ -10,11 +10,11 @@ import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.blockmodel.IBakedModel; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.entity.item.EntityFalling; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.entity.item.EntityFalling; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class RenderFallingBlock extends Render { diff --git a/client/src/client/renderer/entity/RenderFireball.java b/client/src/client/renderer/entity/RenderFireball.java index 378780c..4431da3 100755 --- a/client/src/client/renderer/entity/RenderFireball.java +++ b/client/src/client/renderer/entity/RenderFireball.java @@ -9,8 +9,8 @@ import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; -import game.entity.projectile.EntityProjectile; -import game.init.Items; +import common.entity.projectile.EntityProjectile; +import common.init.Items; public class RenderFireball extends Render diff --git a/client/src/client/renderer/entity/RenderFish.java b/client/src/client/renderer/entity/RenderFish.java index e2c3b7d..c9537ab 100755 --- a/client/src/client/renderer/entity/RenderFish.java +++ b/client/src/client/renderer/entity/RenderFish.java @@ -8,9 +8,9 @@ import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.particle.EffectRenderer; -import game.entity.projectile.EntityHook; -import game.util.ExtMath; -import game.world.Vec3; +import common.entity.projectile.EntityHook; +import common.util.ExtMath; +import common.world.Vec3; public class RenderFish extends Render { diff --git a/client/src/client/renderer/entity/RenderFlyingBox.java b/client/src/client/renderer/entity/RenderFlyingBox.java index 0b974a0..a8518c5 100755 --- a/client/src/client/renderer/entity/RenderFlyingBox.java +++ b/client/src/client/renderer/entity/RenderFlyingBox.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.model.ModelHead; -import game.entity.projectile.EntityBox; +import common.entity.projectile.EntityBox; public class RenderFlyingBox extends Render diff --git a/client/src/client/renderer/entity/RenderHorse.java b/client/src/client/renderer/entity/RenderHorse.java index 2c062fa..46a3ff9 100755 --- a/client/src/client/renderer/entity/RenderHorse.java +++ b/client/src/client/renderer/entity/RenderHorse.java @@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.renderer.model.ModelHorse; import client.renderer.texture.LayeredTexture; -import game.collect.Sets; -import game.entity.animal.EntityHorse; +import common.collect.Sets; +import common.entity.animal.EntityHorse; public class RenderHorse extends RenderLiving { diff --git a/client/src/client/renderer/entity/RenderHumanoid.java b/client/src/client/renderer/entity/RenderHumanoid.java index 6815f32..04e767e 100755 --- a/client/src/client/renderer/entity/RenderHumanoid.java +++ b/client/src/client/renderer/entity/RenderHumanoid.java @@ -13,9 +13,9 @@ import client.renderer.layers.LayerPowerRods; import client.renderer.model.ModelBiped; import client.renderer.model.ModelHumanoid; import client.renderer.texture.EntityTexManager; -import game.entity.npc.EntityNPC; -import game.item.ItemAction; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemAction; +import common.item.ItemStack; public class RenderHumanoid extends RenderNpc diff --git a/client/src/client/renderer/entity/RenderItem.java b/client/src/client/renderer/entity/RenderItem.java index 336ac19..b881350 100755 --- a/client/src/client/renderer/entity/RenderItem.java +++ b/client/src/client/renderer/entity/RenderItem.java @@ -15,15 +15,15 @@ import client.renderer.blockmodel.ModelManager; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; import client.renderer.tileentity.TileEntityItemStackRenderer; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.model.Transform; -import game.model.Transforms; -import game.world.Facing; -import game.world.Vec3i; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.model.Transform; +import common.model.Transforms; +import common.world.Facing; +import common.world.Vec3i; public class RenderItem { diff --git a/client/src/client/renderer/entity/RenderItemEntity.java b/client/src/client/renderer/entity/RenderItemEntity.java index d7c1108..41da344 100755 --- a/client/src/client/renderer/entity/RenderItemEntity.java +++ b/client/src/client/renderer/entity/RenderItemEntity.java @@ -4,10 +4,10 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.texture.TextureMap; -import game.entity.Entity; -import game.item.Item; -import game.item.ItemStack; -import game.model.Transforms; +import common.entity.Entity; +import common.item.Item; +import common.item.ItemStack; +import common.model.Transforms; public class RenderItemEntity extends Render diff --git a/client/src/client/renderer/entity/RenderLeashKnot.java b/client/src/client/renderer/entity/RenderLeashKnot.java index cd89065..9a03683 100755 --- a/client/src/client/renderer/entity/RenderLeashKnot.java +++ b/client/src/client/renderer/entity/RenderLeashKnot.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.model.ModelLeashKnot; -import game.entity.item.EntityLeashKnot; +import common.entity.item.EntityLeashKnot; public class RenderLeashKnot extends Render diff --git a/client/src/client/renderer/entity/RenderLightning.java b/client/src/client/renderer/entity/RenderLightning.java index f4a77ec..3cf3319 100755 --- a/client/src/client/renderer/entity/RenderLightning.java +++ b/client/src/client/renderer/entity/RenderLightning.java @@ -6,8 +6,8 @@ import client.renderer.DefaultVertexFormats; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.entity.effect.EntityLightning; -import game.rng.Random; +import common.entity.effect.EntityLightning; +import common.rng.Random; public class RenderLightning extends Render diff --git a/client/src/client/renderer/entity/RenderLiving.java b/client/src/client/renderer/entity/RenderLiving.java index bb75233..4e308dd 100755 --- a/client/src/client/renderer/entity/RenderLiving.java +++ b/client/src/client/renderer/entity/RenderLiving.java @@ -9,9 +9,9 @@ import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.model.ModelBase; -import game.entity.Entity; -import game.entity.item.EntityLeashKnot; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.item.EntityLeashKnot; +import common.entity.types.EntityLiving; public abstract class RenderLiving extends RendererLivingEntity { public RenderLiving(RenderManager manager, ModelBase model) { diff --git a/client/src/client/renderer/entity/RenderManager.java b/client/src/client/renderer/entity/RenderManager.java index 3fb1186..f88738d 100755 --- a/client/src/client/renderer/entity/RenderManager.java +++ b/client/src/client/renderer/entity/RenderManager.java @@ -13,13 +13,13 @@ import client.renderer.RenderBuffer; import client.renderer.RenderGlobal; import client.renderer.Tessellator; import client.renderer.texture.TextureManager; -import game.collect.Maps; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.SpeciesRegistry.ModelType; -import game.world.BoundingBox; -import game.world.Vec3; -import game.world.World; +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.world.World; public class RenderManager { diff --git a/client/src/client/renderer/entity/RenderMinecart.java b/client/src/client/renderer/entity/RenderMinecart.java index c3256d1..24255f9 100755 --- a/client/src/client/renderer/entity/RenderMinecart.java +++ b/client/src/client/renderer/entity/RenderMinecart.java @@ -7,10 +7,10 @@ import client.renderer.GlState; import client.renderer.model.ModelBase; import client.renderer.model.ModelMinecart; import client.renderer.texture.TextureMap; -import game.entity.item.EntityCart; -import game.util.ExtMath; -import game.world.State; -import game.world.Vec3; +import common.entity.item.EntityCart; +import common.util.ExtMath; +import common.world.State; +import common.world.Vec3; public class RenderMinecart extends Render { diff --git a/client/src/client/renderer/entity/RenderMooshroom.java b/client/src/client/renderer/entity/RenderMooshroom.java index 878c203..28793f3 100755 --- a/client/src/client/renderer/entity/RenderMooshroom.java +++ b/client/src/client/renderer/entity/RenderMooshroom.java @@ -2,7 +2,7 @@ package client.renderer.entity; import client.renderer.layers.LayerMooshroomMushroom; import client.renderer.model.ModelBase; -import game.entity.animal.EntityMooshroom; +import common.entity.animal.EntityMooshroom; public class RenderMooshroom extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderMouse.java b/client/src/client/renderer/entity/RenderMouse.java index 3fa6ad3..5c266dd 100755 --- a/client/src/client/renderer/entity/RenderMouse.java +++ b/client/src/client/renderer/entity/RenderMouse.java @@ -1,7 +1,7 @@ package client.renderer.entity; import client.renderer.model.ModelBase; -import game.entity.animal.EntityMouse; +import common.entity.animal.EntityMouse; public class RenderMouse extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderNpc.java b/client/src/client/renderer/entity/RenderNpc.java index 8fee9dc..7462455 100755 --- a/client/src/client/renderer/entity/RenderNpc.java +++ b/client/src/client/renderer/entity/RenderNpc.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import client.renderer.model.ModelBase; import client.renderer.texture.EntityTexManager; -import game.entity.npc.EntityNPC; -import game.network.IPlayer; +import common.entity.npc.EntityNPC; +import common.network.IPlayer; public abstract class RenderNpc extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderOcelot.java b/client/src/client/renderer/entity/RenderOcelot.java index 2fd5203..09edb56 100755 --- a/client/src/client/renderer/entity/RenderOcelot.java +++ b/client/src/client/renderer/entity/RenderOcelot.java @@ -3,7 +3,7 @@ package client.renderer.entity; import org.lwjgl.opengl.GL11; import client.renderer.model.ModelBase; -import game.entity.animal.EntityOcelot; +import common.entity.animal.EntityOcelot; public class RenderOcelot extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderPig.java b/client/src/client/renderer/entity/RenderPig.java index 8b821da..be614ee 100755 --- a/client/src/client/renderer/entity/RenderPig.java +++ b/client/src/client/renderer/entity/RenderPig.java @@ -2,7 +2,7 @@ package client.renderer.entity; import client.renderer.layers.LayerSaddle; import client.renderer.model.ModelBase; -import game.entity.animal.EntityPig; +import common.entity.animal.EntityPig; public class RenderPig extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderPotion.java b/client/src/client/renderer/entity/RenderPotion.java index cb574bf..4256783 100755 --- a/client/src/client/renderer/entity/RenderPotion.java +++ b/client/src/client/renderer/entity/RenderPotion.java @@ -1,8 +1,8 @@ package client.renderer.entity; -import game.entity.projectile.EntityPotion; -import game.init.Items; -import game.item.ItemStack; +import common.entity.projectile.EntityPotion; +import common.init.Items; +import common.item.ItemStack; public class RenderPotion extends RenderItemEntity { diff --git a/client/src/client/renderer/entity/RenderRabbit.java b/client/src/client/renderer/entity/RenderRabbit.java index fbb7c7e..7527e5a 100755 --- a/client/src/client/renderer/entity/RenderRabbit.java +++ b/client/src/client/renderer/entity/RenderRabbit.java @@ -1,8 +1,8 @@ package client.renderer.entity; import client.renderer.model.ModelBase; -import game.color.TextColor; -import game.entity.animal.EntityRabbit; +import common.color.TextColor; +import common.entity.animal.EntityRabbit; public class RenderRabbit extends RenderLiving { diff --git a/client/src/client/renderer/entity/RenderSheep.java b/client/src/client/renderer/entity/RenderSheep.java index 01cad8d..c9277db 100755 --- a/client/src/client/renderer/entity/RenderSheep.java +++ b/client/src/client/renderer/entity/RenderSheep.java @@ -2,7 +2,7 @@ package client.renderer.entity; import client.renderer.layers.LayerSheepWool; import client.renderer.model.ModelBase; -import game.entity.animal.EntitySheep; +import common.entity.animal.EntitySheep; public class RenderSheep extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderSlime.java b/client/src/client/renderer/entity/RenderSlime.java index c3ff29f..e76df43 100755 --- a/client/src/client/renderer/entity/RenderSlime.java +++ b/client/src/client/renderer/entity/RenderSlime.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.layers.LayerSlimeGel; import client.renderer.model.ModelSlime; -import game.entity.npc.EntityNPC; -import game.entity.npc.EntitySlime; +import common.entity.npc.EntityNPC; +import common.entity.npc.EntitySlime; public class RenderSlime extends RenderNpc diff --git a/client/src/client/renderer/entity/RenderSpaceMarine.java b/client/src/client/renderer/entity/RenderSpaceMarine.java index bad1b01..864b24c 100755 --- a/client/src/client/renderer/entity/RenderSpaceMarine.java +++ b/client/src/client/renderer/entity/RenderSpaceMarine.java @@ -5,9 +5,9 @@ import org.lwjgl.opengl.GL11; import client.renderer.layers.LayerArrow; import client.renderer.layers.LayerHeldItem; import client.renderer.model.ModelSpaceMarine; -import game.entity.npc.EntityNPC; -import game.item.ItemAction; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemAction; +import common.item.ItemStack; public class RenderSpaceMarine extends RenderNpc diff --git a/client/src/client/renderer/entity/RenderSquid.java b/client/src/client/renderer/entity/RenderSquid.java index c09b1cf..15f3c96 100755 --- a/client/src/client/renderer/entity/RenderSquid.java +++ b/client/src/client/renderer/entity/RenderSquid.java @@ -3,7 +3,7 @@ package client.renderer.entity; import org.lwjgl.opengl.GL11; import client.renderer.model.ModelBase; -import game.entity.animal.EntitySquid; +import common.entity.animal.EntitySquid; public class RenderSquid extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderTntMinecart.java b/client/src/client/renderer/entity/RenderTntMinecart.java index 5150ccf..2a9413e 100755 --- a/client/src/client/renderer/entity/RenderTntMinecart.java +++ b/client/src/client/renderer/entity/RenderTntMinecart.java @@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.renderer.BlockRenderer; import client.renderer.GlState; -import game.entity.item.EntityTntCart; -import game.init.Blocks; -import game.util.ExtMath; -import game.world.State; +import common.entity.item.EntityTntCart; +import common.init.Blocks; +import common.util.ExtMath; +import common.world.State; public class RenderTntMinecart extends RenderMinecart { diff --git a/client/src/client/renderer/entity/RenderTntPrimed.java b/client/src/client/renderer/entity/RenderTntPrimed.java index 5edf422..0c339de 100755 --- a/client/src/client/renderer/entity/RenderTntPrimed.java +++ b/client/src/client/renderer/entity/RenderTntPrimed.java @@ -6,10 +6,10 @@ import client.Game; import client.renderer.BlockRenderer; import client.renderer.GlState; import client.renderer.texture.TextureMap; -import game.block.BlockTNT; -import game.entity.item.EntityTnt; -import game.init.Blocks; -import game.util.ExtMath; +import common.block.BlockTNT; +import common.entity.item.EntityTnt; +import common.init.Blocks; +import common.util.ExtMath; public class RenderTntPrimed extends Render diff --git a/client/src/client/renderer/entity/RenderWolf.java b/client/src/client/renderer/entity/RenderWolf.java index 8831285..3fb1bf1 100755 --- a/client/src/client/renderer/entity/RenderWolf.java +++ b/client/src/client/renderer/entity/RenderWolf.java @@ -3,7 +3,7 @@ package client.renderer.entity; import client.renderer.GlState; import client.renderer.layers.LayerWolfCollar; import client.renderer.model.ModelBase; -import game.entity.animal.EntityWolf; +import common.entity.animal.EntityWolf; public class RenderWolf extends RenderLiving diff --git a/client/src/client/renderer/entity/RenderXpOrb.java b/client/src/client/renderer/entity/RenderXpOrb.java index c9e7d69..815456d 100755 --- a/client/src/client/renderer/entity/RenderXpOrb.java +++ b/client/src/client/renderer/entity/RenderXpOrb.java @@ -7,8 +7,8 @@ import client.renderer.DefaultVertexFormats; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.entity.item.EntityXp; -import game.util.ExtMath; +import common.entity.item.EntityXp; +import common.util.ExtMath; public class RenderXpOrb extends Render diff --git a/client/src/client/renderer/entity/RendererLivingEntity.java b/client/src/client/renderer/entity/RendererLivingEntity.java index 880ec72..e8df489 100755 --- a/client/src/client/renderer/entity/RendererLivingEntity.java +++ b/client/src/client/renderer/entity/RendererLivingEntity.java @@ -16,14 +16,14 @@ import client.renderer.Tessellator; import client.renderer.layers.LayerRenderer; import client.renderer.model.ModelBase; import client.renderer.texture.DynamicTexture; -import game.collect.Lists; -import game.color.TextColor; -import game.entity.Entity; -import game.entity.item.EntityCrystal; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.log.Log; -import game.util.ExtMath; +import common.collect.Lists; +import common.color.TextColor; +import common.entity.Entity; +import common.entity.item.EntityCrystal; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.log.Log; +import common.util.ExtMath; public abstract class RendererLivingEntity extends Render { diff --git a/client/src/client/renderer/layers/LayerArmor.java b/client/src/client/renderer/layers/LayerArmor.java index 98d402b..35f1280 100755 --- a/client/src/client/renderer/layers/LayerArmor.java +++ b/client/src/client/renderer/layers/LayerArmor.java @@ -6,9 +6,9 @@ import client.renderer.GlState; import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelArmor; import client.renderer.model.ModelBiped; -import game.entity.types.EntityLiving; -import game.item.ItemArmor; -import game.item.ItemStack; +import common.entity.types.EntityLiving; +import common.item.ItemArmor; +import common.item.ItemStack; public class LayerArmor implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerArrow.java b/client/src/client/renderer/layers/LayerArrow.java index a16d5a4..6fa6589 100755 --- a/client/src/client/renderer/layers/LayerArrow.java +++ b/client/src/client/renderer/layers/LayerArrow.java @@ -6,11 +6,11 @@ import client.renderer.ItemRenderer; import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelBox; import client.renderer.model.ModelRenderer; -import game.entity.Entity; -import game.entity.projectile.EntityArrow; -import game.entity.types.EntityLiving; -import game.rng.Random; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.projectile.EntityArrow; +import common.entity.types.EntityLiving; +import common.rng.Random; +import common.util.ExtMath; public class LayerArrow implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerCape.java b/client/src/client/renderer/layers/LayerCape.java index ba3bbb9..495e678 100755 --- a/client/src/client/renderer/layers/LayerCape.java +++ b/client/src/client/renderer/layers/LayerCape.java @@ -6,8 +6,8 @@ import client.renderer.GlState; import client.renderer.entity.RenderHumanoid; import client.renderer.model.ModelRenderer; import client.renderer.texture.EntityTexManager; -import game.entity.npc.EntityNPC; -import game.util.ExtMath; +import common.entity.npc.EntityNPC; +import common.util.ExtMath; public class LayerCape implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerCharge.java b/client/src/client/renderer/layers/LayerCharge.java index 64aa253..2bc6578 100755 --- a/client/src/client/renderer/layers/LayerCharge.java +++ b/client/src/client/renderer/layers/LayerCharge.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.entity.RenderHumanoid; import client.renderer.model.ModelCharge; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class LayerCharge implements LayerRenderer diff --git a/client/src/client/renderer/layers/LayerEnderDragonEyes.java b/client/src/client/renderer/layers/LayerEnderDragonEyes.java index 2fed9da..7fb6b27 100755 --- a/client/src/client/renderer/layers/LayerEnderDragonEyes.java +++ b/client/src/client/renderer/layers/LayerEnderDragonEyes.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL13; import client.renderer.GlState; import client.renderer.entity.RenderDragon; -import game.entity.animal.EntityDragon; +import common.entity.animal.EntityDragon; public class LayerEnderDragonEyes implements LayerRenderer diff --git a/client/src/client/renderer/layers/LayerEntityBreak.java b/client/src/client/renderer/layers/LayerEntityBreak.java index 5d64665..a705c6d 100755 --- a/client/src/client/renderer/layers/LayerEntityBreak.java +++ b/client/src/client/renderer/layers/LayerEntityBreak.java @@ -7,8 +7,8 @@ import client.renderer.GlState; import client.renderer.ItemRenderer; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.entity.animal.EntityDragon; -import game.rng.Random; +import common.entity.animal.EntityDragon; +import common.rng.Random; public class LayerEntityBreak implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerExtra.java b/client/src/client/renderer/layers/LayerExtra.java index 75c168b..0364213 100755 --- a/client/src/client/renderer/layers/LayerExtra.java +++ b/client/src/client/renderer/layers/LayerExtra.java @@ -11,9 +11,9 @@ import client.renderer.model.ModelBox; import client.renderer.model.ModelHumanoid; import client.renderer.model.ModelRenderer; import client.renderer.texture.EntityTexManager; -import game.collect.Lists; -import game.entity.npc.EntityNPC; -import game.init.SpeciesRegistry.ModelType; +import common.collect.Lists; +import common.entity.npc.EntityNPC; +import common.init.SpeciesRegistry.ModelType; public class LayerExtra implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerHeldItem.java b/client/src/client/renderer/layers/LayerHeldItem.java index 0c46471..97dc2ad 100755 --- a/client/src/client/renderer/layers/LayerHeldItem.java +++ b/client/src/client/renderer/layers/LayerHeldItem.java @@ -5,13 +5,13 @@ import org.lwjgl.opengl.GL11; import client.Game; import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelBiped; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.Item; -import game.item.ItemBlock; -import game.item.ItemStack; -import game.model.Transforms; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.Item; +import common.item.ItemBlock; +import common.item.ItemStack; +import common.model.Transforms; public class LayerHeldItem implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerMooshroomMushroom.java b/client/src/client/renderer/layers/LayerMooshroomMushroom.java index dd45eab..cc5291f 100755 --- a/client/src/client/renderer/layers/LayerMooshroomMushroom.java +++ b/client/src/client/renderer/layers/LayerMooshroomMushroom.java @@ -8,8 +8,8 @@ import client.renderer.GlState; import client.renderer.entity.RenderMooshroom; import client.renderer.model.ModelQuadruped; import client.renderer.texture.TextureMap; -import game.entity.animal.EntityMooshroom; -import game.init.Blocks; +import common.entity.animal.EntityMooshroom; +import common.init.Blocks; public class LayerMooshroomMushroom implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerPowerRods.java b/client/src/client/renderer/layers/LayerPowerRods.java index dae23aa..54b45a4 100755 --- a/client/src/client/renderer/layers/LayerPowerRods.java +++ b/client/src/client/renderer/layers/LayerPowerRods.java @@ -3,8 +3,8 @@ package client.renderer.layers; import client.renderer.GlState; import client.renderer.entity.RenderHumanoid; import client.renderer.model.ModelRenderer; -import game.entity.npc.EntityNPC; -import game.util.ExtMath; +import common.entity.npc.EntityNPC; +import common.util.ExtMath; public class LayerPowerRods implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerRenderer.java b/client/src/client/renderer/layers/LayerRenderer.java index 6a5c439..dd5905e 100755 --- a/client/src/client/renderer/layers/LayerRenderer.java +++ b/client/src/client/renderer/layers/LayerRenderer.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import game.entity.types.EntityLiving; +import common.entity.types.EntityLiving; public interface LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerSaddle.java b/client/src/client/renderer/layers/LayerSaddle.java index 4432dc8..ce30c6b 100755 --- a/client/src/client/renderer/layers/LayerSaddle.java +++ b/client/src/client/renderer/layers/LayerSaddle.java @@ -2,7 +2,7 @@ package client.renderer.layers; import client.renderer.entity.RenderPig; import client.renderer.model.ModelPig; -import game.entity.animal.EntityPig; +import common.entity.animal.EntityPig; public class LayerSaddle implements LayerRenderer diff --git a/client/src/client/renderer/layers/LayerSheepWool.java b/client/src/client/renderer/layers/LayerSheepWool.java index 5f2efeb..dd1022c 100755 --- a/client/src/client/renderer/layers/LayerSheepWool.java +++ b/client/src/client/renderer/layers/LayerSheepWool.java @@ -3,7 +3,7 @@ package client.renderer.layers; import client.renderer.GlState; import client.renderer.entity.RenderSheep; import client.renderer.model.ModelSheep1; -import game.entity.animal.EntitySheep; +import common.entity.animal.EntitySheep; public class LayerSheepWool implements LayerRenderer diff --git a/client/src/client/renderer/layers/LayerSlimeGel.java b/client/src/client/renderer/layers/LayerSlimeGel.java index 9e16e9f..7cf892a 100755 --- a/client/src/client/renderer/layers/LayerSlimeGel.java +++ b/client/src/client/renderer/layers/LayerSlimeGel.java @@ -6,7 +6,7 @@ import client.renderer.GlState; import client.renderer.entity.RenderSlime; import client.renderer.model.ModelBase; import client.renderer.model.ModelSlime; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class LayerSlimeGel implements LayerRenderer { diff --git a/client/src/client/renderer/layers/LayerWolfCollar.java b/client/src/client/renderer/layers/LayerWolfCollar.java index 42301f8..7d07d87 100755 --- a/client/src/client/renderer/layers/LayerWolfCollar.java +++ b/client/src/client/renderer/layers/LayerWolfCollar.java @@ -2,9 +2,9 @@ package client.renderer.layers; import client.renderer.GlState; import client.renderer.entity.RenderWolf; -import game.color.DyeColor; -import game.entity.animal.EntitySheep; -import game.entity.animal.EntityWolf; +import common.color.DyeColor; +import common.entity.animal.EntitySheep; +import common.entity.animal.EntityWolf; public class LayerWolfCollar implements LayerRenderer diff --git a/client/src/client/renderer/model/ModelArachnoid.java b/client/src/client/renderer/model/ModelArachnoid.java index 609be74..e828555 100755 --- a/client/src/client/renderer/model/ModelArachnoid.java +++ b/client/src/client/renderer/model/ModelArachnoid.java @@ -2,8 +2,8 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.util.ExtMath; +import common.entity.Entity; +import common.util.ExtMath; public class ModelArachnoid extends ModelHumanoid { diff --git a/client/src/client/renderer/model/ModelBase.java b/client/src/client/renderer/model/ModelBase.java index bb98213..f8f65af 100755 --- a/client/src/client/renderer/model/ModelBase.java +++ b/client/src/client/renderer/model/ModelBase.java @@ -3,11 +3,11 @@ package client.renderer.model; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.rng.Random; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.rng.Random; public abstract class ModelBase { diff --git a/client/src/client/renderer/model/ModelBat.java b/client/src/client/renderer/model/ModelBat.java index 43edc45..80a5c31 100755 --- a/client/src/client/renderer/model/ModelBat.java +++ b/client/src/client/renderer/model/ModelBat.java @@ -1,8 +1,8 @@ package client.renderer.model; -import game.entity.Entity; -import game.entity.animal.EntityBat; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.animal.EntityBat; +import common.util.ExtMath; public class ModelBat extends ModelBase { diff --git a/client/src/client/renderer/model/ModelBiped.java b/client/src/client/renderer/model/ModelBiped.java index fc2e8ee..32801ca 100755 --- a/client/src/client/renderer/model/ModelBiped.java +++ b/client/src/client/renderer/model/ModelBiped.java @@ -2,9 +2,9 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public abstract class ModelBiped extends ModelBase { diff --git a/client/src/client/renderer/model/ModelBoat.java b/client/src/client/renderer/model/ModelBoat.java index 0d18951..34a15e4 100755 --- a/client/src/client/renderer/model/ModelBoat.java +++ b/client/src/client/renderer/model/ModelBoat.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelBoat extends ModelBase { diff --git a/client/src/client/renderer/model/ModelBox.java b/client/src/client/renderer/model/ModelBox.java index 5e3c4c5..091e341 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 game.world.Facing; -import game.world.Vec3; +import common.world.Facing; +import common.world.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/ModelCharge.java b/client/src/client/renderer/model/ModelCharge.java index c0bf14d..3f5def9 100755 --- a/client/src/client/renderer/model/ModelCharge.java +++ b/client/src/client/renderer/model/ModelCharge.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelCharge extends ModelBase { diff --git a/client/src/client/renderer/model/ModelChicken.java b/client/src/client/renderer/model/ModelChicken.java index 736fe95..57e7a9f 100755 --- a/client/src/client/renderer/model/ModelChicken.java +++ b/client/src/client/renderer/model/ModelChicken.java @@ -2,8 +2,8 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.util.ExtMath; +import common.entity.Entity; +import common.util.ExtMath; public class ModelChicken extends ModelBase { diff --git a/client/src/client/renderer/model/ModelCrystal.java b/client/src/client/renderer/model/ModelCrystal.java index 3dc7814..9074211 100755 --- a/client/src/client/renderer/model/ModelCrystal.java +++ b/client/src/client/renderer/model/ModelCrystal.java @@ -2,7 +2,7 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; +import common.entity.Entity; public class ModelCrystal extends ModelBase { diff --git a/client/src/client/renderer/model/ModelDie.java b/client/src/client/renderer/model/ModelDie.java index 32c8838..0f99092 100755 --- a/client/src/client/renderer/model/ModelDie.java +++ b/client/src/client/renderer/model/ModelDie.java @@ -2,7 +2,7 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; +import common.entity.Entity; public class ModelDie extends ModelBase { diff --git a/client/src/client/renderer/model/ModelDragon.java b/client/src/client/renderer/model/ModelDragon.java index 6da7183..a4d0f76 100755 --- a/client/src/client/renderer/model/ModelDragon.java +++ b/client/src/client/renderer/model/ModelDragon.java @@ -3,9 +3,9 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; import client.renderer.GlState; -import game.entity.Entity; -import game.entity.animal.EntityDragon; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.animal.EntityDragon; +import common.entity.types.EntityLiving; public class ModelDragon extends ModelBase { diff --git a/client/src/client/renderer/model/ModelHead.java b/client/src/client/renderer/model/ModelHead.java index 457e44c..7f0c6f5 100755 --- a/client/src/client/renderer/model/ModelHead.java +++ b/client/src/client/renderer/model/ModelHead.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelHead extends ModelBase { diff --git a/client/src/client/renderer/model/ModelHorse.java b/client/src/client/renderer/model/ModelHorse.java index 36035bb..9dc1003 100755 --- a/client/src/client/renderer/model/ModelHorse.java +++ b/client/src/client/renderer/model/ModelHorse.java @@ -2,10 +2,10 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class ModelHorse extends ModelBase { diff --git a/client/src/client/renderer/model/ModelHumanoid.java b/client/src/client/renderer/model/ModelHumanoid.java index 73a6c39..df8f4fb 100755 --- a/client/src/client/renderer/model/ModelHumanoid.java +++ b/client/src/client/renderer/model/ModelHumanoid.java @@ -2,8 +2,8 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.util.ExtMath; +import common.entity.Entity; +import common.util.ExtMath; public class ModelHumanoid extends ModelBiped { diff --git a/client/src/client/renderer/model/ModelHumanoidHead.java b/client/src/client/renderer/model/ModelHumanoidHead.java index e7ae14e..6e787e5 100755 --- a/client/src/client/renderer/model/ModelHumanoidHead.java +++ b/client/src/client/renderer/model/ModelHumanoidHead.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelHumanoidHead extends ModelHead { diff --git a/client/src/client/renderer/model/ModelLeashKnot.java b/client/src/client/renderer/model/ModelLeashKnot.java index 3a9e4bb..c2a413c 100755 --- a/client/src/client/renderer/model/ModelLeashKnot.java +++ b/client/src/client/renderer/model/ModelLeashKnot.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelLeashKnot extends ModelBase { diff --git a/client/src/client/renderer/model/ModelMinecart.java b/client/src/client/renderer/model/ModelMinecart.java index ffef2fd..cba48c6 100755 --- a/client/src/client/renderer/model/ModelMinecart.java +++ b/client/src/client/renderer/model/ModelMinecart.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelMinecart extends ModelBase { diff --git a/client/src/client/renderer/model/ModelMouse.java b/client/src/client/renderer/model/ModelMouse.java index 0671240..5cc4e06 100755 --- a/client/src/client/renderer/model/ModelMouse.java +++ b/client/src/client/renderer/model/ModelMouse.java @@ -2,9 +2,9 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class ModelMouse extends ModelBase { diff --git a/client/src/client/renderer/model/ModelOcelot.java b/client/src/client/renderer/model/ModelOcelot.java index 82f27aa..e7765ca 100755 --- a/client/src/client/renderer/model/ModelOcelot.java +++ b/client/src/client/renderer/model/ModelOcelot.java @@ -2,10 +2,10 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.animal.EntityOcelot; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.animal.EntityOcelot; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class ModelOcelot extends ModelBase { diff --git a/client/src/client/renderer/model/ModelQuadruped.java b/client/src/client/renderer/model/ModelQuadruped.java index e8be36c..c608f36 100755 --- a/client/src/client/renderer/model/ModelQuadruped.java +++ b/client/src/client/renderer/model/ModelQuadruped.java @@ -2,8 +2,8 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.util.ExtMath; +import common.entity.Entity; +import common.util.ExtMath; public class ModelQuadruped extends ModelBase { diff --git a/client/src/client/renderer/model/ModelRabbit.java b/client/src/client/renderer/model/ModelRabbit.java index 3b383c0..71e7fff 100755 --- a/client/src/client/renderer/model/ModelRabbit.java +++ b/client/src/client/renderer/model/ModelRabbit.java @@ -2,10 +2,10 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.animal.EntityRabbit; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.animal.EntityRabbit; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class ModelRabbit extends ModelBase { private final ModelRenderer rabbitLeftFoot; diff --git a/client/src/client/renderer/model/ModelRenderer.java b/client/src/client/renderer/model/ModelRenderer.java index 3931a59..330ff92 100755 --- a/client/src/client/renderer/model/ModelRenderer.java +++ b/client/src/client/renderer/model/ModelRenderer.java @@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import game.collect.Lists; +import common.collect.Lists; public class ModelRenderer { diff --git a/client/src/client/renderer/model/ModelSheep1.java b/client/src/client/renderer/model/ModelSheep1.java index fda7fb9..e25a89c 100755 --- a/client/src/client/renderer/model/ModelSheep1.java +++ b/client/src/client/renderer/model/ModelSheep1.java @@ -1,8 +1,8 @@ package client.renderer.model; -import game.entity.Entity; -import game.entity.animal.EntitySheep; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.animal.EntitySheep; +import common.entity.types.EntityLiving; public class ModelSheep1 extends ModelQuadruped { diff --git a/client/src/client/renderer/model/ModelSheep2.java b/client/src/client/renderer/model/ModelSheep2.java index 3ac1c98..510f948 100755 --- a/client/src/client/renderer/model/ModelSheep2.java +++ b/client/src/client/renderer/model/ModelSheep2.java @@ -1,8 +1,8 @@ package client.renderer.model; -import game.entity.Entity; -import game.entity.animal.EntitySheep; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.animal.EntitySheep; +import common.entity.types.EntityLiving; public class ModelSheep2 extends ModelQuadruped { diff --git a/client/src/client/renderer/model/ModelSlime.java b/client/src/client/renderer/model/ModelSlime.java index 8994594..2363426 100755 --- a/client/src/client/renderer/model/ModelSlime.java +++ b/client/src/client/renderer/model/ModelSlime.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelSlime extends ModelBase { diff --git a/client/src/client/renderer/model/ModelSquid.java b/client/src/client/renderer/model/ModelSquid.java index 22242f9..5db6680 100755 --- a/client/src/client/renderer/model/ModelSquid.java +++ b/client/src/client/renderer/model/ModelSquid.java @@ -1,6 +1,6 @@ package client.renderer.model; -import game.entity.Entity; +import common.entity.Entity; public class ModelSquid extends ModelBase { diff --git a/client/src/client/renderer/model/ModelWolf.java b/client/src/client/renderer/model/ModelWolf.java index efa86d1..7bb6909 100755 --- a/client/src/client/renderer/model/ModelWolf.java +++ b/client/src/client/renderer/model/ModelWolf.java @@ -2,10 +2,10 @@ package client.renderer.model; import org.lwjgl.opengl.GL11; -import game.entity.Entity; -import game.entity.animal.EntityWolf; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.animal.EntityWolf; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class ModelWolf extends ModelBase { diff --git a/client/src/client/renderer/model/PositionTextureVertex.java b/client/src/client/renderer/model/PositionTextureVertex.java index f18ca99..8346105 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 game.world.Vec3; +import common.world.Vec3; public class PositionTextureVertex { diff --git a/client/src/client/renderer/model/TexturedQuad.java b/client/src/client/renderer/model/TexturedQuad.java index b3b012d..53ec9a5 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 game.world.Vec3; +import common.world.Vec3; public class TexturedQuad { diff --git a/client/src/client/renderer/particle/EffectRenderer.java b/client/src/client/renderer/particle/EffectRenderer.java index ac369e3..c1624c4 100755 --- a/client/src/client/renderer/particle/EffectRenderer.java +++ b/client/src/client/renderer/particle/EffectRenderer.java @@ -12,18 +12,18 @@ import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.Entity; -import game.material.Material; -import game.model.ParticleType; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.Entity; +import common.material.Material; +import common.model.ParticleType; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class EffectRenderer { diff --git a/client/src/client/renderer/particle/EntityAuraFX.java b/client/src/client/renderer/particle/EntityAuraFX.java index d69be96..1240fb8 100755 --- a/client/src/client/renderer/particle/EntityAuraFX.java +++ b/client/src/client/renderer/particle/EntityAuraFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntityAuraFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityBlockDustFX.java b/client/src/client/renderer/particle/EntityBlockDustFX.java index f1fdce7..cc6f805 100755 --- a/client/src/client/renderer/particle/EntityBlockDustFX.java +++ b/client/src/client/renderer/particle/EntityBlockDustFX.java @@ -1,8 +1,8 @@ package client.renderer.particle; -import game.init.BlockRegistry; -import game.world.State; -import game.world.World; +import common.init.BlockRegistry; +import common.world.State; +import common.world.World; public class EntityBlockDustFX extends EntityDiggingFX { diff --git a/client/src/client/renderer/particle/EntityBreakingFX.java b/client/src/client/renderer/particle/EntityBreakingFX.java index 1982a28..dbd35f0 100755 --- a/client/src/client/renderer/particle/EntityBreakingFX.java +++ b/client/src/client/renderer/particle/EntityBreakingFX.java @@ -2,11 +2,11 @@ package client.renderer.particle; import client.Game; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.world.World; +import common.entity.Entity; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.world.World; public class EntityBreakingFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityBubbleFX.java b/client/src/client/renderer/particle/EntityBubbleFX.java index 072304b..c21ba62 100755 --- a/client/src/client/renderer/particle/EntityBubbleFX.java +++ b/client/src/client/renderer/particle/EntityBubbleFX.java @@ -1,8 +1,8 @@ package client.renderer.particle; -import game.material.Material; -import game.world.BlockPos; -import game.world.World; +import common.material.Material; +import common.world.BlockPos; +import common.world.World; public class EntityBubbleFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityCloudFX.java b/client/src/client/renderer/particle/EntityCloudFX.java index 39baf00..4b46bf9 100755 --- a/client/src/client/renderer/particle/EntityCloudFX.java +++ b/client/src/client/renderer/particle/EntityCloudFX.java @@ -1,10 +1,10 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.util.ExtMath; +import common.world.World; public class EntityCloudFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityCrit2FX.java b/client/src/client/renderer/particle/EntityCrit2FX.java index 49a03c0..e021842 100755 --- a/client/src/client/renderer/particle/EntityCrit2FX.java +++ b/client/src/client/renderer/particle/EntityCrit2FX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntityCrit2FX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityCritFX.java b/client/src/client/renderer/particle/EntityCritFX.java index 743c0b3..2e224cc 100755 --- a/client/src/client/renderer/particle/EntityCritFX.java +++ b/client/src/client/renderer/particle/EntityCritFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntityCritFX extends EntitySmokeFX { diff --git a/client/src/client/renderer/particle/EntityDiggingFX.java b/client/src/client/renderer/particle/EntityDiggingFX.java index ace9f1b..8e3e89d 100755 --- a/client/src/client/renderer/particle/EntityDiggingFX.java +++ b/client/src/client/renderer/particle/EntityDiggingFX.java @@ -2,13 +2,13 @@ package client.renderer.particle; import client.Game; import client.renderer.RenderBuffer; -import game.block.Block; -import game.entity.Entity; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.entity.Entity; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityDiggingFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityDownfallFX.java b/client/src/client/renderer/particle/EntityDownfallFX.java index 8da5ea6..c321d6b 100755 --- a/client/src/client/renderer/particle/EntityDownfallFX.java +++ b/client/src/client/renderer/particle/EntityDownfallFX.java @@ -1,12 +1,12 @@ package client.renderer.particle; -import game.block.Block; -import game.block.BlockLiquid; -import game.material.Material; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockLiquid; +import common.material.Material; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityDownfallFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityDropParticleFX.java b/client/src/client/renderer/particle/EntityDropParticleFX.java index 0b47971..8409e31 100755 --- a/client/src/client/renderer/particle/EntityDropParticleFX.java +++ b/client/src/client/renderer/particle/EntityDropParticleFX.java @@ -1,12 +1,12 @@ package client.renderer.particle; -import game.block.BlockLiquid; -import game.material.Material; -import game.model.ParticleType; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.BlockLiquid; +import common.material.Material; +import common.model.ParticleType; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityDropParticleFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java b/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java index b50ae80..b337bc0 100755 --- a/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java +++ b/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntityEnchantmentTableParticleFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityExplodeFX.java b/client/src/client/renderer/particle/EntityExplodeFX.java index d12c6cf..fcf1d11 100755 --- a/client/src/client/renderer/particle/EntityExplodeFX.java +++ b/client/src/client/renderer/particle/EntityExplodeFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntityExplodeFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityFX.java b/client/src/client/renderer/particle/EntityFX.java index 78f154d..c3066fe 100755 --- a/client/src/client/renderer/particle/EntityFX.java +++ b/client/src/client/renderer/particle/EntityFX.java @@ -3,12 +3,12 @@ package client.renderer.particle; import client.Game; import client.renderer.RenderBuffer; import client.renderer.texture.TextureAtlasSprite; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.IEntityFX; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.IEntityFX; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.World; public class EntityFX extends Entity implements IEntityFX { diff --git a/client/src/client/renderer/particle/EntityFirework.java b/client/src/client/renderer/particle/EntityFirework.java index 042242e..078c6fc 100755 --- a/client/src/client/renderer/particle/EntityFirework.java +++ b/client/src/client/renderer/particle/EntityFirework.java @@ -2,15 +2,15 @@ package client.renderer.particle; import client.Game; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.init.SoundEvent; -import game.item.ItemDye; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.util.ExtMath; -import game.world.BoundingBox; -import game.world.World; -import game.world.WorldClient; +import common.entity.Entity; +import common.init.SoundEvent; +import common.item.ItemDye; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.util.ExtMath; +import common.world.BoundingBox; +import common.world.World; +import common.world.WorldClient; public class EntityFirework { diff --git a/client/src/client/renderer/particle/EntityFishWakeFX.java b/client/src/client/renderer/particle/EntityFishWakeFX.java index 35207c5..c120d5e 100755 --- a/client/src/client/renderer/particle/EntityFishWakeFX.java +++ b/client/src/client/renderer/particle/EntityFishWakeFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntityFishWakeFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityFlameFX.java b/client/src/client/renderer/particle/EntityFlameFX.java index 6ad5901..462370d 100755 --- a/client/src/client/renderer/particle/EntityFlameFX.java +++ b/client/src/client/renderer/particle/EntityFlameFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntityFlameFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityFootStepFX.java b/client/src/client/renderer/particle/EntityFootStepFX.java index 9fc77a5..d8d47e9 100755 --- a/client/src/client/renderer/particle/EntityFootStepFX.java +++ b/client/src/client/renderer/particle/EntityFootStepFX.java @@ -8,9 +8,9 @@ import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.texture.TextureManager; -import game.entity.Entity; -import game.world.BlockPos; -import game.world.World; +import common.entity.Entity; +import common.world.BlockPos; +import common.world.World; public class EntityFootStepFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityHeartFX.java b/client/src/client/renderer/particle/EntityHeartFX.java index 45effe6..f048950 100755 --- a/client/src/client/renderer/particle/EntityHeartFX.java +++ b/client/src/client/renderer/particle/EntityHeartFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntityHeartFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityHugeExplodeFX.java b/client/src/client/renderer/particle/EntityHugeExplodeFX.java index 42cd4a8..7f287b9 100755 --- a/client/src/client/renderer/particle/EntityHugeExplodeFX.java +++ b/client/src/client/renderer/particle/EntityHugeExplodeFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.model.ParticleType; -import game.world.World; +import common.entity.Entity; +import common.model.ParticleType; +import common.world.World; public class EntityHugeExplodeFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityLargeExplodeFX.java b/client/src/client/renderer/particle/EntityLargeExplodeFX.java index 04a509a..e4bdfd5 100755 --- a/client/src/client/renderer/particle/EntityLargeExplodeFX.java +++ b/client/src/client/renderer/particle/EntityLargeExplodeFX.java @@ -10,8 +10,8 @@ import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.VertexFormat; import client.renderer.texture.TextureManager; -import game.entity.Entity; -import game.world.World; +import common.entity.Entity; +import common.world.World; public class EntityLargeExplodeFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityLavaFX.java b/client/src/client/renderer/particle/EntityLavaFX.java index 869b753..bd823f0 100755 --- a/client/src/client/renderer/particle/EntityLavaFX.java +++ b/client/src/client/renderer/particle/EntityLavaFX.java @@ -1,10 +1,10 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.model.ParticleType; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.model.ParticleType; +import common.util.ExtMath; +import common.world.World; public class EntityLavaFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityNoteFX.java b/client/src/client/renderer/particle/EntityNoteFX.java index cdb1373..2bfa850 100755 --- a/client/src/client/renderer/particle/EntityNoteFX.java +++ b/client/src/client/renderer/particle/EntityNoteFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntityNoteFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityParticleEmitter.java b/client/src/client/renderer/particle/EntityParticleEmitter.java index 8a19ef4..262871b 100755 --- a/client/src/client/renderer/particle/EntityParticleEmitter.java +++ b/client/src/client/renderer/particle/EntityParticleEmitter.java @@ -1,10 +1,10 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.model.ParticleType; -import game.world.World; -import game.world.WorldClient; +import common.entity.Entity; +import common.model.ParticleType; +import common.world.World; +import common.world.WorldClient; public class EntityParticleEmitter extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityPickupFX.java b/client/src/client/renderer/particle/EntityPickupFX.java index 9ff6b8b..a9b68b5 100755 --- a/client/src/client/renderer/particle/EntityPickupFX.java +++ b/client/src/client/renderer/particle/EntityPickupFX.java @@ -6,8 +6,8 @@ import client.Game; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.entity.RenderManager; -import game.entity.Entity; -import game.world.World; +import common.entity.Entity; +import common.world.World; public class EntityPickupFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityPortalFX.java b/client/src/client/renderer/particle/EntityPortalFX.java index 712f4d9..3c5dd59 100755 --- a/client/src/client/renderer/particle/EntityPortalFX.java +++ b/client/src/client/renderer/particle/EntityPortalFX.java @@ -1,8 +1,8 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.world.World; +import common.entity.Entity; +import common.world.World; public class EntityPortalFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntityReddustFX.java b/client/src/client/renderer/particle/EntityReddustFX.java index c88dece..f89e164 100755 --- a/client/src/client/renderer/particle/EntityReddustFX.java +++ b/client/src/client/renderer/particle/EntityReddustFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntityReddustFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntitySmokeFX.java b/client/src/client/renderer/particle/EntitySmokeFX.java index 63f85dd..5566bf2 100755 --- a/client/src/client/renderer/particle/EntitySmokeFX.java +++ b/client/src/client/renderer/particle/EntitySmokeFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntitySmokeFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntitySnowShovelFX.java b/client/src/client/renderer/particle/EntitySnowShovelFX.java index 5d83213..ff9e9fa 100755 --- a/client/src/client/renderer/particle/EntitySnowShovelFX.java +++ b/client/src/client/renderer/particle/EntitySnowShovelFX.java @@ -1,9 +1,9 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.World; public class EntitySnowShovelFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntitySpellParticleFX.java b/client/src/client/renderer/particle/EntitySpellParticleFX.java index bdc8765..4aaa047 100755 --- a/client/src/client/renderer/particle/EntitySpellParticleFX.java +++ b/client/src/client/renderer/particle/EntitySpellParticleFX.java @@ -1,10 +1,10 @@ package client.renderer.particle; import client.renderer.RenderBuffer; -import game.entity.Entity; -import game.rng.Random; -import game.util.ExtMath; -import game.world.World; +import common.entity.Entity; +import common.rng.Random; +import common.util.ExtMath; +import common.world.World; public class EntitySpellParticleFX extends EntityFX { diff --git a/client/src/client/renderer/particle/EntitySplashFX.java b/client/src/client/renderer/particle/EntitySplashFX.java index 411b5ba..8c1f93a 100755 --- a/client/src/client/renderer/particle/EntitySplashFX.java +++ b/client/src/client/renderer/particle/EntitySplashFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public class EntitySplashFX extends EntityDownfallFX { diff --git a/client/src/client/renderer/particle/EntitySuspendFX.java b/client/src/client/renderer/particle/EntitySuspendFX.java index 18c0d9e..aae9b5e 100755 --- a/client/src/client/renderer/particle/EntitySuspendFX.java +++ b/client/src/client/renderer/particle/EntitySuspendFX.java @@ -1,8 +1,8 @@ package client.renderer.particle; -import game.material.Material; -import game.world.BlockPos; -import game.world.World; +import common.material.Material; +import common.world.BlockPos; +import common.world.World; public class EntitySuspendFX extends EntityFX { diff --git a/client/src/client/renderer/particle/IParticleFactory.java b/client/src/client/renderer/particle/IParticleFactory.java index 06a5b62..f018fda 100755 --- a/client/src/client/renderer/particle/IParticleFactory.java +++ b/client/src/client/renderer/particle/IParticleFactory.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import game.world.World; +import common.world.World; public interface IParticleFactory { diff --git a/client/src/client/renderer/texture/ColormapLoader.java b/client/src/client/renderer/texture/ColormapLoader.java index 38c257d..7566500 100644 --- a/client/src/client/renderer/texture/ColormapLoader.java +++ b/client/src/client/renderer/texture/ColormapLoader.java @@ -2,8 +2,8 @@ package client.renderer.texture; import java.awt.image.BufferedImage; -import game.color.Colorizer; -import game.util.FileUtils; +import common.color.Colorizer; +import common.util.FileUtils; public abstract class ColormapLoader { private static final String GRASS_TEX = "textures/world/grass.png"; diff --git a/client/src/client/renderer/texture/EntityTexManager.java b/client/src/client/renderer/texture/EntityTexManager.java index 444163c..91e1658 100755 --- a/client/src/client/renderer/texture/EntityTexManager.java +++ b/client/src/client/renderer/texture/EntityTexManager.java @@ -13,14 +13,14 @@ import java.util.Set; import client.Game; import client.renderer.entity.RenderNpc; import client.renderer.layers.LayerExtra; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.entity.npc.EntityNPC; -import game.init.SpeciesRegistry; -import game.init.SpeciesRegistry.ModelType; -import game.log.Log; -import game.util.FileUtils; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.entity.npc.EntityNPC; +import common.init.SpeciesRegistry; +import common.init.SpeciesRegistry.ModelType; +import common.log.Log; +import common.util.FileUtils; public abstract class EntityTexManager { diff --git a/client/src/client/renderer/texture/LayeredColorMaskTexture.java b/client/src/client/renderer/texture/LayeredColorMaskTexture.java index 5920829..654e960 100755 --- a/client/src/client/renderer/texture/LayeredColorMaskTexture.java +++ b/client/src/client/renderer/texture/LayeredColorMaskTexture.java @@ -7,9 +7,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import game.color.DyeColor; -import game.log.Log; -import game.util.FileUtils; +import common.color.DyeColor; +import common.log.Log; +import common.util.FileUtils; public class LayeredColorMaskTexture extends Texture { diff --git a/client/src/client/renderer/texture/LayeredTexture.java b/client/src/client/renderer/texture/LayeredTexture.java index 6f9102f..5339db5 100755 --- a/client/src/client/renderer/texture/LayeredTexture.java +++ b/client/src/client/renderer/texture/LayeredTexture.java @@ -6,9 +6,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import game.collect.Lists; -import game.log.Log; -import game.util.FileUtils; +import common.collect.Lists; +import common.log.Log; +import common.util.FileUtils; public class LayeredTexture extends Texture { diff --git a/client/src/client/renderer/texture/SimpleTexture.java b/client/src/client/renderer/texture/SimpleTexture.java index 8a142b6..43c4629 100755 --- a/client/src/client/renderer/texture/SimpleTexture.java +++ b/client/src/client/renderer/texture/SimpleTexture.java @@ -4,7 +4,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; -import game.util.FileUtils; +import common.util.FileUtils; public class SimpleTexture extends Texture { private final String location; diff --git a/client/src/client/renderer/texture/Stitcher.java b/client/src/client/renderer/texture/Stitcher.java index 008e615..f9cff3b 100755 --- a/client/src/client/renderer/texture/Stitcher.java +++ b/client/src/client/renderer/texture/Stitcher.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; +import common.collect.Lists; +import common.collect.Sets; public class Stitcher { diff --git a/client/src/client/renderer/texture/TextureAtlasSprite.java b/client/src/client/renderer/texture/TextureAtlasSprite.java index d75b3fa..4226a06 100755 --- a/client/src/client/renderer/texture/TextureAtlasSprite.java +++ b/client/src/client/renderer/texture/TextureAtlasSprite.java @@ -4,7 +4,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.util.List; -import game.collect.Lists; +import common.collect.Lists; public class TextureAtlasSprite { diff --git a/client/src/client/renderer/texture/TextureManager.java b/client/src/client/renderer/texture/TextureManager.java index 06de1dd..4bd6328 100755 --- a/client/src/client/renderer/texture/TextureManager.java +++ b/client/src/client/renderer/texture/TextureManager.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Map.Entry; import client.renderer.GlState; -import game.collect.Maps; -import game.log.Log; +import common.collect.Maps; +import common.log.Log; public class TextureManager { private final Map textures = Maps.newHashMap(); diff --git a/client/src/client/renderer/texture/TextureMap.java b/client/src/client/renderer/texture/TextureMap.java index 50af03f..afe4afd 100755 --- a/client/src/client/renderer/texture/TextureMap.java +++ b/client/src/client/renderer/texture/TextureMap.java @@ -9,13 +9,13 @@ import java.util.Map.Entry; import client.init.AnimationRegistry; import client.renderer.GlState; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.init.BlockRegistry; -import game.init.FluidRegistry; -import game.log.Log; -import game.util.FileUtils; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.init.BlockRegistry; +import common.init.FluidRegistry; +import common.log.Log; +import common.util.FileUtils; public class TextureMap extends Texture { diff --git a/client/src/client/renderer/texture/TextureUtil.java b/client/src/client/renderer/texture/TextureUtil.java index 61f517d..71bced9 100755 --- a/client/src/client/renderer/texture/TextureUtil.java +++ b/client/src/client/renderer/texture/TextureUtil.java @@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import client.renderer.GlState; -import game.util.FileUtils; +import common.util.FileUtils; public class TextureUtil { diff --git a/client/src/client/renderer/ticked/TextureLavaFX.java b/client/src/client/renderer/ticked/TextureLavaFX.java index b862970..af7811d 100755 --- a/client/src/client/renderer/ticked/TextureLavaFX.java +++ b/client/src/client/renderer/ticked/TextureLavaFX.java @@ -1,7 +1,7 @@ package client.renderer.ticked; import client.renderer.texture.TextureTicked; -import game.util.ExtMath; +import common.util.ExtMath; public class TextureLavaFX extends TextureTicked { diff --git a/client/src/client/renderer/ticked/TextureLavaFlowFX.java b/client/src/client/renderer/ticked/TextureLavaFlowFX.java index d6494a9..2948f93 100755 --- a/client/src/client/renderer/ticked/TextureLavaFlowFX.java +++ b/client/src/client/renderer/ticked/TextureLavaFlowFX.java @@ -1,7 +1,7 @@ package client.renderer.ticked; import client.renderer.texture.TextureTicked; -import game.util.ExtMath; +import common.util.ExtMath; public class TextureLavaFlowFX extends TextureTicked { diff --git a/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java b/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java index d968685..3e38162 100755 --- a/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java @@ -10,13 +10,13 @@ import client.Game; import client.renderer.GlState; import client.renderer.model.ModelBanner; import client.renderer.texture.LayeredColorMaskTexture; -import game.collect.Lists; -import game.collect.Maps; -import game.color.DyeColor; -import game.init.Blocks; -import game.tileentity.TileEntityBanner; -import game.util.ExtMath; -import game.world.BlockPos; +import common.collect.Lists; +import common.collect.Maps; +import common.color.DyeColor; +import common.init.Blocks; +import common.tileentity.TileEntityBanner; +import common.util.ExtMath; +import common.world.BlockPos; public class TileEntityBannerRenderer extends TileEntitySpecialRenderer { diff --git a/client/src/client/renderer/tileentity/TileEntityChestRenderer.java b/client/src/client/renderer/tileentity/TileEntityChestRenderer.java index 9d83257..4fbb70f 100755 --- a/client/src/client/renderer/tileentity/TileEntityChestRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntityChestRenderer.java @@ -5,9 +5,9 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.model.ModelChest; import client.renderer.model.ModelLargeChest; -import game.block.Block; -import game.block.BlockChest; -import game.tileentity.TileEntityChest; +import common.block.Block; +import common.block.BlockChest; +import common.tileentity.TileEntityChest; public class TileEntityChestRenderer extends TileEntitySpecialRenderer diff --git a/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java index 72702f5..ed89a94 100755 --- a/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java @@ -3,14 +3,14 @@ package client.renderer.tileentity; import org.lwjgl.opengl.GL11; import client.renderer.GlState; -import game.block.Block; -import game.init.Blocks; -import game.init.Items; -import game.item.ItemStack; -import game.tileentity.TileEntityBanner; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntitySkull; -import game.world.Facing; +import common.block.Block; +import common.init.Blocks; +import common.init.Items; +import common.item.ItemStack; +import common.tileentity.TileEntityBanner; +import common.tileentity.TileEntityChest; +import common.tileentity.TileEntitySkull; +import common.world.Facing; public class TileEntityItemStackRenderer { diff --git a/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java index e31dca2..8a9f501 100755 --- a/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java @@ -3,8 +3,8 @@ package client.renderer.tileentity; import org.lwjgl.opengl.GL11; import client.Game; -import game.entity.Entity; -import game.tileentity.TileEntityMobSpawner; +import common.entity.Entity; +import common.tileentity.TileEntityMobSpawner; public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer { diff --git a/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java b/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java index 651f015..9d0bfe7 100755 --- a/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java @@ -10,15 +10,15 @@ import client.renderer.ItemRenderer; import client.renderer.RenderBuffer; import client.renderer.Tessellator; import client.renderer.texture.TextureMap; -import game.block.Block; -import game.block.BlockPistonBase; -import game.block.BlockPistonHead; -import game.init.Blocks; -import game.material.Material; -import game.tileentity.TileEntityPiston; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockPistonBase; +import common.block.BlockPistonHead; +import common.init.Blocks; +import common.material.Material; +import common.tileentity.TileEntityPiston; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class TileEntityPistonRenderer extends TileEntitySpecialRenderer { diff --git a/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java b/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java index 3fb7166..1bf7bdc 100755 --- a/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java +++ b/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java @@ -6,17 +6,17 @@ import org.lwjgl.opengl.GL13; import client.renderer.GlState; import client.renderer.texture.TextureManager; -import game.collect.Maps; -import game.entity.Entity; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBanner; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntityMobSpawner; -import game.tileentity.TileEntityPiston; -import game.tileentity.TileEntitySign; -import game.tileentity.TileEntitySkull; -import game.world.BlockPos; -import game.world.World; +import common.collect.Maps; +import common.entity.Entity; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityBanner; +import common.tileentity.TileEntityChest; +import common.tileentity.TileEntityMobSpawner; +import common.tileentity.TileEntityPiston; +import common.tileentity.TileEntitySign; +import common.tileentity.TileEntitySkull; +import common.world.BlockPos; +import common.world.World; public class TileEntityRendererDispatcher { diff --git a/client/src/client/renderer/tileentity/TileEntitySignRenderer.java b/client/src/client/renderer/tileentity/TileEntitySignRenderer.java index b5d3117..22d543c 100755 --- a/client/src/client/renderer/tileentity/TileEntitySignRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntitySignRenderer.java @@ -6,9 +6,9 @@ import client.gui.Font; import client.renderer.Drawing; import client.renderer.GlState; import client.renderer.model.ModelSign; -import game.block.Block; -import game.init.Blocks; -import game.tileentity.TileEntitySign; +import common.block.Block; +import common.init.Blocks; +import common.tileentity.TileEntitySign; public class TileEntitySignRenderer extends TileEntitySpecialRenderer diff --git a/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java b/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java index 577b18a..86478f3 100755 --- a/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.GlState; import client.renderer.model.ModelHumanoidHead; -import game.tileentity.TileEntitySkull; -import game.world.Facing; +import common.tileentity.TileEntitySkull; +import common.world.Facing; public class TileEntitySkullRenderer extends TileEntitySpecialRenderer diff --git a/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java b/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java index 8903943..fa30d2f 100755 --- a/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java +++ b/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java @@ -1,8 +1,8 @@ package client.renderer.tileentity; import client.renderer.texture.TextureManager; -import game.tileentity.TileEntity; -import game.world.World; +import common.tileentity.TileEntity; +import common.world.World; public abstract class TileEntitySpecialRenderer { diff --git a/client/src/game/vars/BaseVar.java b/client/src/client/vars/BaseVar.java similarity index 97% rename from client/src/game/vars/BaseVar.java rename to client/src/client/vars/BaseVar.java index 2029a09..e6c4c33 100644 --- a/client/src/game/vars/BaseVar.java +++ b/client/src/client/vars/BaseVar.java @@ -1,4 +1,4 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; diff --git a/client/src/game/vars/BoolVar.java b/client/src/client/vars/BoolVar.java similarity index 95% rename from client/src/game/vars/BoolVar.java rename to client/src/client/vars/BoolVar.java index 388ccc8..af51d6b 100644 --- a/client/src/game/vars/BoolVar.java +++ b/client/src/client/vars/BoolVar.java @@ -1,10 +1,10 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; import client.gui.element.Toggle; -import game.color.TextColor; -import game.util.Util; +import common.color.TextColor; +import common.util.Util; public class BoolVar extends BaseVar { public static interface BoolFunction extends VarFunction { diff --git a/client/src/game/vars/CVar.java b/client/src/client/vars/CVar.java similarity index 86% rename from client/src/game/vars/CVar.java rename to client/src/client/vars/CVar.java index 26649cb..07a86bb 100644 --- a/client/src/game/vars/CVar.java +++ b/client/src/client/vars/CVar.java @@ -1,7 +1,7 @@ -package game.vars; +package client.vars; import client.gui.element.Element; -import game.util.Displayable; +import common.util.Displayable; public interface CVar extends Displayable { String getType(); diff --git a/client/src/game/vars/CVarCategory.java b/client/src/client/vars/CVarCategory.java similarity index 89% rename from client/src/game/vars/CVarCategory.java rename to client/src/client/vars/CVarCategory.java index 8445c25..aa40d07 100644 --- a/client/src/game/vars/CVarCategory.java +++ b/client/src/client/vars/CVarCategory.java @@ -1,6 +1,6 @@ -package game.vars; +package client.vars; -import game.color.TextColor; +import common.color.TextColor; public enum CVarCategory { SYSTEM(TextColor.RED + "system"), diff --git a/client/src/game/vars/ColorVar.java b/client/src/client/vars/ColorVar.java similarity index 95% rename from client/src/game/vars/ColorVar.java rename to client/src/client/vars/ColorVar.java index e361a08..2a1bfb1 100644 --- a/client/src/game/vars/ColorVar.java +++ b/client/src/client/vars/ColorVar.java @@ -1,4 +1,4 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; @@ -7,8 +7,8 @@ import client.gui.element.Label; import client.gui.element.Slider; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; -import game.color.TextColor; -import game.util.Util; +import common.color.TextColor; +import common.util.Util; public class ColorVar extends IntVar { private final boolean alpha; diff --git a/client/src/game/vars/EnumVar.java b/client/src/client/vars/EnumVar.java similarity index 96% rename from client/src/game/vars/EnumVar.java rename to client/src/client/vars/EnumVar.java index def5478..ed30980 100644 --- a/client/src/game/vars/EnumVar.java +++ b/client/src/client/vars/EnumVar.java @@ -1,13 +1,13 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; import client.gui.element.Dropdown; import client.gui.element.Element; import client.gui.element.Switch; -import game.color.TextColor; -import game.util.Identifyable; -import game.util.Util; +import common.color.TextColor; +import common.util.Identifyable; +import common.util.Util; public class EnumVar extends BaseVar { public static interface EnumFunction extends VarFunction { diff --git a/client/src/game/vars/FloatVar.java b/client/src/client/vars/FloatVar.java similarity index 97% rename from client/src/game/vars/FloatVar.java rename to client/src/client/vars/FloatVar.java index 734ca49..2343af1 100644 --- a/client/src/game/vars/FloatVar.java +++ b/client/src/client/vars/FloatVar.java @@ -1,10 +1,10 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; import client.gui.element.Slider; -import game.color.TextColor; -import game.util.ExtMath; +import common.color.TextColor; +import common.util.ExtMath; public class FloatVar extends BaseVar { public static interface FloatFunction extends VarFunction { diff --git a/client/src/game/vars/IntVar.java b/client/src/client/vars/IntVar.java similarity index 95% rename from client/src/game/vars/IntVar.java rename to client/src/client/vars/IntVar.java index 3d87ef5..06282fb 100644 --- a/client/src/game/vars/IntVar.java +++ b/client/src/client/vars/IntVar.java @@ -1,11 +1,11 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; import client.gui.element.Slider; -import game.color.TextColor; -import game.util.ExtMath; -import game.util.Util; +import common.color.TextColor; +import common.util.ExtMath; +import common.util.Util; public class IntVar extends BaseVar { public static interface IntFunction extends VarFunction { diff --git a/client/src/game/vars/StringVar.java b/client/src/client/vars/StringVar.java similarity index 96% rename from client/src/game/vars/StringVar.java rename to client/src/client/vars/StringVar.java index c761585..66dea94 100644 --- a/client/src/game/vars/StringVar.java +++ b/client/src/client/vars/StringVar.java @@ -1,11 +1,11 @@ -package game.vars; +package client.vars; import java.lang.reflect.Field; import client.gui.element.Textbox; import client.gui.element.Textbox.Action; -import game.color.TextColor; -import game.util.CharValidator; +import common.color.TextColor; +import common.util.CharValidator; public class StringVar extends BaseVar { public static interface StringFunction extends VarFunction { diff --git a/client/src/game/vars/Variable.java b/client/src/client/vars/Variable.java similarity index 88% rename from client/src/game/vars/Variable.java rename to client/src/client/vars/Variable.java index 606fd9e..4c16bb8 100644 --- a/client/src/game/vars/Variable.java +++ b/client/src/client/vars/Variable.java @@ -1,4 +1,4 @@ -package game.vars; +package client.vars; import static java.lang.annotation.ElementType.FIELD; @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import game.util.CharValidator; -import game.vars.BaseVar.VarFunction; +import client.vars.BaseVar.VarFunction; +import common.util.CharValidator; @Target(FIELD) @Retention(value = RetentionPolicy.RUNTIME) diff --git a/client/src/client/window/Bind.java b/client/src/client/window/Bind.java index 040ea95..2cbf390 100644 --- a/client/src/client/window/Bind.java +++ b/client/src/client/window/Bind.java @@ -2,11 +2,11 @@ package client.window; import client.Game; import client.gui.element.Element; -import game.color.TextColor; -import game.util.Identifyable; -import game.util.Util; -import game.vars.CVar; -import game.vars.CVarCategory; +import client.vars.CVar; +import client.vars.CVarCategory; +import common.color.TextColor; +import common.util.Identifyable; +import common.util.Util; public enum Bind implements Identifyable, CVar { FORWARD("forward", "Vorwärts", Keysym.W), diff --git a/client/src/client/window/Input.java b/client/src/client/window/Input.java index b4700a4..f1a3d33 100644 --- a/client/src/client/window/Input.java +++ b/client/src/client/window/Input.java @@ -1,7 +1,7 @@ package client.window; -import game.util.Displayable; -import game.util.Identifyable; +import common.util.Displayable; +import common.util.Identifyable; public interface Input extends Identifyable, Displayable { public boolean read(); diff --git a/client/src/client/window/Window.java b/client/src/client/window/Window.java index 5356abe..515c79c 100644 --- a/client/src/client/window/Window.java +++ b/client/src/client/window/Window.java @@ -74,7 +74,7 @@ import org.lwjgl.glfw.GLFWWindowRefreshCallback; import org.lwjgl.opengl.GL; import org.lwjgl.system.APIUtil; -import game.log.Log; +import common.log.Log; public abstract class Window { public static void setWindowed(int xpos, int ypos, int xsize, int ysize) { diff --git a/client/src/game/world/Converter.java b/client/src/client/world/Converter.java similarity index 95% rename from client/src/game/world/Converter.java rename to client/src/client/world/Converter.java index c50ebe0..6a81987 100644 --- a/client/src/game/world/Converter.java +++ b/client/src/client/world/Converter.java @@ -1,4 +1,4 @@ -package game.world; +package client.world; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -17,77 +17,83 @@ import client.Game; import client.gui.GuiConvert; import client.gui.GuiLoading; import client.gui.GuiLoading.Callback; -import game.biome.Biome; -import game.block.Block; -import game.block.BlockCactus; -import game.block.BlockCarpet; -import game.block.BlockColored; -import game.block.BlockDirt; -import game.block.BlockFire; -import game.block.BlockFlower; -import game.block.BlockFlowerPot; -import game.block.BlockLeaves; -import game.block.BlockLiquid; -import game.block.BlockLog; -import game.block.BlockPistonBase; -import game.block.BlockPistonHead; -import game.block.BlockQuartz; -import game.block.BlockRock; -import game.block.BlockSand; -import game.block.BlockSandStone; -import game.block.BlockSlab; -import game.block.BlockStainedGlass; -import game.block.BlockStainedGlassPane; -import game.block.BlockStoneBrick; -import game.block.BlockTNT; -import game.block.BlockTallGrass; -import game.block.BlockWall; -import game.block.LeavesType; -import game.collect.Maps; -import game.color.DyeColor; -import game.entity.Entity; -import game.entity.animal.EntityBat; -import game.entity.animal.EntityChicken; -import game.entity.animal.EntityCow; -import game.entity.animal.EntityHorse; -import game.entity.animal.EntityMooshroom; -import game.entity.animal.EntityOcelot; -import game.entity.animal.EntityPig; -import game.entity.animal.EntityRabbit; -import game.entity.animal.EntitySheep; -import game.entity.animal.EntitySquid; -import game.entity.animal.EntityWolf; -import game.entity.item.EntityBoat; -import game.entity.item.EntityMinecart; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.TileRegistry; -import game.init.UniverseRegistry; -import game.log.Log; -import game.nbt.NBTLoader; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBanner; -import game.tileentity.TileEntityBeacon; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntityComparator; -import game.tileentity.TileEntityDaylightDetector; -import game.tileentity.TileEntityDispenser; -import game.tileentity.TileEntityDropper; -import game.tileentity.TileEntityEnchantmentTable; -import game.tileentity.TileEntityFurnace; -import game.tileentity.TileEntityHopper; -import game.tileentity.TileEntityMobSpawner; -import game.tileentity.TileEntityNote; -import game.tileentity.TileEntityPiston; -import game.tileentity.TileEntitySign; -import game.tileentity.TileEntitySkull; -import game.world.Region.FolderInfo; -import game.world.Region.SaveVersion; +import common.biome.Biome; +import common.block.Block; +import common.block.BlockCactus; +import common.block.BlockCarpet; +import common.block.BlockColored; +import common.block.BlockDirt; +import common.block.BlockFire; +import common.block.BlockFlower; +import common.block.BlockFlowerPot; +import common.block.BlockLeaves; +import common.block.BlockLiquid; +import common.block.BlockLog; +import common.block.BlockPistonBase; +import common.block.BlockPistonHead; +import common.block.BlockQuartz; +import common.block.BlockRock; +import common.block.BlockSand; +import common.block.BlockSandStone; +import common.block.BlockSlab; +import common.block.BlockStainedGlass; +import common.block.BlockStainedGlassPane; +import common.block.BlockStoneBrick; +import common.block.BlockTNT; +import common.block.BlockTallGrass; +import common.block.BlockWall; +import common.block.LeavesType; +import common.collect.Maps; +import common.color.DyeColor; +import common.entity.Entity; +import common.entity.animal.EntityBat; +import common.entity.animal.EntityChicken; +import common.entity.animal.EntityCow; +import common.entity.animal.EntityHorse; +import common.entity.animal.EntityMooshroom; +import common.entity.animal.EntityOcelot; +import common.entity.animal.EntityPig; +import common.entity.animal.EntityRabbit; +import common.entity.animal.EntitySheep; +import common.entity.animal.EntitySquid; +import common.entity.animal.EntityWolf; +import common.entity.item.EntityBoat; +import common.entity.item.EntityMinecart; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.TileRegistry; +import common.init.UniverseRegistry; +import common.log.Log; +import common.nbt.NBTLoader; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityBanner; +import common.tileentity.TileEntityBeacon; +import common.tileentity.TileEntityChest; +import common.tileentity.TileEntityComparator; +import common.tileentity.TileEntityDaylightDetector; +import common.tileentity.TileEntityDispenser; +import common.tileentity.TileEntityDropper; +import common.tileentity.TileEntityEnchantmentTable; +import common.tileentity.TileEntityFurnace; +import common.tileentity.TileEntityHopper; +import common.tileentity.TileEntityMobSpawner; +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.world.Region; +import common.world.State; +import common.world.Weather; +import common.world.World; +import common.world.Region.FolderInfo; +import common.world.Region.SaveVersion; public final class Converter { // public static interface Callback { diff --git a/java/src/game/IClient.java b/java/src/common/IClient.java similarity index 78% rename from java/src/game/IClient.java rename to java/src/common/IClient.java index 3049938..1e0ed74 100644 --- a/java/src/game/IClient.java +++ b/java/src/common/IClient.java @@ -1,13 +1,13 @@ -package game; +package common; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.IEntityFX; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.sound.Sound; -import game.world.BlockPos; -import game.world.State; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.IEntityFX; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.sound.Sound; +import common.world.BlockPos; +import common.world.State; public interface IClient { int getRenderDistance(); diff --git a/java/src/game/IServer.java b/java/src/common/IServer.java similarity index 69% rename from java/src/game/IServer.java rename to java/src/common/IServer.java index bae8d70..cd3fd18 100644 --- a/java/src/game/IServer.java +++ b/java/src/common/IServer.java @@ -1,16 +1,16 @@ -package game; +package common; import java.util.List; import java.util.Map; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.network.IPlayer; -import game.network.Packet; -import game.world.BlockPos; -import game.world.PortalType; -import game.world.Position; -import game.world.WorldServer; +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.world.WorldServer; public interface IServer { List getIPlayers(); diff --git a/java/src/game/ai/AIFireballAttack.java b/java/src/common/ai/AIFireballAttack.java similarity index 92% rename from java/src/game/ai/AIFireballAttack.java rename to java/src/common/ai/AIFireballAttack.java index ec933eb..6790164 100755 --- a/java/src/game/ai/AIFireballAttack.java +++ b/java/src/common/ai/AIFireballAttack.java @@ -1,13 +1,13 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityFireball; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.ItemStack; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.World; +import common.entity.npc.EntityNPC; +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.world.World; public class AIFireballAttack extends EntityAIBase { diff --git a/java/src/game/ai/AIFlyingBoxAttack.java b/java/src/common/ai/AIFlyingBoxAttack.java similarity index 94% rename from java/src/game/ai/AIFlyingBoxAttack.java rename to java/src/common/ai/AIFlyingBoxAttack.java index f7825b6..4477be0 100755 --- a/java/src/game/ai/AIFlyingBoxAttack.java +++ b/java/src/common/ai/AIFlyingBoxAttack.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityBox; -import game.entity.types.EntityLiving; -import game.world.BlockPos; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityBox; +import common.entity.types.EntityLiving; +import common.world.BlockPos; public class AIFlyingBoxAttack extends EntityAIBase { diff --git a/java/src/game/ai/AIRangedAttack.java b/java/src/common/ai/AIRangedAttack.java similarity index 96% rename from java/src/game/ai/AIRangedAttack.java rename to java/src/common/ai/AIRangedAttack.java index 6104b95..caf7d72 100755 --- a/java/src/game/ai/AIRangedAttack.java +++ b/java/src/common/ai/AIRangedAttack.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class AIRangedAttack extends EntityAIBase { diff --git a/java/src/game/ai/AISmallFireballAttack.java b/java/src/common/ai/AISmallFireballAttack.java similarity index 94% rename from java/src/game/ai/AISmallFireballAttack.java rename to java/src/common/ai/AISmallFireballAttack.java index ce27ce7..9bdbd59 100755 --- a/java/src/game/ai/AISmallFireballAttack.java +++ b/java/src/common/ai/AISmallFireballAttack.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityFireCharge; -import game.entity.types.EntityLiving; -import game.world.BlockPos; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityFireCharge; +import common.entity.types.EntityLiving; +import common.world.BlockPos; public class AISmallFireballAttack extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIAttackOnCollide.java b/java/src/common/ai/EntityAIAttackOnCollide.java similarity index 96% rename from java/src/game/ai/EntityAIAttackOnCollide.java rename to java/src/common/ai/EntityAIAttackOnCollide.java index 3c21879..26ab783 100755 --- a/java/src/game/ai/EntityAIAttackOnCollide.java +++ b/java/src/common/ai/EntityAIAttackOnCollide.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.pathfinding.PathEntity; -import game.world.BlockPos; -import game.world.World; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.pathfinding.PathEntity; +import common.world.BlockPos; +import common.world.World; public class EntityAIAttackOnCollide extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIAvoidEntity.java b/java/src/common/ai/EntityAIAvoidEntity.java similarity index 94% rename from java/src/game/ai/EntityAIAvoidEntity.java rename to java/src/common/ai/EntityAIAvoidEntity.java index 8fe4468..90cd980 100755 --- a/java/src/game/ai/EntityAIAvoidEntity.java +++ b/java/src/common/ai/EntityAIAvoidEntity.java @@ -1,14 +1,14 @@ -package game.ai; +package common.ai; import java.util.List; import java.util.function.Predicate; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.pathfinding.PathEntity; -import game.pathfinding.PathNavigate; -import game.util.Predicates; -import game.world.Vec3; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.pathfinding.PathEntity; +import common.pathfinding.PathNavigate; +import common.util.Predicates; +import common.world.Vec3; public class EntityAIAvoidEntity extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIBase.java b/java/src/common/ai/EntityAIBase.java similarity index 98% rename from java/src/game/ai/EntityAIBase.java rename to java/src/common/ai/EntityAIBase.java index 3b706ea..9eccf20 100755 --- a/java/src/game/ai/EntityAIBase.java +++ b/java/src/common/ai/EntityAIBase.java @@ -1,4 +1,4 @@ -package game.ai; +package common.ai; public abstract class EntityAIBase { diff --git a/java/src/game/ai/EntityAIBeg.java b/java/src/common/ai/EntityAIBeg.java similarity index 92% rename from java/src/game/ai/EntityAIBeg.java rename to java/src/common/ai/EntityAIBeg.java index 5347d54..752e455 100755 --- a/java/src/game/ai/EntityAIBeg.java +++ b/java/src/common/ai/EntityAIBeg.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; -import game.entity.animal.EntityWolf; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.item.ItemStack; -import game.world.World; +import common.entity.animal.EntityWolf; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.item.ItemStack; +import common.world.World; public class EntityAIBeg extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIControlledByPlayer.java b/java/src/common/ai/EntityAIControlledByPlayer.java similarity index 94% rename from java/src/game/ai/EntityAIControlledByPlayer.java rename to java/src/common/ai/EntityAIControlledByPlayer.java index dcee7b8..4975645 100755 --- a/java/src/game/ai/EntityAIControlledByPlayer.java +++ b/java/src/common/ai/EntityAIControlledByPlayer.java @@ -1,16 +1,16 @@ -package game.ai; +package common.ai; -import game.block.Block; -import game.block.BlockSlab; -import game.block.BlockStairs; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.ItemStack; -import game.material.Material; -import game.pathfinding.WalkNodeProcessor; -import game.util.ExtMath; -import game.world.BlockPos; +import common.block.Block; +import common.block.BlockSlab; +import common.block.BlockStairs; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.ItemStack; +import common.material.Material; +import common.pathfinding.WalkNodeProcessor; +import common.util.ExtMath; +import common.world.BlockPos; public class EntityAIControlledByPlayer extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIDoorInteract.java b/java/src/common/ai/EntityAIDoorInteract.java similarity index 92% rename from java/src/game/ai/EntityAIDoorInteract.java rename to java/src/common/ai/EntityAIDoorInteract.java index 2a11706..e45f438 100755 --- a/java/src/game/ai/EntityAIDoorInteract.java +++ b/java/src/common/ai/EntityAIDoorInteract.java @@ -1,13 +1,13 @@ -package game.ai; +package common.ai; -import game.block.Block; -import game.block.BlockDoor; -import game.entity.types.EntityLiving; -import game.material.Material; -import game.pathfinding.PathEntity; -import game.pathfinding.PathNavigateGround; -import game.pathfinding.PathPoint; -import game.world.BlockPos; +import common.block.Block; +import common.block.BlockDoor; +import common.entity.types.EntityLiving; +import common.material.Material; +import common.pathfinding.PathEntity; +import common.pathfinding.PathNavigateGround; +import common.pathfinding.PathPoint; +import common.world.BlockPos; public abstract class EntityAIDoorInteract extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIEatGrass.java b/java/src/common/ai/EntityAIEatGrass.java similarity index 90% rename from java/src/game/ai/EntityAIEatGrass.java rename to java/src/common/ai/EntityAIEatGrass.java index 4996966..5930c11 100755 --- a/java/src/game/ai/EntityAIEatGrass.java +++ b/java/src/common/ai/EntityAIEatGrass.java @@ -1,17 +1,17 @@ -package game.ai; +package common.ai; import java.util.function.Predicate; -import game.block.BlockTallGrass; -import game.entity.animal.EntitySheep; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.pattern.BlockStateHelper; -import game.util.Predicates; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.BlockTallGrass; +import common.entity.animal.EntitySheep; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.pattern.BlockStateHelper; +import common.util.Predicates; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityAIEatGrass extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIExplode.java b/java/src/common/ai/EntityAIExplode.java similarity index 93% rename from java/src/game/ai/EntityAIExplode.java rename to java/src/common/ai/EntityAIExplode.java index d5223b7..16ec2a4 100755 --- a/java/src/game/ai/EntityAIExplode.java +++ b/java/src/common/ai/EntityAIExplode.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityHaunter; -import game.entity.types.EntityLiving; +import common.entity.npc.EntityHaunter; +import common.entity.types.EntityLiving; public class EntityAIExplode extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIFindEntityNearest.java b/java/src/common/ai/EntityAIFindEntityNearest.java similarity index 95% rename from java/src/game/ai/EntityAIFindEntityNearest.java rename to java/src/common/ai/EntityAIFindEntityNearest.java index 5d9af13..ee34588 100755 --- a/java/src/game/ai/EntityAIFindEntityNearest.java +++ b/java/src/common/ai/EntityAIFindEntityNearest.java @@ -1,12 +1,12 @@ -package game.ai; +package common.ai; import java.util.Collections; import java.util.List; import java.util.function.Predicate; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; public class EntityAIFindEntityNearest extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIFleeSun.java b/java/src/common/ai/EntityAIFleeSun.java similarity index 92% rename from java/src/game/ai/EntityAIFleeSun.java rename to java/src/common/ai/EntityAIFleeSun.java index 135d923..d6e9733 100755 --- a/java/src/game/ai/EntityAIFleeSun.java +++ b/java/src/common/ai/EntityAIFleeSun.java @@ -1,11 +1,11 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.rng.Random; +import common.world.BlockPos; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; public class EntityAIFleeSun extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIFollowOwner.java b/java/src/common/ai/EntityAIFollowOwner.java similarity index 93% rename from java/src/game/ai/EntityAIFollowOwner.java rename to java/src/common/ai/EntityAIFollowOwner.java index 6e30917..0d03d68 100755 --- a/java/src/game/ai/EntityAIFollowOwner.java +++ b/java/src/common/ai/EntityAIFollowOwner.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; -import game.pathfinding.PathNavigate; -import game.pathfinding.PathNavigateGround; -import game.world.World; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; +import common.pathfinding.PathNavigate; +import common.pathfinding.PathNavigateGround; +import common.world.World; public class EntityAIFollowOwner extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIFollowParent.java b/java/src/common/ai/EntityAIFollowParent.java similarity index 97% rename from java/src/game/ai/EntityAIFollowParent.java rename to java/src/common/ai/EntityAIFollowParent.java index c7db17e..d61e1f5 100755 --- a/java/src/game/ai/EntityAIFollowParent.java +++ b/java/src/common/ai/EntityAIFollowParent.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; import java.util.List; -import game.entity.types.EntityAnimal; +import common.entity.types.EntityAnimal; public class EntityAIFollowParent extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIHarvestFarmland.java b/java/src/common/ai/EntityAIHarvestFarmland.java similarity index 97% rename from java/src/game/ai/EntityAIHarvestFarmland.java rename to java/src/common/ai/EntityAIHarvestFarmland.java index a35503f..3bcc9a9 100755 --- a/java/src/game/ai/EntityAIHarvestFarmland.java +++ b/java/src/common/ai/EntityAIHarvestFarmland.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.BlockPos; -import game.world.World; +import common.entity.types.EntityLiving; +import common.world.BlockPos; +import common.world.World; public class EntityAIHarvestFarmland extends EntityAIMoveToBlock { diff --git a/java/src/game/ai/EntityAIHurtByTarget.java b/java/src/common/ai/EntityAIHurtByTarget.java similarity index 96% rename from java/src/game/ai/EntityAIHurtByTarget.java rename to java/src/common/ai/EntityAIHurtByTarget.java index 51ab111..096dd21 100755 --- a/java/src/game/ai/EntityAIHurtByTarget.java +++ b/java/src/common/ai/EntityAIHurtByTarget.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.BoundingBox; +import common.entity.types.EntityLiving; +import common.world.BoundingBox; public class EntityAIHurtByTarget extends EntityAITarget { diff --git a/java/src/game/ai/EntityAILeapAtTarget.java b/java/src/common/ai/EntityAILeapAtTarget.java similarity index 95% rename from java/src/game/ai/EntityAILeapAtTarget.java rename to java/src/common/ai/EntityAILeapAtTarget.java index f772265..8b62906 100755 --- a/java/src/game/ai/EntityAILeapAtTarget.java +++ b/java/src/common/ai/EntityAILeapAtTarget.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class EntityAILeapAtTarget extends EntityAIBase { diff --git a/java/src/game/ai/EntityAILookAtTalkingPlayer.java b/java/src/common/ai/EntityAILookAtTalkingPlayer.java similarity index 90% rename from java/src/game/ai/EntityAILookAtTalkingPlayer.java rename to java/src/common/ai/EntityAILookAtTalkingPlayer.java index d268ddc..ce521e0 100755 --- a/java/src/game/ai/EntityAILookAtTalkingPlayer.java +++ b/java/src/common/ai/EntityAILookAtTalkingPlayer.java @@ -1,6 +1,6 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class EntityAILookAtTalkingPlayer extends EntityAIWatchClosest { diff --git a/java/src/game/ai/EntityAILookIdle.java b/java/src/common/ai/EntityAILookIdle.java similarity index 96% rename from java/src/game/ai/EntityAILookIdle.java rename to java/src/common/ai/EntityAILookIdle.java index c8858f4..59f9f1b 100755 --- a/java/src/game/ai/EntityAILookIdle.java +++ b/java/src/common/ai/EntityAILookIdle.java @@ -1,6 +1,6 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; +import common.entity.types.EntityLiving; public class EntityAILookIdle extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIMate.java b/java/src/common/ai/EntityAIMate.java similarity index 94% rename from java/src/game/ai/EntityAIMate.java rename to java/src/common/ai/EntityAIMate.java index ec0c071..adff92f 100755 --- a/java/src/game/ai/EntityAIMate.java +++ b/java/src/common/ai/EntityAIMate.java @@ -1,15 +1,15 @@ -package game.ai; +package common.ai; import java.util.List; -import game.entity.item.EntityXp; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.model.ParticleType; -import game.rng.Random; -import game.world.World; +import common.entity.item.EntityXp; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.model.ParticleType; +import common.rng.Random; +import common.world.World; public class EntityAIMate extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIMoveIndoors.java b/java/src/common/ai/EntityAIMoveIndoors.java similarity index 93% rename from java/src/game/ai/EntityAIMoveIndoors.java rename to java/src/common/ai/EntityAIMoveIndoors.java index abc69f3..609f82e 100755 --- a/java/src/game/ai/EntityAIMoveIndoors.java +++ b/java/src/common/ai/EntityAIMoveIndoors.java @@ -1,11 +1,11 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.village.Village; -import game.village.VillageDoorInfo; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +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/java/src/game/ai/EntityAIMoveThroughVillage.java b/java/src/common/ai/EntityAIMoveThroughVillage.java similarity index 93% rename from java/src/game/ai/EntityAIMoveThroughVillage.java rename to java/src/common/ai/EntityAIMoveThroughVillage.java index fa7b075..ac2428f 100755 --- a/java/src/game/ai/EntityAIMoveThroughVillage.java +++ b/java/src/common/ai/EntityAIMoveThroughVillage.java @@ -1,17 +1,17 @@ -package game.ai; +package common.ai; import java.util.List; -import game.collect.Lists; -import game.entity.types.EntityLiving; -import game.pathfinding.PathEntity; -import game.pathfinding.PathNavigateGround; -import game.util.ExtMath; -import game.village.Village; -import game.village.VillageDoorInfo; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.WorldServer; +import common.collect.Lists; +import common.entity.types.EntityLiving; +import common.pathfinding.PathEntity; +import common.pathfinding.PathNavigateGround; +import common.util.ExtMath; +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/java/src/game/ai/EntityAIMoveToBlock.java b/java/src/common/ai/EntityAIMoveToBlock.java similarity index 97% rename from java/src/game/ai/EntityAIMoveToBlock.java rename to java/src/common/ai/EntityAIMoveToBlock.java index 25d3d75..83f1416 100755 --- a/java/src/game/ai/EntityAIMoveToBlock.java +++ b/java/src/common/ai/EntityAIMoveToBlock.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.BlockPos; -import game.world.World; +import common.entity.types.EntityLiving; +import common.world.BlockPos; +import common.world.World; public abstract class EntityAIMoveToBlock extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIMoveTowardsRestriction.java b/java/src/common/ai/EntityAIMoveTowardsRestriction.java similarity index 93% rename from java/src/game/ai/EntityAIMoveTowardsRestriction.java rename to java/src/common/ai/EntityAIMoveTowardsRestriction.java index 900d49b..daf2b9b 100755 --- a/java/src/game/ai/EntityAIMoveTowardsRestriction.java +++ b/java/src/common/ai/EntityAIMoveTowardsRestriction.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.BlockPos; -import game.world.Vec3; +import common.entity.types.EntityLiving; +import common.world.BlockPos; +import common.world.Vec3; public class EntityAIMoveTowardsRestriction extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIMoveTowardsTarget.java b/java/src/common/ai/EntityAIMoveTowardsTarget.java similarity index 96% rename from java/src/game/ai/EntityAIMoveTowardsTarget.java rename to java/src/common/ai/EntityAIMoveTowardsTarget.java index c85bd02..eaff1e3 100755 --- a/java/src/game/ai/EntityAIMoveTowardsTarget.java +++ b/java/src/common/ai/EntityAIMoveTowardsTarget.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.Vec3; +import common.entity.types.EntityLiving; +import common.world.Vec3; public class EntityAIMoveTowardsTarget extends EntityAIBase { diff --git a/java/src/game/ai/EntityAINagPlayer.java b/java/src/common/ai/EntityAINagPlayer.java similarity index 91% rename from java/src/game/ai/EntityAINagPlayer.java rename to java/src/common/ai/EntityAINagPlayer.java index b880895..e83c0c0 100755 --- a/java/src/game/ai/EntityAINagPlayer.java +++ b/java/src/common/ai/EntityAINagPlayer.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.inventory.ContainerMerchant; +import common.entity.npc.EntityNPC; +import common.inventory.ContainerMerchant; public class EntityAINagPlayer extends EntityAIBase { diff --git a/java/src/game/ai/EntityAINearestAttackableTarget.java b/java/src/common/ai/EntityAINearestAttackableTarget.java similarity index 98% rename from java/src/game/ai/EntityAINearestAttackableTarget.java rename to java/src/common/ai/EntityAINearestAttackableTarget.java index 3e7ed3b..05d3245 100755 --- a/java/src/game/ai/EntityAINearestAttackableTarget.java +++ b/java/src/common/ai/EntityAINearestAttackableTarget.java @@ -1,12 +1,12 @@ -package game.ai; +package common.ai; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.function.Predicate; -import game.entity.Entity; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.types.EntityLiving; public class EntityAINearestAttackableTarget extends EntityAITarget { diff --git a/java/src/game/ai/EntityAINpcInteract.java b/java/src/common/ai/EntityAINpcInteract.java similarity index 95% rename from java/src/game/ai/EntityAINpcInteract.java rename to java/src/common/ai/EntityAINpcInteract.java index 82c5c4c..99849a0 100755 --- a/java/src/game/ai/EntityAINpcInteract.java +++ b/java/src/common/ai/EntityAINpcInteract.java @@ -1,6 +1,6 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; public class EntityAINpcInteract extends EntityAIWatchClosest2 { diff --git a/java/src/game/ai/EntityAINpcMate.java b/java/src/common/ai/EntityAINpcMate.java similarity index 95% rename from java/src/game/ai/EntityAINpcMate.java rename to java/src/common/ai/EntityAINpcMate.java index ee555de..654af34 100755 --- a/java/src/game/ai/EntityAINpcMate.java +++ b/java/src/common/ai/EntityAINpcMate.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.world.World; +import common.world.WorldServer; public class EntityAINpcMate extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIOcelotAttack.java b/java/src/common/ai/EntityAIOcelotAttack.java similarity index 96% rename from java/src/game/ai/EntityAIOcelotAttack.java rename to java/src/common/ai/EntityAIOcelotAttack.java index cb48c13..87c61e8 100755 --- a/java/src/game/ai/EntityAIOcelotAttack.java +++ b/java/src/common/ai/EntityAIOcelotAttack.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.World; +import common.entity.types.EntityLiving; +import common.world.World; public class EntityAIOcelotAttack extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIOcelotSit.java b/java/src/common/ai/EntityAIOcelotSit.java similarity index 88% rename from java/src/game/ai/EntityAIOcelotSit.java rename to java/src/common/ai/EntityAIOcelotSit.java index cfa2b7e..f6d329d 100755 --- a/java/src/game/ai/EntityAIOcelotSit.java +++ b/java/src/common/ai/EntityAIOcelotSit.java @@ -1,14 +1,14 @@ -package game.ai; +package common.ai; -import game.block.Block; -import game.block.BlockBed; -import game.entity.animal.EntityOcelot; -import game.init.Blocks; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockBed; +import common.entity.animal.EntityOcelot; +import common.init.Blocks; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityChest; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityAIOcelotSit extends EntityAIMoveToBlock { diff --git a/java/src/game/ai/EntityAIOpenDoor.java b/java/src/common/ai/EntityAIOpenDoor.java similarity index 95% rename from java/src/game/ai/EntityAIOpenDoor.java rename to java/src/common/ai/EntityAIOpenDoor.java index 50879d0..7956a61 100755 --- a/java/src/game/ai/EntityAIOpenDoor.java +++ b/java/src/common/ai/EntityAIOpenDoor.java @@ -1,6 +1,6 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; +import common.entity.types.EntityLiving; public class EntityAIOpenDoor extends EntityAIDoorInteract { diff --git a/java/src/game/ai/EntityAIOwnerHurtByTarget.java b/java/src/common/ai/EntityAIOwnerHurtByTarget.java similarity index 94% rename from java/src/game/ai/EntityAIOwnerHurtByTarget.java rename to java/src/common/ai/EntityAIOwnerHurtByTarget.java index 0230e15..70c3b95 100755 --- a/java/src/game/ai/EntityAIOwnerHurtByTarget.java +++ b/java/src/common/ai/EntityAIOwnerHurtByTarget.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; public class EntityAIOwnerHurtByTarget extends EntityAITarget { diff --git a/java/src/game/ai/EntityAIOwnerHurtTarget.java b/java/src/common/ai/EntityAIOwnerHurtTarget.java similarity index 93% rename from java/src/game/ai/EntityAIOwnerHurtTarget.java rename to java/src/common/ai/EntityAIOwnerHurtTarget.java index 8dc2e2a..27d9d53 100755 --- a/java/src/game/ai/EntityAIOwnerHurtTarget.java +++ b/java/src/common/ai/EntityAIOwnerHurtTarget.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; public class EntityAIOwnerHurtTarget extends EntityAITarget { diff --git a/java/src/game/ai/EntityAIPanic.java b/java/src/common/ai/EntityAIPanic.java similarity index 94% rename from java/src/game/ai/EntityAIPanic.java rename to java/src/common/ai/EntityAIPanic.java index 0735848..ab28240 100755 --- a/java/src/game/ai/EntityAIPanic.java +++ b/java/src/common/ai/EntityAIPanic.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.Vec3; +import common.entity.types.EntityLiving; +import common.world.Vec3; public class EntityAIPanic extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIPlay.java b/java/src/common/ai/EntityAIPlay.java similarity index 93% rename from java/src/game/ai/EntityAIPlay.java rename to java/src/common/ai/EntityAIPlay.java index 83fec8f..38363e6 100755 --- a/java/src/game/ai/EntityAIPlay.java +++ b/java/src/common/ai/EntityAIPlay.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; import java.util.List; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.world.Vec3; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.world.Vec3; public class EntityAIPlay extends EntityAIBase { private EntityNPC entity; diff --git a/java/src/game/ai/EntityAIRestrictOpenDoor.java b/java/src/common/ai/EntityAIRestrictOpenDoor.java similarity index 90% rename from java/src/game/ai/EntityAIRestrictOpenDoor.java rename to java/src/common/ai/EntityAIRestrictOpenDoor.java index 94991dc..c89644b 100755 --- a/java/src/game/ai/EntityAIRestrictOpenDoor.java +++ b/java/src/common/ai/EntityAIRestrictOpenDoor.java @@ -1,11 +1,11 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.pathfinding.PathNavigateGround; -import game.village.Village; -import game.village.VillageDoorInfo; -import game.world.BlockPos; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.pathfinding.PathNavigateGround; +import common.village.Village; +import common.village.VillageDoorInfo; +import common.world.BlockPos; +import common.world.WorldServer; public class EntityAIRestrictOpenDoor extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIRestrictSun.java b/java/src/common/ai/EntityAIRestrictSun.java similarity index 84% rename from java/src/game/ai/EntityAIRestrictSun.java rename to java/src/common/ai/EntityAIRestrictSun.java index 80068d0..2734f28 100755 --- a/java/src/game/ai/EntityAIRestrictSun.java +++ b/java/src/common/ai/EntityAIRestrictSun.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.pathfinding.PathNavigateGround; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.pathfinding.PathNavigateGround; +import common.world.WorldServer; public class EntityAIRestrictSun extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIRunAroundLikeCrazy.java b/java/src/common/ai/EntityAIRunAroundLikeCrazy.java similarity index 94% rename from java/src/game/ai/EntityAIRunAroundLikeCrazy.java rename to java/src/common/ai/EntityAIRunAroundLikeCrazy.java index baaeb2c..9b02e75 100755 --- a/java/src/game/ai/EntityAIRunAroundLikeCrazy.java +++ b/java/src/common/ai/EntityAIRunAroundLikeCrazy.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.npc.EntityNPC; -import game.world.Vec3; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.npc.EntityNPC; +import common.world.Vec3; public class EntityAIRunAroundLikeCrazy extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIShareItems.java b/java/src/common/ai/EntityAIShareItems.java similarity index 93% rename from java/src/game/ai/EntityAIShareItems.java rename to java/src/common/ai/EntityAIShareItems.java index e0bda32..b22235c 100755 --- a/java/src/game/ai/EntityAIShareItems.java +++ b/java/src/common/ai/EntityAIShareItems.java @@ -1,12 +1,12 @@ -package game.ai; +package common.ai; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.inventory.InventoryBasic; -import game.item.Item; -import game.item.ItemStack; -import game.util.ExtMath; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.inventory.InventoryBasic; +import common.item.Item; +import common.item.ItemStack; +import common.util.ExtMath; public class EntityAIShareItems extends EntityAIWatchClosest2 { diff --git a/java/src/game/ai/EntityAISit.java b/java/src/common/ai/EntityAISit.java similarity index 93% rename from java/src/game/ai/EntityAISit.java rename to java/src/common/ai/EntityAISit.java index 48d0b4f..6ffb567 100755 --- a/java/src/game/ai/EntityAISit.java +++ b/java/src/common/ai/EntityAISit.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; public class EntityAISit extends EntityAIBase { diff --git a/java/src/game/ai/EntityAISwimming.java b/java/src/common/ai/EntityAISwimming.java similarity index 87% rename from java/src/game/ai/EntityAISwimming.java rename to java/src/common/ai/EntityAISwimming.java index eb7e86a..b7a6193 100755 --- a/java/src/game/ai/EntityAISwimming.java +++ b/java/src/common/ai/EntityAISwimming.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.pathfinding.PathNavigateGround; +import common.entity.types.EntityLiving; +import common.pathfinding.PathNavigateGround; public class EntityAISwimming extends EntityAIBase { diff --git a/java/src/game/ai/EntityAITakePlace.java b/java/src/common/ai/EntityAITakePlace.java similarity index 93% rename from java/src/game/ai/EntityAITakePlace.java rename to java/src/common/ai/EntityAITakePlace.java index 597bf01..bde8a0a 100755 --- a/java/src/game/ai/EntityAITakePlace.java +++ b/java/src/common/ai/EntityAITakePlace.java @@ -1,20 +1,20 @@ -package game.ai; +package common.ai; import java.util.Map; -import game.block.Block; -import game.collect.Maps; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.item.ItemStack; -import game.material.Material; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.collect.Maps; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.item.ItemStack; +import common.material.Material; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityAITakePlace extends EntityAIBase { diff --git a/java/src/game/ai/EntityAITarget.java b/java/src/common/ai/EntityAITarget.java similarity index 95% rename from java/src/game/ai/EntityAITarget.java rename to java/src/common/ai/EntityAITarget.java index 506cf60..7890657 100755 --- a/java/src/game/ai/EntityAITarget.java +++ b/java/src/common/ai/EntityAITarget.java @@ -1,14 +1,14 @@ -package game.ai; +package common.ai; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.entity.types.IEntityOwnable; -import game.init.Config; -import game.pathfinding.PathEntity; -import game.pathfinding.PathPoint; -import game.util.ExtMath; -import game.world.BlockPos; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.entity.types.IEntityOwnable; +import common.init.Config; +import common.pathfinding.PathEntity; +import common.pathfinding.PathPoint; +import common.util.ExtMath; +import common.world.BlockPos; public abstract class EntityAITarget extends EntityAIBase { diff --git a/java/src/game/ai/EntityAITargetNonTamed.java b/java/src/common/ai/EntityAITargetNonTamed.java similarity index 86% rename from java/src/game/ai/EntityAITargetNonTamed.java rename to java/src/common/ai/EntityAITargetNonTamed.java index 4b9fd5b..2b0cfc3 100755 --- a/java/src/game/ai/EntityAITargetNonTamed.java +++ b/java/src/common/ai/EntityAITargetNonTamed.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; import java.util.function.Predicate; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; public class EntityAITargetNonTamed extends EntityAINearestAttackableTarget { diff --git a/java/src/game/ai/EntityAITasks.java b/java/src/common/ai/EntityAITasks.java similarity index 99% rename from java/src/game/ai/EntityAITasks.java rename to java/src/common/ai/EntityAITasks.java index 3db2a95..98f50c9 100755 --- a/java/src/game/ai/EntityAITasks.java +++ b/java/src/common/ai/EntityAITasks.java @@ -1,9 +1,9 @@ -package game.ai; +package common.ai; import java.util.Iterator; import java.util.List; -import game.collect.Lists; +import common.collect.Lists; public class EntityAITasks { diff --git a/java/src/game/ai/EntityAITempt.java b/java/src/common/ai/EntityAITempt.java similarity index 96% rename from java/src/game/ai/EntityAITempt.java rename to java/src/common/ai/EntityAITempt.java index ff230ba..a7008c7 100755 --- a/java/src/game/ai/EntityAITempt.java +++ b/java/src/common/ai/EntityAITempt.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.item.Item; -import game.item.ItemStack; -import game.pathfinding.PathNavigateGround; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.item.Item; +import common.item.ItemStack; +import common.pathfinding.PathNavigateGround; public class EntityAITempt extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIWander.java b/java/src/common/ai/EntityAIWander.java similarity index 96% rename from java/src/game/ai/EntityAIWander.java rename to java/src/common/ai/EntityAIWander.java index 29e1c68..f1ae22a 100755 --- a/java/src/game/ai/EntityAIWander.java +++ b/java/src/common/ai/EntityAIWander.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.world.Vec3; +import common.entity.types.EntityLiving; +import common.world.Vec3; public class EntityAIWander extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIWatchClosest.java b/java/src/common/ai/EntityAIWatchClosest.java similarity index 96% rename from java/src/game/ai/EntityAIWatchClosest.java rename to java/src/common/ai/EntityAIWatchClosest.java index 54c17a7..81b0a9e 100755 --- a/java/src/game/ai/EntityAIWatchClosest.java +++ b/java/src/common/ai/EntityAIWatchClosest.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.world.WorldServer; public class EntityAIWatchClosest extends EntityAIBase { diff --git a/java/src/game/ai/EntityAIWatchClosest2.java b/java/src/common/ai/EntityAIWatchClosest2.java similarity index 78% rename from java/src/game/ai/EntityAIWatchClosest2.java rename to java/src/common/ai/EntityAIWatchClosest2.java index 8991e82..0684c41 100755 --- a/java/src/game/ai/EntityAIWatchClosest2.java +++ b/java/src/common/ai/EntityAIWatchClosest2.java @@ -1,7 +1,7 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.types.EntityLiving; +import common.entity.Entity; +import common.entity.types.EntityLiving; public class EntityAIWatchClosest2 extends EntityAIWatchClosest { diff --git a/java/src/game/ai/EntityJumpHelper.java b/java/src/common/ai/EntityJumpHelper.java similarity index 88% rename from java/src/game/ai/EntityJumpHelper.java rename to java/src/common/ai/EntityJumpHelper.java index 461cff0..cf9b91c 100755 --- a/java/src/game/ai/EntityJumpHelper.java +++ b/java/src/common/ai/EntityJumpHelper.java @@ -1,6 +1,6 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; +import common.entity.types.EntityLiving; public class EntityJumpHelper { diff --git a/java/src/game/ai/EntityLookHelper.java b/java/src/common/ai/EntityLookHelper.java similarity index 96% rename from java/src/game/ai/EntityLookHelper.java rename to java/src/common/ai/EntityLookHelper.java index e2a5243..26e5d7e 100755 --- a/java/src/game/ai/EntityLookHelper.java +++ b/java/src/common/ai/EntityLookHelper.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class EntityLookHelper { diff --git a/java/src/game/ai/EntityMoveHelper.java b/java/src/common/ai/EntityMoveHelper.java similarity index 95% rename from java/src/game/ai/EntityMoveHelper.java rename to java/src/common/ai/EntityMoveHelper.java index a7f8e5c..1528c0e 100755 --- a/java/src/game/ai/EntityMoveHelper.java +++ b/java/src/common/ai/EntityMoveHelper.java @@ -1,8 +1,8 @@ -package game.ai; +package common.ai; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.util.ExtMath; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.util.ExtMath; public class EntityMoveHelper { diff --git a/java/src/game/ai/EntitySenses.java b/java/src/common/ai/EntitySenses.java similarity index 91% rename from java/src/game/ai/EntitySenses.java rename to java/src/common/ai/EntitySenses.java index 245cafb..b0aa429 100755 --- a/java/src/game/ai/EntitySenses.java +++ b/java/src/common/ai/EntitySenses.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.types.EntityLiving; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.types.EntityLiving; public class EntitySenses { diff --git a/java/src/game/ai/RandomPositionGenerator.java b/java/src/common/ai/RandomPositionGenerator.java similarity index 96% rename from java/src/game/ai/RandomPositionGenerator.java rename to java/src/common/ai/RandomPositionGenerator.java index 57712ba..74c03ed 100755 --- a/java/src/game/ai/RandomPositionGenerator.java +++ b/java/src/common/ai/RandomPositionGenerator.java @@ -1,10 +1,10 @@ -package game.ai; +package common.ai; -import game.entity.types.EntityLiving; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Vec3; +import common.entity.types.EntityLiving; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Vec3; public class RandomPositionGenerator { diff --git a/java/src/game/biome/Biome.java b/java/src/common/biome/Biome.java similarity index 93% rename from java/src/game/biome/Biome.java rename to java/src/common/biome/Biome.java index b7a60d3..cabe35b 100755 --- a/java/src/game/biome/Biome.java +++ b/java/src/common/biome/Biome.java @@ -1,61 +1,61 @@ -package game.biome; +package common.biome; import java.util.List; import java.util.Map; -import game.block.Block; -import game.block.BlockColored; -import game.block.BlockFlower; -import game.block.BlockSand; -import game.block.BlockTallGrass; -import game.collect.Lists; -import game.collect.Maps; -import game.color.Colorizer; -import game.color.DyeColor; -import game.entity.animal.EntityBat; -import game.entity.animal.EntityChicken; -import game.entity.animal.EntityCow; -import game.entity.animal.EntityMouse; -import game.entity.animal.EntityPig; -import game.entity.animal.EntityRabbit; -import game.entity.animal.EntitySheep; -import game.entity.animal.EntitySquid; -import game.entity.npc.EntityArachnoid; -import game.entity.npc.EntityHaunter; -import game.entity.npc.EntityMage; -import game.entity.npc.EntitySlime; -import game.entity.npc.EntityUndead; -import game.entity.npc.EntityZombie; -import game.init.Blocks; -import game.log.Log; -import game.material.Material; -import game.rng.PerlinGen; -import game.rng.Random; -import game.rng.WeightedList; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.FeatureGenerator; -import game.worldgen.feature.WorldGenClay; -import game.worldgen.feature.WorldGenClayExt; -import game.worldgen.feature.WorldGenSand; -import game.worldgen.foliage.FeatureDoublePlant; -import game.worldgen.foliage.WorldGenBigMushroom; -import game.worldgen.foliage.WorldGenCactus; -import game.worldgen.foliage.WorldGenDeadBush; -import game.worldgen.foliage.WorldGenFlowers; -import game.worldgen.foliage.WorldGenMushroom; -import game.worldgen.foliage.WorldGenPumpkin; -import game.worldgen.foliage.WorldGenReed; -import game.worldgen.foliage.WorldGenTallGrass; -import game.worldgen.foliage.WorldGenWaterlily; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenBigTree; -import game.worldgen.tree.WorldGenSwamp; -import game.worldgen.tree.WorldGenTree; +import common.block.Block; +import common.block.BlockColored; +import common.block.BlockFlower; +import common.block.BlockSand; +import common.block.BlockTallGrass; +import common.collect.Lists; +import common.collect.Maps; +import common.color.Colorizer; +import common.color.DyeColor; +import common.entity.animal.EntityBat; +import common.entity.animal.EntityChicken; +import common.entity.animal.EntityCow; +import common.entity.animal.EntityMouse; +import common.entity.animal.EntityPig; +import common.entity.animal.EntityRabbit; +import common.entity.animal.EntitySheep; +import common.entity.animal.EntitySquid; +import common.entity.npc.EntityArachnoid; +import common.entity.npc.EntityHaunter; +import common.entity.npc.EntityMage; +import common.entity.npc.EntitySlime; +import common.entity.npc.EntityUndead; +import common.entity.npc.EntityZombie; +import common.init.Blocks; +import common.log.Log; +import common.material.Material; +import common.rng.PerlinGen; +import common.rng.Random; +import common.rng.WeightedList; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.FeatureGenerator; +import common.worldgen.feature.WorldGenClay; +import common.worldgen.feature.WorldGenClayExt; +import common.worldgen.feature.WorldGenSand; +import common.worldgen.foliage.FeatureDoublePlant; +import common.worldgen.foliage.WorldGenBigMushroom; +import common.worldgen.foliage.WorldGenCactus; +import common.worldgen.foliage.WorldGenDeadBush; +import common.worldgen.foliage.WorldGenFlowers; +import common.worldgen.foliage.WorldGenMushroom; +import common.worldgen.foliage.WorldGenPumpkin; +import common.worldgen.foliage.WorldGenReed; +import common.worldgen.foliage.WorldGenTallGrass; +import common.worldgen.foliage.WorldGenWaterlily; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenBigTree; +import common.worldgen.tree.WorldGenSwamp; +import common.worldgen.tree.WorldGenTree; public abstract class Biome { private static final Biome[] BIOMES = new Biome[256]; diff --git a/java/src/game/biome/BiomeBeach.java b/java/src/common/biome/BiomeBeach.java similarity index 83% rename from java/src/game/biome/BiomeBeach.java rename to java/src/common/biome/BiomeBeach.java index 982f2c6..f73c715 100755 --- a/java/src/game/biome/BiomeBeach.java +++ b/java/src/common/biome/BiomeBeach.java @@ -1,7 +1,7 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.WeightedList; +import common.init.Blocks; +import common.rng.WeightedList; public class BiomeBeach extends Biome { diff --git a/java/src/game/biome/BiomeBlackened.java b/java/src/common/biome/BiomeBlackened.java similarity index 70% rename from java/src/game/biome/BiomeBlackened.java rename to java/src/common/biome/BiomeBlackened.java index 996197e..082be75 100644 --- a/java/src/game/biome/BiomeBlackened.java +++ b/java/src/common/biome/BiomeBlackened.java @@ -1,13 +1,13 @@ -package game.biome; +package common.biome; -import game.block.BlockFlower; -import game.entity.npc.EntityMetalhead; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockFlower; +import common.entity.npc.EntityMetalhead; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenTree; public class BiomeBlackened extends Biome { protected final WorldGenTree treeGen = new WorldGenBaseTree(false, Blocks.blackwood_log.getState(), Blocks.blackwood_leaves.getState()); diff --git a/java/src/game/biome/BiomeChaos.java b/java/src/common/biome/BiomeChaos.java similarity index 73% rename from java/src/game/biome/BiomeChaos.java rename to java/src/common/biome/BiomeChaos.java index 01203b9..a068043 100755 --- a/java/src/game/biome/BiomeChaos.java +++ b/java/src/common/biome/BiomeChaos.java @@ -1,15 +1,15 @@ -package game.biome; +package common.biome; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.EntityRegistry; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.foliage.WorldGenMushroom; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.EntityRegistry; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.foliage.WorldGenMushroom; public class BiomeChaos extends Biome { diff --git a/java/src/game/biome/BiomeDesert.java b/java/src/common/biome/BiomeDesert.java similarity index 79% rename from java/src/game/biome/BiomeDesert.java rename to java/src/common/biome/BiomeDesert.java index 895310a..56da83c 100755 --- a/java/src/game/biome/BiomeDesert.java +++ b/java/src/common/biome/BiomeDesert.java @@ -1,11 +1,11 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.feature.WorldGenDesertWells; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.feature.WorldGenDesertWells; public class BiomeDesert extends Biome { diff --git a/java/src/game/biome/BiomeExterminated.java b/java/src/common/biome/BiomeExterminated.java similarity index 73% rename from java/src/game/biome/BiomeExterminated.java rename to java/src/common/biome/BiomeExterminated.java index 076c215..837aaaf 100755 --- a/java/src/game/biome/BiomeExterminated.java +++ b/java/src/common/biome/BiomeExterminated.java @@ -1,10 +1,10 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; public class BiomeExterminated extends Biome { public BiomeExterminated(int id) { diff --git a/java/src/game/biome/BiomeForest.java b/java/src/common/biome/BiomeForest.java similarity index 93% rename from java/src/game/biome/BiomeForest.java rename to java/src/common/biome/BiomeForest.java index 01a409c..183668b 100755 --- a/java/src/game/biome/BiomeForest.java +++ b/java/src/common/biome/BiomeForest.java @@ -1,22 +1,22 @@ -package game.biome; +package common.biome; -import game.block.BlockDoublePlant; -import game.block.BlockFlower; -import game.color.Colorizer; -import game.entity.animal.EntityWolf; -import game.entity.npc.EntityElf; -import game.entity.npc.EntityWoodElf; -import game.init.Blocks; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.foliage.WorldGenBigMushroom; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenBigTree; -import game.worldgen.tree.WorldGenBirch; -import game.worldgen.tree.WorldGenDarkOak; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockDoublePlant; +import common.block.BlockFlower; +import common.color.Colorizer; +import common.entity.animal.EntityWolf; +import common.entity.npc.EntityElf; +import common.entity.npc.EntityWoodElf; +import common.init.Blocks; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.foliage.WorldGenBigMushroom; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenBigTree; +import common.worldgen.tree.WorldGenBirch; +import common.worldgen.tree.WorldGenDarkOak; +import common.worldgen.tree.WorldGenTree; public class BiomeForest extends Biome { diff --git a/java/src/game/biome/BiomeHell.java b/java/src/common/biome/BiomeHell.java similarity index 87% rename from java/src/game/biome/BiomeHell.java rename to java/src/common/biome/BiomeHell.java index 8f4d3c3..0591795 100755 --- a/java/src/game/biome/BiomeHell.java +++ b/java/src/common/biome/BiomeHell.java @@ -1,21 +1,21 @@ -package game.biome; +package common.biome; -import game.entity.npc.EntityBloodElf; -import game.entity.npc.EntityCultivator; -import game.entity.npc.EntityFireDemon; -import game.entity.npc.EntityMagma; -import game.entity.npc.EntityMetalhead; -import game.entity.npc.EntityTiefling; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureOres; -import game.worldgen.feature.WorldGenFire; -import game.worldgen.feature.WorldGenGlowStone; -import game.worldgen.feature.WorldGenHellLava; -import game.worldgen.foliage.WorldGenMushroom; +import common.entity.npc.EntityBloodElf; +import common.entity.npc.EntityCultivator; +import common.entity.npc.EntityFireDemon; +import common.entity.npc.EntityMagma; +import common.entity.npc.EntityMetalhead; +import common.entity.npc.EntityTiefling; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureOres; +import common.worldgen.feature.WorldGenFire; +import common.worldgen.feature.WorldGenGlowStone; +import common.worldgen.feature.WorldGenHellLava; +import common.worldgen.foliage.WorldGenMushroom; public class BiomeHell extends Biome { diff --git a/java/src/game/biome/BiomeHills.java b/java/src/common/biome/BiomeHills.java similarity index 91% rename from java/src/game/biome/BiomeHills.java rename to java/src/common/biome/BiomeHills.java index 7f86b7b..125e977 100755 --- a/java/src/game/biome/BiomeHills.java +++ b/java/src/common/biome/BiomeHills.java @@ -1,13 +1,13 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.FeatureOres; -import game.worldgen.tree.WorldGenTaiga2; -import game.worldgen.tree.WorldGenTree; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.FeatureOres; +import common.worldgen.tree.WorldGenTaiga2; +import common.worldgen.tree.WorldGenTree; public class BiomeHills extends Biome { diff --git a/java/src/game/biome/BiomeJungle.java b/java/src/common/biome/BiomeJungle.java similarity index 78% rename from java/src/game/biome/BiomeJungle.java rename to java/src/common/biome/BiomeJungle.java index ce45cb2..dbbc6d6 100755 --- a/java/src/game/biome/BiomeJungle.java +++ b/java/src/common/biome/BiomeJungle.java @@ -1,21 +1,21 @@ -package game.biome; +package common.biome; -import game.block.BlockTallGrass; -import game.entity.animal.EntityChicken; -import game.entity.animal.EntityOcelot; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.foliage.WorldGenMelon; -import game.worldgen.foliage.WorldGenShrub; -import game.worldgen.foliage.WorldGenTallGrass; -import game.worldgen.foliage.WorldGenVines; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenJungle; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockTallGrass; +import common.entity.animal.EntityChicken; +import common.entity.animal.EntityOcelot; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.foliage.WorldGenMelon; +import common.worldgen.foliage.WorldGenShrub; +import common.worldgen.foliage.WorldGenTallGrass; +import common.worldgen.foliage.WorldGenVines; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenJungle; +import common.worldgen.tree.WorldGenTree; public class BiomeJungle extends Biome { diff --git a/java/src/game/biome/BiomeMesa.java b/java/src/common/biome/BiomeMesa.java similarity index 95% rename from java/src/game/biome/BiomeMesa.java rename to java/src/common/biome/BiomeMesa.java index edf1000..29c92b7 100755 --- a/java/src/game/biome/BiomeMesa.java +++ b/java/src/common/biome/BiomeMesa.java @@ -1,22 +1,22 @@ -package game.biome; +package common.biome; import java.util.Arrays; -import game.block.Block; -import game.block.BlockColored; -import game.block.BlockDirt; -import game.block.BlockSand; -import game.color.DyeColor; -import game.init.Blocks; -import game.material.Material; -import game.rng.PerlinGen; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.tree.WorldGenTree; +import common.block.Block; +import common.block.BlockColored; +import common.block.BlockDirt; +import common.block.BlockSand; +import common.color.DyeColor; +import common.init.Blocks; +import common.material.Material; +import common.rng.PerlinGen; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.tree.WorldGenTree; public class BiomeMesa extends Biome { diff --git a/java/src/game/biome/BiomeMoon.java b/java/src/common/biome/BiomeMoon.java similarity index 70% rename from java/src/game/biome/BiomeMoon.java rename to java/src/common/biome/BiomeMoon.java index 6a3baad..297eabe 100755 --- a/java/src/game/biome/BiomeMoon.java +++ b/java/src/common/biome/BiomeMoon.java @@ -1,11 +1,11 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureOres; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureOres; public class BiomeMoon extends Biome { private FeatureOres cheeseGenerator = new FeatureOres(Blocks.moon_cheese.getState(), 8, 8, 12, 24, 52, false); diff --git a/java/src/game/biome/BiomeMushroom.java b/java/src/common/biome/BiomeMushroom.java similarity index 79% rename from java/src/game/biome/BiomeMushroom.java rename to java/src/common/biome/BiomeMushroom.java index 07ebec9..5133daa 100755 --- a/java/src/game/biome/BiomeMushroom.java +++ b/java/src/common/biome/BiomeMushroom.java @@ -1,8 +1,8 @@ -package game.biome; +package common.biome; -import game.entity.animal.EntityMooshroom; -import game.init.Blocks; -import game.rng.WeightedList; +import common.entity.animal.EntityMooshroom; +import common.init.Blocks; +import common.rng.WeightedList; public class BiomeMushroom extends Biome { diff --git a/java/src/game/biome/BiomeMutated.java b/java/src/common/biome/BiomeMutated.java similarity index 92% rename from java/src/game/biome/BiomeMutated.java rename to java/src/common/biome/BiomeMutated.java index 95d4d93..d0d5f7b 100755 --- a/java/src/game/biome/BiomeMutated.java +++ b/java/src/common/biome/BiomeMutated.java @@ -1,11 +1,11 @@ -package game.biome; +package common.biome; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.tree.WorldGenTree; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.tree.WorldGenTree; public class BiomeMutated extends Biome { diff --git a/java/src/game/biome/BiomeNone.java b/java/src/common/biome/BiomeNone.java similarity index 71% rename from java/src/game/biome/BiomeNone.java rename to java/src/common/biome/BiomeNone.java index bac124c..9c84a6f 100755 --- a/java/src/game/biome/BiomeNone.java +++ b/java/src/common/biome/BiomeNone.java @@ -1,11 +1,11 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; public class BiomeNone extends Biome { public BiomeNone(int id) { diff --git a/java/src/game/biome/BiomePlains.java b/java/src/common/biome/BiomePlains.java similarity index 94% rename from java/src/game/biome/BiomePlains.java rename to java/src/common/biome/BiomePlains.java index 35ee03b..f652fb5 100755 --- a/java/src/game/biome/BiomePlains.java +++ b/java/src/common/biome/BiomePlains.java @@ -1,11 +1,11 @@ -package game.biome; +package common.biome; -import game.block.BlockDoublePlant; -import game.block.BlockFlower; -import game.entity.animal.EntityHorse; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; +import common.block.BlockDoublePlant; +import common.block.BlockFlower; +import common.entity.animal.EntityHorse; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; public class BiomePlains extends Biome { diff --git a/java/src/game/biome/BiomeSavanna.java b/java/src/common/biome/BiomeSavanna.java similarity index 87% rename from java/src/game/biome/BiomeSavanna.java rename to java/src/common/biome/BiomeSavanna.java index fd987cf..aae7642 100755 --- a/java/src/game/biome/BiomeSavanna.java +++ b/java/src/common/biome/BiomeSavanna.java @@ -1,15 +1,15 @@ -package game.biome; +package common.biome; -import game.block.BlockDirt; -import game.block.BlockDoublePlant; -import game.entity.animal.EntityHorse; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.tree.WorldGenSavanna; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockDirt; +import common.block.BlockDoublePlant; +import common.entity.animal.EntityHorse; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.tree.WorldGenSavanna; +import common.worldgen.tree.WorldGenTree; public class BiomeSavanna extends Biome { diff --git a/java/src/game/biome/BiomeSnow.java b/java/src/common/biome/BiomeSnow.java similarity index 82% rename from java/src/game/biome/BiomeSnow.java rename to java/src/common/biome/BiomeSnow.java index 44767cf..5e0e697 100755 --- a/java/src/game/biome/BiomeSnow.java +++ b/java/src/common/biome/BiomeSnow.java @@ -1,14 +1,14 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.feature.WorldGenIcePath; -import game.worldgen.feature.WorldGenIceSpike; -import game.worldgen.tree.WorldGenTaiga2; -import game.worldgen.tree.WorldGenTree; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.feature.WorldGenIcePath; +import common.worldgen.feature.WorldGenIceSpike; +import common.worldgen.tree.WorldGenTaiga2; +import common.worldgen.tree.WorldGenTree; public class BiomeSnow extends Biome { diff --git a/java/src/game/biome/BiomeSnowLand.java b/java/src/common/biome/BiomeSnowLand.java similarity index 73% rename from java/src/game/biome/BiomeSnowLand.java rename to java/src/common/biome/BiomeSnowLand.java index 8ad0d4a..5699886 100755 --- a/java/src/game/biome/BiomeSnowLand.java +++ b/java/src/common/biome/BiomeSnowLand.java @@ -1,9 +1,9 @@ -package game.biome; +package common.biome; -import game.entity.animal.EntitySheep; -import game.entity.npc.EntitySpirit; -import game.init.Blocks; -import game.rng.WeightedList; +import common.entity.animal.EntitySheep; +import common.entity.npc.EntitySpirit; +import common.init.Blocks; +import common.rng.WeightedList; public class BiomeSnowLand extends Biome { diff --git a/java/src/game/biome/BiomeSpace.java b/java/src/common/biome/BiomeSpace.java similarity index 74% rename from java/src/game/biome/BiomeSpace.java rename to java/src/common/biome/BiomeSpace.java index 67a3cf1..da3953e 100755 --- a/java/src/game/biome/BiomeSpace.java +++ b/java/src/common/biome/BiomeSpace.java @@ -1,13 +1,13 @@ -package game.biome; +package common.biome; -import game.block.BlockDirt; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.feature.WorldGenAsteroid; +import common.block.BlockDirt; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.feature.WorldGenAsteroid; public class BiomeSpace extends Biome { diff --git a/java/src/game/biome/BiomeStoneBeach.java b/java/src/common/biome/BiomeStoneBeach.java similarity index 84% rename from java/src/game/biome/BiomeStoneBeach.java rename to java/src/common/biome/BiomeStoneBeach.java index 550a07b..41c1926 100755 --- a/java/src/game/biome/BiomeStoneBeach.java +++ b/java/src/common/biome/BiomeStoneBeach.java @@ -1,7 +1,7 @@ -package game.biome; +package common.biome; -import game.init.Blocks; -import game.rng.WeightedList; +import common.init.Blocks; +import common.rng.WeightedList; public class BiomeStoneBeach extends Biome { diff --git a/java/src/game/biome/BiomeSwamp.java b/java/src/common/biome/BiomeSwamp.java similarity index 85% rename from java/src/game/biome/BiomeSwamp.java rename to java/src/common/biome/BiomeSwamp.java index c742d0a..41a39a3 100755 --- a/java/src/game/biome/BiomeSwamp.java +++ b/java/src/common/biome/BiomeSwamp.java @@ -1,16 +1,16 @@ -package game.biome; +package common.biome; -import game.block.BlockDirectional; -import game.block.BlockFlower; -import game.entity.npc.EntitySlime; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockDirectional; +import common.block.BlockFlower; +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.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.tree.WorldGenTree; public class BiomeSwamp extends Biome { diff --git a/java/src/game/biome/BiomeTaiga.java b/java/src/common/biome/BiomeTaiga.java similarity index 85% rename from java/src/game/biome/BiomeTaiga.java rename to java/src/common/biome/BiomeTaiga.java index f5b4b7e..2281c1d 100755 --- a/java/src/game/biome/BiomeTaiga.java +++ b/java/src/common/biome/BiomeTaiga.java @@ -1,21 +1,21 @@ -package game.biome; +package common.biome; -import game.block.BlockDirt; -import game.block.BlockDoublePlant; -import game.block.BlockTallGrass; -import game.entity.animal.EntityWolf; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; -import game.worldgen.FeatureGenerator; -import game.worldgen.feature.WorldGenBlockBlob; -import game.worldgen.foliage.WorldGenTallGrass; -import game.worldgen.tree.WorldGenPine; -import game.worldgen.tree.WorldGenTaiga1; -import game.worldgen.tree.WorldGenTaiga2; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockDirt; +import common.block.BlockDoublePlant; +import common.block.BlockTallGrass; +import common.entity.animal.EntityWolf; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; +import common.worldgen.FeatureGenerator; +import common.worldgen.feature.WorldGenBlockBlob; +import common.worldgen.foliage.WorldGenTallGrass; +import common.worldgen.tree.WorldGenPine; +import common.worldgen.tree.WorldGenTaiga1; +import common.worldgen.tree.WorldGenTaiga2; +import common.worldgen.tree.WorldGenTree; public class BiomeTaiga extends Biome { diff --git a/java/src/game/biome/BiomeTian.java b/java/src/common/biome/BiomeTian.java similarity index 80% rename from java/src/game/biome/BiomeTian.java rename to java/src/common/biome/BiomeTian.java index 1382e11..933eaf3 100755 --- a/java/src/game/biome/BiomeTian.java +++ b/java/src/common/biome/BiomeTian.java @@ -1,21 +1,21 @@ -package game.biome; +package common.biome; -import game.block.BlockFlower; -import game.entity.animal.EntityBat; -import game.entity.animal.EntityMouse; -import game.entity.animal.EntityRabbit; -import game.entity.npc.EntityCultivator; -import game.init.Blocks; -import game.rng.Random; -import game.rng.WeightedList; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.feature.WorldGenSpikes; -import game.worldgen.foliage.WorldGenMushroom; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenBigTree; -import game.worldgen.tree.WorldGenTree; +import common.block.BlockFlower; +import common.entity.animal.EntityBat; +import common.entity.animal.EntityMouse; +import common.entity.animal.EntityRabbit; +import common.entity.npc.EntityCultivator; +import common.init.Blocks; +import common.rng.Random; +import common.rng.WeightedList; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.feature.WorldGenSpikes; +import common.worldgen.foliage.WorldGenMushroom; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenBigTree; +import common.worldgen.tree.WorldGenTree; public class BiomeTian extends Biome { diff --git a/java/src/game/biome/BiomeWater.java b/java/src/common/biome/BiomeWater.java similarity index 80% rename from java/src/game/biome/BiomeWater.java rename to java/src/common/biome/BiomeWater.java index 6c68df8..af521da 100755 --- a/java/src/game/biome/BiomeWater.java +++ b/java/src/common/biome/BiomeWater.java @@ -1,7 +1,7 @@ -package game.biome; +package common.biome; -import game.entity.animal.EntitySquid; -import game.rng.WeightedList; +import common.entity.animal.EntitySquid; +import common.rng.WeightedList; public class BiomeWater extends Biome { private final boolean river; diff --git a/java/src/game/biome/RngSpawn.java b/java/src/common/biome/RngSpawn.java similarity index 77% rename from java/src/game/biome/RngSpawn.java rename to java/src/common/biome/RngSpawn.java index 25ba373..969bdca 100644 --- a/java/src/game/biome/RngSpawn.java +++ b/java/src/common/biome/RngSpawn.java @@ -1,7 +1,7 @@ -package game.biome; +package common.biome; -import game.entity.types.EntityLiving; -import game.rng.RngItem; +import common.entity.types.EntityLiving; +import common.rng.RngItem; public class RngSpawn extends RngItem { public final Class type; diff --git a/java/src/game/biome/Scaling.java b/java/src/common/biome/Scaling.java similarity index 96% rename from java/src/game/biome/Scaling.java rename to java/src/common/biome/Scaling.java index 6629d78..1518b57 100644 --- a/java/src/game/biome/Scaling.java +++ b/java/src/common/biome/Scaling.java @@ -1,4 +1,4 @@ -package game.biome; +package common.biome; public enum Scaling { VARYING_LOW(0.1F, 0.2F), diff --git a/java/src/game/biome/Temperature.java b/java/src/common/biome/Temperature.java similarity index 71% rename from java/src/game/biome/Temperature.java rename to java/src/common/biome/Temperature.java index b9acbf2..3c809c9 100644 --- a/java/src/game/biome/Temperature.java +++ b/java/src/common/biome/Temperature.java @@ -1,4 +1,4 @@ -package game.biome; +package common.biome; public enum Temperature { SEA, COLD, MEDIUM, WARM; diff --git a/java/src/game/block/Block.java b/java/src/common/block/Block.java similarity index 96% rename from java/src/game/block/Block.java rename to java/src/common/block/Block.java index 16e974a..92d3ab9 100755 --- a/java/src/game/block/Block.java +++ b/java/src/common/block/Block.java @@ -1,4 +1,4 @@ -package game.block; +package common.block; import java.lang.reflect.Array; import java.util.Arrays; @@ -11,45 +11,45 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.function.Function; -import game.collect.ImmutableList; -import game.collect.ImmutableMap; -import game.collect.Iterables; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.UnmodifiableIterator; -import game.enchantment.EnchantmentHelper; -import game.entity.Entity; -import game.entity.item.EntityItem; -import game.entity.item.EntityXp; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.properties.IProperty; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Explosion; -import game.world.Facing; -import game.world.HitPosition; -import game.world.HitPosition.ObjectType; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.collect.ImmutableList; +import common.collect.ImmutableMap; +import common.collect.Iterables; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.UnmodifiableIterator; +import common.enchantment.EnchantmentHelper; +import common.entity.Entity; +import common.entity.item.EntityItem; +import common.entity.item.EntityXp; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.properties.IProperty; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +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/java/src/game/block/BlockAir.java b/java/src/common/block/BlockAir.java similarity index 86% rename from java/src/game/block/BlockAir.java rename to java/src/common/block/BlockAir.java index 55fdb2b..f0c60bb 100755 --- a/java/src/game/block/BlockAir.java +++ b/java/src/common/block/BlockAir.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.material.Material; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; +import common.material.Material; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.State; +import common.world.World; public class BlockAir extends Block { diff --git a/java/src/game/block/BlockAnvil.java b/java/src/common/block/BlockAnvil.java similarity index 88% rename from java/src/game/block/BlockAnvil.java rename to java/src/common/block/BlockAnvil.java index cfca9f7..f7519e3 100755 --- a/java/src/game/block/BlockAnvil.java +++ b/java/src/common/block/BlockAnvil.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.item.EntityFalling; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.inventory.Container; -import game.inventory.ContainerRepair; -import game.inventory.InventoryPlayer; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.properties.PropertyInteger; -import game.tileentity.IInteractionObject; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.item.EntityFalling; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.inventory.Container; +import common.inventory.ContainerRepair; +import common.inventory.InventoryPlayer; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.Transforms; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockAnvil extends BlockFalling { diff --git a/java/src/game/block/BlockBanner.java b/java/src/common/block/BlockBanner.java similarity index 91% rename from java/src/game/block/BlockBanner.java rename to java/src/common/block/BlockBanner.java index 889a8f0..2994082 100755 --- a/java/src/game/block/BlockBanner.java +++ b/java/src/common/block/BlockBanner.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Transforms; -import game.nbt.NBTTagCompound; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBanner; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Transforms; +import common.nbt.NBTTagCompound; +import common.properties.IProperty; +import common.properties.PropertyDirection; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockBanner extends BlockContainer { diff --git a/java/src/game/block/BlockBaseFlower.java b/java/src/common/block/BlockBaseFlower.java similarity index 88% rename from java/src/game/block/BlockBaseFlower.java rename to java/src/common/block/BlockBaseFlower.java index 205a707..5d07b1b 100755 --- a/java/src/game/block/BlockBaseFlower.java +++ b/java/src/common/block/BlockBaseFlower.java @@ -1,4 +1,4 @@ -package game.block; +package common.block; public class BlockBaseFlower extends BlockFlower { diff --git a/java/src/game/block/BlockBasePressurePlate.java b/java/src/common/block/BlockBasePressurePlate.java similarity index 93% rename from java/src/game/block/BlockBasePressurePlate.java rename to java/src/common/block/BlockBasePressurePlate.java index 1e60e30..339f4c2 100755 --- a/java/src/game/block/BlockBasePressurePlate.java +++ b/java/src/common/block/BlockBasePressurePlate.java @@ -1,20 +1,20 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.init.SoundEvent; +import common.item.CheatTab; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public abstract class BlockBasePressurePlate extends Block { diff --git a/java/src/game/block/BlockBeacon.java b/java/src/common/block/BlockBeacon.java similarity index 89% rename from java/src/game/block/BlockBeacon.java rename to java/src/common/block/BlockBeacon.java index 48bf1a1..7ac615b 100755 --- a/java/src/game/block/BlockBeacon.java +++ b/java/src/common/block/BlockBeacon.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBeacon; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +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.world.State; +import common.world.World; public class BlockBeacon extends BlockContainer { diff --git a/java/src/game/block/BlockBed.java b/java/src/common/block/BlockBed.java similarity index 91% rename from java/src/game/block/BlockBed.java rename to java/src/common/block/BlockBed.java index 9ed32a2..f602551 100755 --- a/java/src/game/block/BlockBed.java +++ b/java/src/common/block/BlockBed.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; -import game.color.DyeColor; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.init.ItemRegistry; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldPos; +import common.color.DyeColor; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.init.ItemRegistry; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +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/java/src/game/block/BlockBedrock.java b/java/src/common/block/BlockBedrock.java similarity index 68% rename from java/src/game/block/BlockBedrock.java rename to java/src/common/block/BlockBedrock.java index 42c60eb..78c30f7 100755 --- a/java/src/game/block/BlockBedrock.java +++ b/java/src/common/block/BlockBedrock.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.material.Material; -import game.model.ParticleType; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldClient; +import common.material.Material; +import common.model.ParticleType; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldClient; public class BlockBedrock extends Block { public BlockBedrock() { diff --git a/java/src/game/block/BlockBlackenedDirt.java b/java/src/common/block/BlockBlackenedDirt.java similarity index 83% rename from java/src/game/block/BlockBlackenedDirt.java rename to java/src/common/block/BlockBlackenedDirt.java index 9021411..e3552c5 100644 --- a/java/src/game/block/BlockBlackenedDirt.java +++ b/java/src/common/block/BlockBlackenedDirt.java @@ -1,13 +1,13 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class BlockBlackenedDirt extends Block { diff --git a/java/src/game/block/BlockBlackenedSoil.java b/java/src/common/block/BlockBlackenedSoil.java similarity index 83% rename from java/src/game/block/BlockBlackenedSoil.java rename to java/src/common/block/BlockBlackenedSoil.java index d1427ba..7918522 100644 --- a/java/src/game/block/BlockBlackenedSoil.java +++ b/java/src/common/block/BlockBlackenedSoil.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class BlockBlackenedSoil extends Block { diff --git a/java/src/game/block/BlockBlackenedStone.java b/java/src/common/block/BlockBlackenedStone.java similarity index 56% rename from java/src/game/block/BlockBlackenedStone.java rename to java/src/common/block/BlockBlackenedStone.java index 7454eae..a28fdae 100644 --- a/java/src/game/block/BlockBlackenedStone.java +++ b/java/src/common/block/BlockBlackenedStone.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.State; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.State; public class BlockBlackenedStone extends Block { public BlockBlackenedStone() { diff --git a/java/src/game/block/BlockBlueShroom.java b/java/src/common/block/BlockBlueShroom.java similarity index 89% rename from java/src/game/block/BlockBlueShroom.java rename to java/src/common/block/BlockBlueShroom.java index d8b7ffe..7e9b87c 100755 --- a/java/src/game/block/BlockBlueShroom.java +++ b/java/src/common/block/BlockBlueShroom.java @@ -1,14 +1,14 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockBlueShroom extends BlockBush { diff --git a/java/src/game/block/BlockBookshelf.java b/java/src/common/block/BlockBookshelf.java similarity index 72% rename from java/src/game/block/BlockBookshelf.java rename to java/src/common/block/BlockBookshelf.java index 7d871f4..a555b4c 100755 --- a/java/src/game/block/BlockBookshelf.java +++ b/java/src/common/block/BlockBookshelf.java @@ -1,13 +1,13 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.State; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.world.State; public class BlockBookshelf extends Block { diff --git a/java/src/game/block/BlockBreakable.java b/java/src/common/block/BlockBreakable.java similarity index 83% rename from java/src/game/block/BlockBreakable.java rename to java/src/common/block/BlockBreakable.java index f99b134..e60acea 100755 --- a/java/src/game/block/BlockBreakable.java +++ b/java/src/common/block/BlockBreakable.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; +import common.init.Blocks; +import common.material.Material; +import common.world.BlockPos; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; public class BlockBreakable extends Block { diff --git a/java/src/game/block/BlockBrewingStand.java b/java/src/common/block/BlockBrewingStand.java similarity index 96% rename from java/src/game/block/BlockBrewingStand.java rename to java/src/common/block/BlockBrewingStand.java index 5a51b4b..4de9271 100755 --- a/java/src/game/block/BlockBrewingStand.java +++ b/java/src/common/block/BlockBrewingStand.java @@ -1,32 +1,32 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBrewingStand; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ParticleType; +import common.properties.IProperty; +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.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockBrewingStand extends BlockContainer { diff --git a/java/src/game/block/BlockBush.java b/java/src/common/block/BlockBush.java similarity index 87% rename from java/src/game/block/BlockBush.java rename to java/src/common/block/BlockBush.java index efc7592..79b8a13 100755 --- a/java/src/game/block/BlockBush.java +++ b/java/src/common/block/BlockBush.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockBush extends Block { diff --git a/java/src/game/block/BlockButton.java b/java/src/common/block/BlockButton.java similarity index 94% rename from java/src/game/block/BlockButton.java rename to java/src/common/block/BlockButton.java index 982d1a6..ea3415a 100755 --- a/java/src/game/block/BlockButton.java +++ b/java/src/common/block/BlockButton.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityArrow; -import game.entity.types.EntityLiving; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityArrow; +import common.entity.types.EntityLiving; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.Transforms; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockButton extends Block { diff --git a/java/src/game/block/BlockCactus.java b/java/src/common/block/BlockCactus.java similarity index 89% rename from java/src/game/block/BlockCactus.java rename to java/src/common/block/BlockCactus.java index fa0cf2a..03777da 100755 --- a/java/src/game/block/BlockCactus.java +++ b/java/src/common/block/BlockCactus.java @@ -1,23 +1,23 @@ -package game.block; +package common.block; -import game.entity.DamageSource; -import game.entity.Entity; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.DamageSource; +import common.entity.Entity; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockCactus extends Block { diff --git a/java/src/game/block/BlockCake.java b/java/src/common/block/BlockCake.java similarity index 93% rename from java/src/game/block/BlockCake.java rename to java/src/common/block/BlockCake.java index bf8995d..4a62734 100755 --- a/java/src/game/block/BlockCake.java +++ b/java/src/common/block/BlockCake.java @@ -1,21 +1,21 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockCake extends Block { diff --git a/java/src/game/block/BlockCarpet.java b/java/src/common/block/BlockCarpet.java similarity index 89% rename from java/src/game/block/BlockCarpet.java rename to java/src/common/block/BlockCarpet.java index a54cc4d..8a93ae1 100755 --- a/java/src/game/block/BlockCarpet.java +++ b/java/src/common/block/BlockCarpet.java @@ -1,22 +1,22 @@ -package game.block; +package common.block; import java.util.List; -import game.color.DyeColor; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.color.DyeColor; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockCarpet extends Block { diff --git a/java/src/game/block/BlockCarrot.java b/java/src/common/block/BlockCarrot.java similarity index 70% rename from java/src/game/block/BlockCarrot.java rename to java/src/common/block/BlockCarrot.java index 54088e8..be7f274 100755 --- a/java/src/game/block/BlockCarrot.java +++ b/java/src/common/block/BlockCarrot.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.Item; -import game.model.Model; -import game.model.ModelProvider; -import game.world.State; +import common.init.Items; +import common.item.Item; +import common.model.Model; +import common.model.ModelProvider; +import common.world.State; public class BlockCarrot extends BlockCrops { diff --git a/java/src/game/block/BlockCauldron.java b/java/src/common/block/BlockCauldron.java similarity index 96% rename from java/src/game/block/BlockCauldron.java rename to java/src/common/block/BlockCauldron.java index 37296d8..5ed3371 100755 --- a/java/src/game/block/BlockCauldron.java +++ b/java/src/common/block/BlockCauldron.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.FluidRegistry; -import game.init.Items; -import game.item.Item; -import game.item.ItemArmor; -import game.item.ItemBanner; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.tileentity.TileEntityBanner; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.FluidRegistry; +import common.init.Items; +import common.item.Item; +import common.item.ItemArmor; +import common.item.ItemBanner; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.tileentity.TileEntityBanner; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +import common.world.State; +import common.world.World; public class BlockCauldron extends Block { diff --git a/java/src/game/block/BlockChest.java b/java/src/common/block/BlockChest.java similarity index 94% rename from java/src/game/block/BlockChest.java rename to java/src/common/block/BlockChest.java index bcb3356..92d3821 100755 --- a/java/src/game/block/BlockChest.java +++ b/java/src/common/block/BlockChest.java @@ -1,35 +1,35 @@ -package game.block; +package common.block; -import game.color.TextColor; -import game.entity.Entity; -import game.entity.animal.EntityOcelot; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.inventory.Container; -import game.inventory.IInventory; -import game.inventory.InventoryHelper; -import game.inventory.InventoryLargeChest; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.packet.S29PacketSoundEffect; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.tileentity.ILockableContainer; -import game.tileentity.LockCode; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.TextColor; +import common.entity.Entity; +import common.entity.animal.EntityOcelot; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.inventory.Container; +import common.inventory.IInventory; +import common.inventory.InventoryHelper; +import common.inventory.InventoryLargeChest; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.packet.S29PacketSoundEffect; +import common.properties.IProperty; +import common.properties.PropertyDirection; +import common.tileentity.ILockableContainer; +import common.tileentity.LockCode; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityChest; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockChest extends BlockContainer { diff --git a/java/src/game/block/BlockClay.java b/java/src/common/block/BlockClay.java similarity index 72% rename from java/src/game/block/BlockClay.java rename to java/src/common/block/BlockClay.java index 0637152..c1d0259 100755 --- a/java/src/game/block/BlockClay.java +++ b/java/src/common/block/BlockClay.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.State; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.State; public class BlockClay extends Block { diff --git a/java/src/game/block/BlockCocoa.java b/java/src/common/block/BlockCocoa.java similarity index 92% rename from java/src/game/block/BlockCocoa.java rename to java/src/common/block/BlockCocoa.java index 0f24db0..baad0fa 100755 --- a/java/src/game/block/BlockCocoa.java +++ b/java/src/common/block/BlockCocoa.java @@ -1,27 +1,27 @@ -package game.block; +package common.block; -import game.color.DyeColor; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.DyeColor; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockCocoa extends BlockDirectional implements IGrowable { diff --git a/java/src/game/block/BlockColored.java b/java/src/common/block/BlockColored.java similarity index 85% rename from java/src/game/block/BlockColored.java rename to java/src/common/block/BlockColored.java index 9aee9e4..8516cbc 100755 --- a/java/src/game/block/BlockColored.java +++ b/java/src/common/block/BlockColored.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; import java.util.List; -import game.color.DyeColor; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.world.State; +import common.color.DyeColor; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.world.State; public class BlockColored extends Block { diff --git a/java/src/game/block/BlockCompressedPowered.java b/java/src/common/block/BlockCompressedPowered.java similarity index 75% rename from java/src/game/block/BlockCompressedPowered.java rename to java/src/common/block/BlockCompressedPowered.java index 39d2736..f78ab13 100755 --- a/java/src/game/block/BlockCompressedPowered.java +++ b/java/src/common/block/BlockCompressedPowered.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; +import common.material.Material; +import common.world.BlockPos; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; public class BlockCompressedPowered extends Block { diff --git a/java/src/game/block/BlockContainer.java b/java/src/common/block/BlockContainer.java similarity index 87% rename from java/src/game/block/BlockContainer.java rename to java/src/common/block/BlockContainer.java index 909b5d6..84bec0f 100755 --- a/java/src/game/block/BlockContainer.java +++ b/java/src/common/block/BlockContainer.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.material.Material; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.material.Material; +import common.tileentity.TileEntity; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public abstract class BlockContainer extends Block implements ITileEntityProvider { diff --git a/java/src/game/block/BlockCore.java b/java/src/common/block/BlockCore.java similarity index 66% rename from java/src/game/block/BlockCore.java rename to java/src/common/block/BlockCore.java index 03ac7e9..b125c14 100755 --- a/java/src/game/block/BlockCore.java +++ b/java/src/common/block/BlockCore.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.init.Config; -import game.item.CheatTab; -import game.material.Material; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.init.Config; +import common.item.CheatTab; +import common.material.Material; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class BlockCore extends Block { public BlockCore() { diff --git a/java/src/game/block/BlockCrops.java b/java/src/common/block/BlockCrops.java similarity index 93% rename from java/src/game/block/BlockCrops.java rename to java/src/common/block/BlockCrops.java index cb052a9..979ebaf 100755 --- a/java/src/game/block/BlockCrops.java +++ b/java/src/common/block/BlockCrops.java @@ -1,20 +1,20 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockCrops extends BlockBush implements IGrowable { diff --git a/java/src/game/block/BlockDaylightDetector.java b/java/src/common/block/BlockDaylightDetector.java similarity index 87% rename from java/src/game/block/BlockDaylightDetector.java rename to java/src/common/block/BlockDaylightDetector.java index 5ce1ee7..8e0a6f9 100755 --- a/java/src/game/block/BlockDaylightDetector.java +++ b/java/src/common/block/BlockDaylightDetector.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityDaylightDetector; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.LightType; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityDaylightDetector; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.LightType; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockDaylightDetector extends BlockContainer { diff --git a/java/src/game/block/BlockDeadBush.java b/java/src/common/block/BlockDeadBush.java similarity index 80% rename from java/src/game/block/BlockDeadBush.java rename to java/src/common/block/BlockDeadBush.java index 0badc17..f81d79b 100755 --- a/java/src/game/block/BlockDeadBush.java +++ b/java/src/common/block/BlockDeadBush.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockDeadBush extends BlockBush { diff --git a/java/src/game/block/BlockDirectional.java b/java/src/common/block/BlockDirectional.java similarity index 67% rename from java/src/game/block/BlockDirectional.java rename to java/src/common/block/BlockDirectional.java index 5c2c881..79113df 100755 --- a/java/src/game/block/BlockDirectional.java +++ b/java/src/common/block/BlockDirectional.java @@ -1,8 +1,8 @@ -package game.block; +package common.block; -import game.material.Material; -import game.properties.PropertyDirection; -import game.world.Facing; +import common.material.Material; +import common.properties.PropertyDirection; +import common.world.Facing; public abstract class BlockDirectional extends Block { diff --git a/java/src/game/block/BlockDirt.java b/java/src/common/block/BlockDirt.java similarity index 91% rename from java/src/game/block/BlockDirt.java rename to java/src/common/block/BlockDirt.java index 159bbda..ab9f792 100755 --- a/java/src/game/block/BlockDirt.java +++ b/java/src/common/block/BlockDirt.java @@ -1,22 +1,22 @@ -package game.block; +package common.block; import java.util.List; -import game.init.Blocks; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockDirt extends Block { diff --git a/java/src/game/block/BlockDispenser.java b/java/src/common/block/BlockDispenser.java similarity index 90% rename from java/src/game/block/BlockDispenser.java rename to java/src/common/block/BlockDispenser.java index f4f6e51..4c693c8 100755 --- a/java/src/game/block/BlockDispenser.java +++ b/java/src/common/block/BlockDispenser.java @@ -1,34 +1,34 @@ -package game.block; +package common.block; -import game.dispenser.BehaviorDefaultDispenseItem; -import game.dispenser.IBehaviorDispenseItem; -import game.dispenser.IBlockSource; -import game.dispenser.IPosition; -import game.dispenser.PositionImpl; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.DispenserRegistry; -import game.init.RegistryDefaulted; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityDispenser; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.dispenser.BehaviorDefaultDispenseItem; +import common.dispenser.IBehaviorDispenseItem; +import common.dispenser.IBlockSource; +import common.dispenser.IPosition; +import common.dispenser.PositionImpl; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.DispenserRegistry; +import common.init.RegistryDefaulted; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockDispenser extends BlockContainer { diff --git a/java/src/game/block/BlockDoor.java b/java/src/common/block/BlockDoor.java similarity index 95% rename from java/src/game/block/BlockDoor.java rename to java/src/common/block/BlockDoor.java index 8addee0..d0fa735 100755 --- a/java/src/game/block/BlockDoor.java +++ b/java/src/common/block/BlockDoor.java @@ -1,32 +1,32 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.HitPosition; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.collect.Lists; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyDirection; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.BoundingBox; +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; public class BlockDoor extends Block { diff --git a/java/src/game/block/BlockDoublePlant.java b/java/src/common/block/BlockDoublePlant.java similarity index 95% rename from java/src/game/block/BlockDoublePlant.java rename to java/src/common/block/BlockDoublePlant.java index ce68511..a580050 100755 --- a/java/src/game/block/BlockDoublePlant.java +++ b/java/src/common/block/BlockDoublePlant.java @@ -1,33 +1,33 @@ -package game.block; +package common.block; import java.util.List; -import game.color.Colorizer; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.Facing.Axis; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.Colorizer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +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/java/src/game/block/BlockDragonEgg.java b/java/src/common/block/BlockDragonEgg.java similarity index 93% rename from java/src/game/block/BlockDragonEgg.java rename to java/src/common/block/BlockDragonEgg.java index e343fa7..ef360b2 100755 --- a/java/src/game/block/BlockDragonEgg.java +++ b/java/src/common/block/BlockDragonEgg.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; -import game.entity.item.EntityFalling; -import game.entity.npc.EntityNPC; -import game.init.Config; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.item.EntityFalling; +import common.entity.npc.EntityNPC; +import common.init.Config; +import common.material.Material; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockDragonEgg extends Block { diff --git a/java/src/game/block/BlockDropper.java b/java/src/common/block/BlockDropper.java similarity index 85% rename from java/src/game/block/BlockDropper.java rename to java/src/common/block/BlockDropper.java index 668378a..b939e09 100755 --- a/java/src/game/block/BlockDropper.java +++ b/java/src/common/block/BlockDropper.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.dispenser.BehaviorDefaultDispenseItem; -import game.dispenser.IBehaviorDispenseItem; -import game.inventory.IInventory; -import game.item.ItemStack; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityDispenser; -import game.tileentity.TileEntityDropper; -import game.tileentity.TileEntityHopper; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.dispenser.BehaviorDefaultDispenseItem; +import common.dispenser.IBehaviorDispenseItem; +import common.inventory.IInventory; +import common.item.ItemStack; +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.world.World; public class BlockDropper extends BlockDispenser { diff --git a/java/src/game/block/BlockDryLeaves.java b/java/src/common/block/BlockDryLeaves.java similarity index 88% rename from java/src/game/block/BlockDryLeaves.java rename to java/src/common/block/BlockDryLeaves.java index 2cfd685..5ed08d6 100755 --- a/java/src/game/block/BlockDryLeaves.java +++ b/java/src/common/block/BlockDryLeaves.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.State; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.State; public class BlockDryLeaves extends BlockLeavesBase { diff --git a/java/src/game/block/BlockDynamicLiquid.java b/java/src/common/block/BlockDynamicLiquid.java similarity index 96% rename from java/src/game/block/BlockDynamicLiquid.java rename to java/src/common/block/BlockDynamicLiquid.java index 98c362f..df8128b 100755 --- a/java/src/game/block/BlockDynamicLiquid.java +++ b/java/src/common/block/BlockDynamicLiquid.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; import java.util.EnumSet; import java.util.Set; -import game.init.Blocks; -import game.init.Config; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockDynamicLiquid extends BlockLiquid { diff --git a/java/src/game/block/BlockEnchantmentTable.java b/java/src/common/block/BlockEnchantmentTable.java similarity index 87% rename from java/src/game/block/BlockEnchantmentTable.java rename to java/src/common/block/BlockEnchantmentTable.java index 1f0bd32..d33874e 100755 --- a/java/src/game/block/BlockEnchantmentTable.java +++ b/java/src/common/block/BlockEnchantmentTable.java @@ -1,22 +1,22 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityEnchantmentTable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldClient; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +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.world.State; +import common.world.World; +import common.world.WorldClient; public class BlockEnchantmentTable extends BlockContainer { diff --git a/java/src/game/block/BlockEventData.java b/java/src/common/block/BlockEventData.java similarity index 96% rename from java/src/game/block/BlockEventData.java rename to java/src/common/block/BlockEventData.java index b595cbb..5df52e1 100755 --- a/java/src/game/block/BlockEventData.java +++ b/java/src/common/block/BlockEventData.java @@ -1,6 +1,6 @@ -package game.block; +package common.block; -import game.world.BlockPos; +import common.world.BlockPos; public class BlockEventData { diff --git a/java/src/game/block/BlockFalling.java b/java/src/common/block/BlockFalling.java similarity index 88% rename from java/src/game/block/BlockFalling.java rename to java/src/common/block/BlockFalling.java index 9546e4d..c80b15c 100755 --- a/java/src/game/block/BlockFalling.java +++ b/java/src/common/block/BlockFalling.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.entity.item.EntityFalling; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.item.EntityFalling; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockFalling extends Block { diff --git a/java/src/game/block/BlockFarmland.java b/java/src/common/block/BlockFarmland.java similarity index 89% rename from java/src/game/block/BlockFarmland.java rename to java/src/common/block/BlockFarmland.java index 1885e73..38f6359 100755 --- a/java/src/game/block/BlockFarmland.java +++ b/java/src/common/block/BlockFarmland.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.item.Item; +import common.material.Material; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockFarmland extends Block { diff --git a/java/src/game/block/BlockFence.java b/java/src/common/block/BlockFence.java similarity index 95% rename from java/src/game/block/BlockFence.java rename to java/src/common/block/BlockFence.java index 715bfcc..37ad1a4 100755 --- a/java/src/game/block/BlockFence.java +++ b/java/src/common/block/BlockFence.java @@ -1,26 +1,26 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.item.CheatTab; -import game.item.ItemLead; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.ItemLead; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockFence extends Block { diff --git a/java/src/game/block/BlockFenceGate.java b/java/src/common/block/BlockFenceGate.java similarity index 95% rename from java/src/game/block/BlockFenceGate.java rename to java/src/common/block/BlockFenceGate.java index 1d5d2a1..fbf6658 100755 --- a/java/src/game/block/BlockFenceGate.java +++ b/java/src/common/block/BlockFenceGate.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.WoodType; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.WoodType; +import common.item.CheatTab; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockFenceGate extends BlockDirectional { diff --git a/java/src/game/block/BlockFire.java b/java/src/common/block/BlockFire.java similarity index 98% rename from java/src/game/block/BlockFire.java rename to java/src/common/block/BlockFire.java index 3374010..18a13bb 100755 --- a/java/src/game/block/BlockFire.java +++ b/java/src/common/block/BlockFire.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.Map; -import game.collect.Maps; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.collect.Maps; +import common.init.Blocks; +import common.init.Config; +import common.init.SoundEvent; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.ParticleType; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockFire extends Block { diff --git a/java/src/game/block/BlockFloorPortal.java b/java/src/common/block/BlockFloorPortal.java similarity index 90% rename from java/src/game/block/BlockFloorPortal.java rename to java/src/common/block/BlockFloorPortal.java index acc7dfb..347e4e1 100755 --- a/java/src/game/block/BlockFloorPortal.java +++ b/java/src/common/block/BlockFloorPortal.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; import java.util.List; import java.util.Map; import java.util.Set; -import game.collect.Sets; -import game.entity.Entity; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; +import common.collect.Sets; +import common.entity.Entity; +import common.item.Item; +import common.material.Material; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldClient; public class BlockFloorPortal extends Block { diff --git a/java/src/game/block/BlockFlower.java b/java/src/common/block/BlockFlower.java similarity index 93% rename from java/src/game/block/BlockFlower.java rename to java/src/common/block/BlockFlower.java index fff920c..3ce19a9 100755 --- a/java/src/game/block/BlockFlower.java +++ b/java/src/common/block/BlockFlower.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; import java.util.Collection; import java.util.List; import java.util.function.Predicate; -import game.collect.Filter; -import game.collect.Lists; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.collect.Filter; +import common.collect.Lists; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public abstract class BlockFlower extends BlockBush { diff --git a/java/src/game/block/BlockFlowerPot.java b/java/src/common/block/BlockFlowerPot.java similarity index 95% rename from java/src/game/block/BlockFlowerPot.java rename to java/src/common/block/BlockFlowerPot.java index 852df5b..133ea9f 100755 --- a/java/src/game/block/BlockFlowerPot.java +++ b/java/src/common/block/BlockFlowerPot.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.item.ItemBlock; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.item.ItemBlock; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockFlowerPot extends Block // Container { diff --git a/java/src/game/block/BlockFurnace.java b/java/src/common/block/BlockFurnace.java similarity index 91% rename from java/src/game/block/BlockFurnace.java rename to java/src/common/block/BlockFurnace.java index 1e89482..8e225cd 100755 --- a/java/src/game/block/BlockFurnace.java +++ b/java/src/common/block/BlockFurnace.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityFurnace; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.ParticleType; +import common.properties.IProperty; +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.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockFurnace extends BlockContainer { diff --git a/java/src/game/block/BlockGlass.java b/java/src/common/block/BlockGlass.java similarity index 80% rename from java/src/game/block/BlockGlass.java rename to java/src/common/block/BlockGlass.java index 4445d66..adc1e63 100755 --- a/java/src/game/block/BlockGlass.java +++ b/java/src/common/block/BlockGlass.java @@ -1,9 +1,9 @@ -package game.block; +package common.block; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.rng.Random; public class BlockGlass extends BlockBreakable { diff --git a/java/src/game/block/BlockGlowstone.java b/java/src/common/block/BlockGlowstone.java similarity index 82% rename from java/src/game/block/BlockGlowstone.java rename to java/src/common/block/BlockGlowstone.java index 99cbce4..ddcdf75 100755 --- a/java/src/game/block/BlockGlowstone.java +++ b/java/src/common/block/BlockGlowstone.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.util.ExtMath; -import game.world.State; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.util.ExtMath; +import common.world.State; public class BlockGlowstone extends Block { diff --git a/java/src/game/block/BlockGrass.java b/java/src/common/block/BlockGrass.java similarity index 91% rename from java/src/game/block/BlockGrass.java rename to java/src/common/block/BlockGrass.java index 39cd89c..95a32d1 100755 --- a/java/src/game/block/BlockGrass.java +++ b/java/src/common/block/BlockGrass.java @@ -1,22 +1,22 @@ -package game.block; +package common.block; -import game.color.Colorizer; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.Colorizer; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.rng.Random; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockGrass extends Block implements IGrowable { diff --git a/java/src/game/block/BlockGravel.java b/java/src/common/block/BlockGravel.java similarity index 74% rename from java/src/game/block/BlockGravel.java rename to java/src/common/block/BlockGravel.java index 8684acb..9206e53 100755 --- a/java/src/game/block/BlockGravel.java +++ b/java/src/common/block/BlockGravel.java @@ -1,11 +1,11 @@ -package game.block; +package common.block; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.rng.Random; -import game.world.State; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.rng.Random; +import common.world.State; public class BlockGravel extends BlockFalling { diff --git a/java/src/game/block/BlockHardenedClay.java b/java/src/common/block/BlockHardenedClay.java similarity index 80% rename from java/src/game/block/BlockHardenedClay.java rename to java/src/common/block/BlockHardenedClay.java index 4f3cbdb..d3be1c4 100755 --- a/java/src/game/block/BlockHardenedClay.java +++ b/java/src/common/block/BlockHardenedClay.java @@ -1,7 +1,7 @@ -package game.block; +package common.block; -import game.item.CheatTab; -import game.material.Material; +import common.item.CheatTab; +import common.material.Material; public class BlockHardenedClay extends Block { diff --git a/java/src/game/block/BlockHay.java b/java/src/common/block/BlockHay.java similarity index 84% rename from java/src/game/block/BlockHay.java rename to java/src/common/block/BlockHay.java index 6aad1cc..c48465c 100755 --- a/java/src/game/block/BlockHay.java +++ b/java/src/common/block/BlockHay.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.properties.IProperty; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.types.EntityLiving; +import common.init.ItemRegistry; +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.world.State; +import common.world.World; public class BlockHay extends BlockRotatedPillar { diff --git a/java/src/game/block/BlockHellRock.java b/java/src/common/block/BlockHellRock.java similarity index 83% rename from java/src/game/block/BlockHellRock.java rename to java/src/common/block/BlockHellRock.java index 664aad4..26a4859 100755 --- a/java/src/game/block/BlockHellRock.java +++ b/java/src/common/block/BlockHellRock.java @@ -1,7 +1,7 @@ -package game.block; +package common.block; -import game.item.CheatTab; -import game.material.Material; +import common.item.CheatTab; +import common.material.Material; public class BlockHellRock extends Block { diff --git a/java/src/game/block/BlockHopper.java b/java/src/common/block/BlockHopper.java similarity index 92% rename from java/src/game/block/BlockHopper.java rename to java/src/common/block/BlockHopper.java index 6d4fd33..489f8f6 100755 --- a/java/src/game/block/BlockHopper.java +++ b/java/src/common/block/BlockHopper.java @@ -1,32 +1,32 @@ -package game.block; +package common.block; import java.util.List; import java.util.function.Predicate; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityHopper; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockHopper extends BlockContainer { diff --git a/java/src/game/block/BlockHugeMushroom.java b/java/src/common/block/BlockHugeMushroom.java similarity index 93% rename from java/src/game/block/BlockHugeMushroom.java rename to java/src/common/block/BlockHugeMushroom.java index ba36f71..6493036 100755 --- a/java/src/game/block/BlockHugeMushroom.java +++ b/java/src/common/block/BlockHugeMushroom.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.init.ItemRegistry; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.types.EntityLiving; +import common.init.ItemRegistry; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class BlockHugeMushroom extends Block { diff --git a/java/src/game/block/BlockIce.java b/java/src/common/block/BlockIce.java similarity index 81% rename from java/src/game/block/BlockIce.java rename to java/src/common/block/BlockIce.java index 565104a..1adca24 100755 --- a/java/src/game/block/BlockIce.java +++ b/java/src/common/block/BlockIce.java @@ -1,20 +1,20 @@ -package game.block; +package common.block; -import game.enchantment.EnchantmentHelper; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.LightType; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.enchantment.EnchantmentHelper; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.world.BlockPos; +import common.world.LightType; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockIce extends BlockBreakable { diff --git a/java/src/game/block/BlockJukebox.java b/java/src/common/block/BlockJukebox.java similarity index 64% rename from java/src/game/block/BlockJukebox.java rename to java/src/common/block/BlockJukebox.java index 839ae8e..f37d8b2 100755 --- a/java/src/game/block/BlockJukebox.java +++ b/java/src/common/block/BlockJukebox.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +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.world.State; +import common.world.World; public class BlockJukebox extends Block { public BlockJukebox() { diff --git a/java/src/game/block/BlockLadder.java b/java/src/common/block/BlockLadder.java similarity index 90% rename from java/src/game/block/BlockLadder.java rename to java/src/common/block/BlockLadder.java index 3c8df92..f22b33f 100755 --- a/java/src/game/block/BlockLadder.java +++ b/java/src/common/block/BlockLadder.java @@ -1,20 +1,20 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockLadder extends Block { diff --git a/java/src/game/block/BlockLeaves.java b/java/src/common/block/BlockLeaves.java similarity index 93% rename from java/src/game/block/BlockLeaves.java rename to java/src/common/block/BlockLeaves.java index d37c901..e5f2d51 100755 --- a/java/src/game/block/BlockLeaves.java +++ b/java/src/common/block/BlockLeaves.java @@ -1,33 +1,33 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.color.Colorizer; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.WoodType; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.collect.Lists; +import common.color.Colorizer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.WoodType; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ParticleType; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockLeaves extends BlockLeavesBase { diff --git a/java/src/game/block/BlockLeavesBase.java b/java/src/common/block/BlockLeavesBase.java similarity index 91% rename from java/src/game/block/BlockLeavesBase.java rename to java/src/common/block/BlockLeavesBase.java index e9b871d..2c7a3c2 100755 --- a/java/src/game/block/BlockLeavesBase.java +++ b/java/src/common/block/BlockLeavesBase.java @@ -1,7 +1,7 @@ -package game.block; +package common.block; -import game.material.Material; -import game.model.BlockLayer; +import common.material.Material; +import common.model.BlockLayer; public class BlockLeavesBase extends Block { diff --git a/java/src/game/block/BlockLever.java b/java/src/common/block/BlockLever.java similarity index 94% rename from java/src/game/block/BlockLever.java rename to java/src/common/block/BlockLever.java index 0592a0d..6766b57 100755 --- a/java/src/game/block/BlockLever.java +++ b/java/src/common/block/BlockLever.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +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; +import common.world.WorldServer; public class BlockLever extends Block { diff --git a/java/src/game/block/BlockLilyPad.java b/java/src/common/block/BlockLilyPad.java similarity index 86% rename from java/src/game/block/BlockLilyPad.java rename to java/src/common/block/BlockLilyPad.java index 1e67c54..a117b36 100755 --- a/java/src/game/block/BlockLilyPad.java +++ b/java/src/common/block/BlockLilyPad.java @@ -1,22 +1,22 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.item.EntityBoat; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.item.CheatTab; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.entity.item.EntityBoat; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.item.CheatTab; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockLilyPad extends BlockBush { diff --git a/java/src/game/block/BlockLiquid.java b/java/src/common/block/BlockLiquid.java similarity index 94% rename from java/src/game/block/BlockLiquid.java rename to java/src/common/block/BlockLiquid.java index 940ffd7..570baaa 100755 --- a/java/src/game/block/BlockLiquid.java +++ b/java/src/common/block/BlockLiquid.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; -import game.color.Colorizer; -import game.entity.Entity; -import game.init.Blocks; -import game.init.Config; -import game.init.FluidRegistry; -import game.init.SoundEvent; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.color.Colorizer; +import common.entity.Entity; +import common.init.Blocks; +import common.init.Config; +import common.init.FluidRegistry; +import common.init.SoundEvent; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.ParticleType; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +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; public abstract class BlockLiquid extends Block { diff --git a/java/src/game/block/BlockLog.java b/java/src/common/block/BlockLog.java similarity index 90% rename from java/src/game/block/BlockLog.java rename to java/src/common/block/BlockLog.java index c3de107..9162608 100755 --- a/java/src/game/block/BlockLog.java +++ b/java/src/common/block/BlockLog.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockLog extends BlockRotatedPillar { diff --git a/java/src/game/block/BlockMachine.java b/java/src/common/block/BlockMachine.java similarity index 85% rename from java/src/game/block/BlockMachine.java rename to java/src/common/block/BlockMachine.java index 55d7719..efe8555 100755 --- a/java/src/game/block/BlockMachine.java +++ b/java/src/common/block/BlockMachine.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.CheatTab; -import game.material.Material; -import game.properties.IProperty; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMachine; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.CheatTab; +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.world.State; +import common.world.World; +import common.world.WorldServer; public abstract class BlockMachine extends BlockDirectional implements ITileEntityProvider { public BlockMachine() { diff --git a/java/src/game/block/BlockMelon.java b/java/src/common/block/BlockMelon.java similarity index 78% rename from java/src/game/block/BlockMelon.java rename to java/src/common/block/BlockMelon.java index 6ce8e2d..53e8c84 100755 --- a/java/src/game/block/BlockMelon.java +++ b/java/src/common/block/BlockMelon.java @@ -1,13 +1,13 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.State; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.world.State; public class BlockMelon extends Block { diff --git a/java/src/game/block/BlockMobSpawner.java b/java/src/common/block/BlockMobSpawner.java similarity index 84% rename from java/src/game/block/BlockMobSpawner.java rename to java/src/common/block/BlockMobSpawner.java index 3e79503..9263baa 100755 --- a/java/src/game/block/BlockMobSpawner.java +++ b/java/src/common/block/BlockMobSpawner.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMobSpawner; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityMobSpawner; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockMobSpawner extends BlockContainer { diff --git a/java/src/game/block/BlockMushroom.java b/java/src/common/block/BlockMushroom.java similarity index 90% rename from java/src/game/block/BlockMushroom.java rename to java/src/common/block/BlockMushroom.java index 9fb2154..a69d71a 100755 --- a/java/src/game/block/BlockMushroom.java +++ b/java/src/common/block/BlockMushroom.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.foliage.WorldGenBigMushroom; +import common.init.Blocks; +import common.init.Config; +import common.model.Model; +import common.model.ModelProvider; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.foliage.WorldGenBigMushroom; public class BlockMushroom extends BlockBush implements IGrowable { diff --git a/java/src/game/block/BlockMycelium.java b/java/src/common/block/BlockMycelium.java similarity index 86% rename from java/src/game/block/BlockMycelium.java rename to java/src/common/block/BlockMycelium.java index d014d87..38fed42 100755 --- a/java/src/game/block/BlockMycelium.java +++ b/java/src/common/block/BlockMycelium.java @@ -1,21 +1,21 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; -import game.world.WorldClient; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ParticleType; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.rng.Random; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockMycelium extends Block { diff --git a/java/src/game/block/BlockNote.java b/java/src/common/block/BlockNote.java similarity index 90% rename from java/src/game/block/BlockNote.java rename to java/src/common/block/BlockNote.java index 1413107..9a548f9 100755 --- a/java/src/game/block/BlockNote.java +++ b/java/src/common/block/BlockNote.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.ParticleType; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityNote; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.item.CheatTab; +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.world.State; +import common.world.World; public class BlockNote extends BlockContainer { diff --git a/java/src/game/block/BlockNuke.java b/java/src/common/block/BlockNuke.java similarity index 81% rename from java/src/game/block/BlockNuke.java rename to java/src/common/block/BlockNuke.java index f666ba6..e993151 100755 --- a/java/src/game/block/BlockNuke.java +++ b/java/src/common/block/BlockNuke.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; -import game.entity.item.EntityNuke; -import game.init.Blocks; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.world.BlockPos; -import game.world.Explosion; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.item.EntityNuke; +import common.init.Blocks; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.world.BlockPos; +import common.world.Explosion; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockNuke extends Block { diff --git a/java/src/game/block/BlockObsidian.java b/java/src/common/block/BlockObsidian.java similarity index 72% rename from java/src/game/block/BlockObsidian.java rename to java/src/common/block/BlockObsidian.java index 86aab37..b2c80f9 100755 --- a/java/src/game/block/BlockObsidian.java +++ b/java/src/common/block/BlockObsidian.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.State; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.State; public class BlockObsidian extends Block { diff --git a/java/src/game/block/BlockOre.java b/java/src/common/block/BlockOre.java similarity index 93% rename from java/src/game/block/BlockOre.java rename to java/src/common/block/BlockOre.java index ebec758..008fdf9 100755 --- a/java/src/game/block/BlockOre.java +++ b/java/src/common/block/BlockOre.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.init.Config; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.init.Config; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockOre extends Block { diff --git a/java/src/game/block/BlockPackedIce.java b/java/src/common/block/BlockPackedIce.java similarity index 76% rename from java/src/game/block/BlockPackedIce.java rename to java/src/common/block/BlockPackedIce.java index ca2270c..c21ff05 100755 --- a/java/src/game/block/BlockPackedIce.java +++ b/java/src/common/block/BlockPackedIce.java @@ -1,8 +1,8 @@ -package game.block; +package common.block; -import game.item.CheatTab; -import game.material.Material; -import game.rng.Random; +import common.item.CheatTab; +import common.material.Material; +import common.rng.Random; public class BlockPackedIce extends Block { diff --git a/java/src/game/block/BlockPane.java b/java/src/common/block/BlockPane.java similarity index 96% rename from java/src/game/block/BlockPane.java rename to java/src/common/block/BlockPane.java index 7b01c70..66db2be 100755 --- a/java/src/game/block/BlockPane.java +++ b/java/src/common/block/BlockPane.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.init.Blocks; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockPane extends Block { diff --git a/java/src/game/block/BlockPistonBase.java b/java/src/common/block/BlockPistonBase.java similarity index 96% rename from java/src/game/block/BlockPistonBase.java rename to java/src/common/block/BlockPistonBase.java index 03a2622..3304a32 100755 --- a/java/src/game/block/BlockPistonBase.java +++ b/java/src/common/block/BlockPistonBase.java @@ -1,32 +1,32 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityPiston; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyDirection; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityPiston; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockPistonBase extends Block { diff --git a/java/src/game/block/BlockPistonHead.java b/java/src/common/block/BlockPistonHead.java similarity index 93% rename from java/src/game/block/BlockPistonHead.java rename to java/src/common/block/BlockPistonHead.java index 911638d..3c8870b 100755 --- a/java/src/game/block/BlockPistonHead.java +++ b/java/src/common/block/BlockPistonHead.java @@ -1,28 +1,28 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyDirection; +import common.properties.PropertyEnum; +import common.rng.Random; +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; +import common.world.WorldServer; public class BlockPistonHead extends Block { diff --git a/java/src/game/block/BlockPistonMoving.java b/java/src/common/block/BlockPistonMoving.java similarity index 93% rename from java/src/game/block/BlockPistonMoving.java rename to java/src/common/block/BlockPistonMoving.java index 89fea3b..bf0792a 100755 --- a/java/src/game/block/BlockPistonMoving.java +++ b/java/src/common/block/BlockPistonMoving.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.item.Item; -import game.material.Material; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityPiston; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.HitPosition; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.item.Item; +import common.material.Material; +import common.properties.IProperty; +import common.properties.PropertyDirection; +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.world.IWorldAccess; +import common.world.State; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; public class BlockPistonMoving extends BlockContainer { diff --git a/java/src/game/block/BlockPortal.java b/java/src/common/block/BlockPortal.java similarity index 96% rename from java/src/game/block/BlockPortal.java rename to java/src/common/block/BlockPortal.java index 33cd0ab..679cdfc 100755 --- a/java/src/game/block/BlockPortal.java +++ b/java/src/common/block/BlockPortal.java @@ -1,27 +1,27 @@ -package game.block; +package common.block; import java.util.Map; -import game.entity.Entity; -import game.init.Blocks; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.Facing.Axis; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; +import common.entity.Entity; +import common.init.Blocks; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ParticleType; +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.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/java/src/game/block/BlockPortalFrame.java b/java/src/common/block/BlockPortalFrame.java similarity index 87% rename from java/src/game/block/BlockPortalFrame.java rename to java/src/common/block/BlockPortalFrame.java index aefda08..c3dbab6 100755 --- a/java/src/game/block/BlockPortalFrame.java +++ b/java/src/common/block/BlockPortalFrame.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +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.world.State; +import common.world.World; public class BlockPortalFrame extends Block { diff --git a/java/src/game/block/BlockPotato.java b/java/src/common/block/BlockPotato.java similarity index 78% rename from java/src/game/block/BlockPotato.java rename to java/src/common/block/BlockPotato.java index 68d5c30..d1b2e33 100755 --- a/java/src/game/block/BlockPotato.java +++ b/java/src/common/block/BlockPotato.java @@ -1,13 +1,13 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.model.Model; -import game.model.ModelProvider; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.model.Model; +import common.model.ModelProvider; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockPotato extends BlockCrops { diff --git a/java/src/game/block/BlockPressurePlate.java b/java/src/common/block/BlockPressurePlate.java similarity index 88% rename from java/src/game/block/BlockPressurePlate.java rename to java/src/common/block/BlockPressurePlate.java index 64bafb7..cd29000 100755 --- a/java/src/game/block/BlockPressurePlate.java +++ b/java/src/common/block/BlockPressurePlate.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.material.Material; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; +import common.entity.Entity; +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.world.State; +import common.world.World; public class BlockPressurePlate extends BlockBasePressurePlate { diff --git a/java/src/game/block/BlockPressurePlateWeighted.java b/java/src/common/block/BlockPressurePlateWeighted.java similarity index 88% rename from java/src/game/block/BlockPressurePlateWeighted.java rename to java/src/common/block/BlockPressurePlateWeighted.java index ddce333..2468a10 100755 --- a/java/src/game/block/BlockPressurePlateWeighted.java +++ b/java/src/common/block/BlockPressurePlateWeighted.java @@ -1,13 +1,13 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.material.Material; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.material.Material; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockPressurePlateWeighted extends BlockBasePressurePlate { diff --git a/java/src/game/block/BlockPumpkin.java b/java/src/common/block/BlockPumpkin.java similarity index 95% rename from java/src/game/block/BlockPumpkin.java rename to java/src/common/block/BlockPumpkin.java index e3a6fa8..8cc3b9d 100755 --- a/java/src/game/block/BlockPumpkin.java +++ b/java/src/common/block/BlockPumpkin.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.material.Material; +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.world.State; +import common.world.World; public class BlockPumpkin extends BlockDirectional { diff --git a/java/src/game/block/BlockQuartz.java b/java/src/common/block/BlockQuartz.java similarity index 92% rename from java/src/game/block/BlockQuartz.java rename to java/src/common/block/BlockQuartz.java index dafd6c6..a6cccc3 100755 --- a/java/src/game/block/BlockQuartz.java +++ b/java/src/common/block/BlockQuartz.java @@ -1,23 +1,23 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.types.EntityLiving; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.types.EntityLiving; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class BlockQuartz extends Block { diff --git a/java/src/game/block/BlockRail.java b/java/src/common/block/BlockRail.java similarity index 88% rename from java/src/game/block/BlockRail.java rename to java/src/common/block/BlockRail.java index 92bab17..6b50f52 100755 --- a/java/src/game/block/BlockRail.java +++ b/java/src/common/block/BlockRail.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockRail extends BlockRailBase { diff --git a/java/src/game/block/BlockRailBase.java b/java/src/common/block/BlockRailBase.java similarity index 97% rename from java/src/game/block/BlockRailBase.java rename to java/src/common/block/BlockRailBase.java index a64c897..ec47041 100755 --- a/java/src/game/block/BlockRailBase.java +++ b/java/src/common/block/BlockRailBase.java @@ -1,26 +1,26 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.init.Blocks; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.HitPosition; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.collect.Lists; +import common.init.Blocks; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +import common.world.HitPosition; +import common.world.IWorldAccess; +import common.world.State; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; public abstract class BlockRailBase extends Block { diff --git a/java/src/game/block/BlockRailDetector.java b/java/src/common/block/BlockRailDetector.java similarity index 92% rename from java/src/game/block/BlockRailDetector.java rename to java/src/common/block/BlockRailDetector.java index 7070c82..28e977c 100755 --- a/java/src/game/block/BlockRailDetector.java +++ b/java/src/common/block/BlockRailDetector.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; import java.util.List; import java.util.function.Predicate; -import game.entity.Entity; -import game.entity.item.EntityCart; -import game.inventory.Container; -import game.inventory.IInventory; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.item.EntityCart; +import common.inventory.Container; +import common.inventory.IInventory; +import common.model.Model; +import common.model.ModelProvider; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockRailDetector extends BlockRailBase { diff --git a/java/src/game/block/BlockRailPowered.java b/java/src/common/block/BlockRailPowered.java similarity index 96% rename from java/src/game/block/BlockRailPowered.java rename to java/src/common/block/BlockRailPowered.java index f7b6181..65e978a 100755 --- a/java/src/game/block/BlockRailPowered.java +++ b/java/src/common/block/BlockRailPowered.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; import java.util.function.Predicate; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockRailPowered extends BlockRailBase { diff --git a/java/src/game/block/BlockRedstoneComparator.java b/java/src/common/block/BlockRedstoneComparator.java similarity index 95% rename from java/src/game/block/BlockRedstoneComparator.java rename to java/src/common/block/BlockRedstoneComparator.java index 5d61b94..b6f3859 100755 --- a/java/src/game/block/BlockRedstoneComparator.java +++ b/java/src/common/block/BlockRedstoneComparator.java @@ -1,27 +1,27 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityComparator; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityComparator; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITileEntityProvider { diff --git a/java/src/game/block/BlockRedstoneDiode.java b/java/src/common/block/BlockRedstoneDiode.java similarity index 95% rename from java/src/game/block/BlockRedstoneDiode.java rename to java/src/common/block/BlockRedstoneDiode.java index a510f6e..e12d943 100755 --- a/java/src/game/block/BlockRedstoneDiode.java +++ b/java/src/common/block/BlockRedstoneDiode.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.init.Blocks; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public abstract class BlockRedstoneDiode extends BlockDirectional { diff --git a/java/src/game/block/BlockRedstoneLight.java b/java/src/common/block/BlockRedstoneLight.java similarity index 87% rename from java/src/game/block/BlockRedstoneLight.java rename to java/src/common/block/BlockRedstoneLight.java index b3fda33..49cb79b 100755 --- a/java/src/game/block/BlockRedstoneLight.java +++ b/java/src/common/block/BlockRedstoneLight.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockRedstoneLight extends Block { diff --git a/java/src/game/block/BlockRedstoneOre.java b/java/src/common/block/BlockRedstoneOre.java similarity index 90% rename from java/src/game/block/BlockRedstoneOre.java rename to java/src/common/block/BlockRedstoneOre.java index f5736f1..09aa47a 100755 --- a/java/src/game/block/BlockRedstoneOre.java +++ b/java/src/common/block/BlockRedstoneOre.java @@ -1,23 +1,23 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +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.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockRedstoneOre extends Block { diff --git a/java/src/game/block/BlockRedstoneRepeater.java b/java/src/common/block/BlockRedstoneRepeater.java similarity index 97% rename from java/src/game/block/BlockRedstoneRepeater.java rename to java/src/common/block/BlockRedstoneRepeater.java index a43adfd..30c64ec 100755 --- a/java/src/game/block/BlockRedstoneRepeater.java +++ b/java/src/common/block/BlockRedstoneRepeater.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.Item; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.Item; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.ParticleType; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockRedstoneRepeater extends BlockRedstoneDiode { diff --git a/java/src/game/block/BlockRedstoneTorch.java b/java/src/common/block/BlockRedstoneTorch.java similarity index 93% rename from java/src/game/block/BlockRedstoneTorch.java rename to java/src/common/block/BlockRedstoneTorch.java index 2590c67..04cbe22 100755 --- a/java/src/game/block/BlockRedstoneTorch.java +++ b/java/src/common/block/BlockRedstoneTorch.java @@ -1,24 +1,24 @@ -package game.block; +package common.block; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.item.Item; -import game.model.ParticleType; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.collect.Lists; +import common.collect.Maps; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.SoundEvent; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockRedstoneTorch extends BlockTorch { diff --git a/java/src/game/block/BlockRedstoneWire.java b/java/src/common/block/BlockRedstoneWire.java similarity index 97% rename from java/src/game/block/BlockRedstoneWire.java rename to java/src/common/block/BlockRedstoneWire.java index 3b119ab..b5aac93 100755 --- a/java/src/game/block/BlockRedstoneWire.java +++ b/java/src/common/block/BlockRedstoneWire.java @@ -1,35 +1,35 @@ -package game.block; +package common.block; import java.util.EnumSet; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; -import game.init.Blocks; -import game.init.Items; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.util.ExtMath; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.collect.Lists; +import common.collect.Sets; +import common.init.Blocks; +import common.init.Items; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.ParticleType; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.util.ExtMath; +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; +import common.world.World; +import common.world.WorldClient; +import common.world.WorldServer; public class BlockRedstoneWire extends Block { diff --git a/java/src/game/block/BlockReed.java b/java/src/common/block/BlockReed.java similarity index 89% rename from java/src/game/block/BlockReed.java rename to java/src/common/block/BlockReed.java index a60106d..816e6e7 100755 --- a/java/src/game/block/BlockReed.java +++ b/java/src/common/block/BlockReed.java @@ -1,23 +1,23 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.Item; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockReed extends Block { diff --git a/java/src/game/block/BlockRock.java b/java/src/common/block/BlockRock.java similarity index 76% rename from java/src/game/block/BlockRock.java rename to java/src/common/block/BlockRock.java index 607027f..a6f0e4d 100755 --- a/java/src/game/block/BlockRock.java +++ b/java/src/common/block/BlockRock.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; import java.util.List; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.world.State; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.world.State; public class BlockRock extends Block { public static final PropertyBool SMOOTH = PropertyBool.create("smooth"); diff --git a/java/src/game/block/BlockRotatedPillar.java b/java/src/common/block/BlockRotatedPillar.java similarity index 78% rename from java/src/game/block/BlockRotatedPillar.java rename to java/src/common/block/BlockRotatedPillar.java index 1bcc08f..a4b59a3 100755 --- a/java/src/game/block/BlockRotatedPillar.java +++ b/java/src/common/block/BlockRotatedPillar.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.PropertyEnum; -import game.world.Facing; -import game.world.State; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.PropertyEnum; +import common.world.Facing; +import common.world.State; public abstract class BlockRotatedPillar extends Block { diff --git a/java/src/game/block/BlockSand.java b/java/src/common/block/BlockSand.java similarity index 91% rename from java/src/game/block/BlockSand.java rename to java/src/common/block/BlockSand.java index 37e93c6..147941b 100755 --- a/java/src/game/block/BlockSand.java +++ b/java/src/common/block/BlockSand.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; import java.util.List; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.State; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.State; public class BlockSand extends BlockFalling { diff --git a/java/src/game/block/BlockSandStone.java b/java/src/common/block/BlockSandStone.java similarity index 92% rename from java/src/game/block/BlockSandStone.java rename to java/src/common/block/BlockSandStone.java index b92213c..3ed7fcc 100755 --- a/java/src/game/block/BlockSandStone.java +++ b/java/src/common/block/BlockSandStone.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; import java.util.List; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.State; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.State; public class BlockSandStone extends Block { diff --git a/java/src/game/block/BlockSapling.java b/java/src/common/block/BlockSapling.java similarity index 92% rename from java/src/game/block/BlockSapling.java rename to java/src/common/block/BlockSapling.java index 5f2eddf..5615ffc 100755 --- a/java/src/game/block/BlockSapling.java +++ b/java/src/common/block/BlockSapling.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.init.Blocks; -import game.init.Config; -import game.init.WoodType; -import game.item.CheatTab; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.tree.WorldGenBaseTree; -import game.worldgen.tree.WorldGenBigTree; -import game.worldgen.tree.WorldGenBirch; -import game.worldgen.tree.WorldGenDarkOak; -import game.worldgen.tree.WorldGenJungle; -import game.worldgen.tree.WorldGenPine; -import game.worldgen.tree.WorldGenSavanna; -import game.worldgen.tree.WorldGenTaiga2; +import common.collect.Lists; +import common.init.Blocks; +import common.init.Config; +import common.init.WoodType; +import common.item.CheatTab; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.tree.WorldGenBaseTree; +import common.worldgen.tree.WorldGenBigTree; +import common.worldgen.tree.WorldGenBirch; +import common.worldgen.tree.WorldGenDarkOak; +import common.worldgen.tree.WorldGenJungle; +import common.worldgen.tree.WorldGenPine; +import common.worldgen.tree.WorldGenSavanna; +import common.worldgen.tree.WorldGenTaiga2; public class BlockSapling extends BlockBush implements IGrowable { diff --git a/java/src/game/block/BlockSign.java b/java/src/common/block/BlockSign.java similarity index 88% rename from java/src/game/block/BlockSign.java rename to java/src/common/block/BlockSign.java index 28730a3..a42b21d 100755 --- a/java/src/game/block/BlockSign.java +++ b/java/src/common/block/BlockSign.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; -import game.init.Items; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntitySign; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.IBlockAccess; -import game.world.State; -import game.world.World; +import common.init.Items; +import common.item.Item; +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.world.IBlockAccess; +import common.world.State; +import common.world.World; public class BlockSign extends BlockContainer { diff --git a/java/src/game/block/BlockSkull.java b/java/src/common/block/BlockSkull.java similarity index 86% rename from java/src/game/block/BlockSkull.java rename to java/src/common/block/BlockSkull.java index b3575c6..3730ffe 100755 --- a/java/src/game/block/BlockSkull.java +++ b/java/src/common/block/BlockSkull.java @@ -1,23 +1,23 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntitySkull; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Transforms; +import common.properties.IProperty; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockSkull extends BlockContainer { diff --git a/java/src/game/block/BlockSlab.java b/java/src/common/block/BlockSlab.java similarity index 95% rename from java/src/game/block/BlockSlab.java rename to java/src/common/block/BlockSlab.java index 222d216..6ad12a3 100755 --- a/java/src/game/block/BlockSlab.java +++ b/java/src/common/block/BlockSlab.java @@ -1,26 +1,26 @@ -package game.block; +package common.block; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.Facing.Axis; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.Facing.Axis; public class BlockSlab extends Block { diff --git a/java/src/game/block/BlockSlime.java b/java/src/common/block/BlockSlime.java similarity index 88% rename from java/src/game/block/BlockSlime.java rename to java/src/common/block/BlockSlime.java index 81f0625..4d4a1f7 100755 --- a/java/src/game/block/BlockSlime.java +++ b/java/src/common/block/BlockSlime.java @@ -1,14 +1,14 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockSlime extends BlockBreakable { diff --git a/java/src/game/block/BlockSnow.java b/java/src/common/block/BlockSnow.java similarity index 87% rename from java/src/game/block/BlockSnow.java rename to java/src/common/block/BlockSnow.java index f8b68fd..588918b 100755 --- a/java/src/game/block/BlockSnow.java +++ b/java/src/common/block/BlockSnow.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.LightType; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.LightType; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockSnow extends Block { diff --git a/java/src/game/block/BlockSnowBlock.java b/java/src/common/block/BlockSnowBlock.java similarity index 73% rename from java/src/game/block/BlockSnowBlock.java rename to java/src/common/block/BlockSnowBlock.java index 9eb13c3..5f8411f 100755 --- a/java/src/game/block/BlockSnowBlock.java +++ b/java/src/common/block/BlockSnowBlock.java @@ -1,15 +1,15 @@ -package game.block; +package common.block; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.LightType; -import game.world.State; -import game.world.WorldServer; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.LightType; +import common.world.State; +import common.world.WorldServer; public class BlockSnowBlock extends Block { diff --git a/java/src/game/block/BlockSoulSand.java b/java/src/common/block/BlockSoulSand.java similarity index 75% rename from java/src/game/block/BlockSoulSand.java rename to java/src/common/block/BlockSoulSand.java index 70641d0..5344f81 100755 --- a/java/src/game/block/BlockSoulSand.java +++ b/java/src/common/block/BlockSoulSand.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.item.CheatTab; -import game.material.Material; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.item.CheatTab; +import common.material.Material; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.State; +import common.world.World; public class BlockSoulSand extends Block { diff --git a/java/src/game/block/BlockSourceImpl.java b/java/src/common/block/BlockSourceImpl.java similarity index 84% rename from java/src/game/block/BlockSourceImpl.java rename to java/src/common/block/BlockSourceImpl.java index 6243f42..63f297b 100755 --- a/java/src/game/block/BlockSourceImpl.java +++ b/java/src/common/block/BlockSourceImpl.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.dispenser.IBlockSource; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.dispenser.IBlockSource; +import common.tileentity.TileEntity; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockSourceImpl implements IBlockSource { diff --git a/java/src/game/block/BlockStainedGlass.java b/java/src/common/block/BlockStainedGlass.java similarity index 87% rename from java/src/game/block/BlockStainedGlass.java rename to java/src/common/block/BlockStainedGlass.java index 8cd1807..47ae319 100755 --- a/java/src/game/block/BlockStainedGlass.java +++ b/java/src/common/block/BlockStainedGlass.java @@ -1,19 +1,19 @@ -package game.block; +package common.block; import java.util.List; -import game.color.DyeColor; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.world.State; +import common.color.DyeColor; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.world.State; public class BlockStainedGlass extends BlockBreakable { diff --git a/java/src/game/block/BlockStainedGlassPane.java b/java/src/common/block/BlockStainedGlassPane.java similarity index 90% rename from java/src/game/block/BlockStainedGlassPane.java rename to java/src/common/block/BlockStainedGlassPane.java index 405b2b1..eb50a9e 100755 --- a/java/src/game/block/BlockStainedGlassPane.java +++ b/java/src/common/block/BlockStainedGlassPane.java @@ -1,16 +1,16 @@ -package game.block; +package common.block; import java.util.List; -import game.color.DyeColor; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.world.State; +import common.color.DyeColor; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.world.State; public class BlockStainedGlassPane extends BlockPane { diff --git a/java/src/game/block/BlockStairs.java b/java/src/common/block/BlockStairs.java similarity index 96% rename from java/src/game/block/BlockStairs.java rename to java/src/common/block/BlockStairs.java index ed7fb59..437f98f 100755 --- a/java/src/game/block/BlockStairs.java +++ b/java/src/common/block/BlockStairs.java @@ -1,36 +1,36 @@ -package game.block; +package common.block; import java.util.Arrays; import java.util.List; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Explosion; -import game.world.Facing; -import game.world.HitPosition; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.properties.IProperty; +import common.properties.PropertyDirection; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.BoundingBox; +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; public class BlockStairs extends Block { diff --git a/java/src/game/block/BlockStandingSign.java b/java/src/common/block/BlockStandingSign.java similarity index 87% rename from java/src/game/block/BlockStandingSign.java rename to java/src/common/block/BlockStandingSign.java index 0eaaf14..754535a 100755 --- a/java/src/game/block/BlockStandingSign.java +++ b/java/src/common/block/BlockStandingSign.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class BlockStandingSign extends BlockSign { diff --git a/java/src/game/block/BlockStaticLiquid.java b/java/src/common/block/BlockStaticLiquid.java similarity index 91% rename from java/src/game/block/BlockStaticLiquid.java rename to java/src/common/block/BlockStaticLiquid.java index c34411c..88791ab 100755 --- a/java/src/game/block/BlockStaticLiquid.java +++ b/java/src/common/block/BlockStaticLiquid.java @@ -1,14 +1,14 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockStaticLiquid extends BlockLiquid { diff --git a/java/src/game/block/BlockStem.java b/java/src/common/block/BlockStem.java similarity index 94% rename from java/src/game/block/BlockStem.java rename to java/src/common/block/BlockStem.java index 5b715de..c6d37f8 100755 --- a/java/src/game/block/BlockStem.java +++ b/java/src/common/block/BlockStem.java @@ -1,27 +1,27 @@ -package game.block; +package common.block; import java.util.function.Predicate; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockStem extends BlockBush implements IGrowable { diff --git a/java/src/game/block/BlockStone.java b/java/src/common/block/BlockStone.java similarity index 54% rename from java/src/game/block/BlockStone.java rename to java/src/common/block/BlockStone.java index 89d99a6..bbfe84c 100755 --- a/java/src/game/block/BlockStone.java +++ b/java/src/common/block/BlockStone.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.rng.Random; -import game.world.State; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.rng.Random; +import common.world.State; public class BlockStone extends Block { public BlockStone() { diff --git a/java/src/game/block/BlockStoneBrick.java b/java/src/common/block/BlockStoneBrick.java similarity index 92% rename from java/src/game/block/BlockStoneBrick.java rename to java/src/common/block/BlockStoneBrick.java index 5300cf5..0d38a04 100755 --- a/java/src/game/block/BlockStoneBrick.java +++ b/java/src/common/block/BlockStoneBrick.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; import java.util.List; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.State; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.State; public class BlockStoneBrick extends Block { diff --git a/java/src/game/block/BlockTNT.java b/java/src/common/block/BlockTNT.java similarity index 89% rename from java/src/game/block/BlockTNT.java rename to java/src/common/block/BlockTNT.java index 17e4550..ceec575 100755 --- a/java/src/game/block/BlockTNT.java +++ b/java/src/common/block/BlockTNT.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.item.EntityTnt; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityArrow; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyInteger; -import game.world.BlockPos; -import game.world.Explosion; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.item.EntityTnt; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityArrow; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyInteger; +import common.world.BlockPos; +import common.world.Explosion; +import common.world.Facing; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockTNT extends Block { diff --git a/java/src/game/block/BlockTallGrass.java b/java/src/common/block/BlockTallGrass.java similarity index 90% rename from java/src/game/block/BlockTallGrass.java rename to java/src/common/block/BlockTallGrass.java index bcf86a7..9724595 100755 --- a/java/src/game/block/BlockTallGrass.java +++ b/java/src/common/block/BlockTallGrass.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; import java.util.List; -import game.color.Colorizer; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyEnum; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.Colorizer; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyEnum; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockTallGrass extends BlockBush implements IGrowable { diff --git a/java/src/game/block/BlockTianReactor.java b/java/src/common/block/BlockTianReactor.java similarity index 70% rename from java/src/game/block/BlockTianReactor.java rename to java/src/common/block/BlockTianReactor.java index f1b7ca0..a073032 100755 --- a/java/src/game/block/BlockTianReactor.java +++ b/java/src/common/block/BlockTianReactor.java @@ -1,14 +1,14 @@ -package game.block; +package common.block; import java.util.Map; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityTianReactor; -import game.world.State; -import game.world.World; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityTianReactor; +import common.world.State; +import common.world.World; public class BlockTianReactor extends BlockMachine { public TileEntity createNewTileEntity(World worldIn, int meta) { diff --git a/java/src/game/block/BlockTianSoil.java b/java/src/common/block/BlockTianSoil.java similarity index 76% rename from java/src/game/block/BlockTianSoil.java rename to java/src/common/block/BlockTianSoil.java index e898bae..339851a 100755 --- a/java/src/game/block/BlockTianSoil.java +++ b/java/src/common/block/BlockTianSoil.java @@ -1,17 +1,17 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.IWorldAccess; -import game.world.State; +import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.rng.Random; +import common.world.BlockPos; +import common.world.IWorldAccess; +import common.world.State; public class BlockTianSoil extends Block { diff --git a/java/src/game/block/BlockTorch.java b/java/src/common/block/BlockTorch.java similarity index 93% rename from java/src/game/block/BlockTorch.java rename to java/src/common/block/BlockTorch.java index 717009c..571d4c3 100755 --- a/java/src/game/block/BlockTorch.java +++ b/java/src/common/block/BlockTorch.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; import java.util.function.Predicate; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Chunk; -import game.world.Facing; -import game.world.HitPosition; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +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.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; public class BlockTorch extends Block { diff --git a/java/src/game/block/BlockTrapDoor.java b/java/src/common/block/BlockTrapDoor.java similarity index 92% rename from java/src/game/block/BlockTrapDoor.java rename to java/src/common/block/BlockTrapDoor.java index 55ffc46..f6f9eae 100755 --- a/java/src/game/block/BlockTrapDoor.java +++ b/java/src/common/block/BlockTrapDoor.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.item.CheatTab; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.Transforms; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.HitPosition; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.item.CheatTab; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.model.Transforms; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyDirection; +import common.properties.PropertyEnum; +import common.util.Identifyable; +import common.world.BlockPos; +import common.world.BoundingBox; +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; public class BlockTrapDoor extends Block { diff --git a/java/src/game/block/BlockTreasure.java b/java/src/common/block/BlockTreasure.java similarity index 75% rename from java/src/game/block/BlockTreasure.java rename to java/src/common/block/BlockTreasure.java index fd5c5f7..7f79172 100755 --- a/java/src/game/block/BlockTreasure.java +++ b/java/src/common/block/BlockTreasure.java @@ -1,6 +1,6 @@ -package game.block; +package common.block; -import game.material.Material; +import common.material.Material; public class BlockTreasure extends Block { public BlockTreasure(Material materialIn) { diff --git a/java/src/game/block/BlockTripWire.java b/java/src/common/block/BlockTripWire.java similarity index 97% rename from java/src/game/block/BlockTripWire.java rename to java/src/common/block/BlockTripWire.java index 11e1a08..cbd9299 100755 --- a/java/src/game/block/BlockTripWire.java +++ b/java/src/common/block/BlockTripWire.java @@ -1,29 +1,29 @@ -package game.block; +package common.block; import java.util.List; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.Item; -import game.item.ItemShears; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.Item; +import common.item.ItemShears; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +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.world.IBlockAccess; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockTripWire extends Block { diff --git a/java/src/game/block/BlockTripWireHook.java b/java/src/common/block/BlockTripWireHook.java similarity index 97% rename from java/src/game/block/BlockTripWireHook.java rename to java/src/common/block/BlockTripWireHook.java index 5dc6835..fb66590 100755 --- a/java/src/game/block/BlockTripWireHook.java +++ b/java/src/common/block/BlockTripWireHook.java @@ -1,26 +1,26 @@ -package game.block; +package common.block; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.SoundEvent; -import game.item.CheatTab; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockTripWireHook extends Block { diff --git a/java/src/game/block/BlockVine.java b/java/src/common/block/BlockVine.java similarity index 96% rename from java/src/game/block/BlockVine.java rename to java/src/common/block/BlockVine.java index b7d516e..10443c8 100755 --- a/java/src/game/block/BlockVine.java +++ b/java/src/common/block/BlockVine.java @@ -1,30 +1,30 @@ -package game.block; +package common.block; -import game.color.Colorizer; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.color.Colorizer; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.material.Material; +import common.model.BlockLayer; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +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.world.IWorldAccess; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockVine extends Block { diff --git a/java/src/game/block/BlockWall.java b/java/src/common/block/BlockWall.java similarity index 95% rename from java/src/game/block/BlockWall.java rename to java/src/common/block/BlockWall.java index c49c0ca..de001d2 100755 --- a/java/src/game/block/BlockWall.java +++ b/java/src/common/block/BlockWall.java @@ -1,25 +1,25 @@ -package game.block; +package common.block; import java.util.List; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.properties.IProperty; -import game.properties.PropertyBool; -import game.properties.PropertyEnum; -import game.util.Identifyable; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.IBlockAccess; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +import common.properties.IProperty; +import common.properties.PropertyBool; +import common.properties.PropertyEnum; +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; +import common.world.World; public class BlockWall extends Block { diff --git a/java/src/game/block/BlockWallSign.java b/java/src/common/block/BlockWallSign.java similarity index 90% rename from java/src/game/block/BlockWallSign.java rename to java/src/common/block/BlockWallSign.java index 55133c0..75fdc0f 100755 --- a/java/src/game/block/BlockWallSign.java +++ b/java/src/common/block/BlockWallSign.java @@ -1,12 +1,12 @@ -package game.block; +package common.block; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.world.BlockPos; -import game.world.Facing; -import game.world.IWorldAccess; -import game.world.State; -import game.world.World; +import common.properties.IProperty; +import common.properties.PropertyDirection; +import common.world.BlockPos; +import common.world.Facing; +import common.world.IWorldAccess; +import common.world.State; +import common.world.World; public class BlockWallSign extends BlockSign { diff --git a/java/src/game/block/BlockWarpChest.java b/java/src/common/block/BlockWarpChest.java similarity index 86% rename from java/src/game/block/BlockWarpChest.java rename to java/src/common/block/BlockWarpChest.java index a8776d2..d32b60e 100755 --- a/java/src/game/block/BlockWarpChest.java +++ b/java/src/common/block/BlockWarpChest.java @@ -1,26 +1,26 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.inventory.InventoryWarpChest; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ModelRotation; -import game.model.ParticleType; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldClient; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.inventory.InventoryWarpChest; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.model.ModelRotation; +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.world.State; +import common.world.World; +import common.world.WorldClient; public class BlockWarpChest extends Block { diff --git a/java/src/game/block/BlockWart.java b/java/src/common/block/BlockWart.java similarity index 86% rename from java/src/game/block/BlockWart.java rename to java/src/common/block/BlockWart.java index c77813c..380e4eb 100755 --- a/java/src/game/block/BlockWart.java +++ b/java/src/common/block/BlockWart.java @@ -1,21 +1,21 @@ -package game.block; +package common.block; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.properties.IProperty; -import game.properties.PropertyInteger; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.Model; +import common.model.ModelProvider; +import common.properties.IProperty; +import common.properties.PropertyInteger; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public class BlockWart extends BlockBush { diff --git a/java/src/game/block/BlockWeb.java b/java/src/common/block/BlockWeb.java similarity index 74% rename from java/src/game/block/BlockWeb.java rename to java/src/common/block/BlockWeb.java index 261b092..959cb0f 100755 --- a/java/src/game/block/BlockWeb.java +++ b/java/src/common/block/BlockWeb.java @@ -1,18 +1,18 @@ -package game.block; +package common.block; -import game.entity.Entity; -import game.init.Items; -import game.item.CheatTab; -import game.item.Item; -import game.material.Material; -import game.model.BlockLayer; -import game.model.Model; -import game.model.ModelProvider; -import game.rng.Random; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; +import common.entity.Entity; +import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.material.Material; +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.world.State; +import common.world.World; public class BlockWeb extends Block { diff --git a/java/src/game/block/BlockWorkbench.java b/java/src/common/block/BlockWorkbench.java similarity index 79% rename from java/src/game/block/BlockWorkbench.java rename to java/src/common/block/BlockWorkbench.java index a970372..0489d2c 100755 --- a/java/src/game/block/BlockWorkbench.java +++ b/java/src/common/block/BlockWorkbench.java @@ -1,18 +1,18 @@ -package game.block; +package common.block; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.ContainerWorkbench; -import game.inventory.InventoryPlayer; -import game.item.CheatTab; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.tileentity.IInteractionObject; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.ContainerWorkbench; +import common.inventory.InventoryPlayer; +import common.item.CheatTab; +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.world.State; +import common.world.World; public class BlockWorkbench extends Block { diff --git a/java/src/game/block/IGrowable.java b/java/src/common/block/IGrowable.java similarity index 62% rename from java/src/game/block/IGrowable.java rename to java/src/common/block/IGrowable.java index 6c9561d..35def7f 100755 --- a/java/src/game/block/IGrowable.java +++ b/java/src/common/block/IGrowable.java @@ -1,10 +1,10 @@ -package game.block; +package common.block; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.World; +import common.world.WorldServer; public interface IGrowable { diff --git a/java/src/game/block/ITileEntityProvider.java b/java/src/common/block/ITileEntityProvider.java similarity index 71% rename from java/src/game/block/ITileEntityProvider.java rename to java/src/common/block/ITileEntityProvider.java index af5e3cd..f4628a7 100755 --- a/java/src/game/block/ITileEntityProvider.java +++ b/java/src/common/block/ITileEntityProvider.java @@ -1,7 +1,7 @@ -package game.block; +package common.block; -import game.tileentity.TileEntity; -import game.world.World; +import common.tileentity.TileEntity; +import common.world.World; public interface ITileEntityProvider { diff --git a/java/src/game/block/LeavesType.java b/java/src/common/block/LeavesType.java similarity index 91% rename from java/src/game/block/LeavesType.java rename to java/src/common/block/LeavesType.java index faa13f1..25b730d 100755 --- a/java/src/game/block/LeavesType.java +++ b/java/src/common/block/LeavesType.java @@ -1,6 +1,6 @@ -package game.block; +package common.block; -import game.util.Identifyable; +import common.util.Identifyable; public enum LeavesType implements Identifyable { SPRING(0, "spring", true, "Frühling"), diff --git a/java/src/game/block/SoundType.java b/java/src/common/block/SoundType.java similarity index 91% rename from java/src/game/block/SoundType.java rename to java/src/common/block/SoundType.java index 9dfc4ec..4b1e988 100755 --- a/java/src/game/block/SoundType.java +++ b/java/src/common/block/SoundType.java @@ -1,6 +1,6 @@ -package game.block; +package common.block; -import game.init.SoundEvent; +import common.init.SoundEvent; public enum SoundType { STONE(SoundEvent.STONE), diff --git a/java/src/game/clipboard/BlockTransform.java b/java/src/common/clipboard/BlockTransform.java similarity index 99% rename from java/src/game/clipboard/BlockTransform.java rename to java/src/common/clipboard/BlockTransform.java index f17f475..62ae4b2 100755 --- a/java/src/game/clipboard/BlockTransform.java +++ b/java/src/common/clipboard/BlockTransform.java @@ -1,4 +1,4 @@ -package game.clipboard; +package common.clipboard; public class BlockTransform { private double m00, m01, m02, m03; diff --git a/java/src/game/clipboard/ClipboardBlock.java b/java/src/common/clipboard/ClipboardBlock.java similarity index 82% rename from java/src/game/clipboard/ClipboardBlock.java rename to java/src/common/clipboard/ClipboardBlock.java index 546b2fa..8ed9ea5 100755 --- a/java/src/game/clipboard/ClipboardBlock.java +++ b/java/src/common/clipboard/ClipboardBlock.java @@ -1,8 +1,8 @@ -package game.clipboard; +package common.clipboard; -import game.nbt.NBTTagCompound; -import game.tileentity.TileEntity; -import game.world.State; +import common.nbt.NBTTagCompound; +import common.tileentity.TileEntity; +import common.world.State; public class ClipboardBlock { private State state; diff --git a/java/src/game/clipboard/ClipboardPlacer.java b/java/src/common/clipboard/ClipboardPlacer.java similarity index 93% rename from java/src/game/clipboard/ClipboardPlacer.java rename to java/src/common/clipboard/ClipboardPlacer.java index 5a94c52..a6525c0 100755 --- a/java/src/game/clipboard/ClipboardPlacer.java +++ b/java/src/common/clipboard/ClipboardPlacer.java @@ -1,4 +1,4 @@ -package game.clipboard; +package common.clipboard; import java.util.Deque; import java.util.HashMap; @@ -8,18 +8,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.block.BlockDoor; -import game.block.BlockRailBase; -import game.block.ITileEntityProvider; -import game.collect.Lists; -import game.init.Blocks; -import game.init.ReorderRegistry; -import game.inventory.IInventory; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.Vec3i; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDoor; +import common.block.BlockRailBase; +import common.block.ITileEntityProvider; +import common.collect.Lists; +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.world.WorldServer; public class ClipboardPlacer { private static class BlockEntry { diff --git a/java/src/game/clipboard/Rotation.java b/java/src/common/clipboard/Rotation.java similarity index 97% rename from java/src/game/clipboard/Rotation.java rename to java/src/common/clipboard/Rotation.java index f70cb46..51e4d1b 100755 --- a/java/src/game/clipboard/Rotation.java +++ b/java/src/common/clipboard/Rotation.java @@ -1,4 +1,4 @@ -package game.clipboard; +package common.clipboard; import java.util.function.Predicate; diff --git a/java/src/game/clipboard/RotationValue.java b/java/src/common/clipboard/RotationValue.java similarity index 95% rename from java/src/game/clipboard/RotationValue.java rename to java/src/common/clipboard/RotationValue.java index c6b6f88..46319c6 100755 --- a/java/src/game/clipboard/RotationValue.java +++ b/java/src/common/clipboard/RotationValue.java @@ -1,4 +1,4 @@ -package game.clipboard; +package common.clipboard; public class RotationValue { public final byte mask; diff --git a/java/src/game/clipboard/Vector.java b/java/src/common/clipboard/Vector.java similarity index 99% rename from java/src/game/clipboard/Vector.java rename to java/src/common/clipboard/Vector.java index 084cf12..71fdb4d 100755 --- a/java/src/game/clipboard/Vector.java +++ b/java/src/common/clipboard/Vector.java @@ -1,4 +1,4 @@ -package game.clipboard; +package common.clipboard; public class Vector implements Comparable { public static final Vector ZERO = new Vector(0, 0, 0); diff --git a/java/src/game/collect/AbstractBiMap.java b/java/src/common/collect/AbstractBiMap.java similarity index 98% rename from java/src/game/collect/AbstractBiMap.java rename to java/src/common/collect/AbstractBiMap.java index d2c3336..f1ebdfa 100644 --- a/java/src/game/collect/AbstractBiMap.java +++ b/java/src/common/collect/AbstractBiMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package game.collect; +package common.collect; -import static game.collect.CollectPreconditions.checkRemove; -import static game.collect.Preconditions.checkArgument; -import static game.collect.Preconditions.checkState; +import static common.collect.CollectPreconditions.checkRemove; +import static common.collect.Preconditions.checkArgument; +import static common.collect.Preconditions.checkState; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/java/src/game/collect/AbstractIndexedListIterator.java b/java/src/common/collect/AbstractIndexedListIterator.java similarity index 97% rename from java/src/game/collect/AbstractIndexedListIterator.java rename to java/src/common/collect/AbstractIndexedListIterator.java index a2056ae..224444d 100644 --- a/java/src/game/collect/AbstractIndexedListIterator.java +++ b/java/src/common/collect/AbstractIndexedListIterator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package game.collect; +package common.collect; -import static game.collect.Preconditions.checkPositionIndex; +import static common.collect.Preconditions.checkPositionIndex; import java.util.NoSuchElementException; diff --git a/java/src/game/collect/AbstractIterator.java b/java/src/common/collect/AbstractIterator.java similarity index 98% rename from java/src/game/collect/AbstractIterator.java rename to java/src/common/collect/AbstractIterator.java index 7ba15e0..a33bfe7 100644 --- a/java/src/game/collect/AbstractIterator.java +++ b/java/src/common/collect/AbstractIterator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package game.collect; +package common.collect; -import static game.collect.Preconditions.checkState; +import static common.collect.Preconditions.checkState; import java.util.NoSuchElementException; diff --git a/java/src/game/collect/AbstractMapEntry.java b/java/src/common/collect/AbstractMapEntry.java similarity index 98% rename from java/src/game/collect/AbstractMapEntry.java rename to java/src/common/collect/AbstractMapEntry.java index 4c89223..18c350c 100644 --- a/java/src/game/collect/AbstractMapEntry.java +++ b/java/src/common/collect/AbstractMapEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Map.Entry; diff --git a/java/src/game/collect/AbstractTable.java b/java/src/common/collect/AbstractTable.java similarity index 99% rename from java/src/game/collect/AbstractTable.java rename to java/src/common/collect/AbstractTable.java index b19ada4..60a7906 100644 --- a/java/src/game/collect/AbstractTable.java +++ b/java/src/common/collect/AbstractTable.java @@ -12,7 +12,7 @@ * the License. */ -package game.collect; +package common.collect; import java.util.AbstractCollection; import java.util.AbstractSet; diff --git a/java/src/game/collect/BiMap.java b/java/src/common/collect/BiMap.java similarity index 99% rename from java/src/game/collect/BiMap.java rename to java/src/common/collect/BiMap.java index 3b920df..7effc10 100644 --- a/java/src/game/collect/BiMap.java +++ b/java/src/common/collect/BiMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Map; import java.util.Set; diff --git a/java/src/game/collect/CollectPreconditions.java b/java/src/common/collect/CollectPreconditions.java similarity index 94% rename from java/src/game/collect/CollectPreconditions.java rename to java/src/common/collect/CollectPreconditions.java index 520d5d2..f84a833 100644 --- a/java/src/game/collect/CollectPreconditions.java +++ b/java/src/common/collect/CollectPreconditions.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package game.collect; +package common.collect; -import static game.collect.Preconditions.checkState; +import static common.collect.Preconditions.checkState; /** * Precondition checks useful in collection implementations. diff --git a/java/src/game/collect/DenseImmutableTable.java b/java/src/common/collect/DenseImmutableTable.java similarity index 98% rename from java/src/game/collect/DenseImmutableTable.java rename to java/src/common/collect/DenseImmutableTable.java index 5afd429..a4e1611 100644 --- a/java/src/game/collect/DenseImmutableTable.java +++ b/java/src/common/collect/DenseImmutableTable.java @@ -12,9 +12,9 @@ * the License. */ -package game.collect; +package common.collect; -import static game.collect.Preconditions.checkArgument; +import static common.collect.Preconditions.checkArgument; import java.util.Map; diff --git a/java/src/game/collect/EmptyImmutableMap.java b/java/src/common/collect/EmptyImmutableMap.java similarity index 99% rename from java/src/game/collect/EmptyImmutableMap.java rename to java/src/common/collect/EmptyImmutableMap.java index 866868a..84d8d06 100644 --- a/java/src/game/collect/EmptyImmutableMap.java +++ b/java/src/common/collect/EmptyImmutableMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; /** * Bimap with no mappings. diff --git a/java/src/game/collect/EmptyImmutableSet.java b/java/src/common/collect/EmptyImmutableSet.java similarity index 98% rename from java/src/game/collect/EmptyImmutableSet.java rename to java/src/common/collect/EmptyImmutableSet.java index f86b50f..9605ea9 100644 --- a/java/src/game/collect/EmptyImmutableSet.java +++ b/java/src/common/collect/EmptyImmutableSet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Collection; import java.util.Set; diff --git a/java/src/game/collect/Filter.java b/java/src/common/collect/Filter.java similarity index 98% rename from java/src/game/collect/Filter.java rename to java/src/common/collect/Filter.java index 3d45f77..a9f4fd1 100644 --- a/java/src/game/collect/Filter.java +++ b/java/src/common/collect/Filter.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package game.collect; +package common.collect; -import static game.collect.Preconditions.checkArgument; -import static game.collect.Preconditions.checkNotNull; -import static game.util.Predicates.and; -import static game.util.Predicates.in; -import static game.util.Predicates.not; +import static common.collect.Preconditions.checkArgument; +import static common.collect.Preconditions.checkNotNull; +import static common.util.Predicates.and; +import static common.util.Predicates.in; +import static common.util.Predicates.not; import java.util.AbstractCollection; import java.util.Collection; import java.util.Iterator; import java.util.function.Predicate; -import game.util.Predicates; +import common.util.Predicates; /** * Provides static methods for working with {@code Collection} instances. diff --git a/java/src/game/collect/ForwardingCollection.java b/java/src/common/collect/ForwardingCollection.java similarity index 99% rename from java/src/game/collect/ForwardingCollection.java rename to java/src/common/collect/ForwardingCollection.java index 3d1733a..57b8d80 100644 --- a/java/src/game/collect/ForwardingCollection.java +++ b/java/src/common/collect/ForwardingCollection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Collection; import java.util.Iterator; diff --git a/java/src/game/collect/ForwardingMap.java b/java/src/common/collect/ForwardingMap.java similarity index 99% rename from java/src/game/collect/ForwardingMap.java rename to java/src/common/collect/ForwardingMap.java index b810066..8294acf 100644 --- a/java/src/game/collect/ForwardingMap.java +++ b/java/src/common/collect/ForwardingMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Collection; import java.util.Map; diff --git a/java/src/game/collect/ForwardingMapEntry.java b/java/src/common/collect/ForwardingMapEntry.java similarity index 99% rename from java/src/game/collect/ForwardingMapEntry.java rename to java/src/common/collect/ForwardingMapEntry.java index a4f4d03..515a3b1 100644 --- a/java/src/game/collect/ForwardingMapEntry.java +++ b/java/src/common/collect/ForwardingMapEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; import java.util.Map; import java.util.Map.Entry; diff --git a/java/src/game/collect/ForwardingObject.java b/java/src/common/collect/ForwardingObject.java similarity index 99% rename from java/src/game/collect/ForwardingObject.java rename to java/src/common/collect/ForwardingObject.java index d5b64e8..6894d30 100644 --- a/java/src/game/collect/ForwardingObject.java +++ b/java/src/common/collect/ForwardingObject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.collect; +package common.collect; /** * An abstract base class for implementing the { public class GeneratorSettings { diff --git a/java/src/game/dimension/Domain.java b/java/src/common/dimension/Domain.java similarity index 90% rename from java/src/game/dimension/Domain.java rename to java/src/common/dimension/Domain.java index 91e640c..f209714 100755 --- a/java/src/game/dimension/Domain.java +++ b/java/src/common/dimension/Domain.java @@ -1,8 +1,8 @@ -package game.dimension; +package common.dimension; import java.util.Set; -import game.collect.Sets; +import common.collect.Sets; public final class Domain extends Nameable implements Comparable { public final String id; diff --git a/java/src/game/dimension/Galaxy.java b/java/src/common/dimension/Galaxy.java similarity index 90% rename from java/src/game/dimension/Galaxy.java rename to java/src/common/dimension/Galaxy.java index fa44e2f..9203107 100755 --- a/java/src/game/dimension/Galaxy.java +++ b/java/src/common/dimension/Galaxy.java @@ -1,8 +1,8 @@ -package game.dimension; +package common.dimension; import java.util.Set; -import game.collect.Sets; +import common.collect.Sets; public final class Galaxy extends Nameable implements Comparable { public final String id; diff --git a/java/src/game/dimension/Moon.java b/java/src/common/dimension/Moon.java similarity index 95% rename from java/src/game/dimension/Moon.java rename to java/src/common/dimension/Moon.java index 10eeff6..cab561c 100755 --- a/java/src/game/dimension/Moon.java +++ b/java/src/common/dimension/Moon.java @@ -1,4 +1,4 @@ -package game.dimension; +package common.dimension; public final class Moon extends Dimension { Moon(int id, String name) { diff --git a/java/src/game/dimension/Nameable.java b/java/src/common/dimension/Nameable.java similarity index 95% rename from java/src/game/dimension/Nameable.java rename to java/src/common/dimension/Nameable.java index 9e9454b..922630d 100755 --- a/java/src/game/dimension/Nameable.java +++ b/java/src/common/dimension/Nameable.java @@ -1,6 +1,6 @@ -package game.dimension; +package common.dimension; -import game.nbt.NBTTagCompound; +import common.nbt.NBTTagCompound; public abstract class Nameable { protected String customName = null; diff --git a/java/src/game/dimension/Planet.java b/java/src/common/dimension/Planet.java similarity index 96% rename from java/src/game/dimension/Planet.java rename to java/src/common/dimension/Planet.java index 19689b7..37fa250 100755 --- a/java/src/game/dimension/Planet.java +++ b/java/src/common/dimension/Planet.java @@ -1,8 +1,8 @@ -package game.dimension; +package common.dimension; import java.util.Set; -import game.collect.Sets; +import common.collect.Sets; public final class Planet extends Dimension { private final Set moons = Sets.newTreeSet(); diff --git a/java/src/game/dimension/Sector.java b/java/src/common/dimension/Sector.java similarity index 90% rename from java/src/game/dimension/Sector.java rename to java/src/common/dimension/Sector.java index 4d11d4e..6327744 100755 --- a/java/src/game/dimension/Sector.java +++ b/java/src/common/dimension/Sector.java @@ -1,8 +1,8 @@ -package game.dimension; +package common.dimension; import java.util.Set; -import game.collect.Sets; +import common.collect.Sets; public final class Sector extends Nameable implements Comparable { public final String id; diff --git a/java/src/game/dimension/Semi.java b/java/src/common/dimension/Semi.java similarity index 95% rename from java/src/game/dimension/Semi.java rename to java/src/common/dimension/Semi.java index 798d6ca..d5e8b58 100755 --- a/java/src/game/dimension/Semi.java +++ b/java/src/common/dimension/Semi.java @@ -1,4 +1,4 @@ -package game.dimension; +package common.dimension; public final class Semi extends Dimension { Semi(int id, String name) { diff --git a/java/src/game/dimension/Space.java b/java/src/common/dimension/Space.java similarity index 98% rename from java/src/game/dimension/Space.java rename to java/src/common/dimension/Space.java index 02f21bc..3eac115 100755 --- a/java/src/game/dimension/Space.java +++ b/java/src/common/dimension/Space.java @@ -1,6 +1,6 @@ -package game.dimension; +package common.dimension; -import game.biome.Biome; +import common.biome.Biome; public final class Space extends Dimension { public static final Space INSTANCE = new Space(); diff --git a/java/src/game/dimension/Star.java b/java/src/common/dimension/Star.java similarity index 96% rename from java/src/game/dimension/Star.java rename to java/src/common/dimension/Star.java index 4a2452b..14af9e6 100755 --- a/java/src/game/dimension/Star.java +++ b/java/src/common/dimension/Star.java @@ -1,9 +1,9 @@ -package game.dimension; +package common.dimension; import java.util.Set; -import game.collect.Sets; -import game.world.State; +import common.collect.Sets; +import common.world.State; public final class Star extends Dimension { private final Set planets = Sets.newTreeSet(); diff --git a/java/src/game/dispenser/BehaviorDefaultDispenseItem.java b/java/src/common/dispenser/BehaviorDefaultDispenseItem.java similarity index 93% rename from java/src/game/dispenser/BehaviorDefaultDispenseItem.java rename to java/src/common/dispenser/BehaviorDefaultDispenseItem.java index 50057a4..937a1ec 100755 --- a/java/src/game/dispenser/BehaviorDefaultDispenseItem.java +++ b/java/src/common/dispenser/BehaviorDefaultDispenseItem.java @@ -1,10 +1,10 @@ -package game.dispenser; +package common.dispenser; -import game.block.BlockDispenser; -import game.entity.item.EntityItem; -import game.item.ItemStack; -import game.world.Facing; -import game.world.World; +import common.block.BlockDispenser; +import common.entity.item.EntityItem; +import common.item.ItemStack; +import common.world.Facing; +import common.world.World; public class BehaviorDefaultDispenseItem implements IBehaviorDispenseItem { diff --git a/java/src/game/dispenser/BehaviorProjectileDispense.java b/java/src/common/dispenser/BehaviorProjectileDispense.java similarity index 86% rename from java/src/game/dispenser/BehaviorProjectileDispense.java rename to java/src/common/dispenser/BehaviorProjectileDispense.java index 98ce906..71230cf 100755 --- a/java/src/game/dispenser/BehaviorProjectileDispense.java +++ b/java/src/common/dispenser/BehaviorProjectileDispense.java @@ -1,11 +1,11 @@ -package game.dispenser; +package common.dispenser; -import game.block.BlockDispenser; -import game.entity.Entity; -import game.entity.types.IProjectile; -import game.item.ItemStack; -import game.world.Facing; -import game.world.World; +import common.block.BlockDispenser; +import common.entity.Entity; +import common.entity.types.IProjectile; +import common.item.ItemStack; +import common.world.Facing; +import common.world.World; public abstract class BehaviorProjectileDispense extends BehaviorDefaultDispenseItem { diff --git a/java/src/game/dispenser/IBehaviorDispenseItem.java b/java/src/common/dispenser/IBehaviorDispenseItem.java similarity index 87% rename from java/src/game/dispenser/IBehaviorDispenseItem.java rename to java/src/common/dispenser/IBehaviorDispenseItem.java index 2b68bf5..d15ef84 100755 --- a/java/src/game/dispenser/IBehaviorDispenseItem.java +++ b/java/src/common/dispenser/IBehaviorDispenseItem.java @@ -1,6 +1,6 @@ -package game.dispenser; +package common.dispenser; -import game.item.ItemStack; +import common.item.ItemStack; public interface IBehaviorDispenseItem { diff --git a/java/src/game/dispenser/IBlockSource.java b/java/src/common/dispenser/IBlockSource.java similarity index 71% rename from java/src/game/dispenser/IBlockSource.java rename to java/src/common/dispenser/IBlockSource.java index 8e6359e..f6d6d8f 100755 --- a/java/src/game/dispenser/IBlockSource.java +++ b/java/src/common/dispenser/IBlockSource.java @@ -1,7 +1,7 @@ -package game.dispenser; +package common.dispenser; -import game.tileentity.TileEntity; -import game.world.BlockPos; +import common.tileentity.TileEntity; +import common.world.BlockPos; public interface IBlockSource extends ILocatableSource { diff --git a/java/src/game/dispenser/ILocatableSource.java b/java/src/common/dispenser/ILocatableSource.java similarity index 68% rename from java/src/game/dispenser/ILocatableSource.java rename to java/src/common/dispenser/ILocatableSource.java index ea67a66..b0875cb 100755 --- a/java/src/game/dispenser/ILocatableSource.java +++ b/java/src/common/dispenser/ILocatableSource.java @@ -1,4 +1,4 @@ -package game.dispenser; +package common.dispenser; public interface ILocatableSource extends ILocation { diff --git a/java/src/game/dispenser/ILocation.java b/java/src/common/dispenser/ILocation.java similarity index 57% rename from java/src/game/dispenser/ILocation.java rename to java/src/common/dispenser/ILocation.java index c4a4142..e4eb4ae 100755 --- a/java/src/game/dispenser/ILocation.java +++ b/java/src/common/dispenser/ILocation.java @@ -1,6 +1,6 @@ -package game.dispenser; +package common.dispenser; -import game.world.World; +import common.world.World; public interface ILocation extends IPosition { diff --git a/java/src/game/dispenser/IPosition.java b/java/src/common/dispenser/IPosition.java similarity index 77% rename from java/src/game/dispenser/IPosition.java rename to java/src/common/dispenser/IPosition.java index d7ec2f1..aa1ebe7 100755 --- a/java/src/game/dispenser/IPosition.java +++ b/java/src/common/dispenser/IPosition.java @@ -1,4 +1,4 @@ -package game.dispenser; +package common.dispenser; public interface IPosition { diff --git a/java/src/game/dispenser/PositionImpl.java b/java/src/common/dispenser/PositionImpl.java similarity index 94% rename from java/src/game/dispenser/PositionImpl.java rename to java/src/common/dispenser/PositionImpl.java index a268ee3..9150126 100755 --- a/java/src/game/dispenser/PositionImpl.java +++ b/java/src/common/dispenser/PositionImpl.java @@ -1,4 +1,4 @@ -package game.dispenser; +package common.dispenser; public class PositionImpl implements IPosition { diff --git a/java/src/game/enchantment/Enchantment.java b/java/src/common/enchantment/Enchantment.java similarity index 97% rename from java/src/game/enchantment/Enchantment.java rename to java/src/common/enchantment/Enchantment.java index 2241101..a83fe87 100755 --- a/java/src/game/enchantment/Enchantment.java +++ b/java/src/common/enchantment/Enchantment.java @@ -1,15 +1,15 @@ -package game.enchantment; +package common.enchantment; import java.util.List; import java.util.Map; import java.util.Set; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.item.ItemStack; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.item.ItemStack; public abstract class Enchantment { diff --git a/java/src/game/enchantment/EnchantmentArrowDamage.java b/java/src/common/enchantment/EnchantmentArrowDamage.java similarity index 96% rename from java/src/game/enchantment/EnchantmentArrowDamage.java rename to java/src/common/enchantment/EnchantmentArrowDamage.java index 7d6b93e..0525e6a 100755 --- a/java/src/game/enchantment/EnchantmentArrowDamage.java +++ b/java/src/common/enchantment/EnchantmentArrowDamage.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentArrowFire.java b/java/src/common/enchantment/EnchantmentArrowFire.java similarity index 96% rename from java/src/game/enchantment/EnchantmentArrowFire.java rename to java/src/common/enchantment/EnchantmentArrowFire.java index 4e0121e..e5e2658 100755 --- a/java/src/game/enchantment/EnchantmentArrowFire.java +++ b/java/src/common/enchantment/EnchantmentArrowFire.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentArrowInfinite.java b/java/src/common/enchantment/EnchantmentArrowInfinite.java similarity index 96% rename from java/src/game/enchantment/EnchantmentArrowInfinite.java rename to java/src/common/enchantment/EnchantmentArrowInfinite.java index 7845109..860a44a 100755 --- a/java/src/game/enchantment/EnchantmentArrowInfinite.java +++ b/java/src/common/enchantment/EnchantmentArrowInfinite.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentArrowKnockback.java b/java/src/common/enchantment/EnchantmentArrowKnockback.java similarity index 96% rename from java/src/game/enchantment/EnchantmentArrowKnockback.java rename to java/src/common/enchantment/EnchantmentArrowKnockback.java index 3619294..2e15fae 100755 --- a/java/src/game/enchantment/EnchantmentArrowKnockback.java +++ b/java/src/common/enchantment/EnchantmentArrowKnockback.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentDamage.java b/java/src/common/enchantment/EnchantmentDamage.java similarity index 96% rename from java/src/game/enchantment/EnchantmentDamage.java rename to java/src/common/enchantment/EnchantmentDamage.java index ffe689f..9be0458 100755 --- a/java/src/game/enchantment/EnchantmentDamage.java +++ b/java/src/common/enchantment/EnchantmentDamage.java @@ -1,7 +1,7 @@ -package game.enchantment; +package common.enchantment; -import game.item.ItemAxe; -import game.item.ItemStack; +import common.item.ItemAxe; +import common.item.ItemStack; public class EnchantmentDamage extends Enchantment diff --git a/java/src/game/enchantment/EnchantmentDigging.java b/java/src/common/enchantment/EnchantmentDigging.java similarity index 92% rename from java/src/game/enchantment/EnchantmentDigging.java rename to java/src/common/enchantment/EnchantmentDigging.java index 32b3031..a504816 100755 --- a/java/src/game/enchantment/EnchantmentDigging.java +++ b/java/src/common/enchantment/EnchantmentDigging.java @@ -1,7 +1,7 @@ -package game.enchantment; +package common.enchantment; -import game.item.ItemShears; -import game.item.ItemStack; +import common.item.ItemShears; +import common.item.ItemStack; public class EnchantmentDigging extends Enchantment diff --git a/java/src/game/enchantment/EnchantmentDraining.java b/java/src/common/enchantment/EnchantmentDraining.java similarity index 85% rename from java/src/game/enchantment/EnchantmentDraining.java rename to java/src/common/enchantment/EnchantmentDraining.java index ed9f589..ec8be82 100755 --- a/java/src/game/enchantment/EnchantmentDraining.java +++ b/java/src/common/enchantment/EnchantmentDraining.java @@ -1,10 +1,10 @@ -package game.enchantment; +package common.enchantment; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.item.ItemAxe; -import game.item.ItemStack; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.item.ItemAxe; +import common.item.ItemStack; public class EnchantmentDraining extends Enchantment { diff --git a/java/src/game/enchantment/EnchantmentDurability.java b/java/src/common/enchantment/EnchantmentDurability.java similarity index 93% rename from java/src/game/enchantment/EnchantmentDurability.java rename to java/src/common/enchantment/EnchantmentDurability.java index a8854bb..8181411 100755 --- a/java/src/game/enchantment/EnchantmentDurability.java +++ b/java/src/common/enchantment/EnchantmentDurability.java @@ -1,8 +1,8 @@ -package game.enchantment; +package common.enchantment; -import game.item.ItemArmor; -import game.item.ItemStack; -import game.rng.Random; +import common.item.ItemArmor; +import common.item.ItemStack; +import common.rng.Random; public class EnchantmentDurability extends Enchantment diff --git a/java/src/game/enchantment/EnchantmentFireAspect.java b/java/src/common/enchantment/EnchantmentFireAspect.java similarity index 96% rename from java/src/game/enchantment/EnchantmentFireAspect.java rename to java/src/common/enchantment/EnchantmentFireAspect.java index 956374f..0e91e40 100755 --- a/java/src/game/enchantment/EnchantmentFireAspect.java +++ b/java/src/common/enchantment/EnchantmentFireAspect.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentFishingSpeed.java b/java/src/common/enchantment/EnchantmentFishingSpeed.java similarity index 96% rename from java/src/game/enchantment/EnchantmentFishingSpeed.java rename to java/src/common/enchantment/EnchantmentFishingSpeed.java index a1e4cc7..0ba0dd0 100755 --- a/java/src/game/enchantment/EnchantmentFishingSpeed.java +++ b/java/src/common/enchantment/EnchantmentFishingSpeed.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentHelper.java b/java/src/common/enchantment/EnchantmentHelper.java similarity index 97% rename from java/src/game/enchantment/EnchantmentHelper.java rename to java/src/common/enchantment/EnchantmentHelper.java index 6a74e6e..a6ce979 100755 --- a/java/src/game/enchantment/EnchantmentHelper.java +++ b/java/src/common/enchantment/EnchantmentHelper.java @@ -1,21 +1,21 @@ -package game.enchantment; +package common.enchantment; import java.util.Iterator; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.rng.WeightedList; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; +import common.rng.WeightedList; public class EnchantmentHelper { diff --git a/java/src/game/enchantment/EnchantmentKnockback.java b/java/src/common/enchantment/EnchantmentKnockback.java similarity index 96% rename from java/src/game/enchantment/EnchantmentKnockback.java rename to java/src/common/enchantment/EnchantmentKnockback.java index 295f00a..5fd4642 100755 --- a/java/src/game/enchantment/EnchantmentKnockback.java +++ b/java/src/common/enchantment/EnchantmentKnockback.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentLootBonus.java b/java/src/common/enchantment/EnchantmentLootBonus.java similarity index 98% rename from java/src/game/enchantment/EnchantmentLootBonus.java rename to java/src/common/enchantment/EnchantmentLootBonus.java index 63b683a..036fdb8 100755 --- a/java/src/game/enchantment/EnchantmentLootBonus.java +++ b/java/src/common/enchantment/EnchantmentLootBonus.java @@ -1,4 +1,4 @@ -package game.enchantment; +package common.enchantment; diff --git a/java/src/game/enchantment/EnchantmentProtection.java b/java/src/common/enchantment/EnchantmentProtection.java similarity index 97% rename from java/src/game/enchantment/EnchantmentProtection.java rename to java/src/common/enchantment/EnchantmentProtection.java index 9c4d0fb..6cfe6bc 100755 --- a/java/src/game/enchantment/EnchantmentProtection.java +++ b/java/src/common/enchantment/EnchantmentProtection.java @@ -1,8 +1,8 @@ -package game.enchantment; +package common.enchantment; -import game.entity.DamageSource; -import game.entity.Entity; -import game.util.ExtMath; +import common.entity.DamageSource; +import common.entity.Entity; +import common.util.ExtMath; public class EnchantmentProtection extends Enchantment diff --git a/java/src/game/enchantment/EnchantmentThorns.java b/java/src/common/enchantment/EnchantmentThorns.java similarity index 90% rename from java/src/game/enchantment/EnchantmentThorns.java rename to java/src/common/enchantment/EnchantmentThorns.java index 67844c4..3693045 100755 --- a/java/src/game/enchantment/EnchantmentThorns.java +++ b/java/src/common/enchantment/EnchantmentThorns.java @@ -1,12 +1,12 @@ -package game.enchantment; +package common.enchantment; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.item.ItemArmor; -import game.item.ItemStack; -import game.rng.Random; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.item.ItemArmor; +import common.item.ItemStack; +import common.rng.Random; public class EnchantmentThorns extends Enchantment { diff --git a/java/src/game/enchantment/EnchantmentUntouching.java b/java/src/common/enchantment/EnchantmentUntouching.java similarity index 93% rename from java/src/game/enchantment/EnchantmentUntouching.java rename to java/src/common/enchantment/EnchantmentUntouching.java index 090d142..3508fca 100755 --- a/java/src/game/enchantment/EnchantmentUntouching.java +++ b/java/src/common/enchantment/EnchantmentUntouching.java @@ -1,7 +1,7 @@ -package game.enchantment; +package common.enchantment; -import game.item.ItemShears; -import game.item.ItemStack; +import common.item.ItemShears; +import common.item.ItemStack; public class EnchantmentUntouching extends Enchantment diff --git a/java/src/game/enchantment/EnumEnchantmentType.java b/java/src/common/enchantment/EnumEnchantmentType.java similarity index 86% rename from java/src/game/enchantment/EnumEnchantmentType.java rename to java/src/common/enchantment/EnumEnchantmentType.java index adc56dc..7c7e2c9 100755 --- a/java/src/game/enchantment/EnumEnchantmentType.java +++ b/java/src/common/enchantment/EnumEnchantmentType.java @@ -1,11 +1,11 @@ -package game.enchantment; +package common.enchantment; -import game.item.Item; -import game.item.ItemArmor; -import game.item.ItemBow; -import game.item.ItemFishingRod; -import game.item.ItemSword; -import game.item.ItemTool; +import common.item.Item; +import common.item.ItemArmor; +import common.item.ItemBow; +import common.item.ItemFishingRod; +import common.item.ItemSword; +import common.item.ItemTool; public enum EnumEnchantmentType { diff --git a/java/src/game/enchantment/RngEnchantment.java b/java/src/common/enchantment/RngEnchantment.java similarity index 89% rename from java/src/game/enchantment/RngEnchantment.java rename to java/src/common/enchantment/RngEnchantment.java index b945bde..d517860 100755 --- a/java/src/game/enchantment/RngEnchantment.java +++ b/java/src/common/enchantment/RngEnchantment.java @@ -1,6 +1,6 @@ -package game.enchantment; +package common.enchantment; -import game.rng.RngItem; +import common.rng.RngItem; public class RngEnchantment extends RngItem { diff --git a/java/src/game/entity/DamageSource.java b/java/src/common/entity/DamageSource.java similarity index 98% rename from java/src/game/entity/DamageSource.java rename to java/src/common/entity/DamageSource.java index abb897f..e46f59b 100755 --- a/java/src/game/entity/DamageSource.java +++ b/java/src/common/entity/DamageSource.java @@ -1,9 +1,9 @@ -package game.entity; +package common.entity; -import game.color.TextColor; -import game.entity.projectile.EntityProjectile; -import game.entity.types.EntityLiving; -import game.world.Explosion; +import common.color.TextColor; +import common.entity.projectile.EntityProjectile; +import common.entity.types.EntityLiving; +import common.world.Explosion; public class DamageSource { diff --git a/java/src/game/entity/DataWatcher.java b/java/src/common/entity/DataWatcher.java similarity index 98% rename from java/src/game/entity/DataWatcher.java rename to java/src/common/entity/DataWatcher.java index bc7f2a7..7b061b3 100755 --- a/java/src/game/entity/DataWatcher.java +++ b/java/src/common/entity/DataWatcher.java @@ -1,4 +1,4 @@ -package game.entity; +package common.entity; import java.io.IOException; import java.util.List; @@ -6,11 +6,11 @@ import java.util.Map; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import game.collect.Lists; -import game.collect.Maps; -import game.item.ItemStack; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.collect.Lists; +import common.collect.Maps; +import common.item.ItemStack; +import common.network.PacketBuffer; +import common.world.BlockPos; public class DataWatcher { private static final Map, Integer> dataTypes = Maps., Integer>newHashMap(); diff --git a/java/src/game/entity/Entity.java b/java/src/common/entity/Entity.java similarity index 98% rename from java/src/game/entity/Entity.java rename to java/src/common/entity/Entity.java index 331864e..0daa035 100755 --- a/java/src/game/entity/Entity.java +++ b/java/src/common/entity/Entity.java @@ -1,49 +1,49 @@ -package game.entity; +package common.entity; import java.util.List; -import game.block.Block; -import game.block.BlockFence; -import game.block.BlockFenceGate; -import game.block.BlockLiquid; -import game.block.BlockWall; -import game.block.SoundType; -import game.color.TextColor; -import game.dimension.DimType; -import game.enchantment.EnchantmentHelper; -import game.enchantment.EnchantmentProtection; -import game.entity.effect.EntityLightning; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.ItemRegistry; -import game.init.SoundEvent; -import game.init.UniverseRegistry; -import game.item.Item; -import game.item.ItemStack; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagDouble; -import game.nbt.NBTTagFloat; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Explosion; -import game.world.Facing; -import game.world.HitPosition; -import game.world.PortalType; -import game.world.Position; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockFence; +import common.block.BlockFenceGate; +import common.block.BlockLiquid; +import common.block.BlockWall; +import common.block.SoundType; +import common.color.TextColor; +import common.dimension.DimType; +import common.enchantment.EnchantmentHelper; +import common.enchantment.EnchantmentProtection; +import common.entity.effect.EntityLightning; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.ItemRegistry; +import common.init.SoundEvent; +import common.init.UniverseRegistry; +import common.item.Item; +import common.item.ItemStack; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagDouble; +import common.nbt.NBTTagFloat; +import common.nbt.NBTTagList; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +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; public abstract class Entity { diff --git a/java/src/game/entity/EntityDamageSource.java b/java/src/common/entity/EntityDamageSource.java similarity index 94% rename from java/src/game/entity/EntityDamageSource.java rename to java/src/common/entity/EntityDamageSource.java index ecb22c7..971a33c 100755 --- a/java/src/game/entity/EntityDamageSource.java +++ b/java/src/common/entity/EntityDamageSource.java @@ -1,8 +1,8 @@ -package game.entity; +package common.entity; -import game.color.TextColor; -import game.entity.types.EntityLiving; -import game.item.ItemStack; +import common.color.TextColor; +import common.entity.types.EntityLiving; +import common.item.ItemStack; public class EntityDamageSource extends DamageSource { diff --git a/java/src/game/entity/EntityDamageSourceIndirect.java b/java/src/common/entity/EntityDamageSourceIndirect.java similarity index 92% rename from java/src/game/entity/EntityDamageSourceIndirect.java rename to java/src/common/entity/EntityDamageSourceIndirect.java index a50bb18..a28b70a 100755 --- a/java/src/game/entity/EntityDamageSourceIndirect.java +++ b/java/src/common/entity/EntityDamageSourceIndirect.java @@ -1,8 +1,8 @@ -package game.entity; +package common.entity; -import game.color.TextColor; -import game.entity.types.EntityLiving; -import game.item.ItemStack; +import common.color.TextColor; +import common.entity.types.EntityLiving; +import common.item.ItemStack; public class EntityDamageSourceIndirect extends EntityDamageSource { diff --git a/java/src/game/entity/EntityTrackerEntry.java b/java/src/common/entity/EntityTrackerEntry.java similarity index 93% rename from java/src/game/entity/EntityTrackerEntry.java rename to java/src/common/entity/EntityTrackerEntry.java index e661a3d..f70867f 100755 --- a/java/src/game/entity/EntityTrackerEntry.java +++ b/java/src/common/entity/EntityTrackerEntry.java @@ -1,34 +1,34 @@ -package game.entity; +package common.entity; import java.util.Collection; import java.util.List; import java.util.Set; -import game.collect.Sets; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.AttributeMap; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityArrow; -import game.entity.types.EntityLiving; -import game.item.ItemStack; -import game.log.Log; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.packet.S14PacketEntity; -import game.packet.S18PacketEntityTeleport; -import game.packet.S19PacketEntityHeadLook; -import game.packet.S1BPacketEntityAttach; -import game.packet.S1CPacketEntityMetadata; -import game.packet.S1DPacketEntityEffect; -import game.packet.S20PacketEntityProperties; -import game.packet.S43PacketUpdateEntityNBT; -import game.packet.SPacketEntityEquipment; -import game.packet.SPacketEntityVelocity; -import game.packet.SPacketSpawnMob; -import game.packet.SPacketSpawnObject; -import game.packet.SPacketSpawnPlayer; -import game.potion.PotionEffect; -import game.util.ExtMath; +import common.collect.Sets; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.AttributeMap; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityArrow; +import common.entity.types.EntityLiving; +import common.item.ItemStack; +import common.log.Log; +import common.nbt.NBTTagCompound; +import common.network.Packet; +import common.packet.S14PacketEntity; +import common.packet.S18PacketEntityTeleport; +import common.packet.S19PacketEntityHeadLook; +import common.packet.S1BPacketEntityAttach; +import common.packet.S1CPacketEntityMetadata; +import common.packet.S1DPacketEntityEffect; +import common.packet.S20PacketEntityProperties; +import common.packet.S43PacketUpdateEntityNBT; +import common.packet.SPacketEntityEquipment; +import common.packet.SPacketEntityVelocity; +import common.packet.SPacketSpawnMob; +import common.packet.SPacketSpawnObject; +import common.packet.SPacketSpawnPlayer; +import common.potion.PotionEffect; +import common.util.ExtMath; public class EntityTrackerEntry { public final Entity trackedEntity; diff --git a/java/src/game/entity/EntityType.java b/java/src/common/entity/EntityType.java similarity index 93% rename from java/src/game/entity/EntityType.java rename to java/src/common/entity/EntityType.java index 55ca7fe..1bfbfd7 100644 --- a/java/src/game/entity/EntityType.java +++ b/java/src/common/entity/EntityType.java @@ -1,8 +1,8 @@ -package game.entity; +package common.entity; import java.util.Map; -import game.collect.Maps; +import common.collect.Maps; public enum EntityType { OBJECT("Object", "Objekt"), diff --git a/java/src/game/entity/animal/EntityBat.java b/java/src/common/entity/animal/EntityBat.java similarity index 95% rename from java/src/game/entity/animal/EntityBat.java rename to java/src/common/entity/animal/EntityBat.java index 7478685..7f30243 100755 --- a/java/src/game/entity/animal/EntityBat.java +++ b/java/src/common/entity/animal/EntityBat.java @@ -1,17 +1,17 @@ -package game.entity.animal; +package common.entity.animal; -import game.block.Block; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.SoundEvent; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +import common.block.Block; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.SoundEvent; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; public class EntityBat extends EntityLiving { diff --git a/java/src/game/entity/animal/EntityChicken.java b/java/src/common/entity/animal/EntityChicken.java similarity index 90% rename from java/src/game/entity/animal/EntityChicken.java rename to java/src/common/entity/animal/EntityChicken.java index dd39420..c809c9f 100755 --- a/java/src/game/entity/animal/EntityChicken.java +++ b/java/src/common/entity/animal/EntityChicken.java @@ -1,25 +1,25 @@ -package game.entity.animal; +package common.entity.animal; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.World; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.World; public class EntityChicken extends EntityAnimal { diff --git a/java/src/game/entity/animal/EntityCow.java b/java/src/common/entity/animal/EntityCow.java similarity index 85% rename from java/src/game/entity/animal/EntityCow.java rename to java/src/common/entity/animal/EntityCow.java index 84bef6e..cadd0a3 100755 --- a/java/src/game/entity/animal/EntityCow.java +++ b/java/src/common/entity/animal/EntityCow.java @@ -1,23 +1,23 @@ -package game.entity.animal; +package common.entity.animal; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.pathfinding.PathNavigateGround; -import game.world.World; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.pathfinding.PathNavigateGround; +import common.world.World; public class EntityCow extends EntityAnimal { diff --git a/java/src/game/entity/animal/EntityDragon.java b/java/src/common/entity/animal/EntityDragon.java similarity index 97% rename from java/src/game/entity/animal/EntityDragon.java rename to java/src/common/entity/animal/EntityDragon.java index 4084f10..dc1953e 100755 --- a/java/src/game/entity/animal/EntityDragon.java +++ b/java/src/common/entity/animal/EntityDragon.java @@ -1,22 +1,22 @@ -package game.entity.animal; +package common.entity.animal; import java.util.List; -import game.collect.Lists; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.entity.types.IEntityMultiPart; -import game.init.Config; -import game.init.SoundEvent; -import game.model.ParticleType; -import game.util.ExtMath; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; +import common.collect.Lists; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.entity.types.IEntityMultiPart; +import common.init.Config; +import common.init.SoundEvent; +import common.model.ParticleType; +import common.util.ExtMath; +import common.world.Vec3; +import common.world.World; +import common.world.WorldClient; public class EntityDragon extends EntityLiving implements IEntityMultiPart { diff --git a/java/src/game/entity/animal/EntityDragonPart.java b/java/src/common/entity/animal/EntityDragonPart.java similarity index 89% rename from java/src/game/entity/animal/EntityDragonPart.java rename to java/src/common/entity/animal/EntityDragonPart.java index 3f9bf65..c78dc53 100755 --- a/java/src/game/entity/animal/EntityDragonPart.java +++ b/java/src/common/entity/animal/EntityDragonPart.java @@ -1,10 +1,10 @@ -package game.entity.animal; +package common.entity.animal; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.IEntityMultiPart; -import game.nbt.NBTTagCompound; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.IEntityMultiPart; +import common.nbt.NBTTagCompound; public class EntityDragonPart extends Entity { diff --git a/java/src/game/entity/animal/EntityHorse.java b/java/src/common/entity/animal/EntityHorse.java similarity index 97% rename from java/src/game/entity/animal/EntityHorse.java rename to java/src/common/entity/animal/EntityHorse.java index 515a0e5..041aa2a 100755 --- a/java/src/game/entity/animal/EntityHorse.java +++ b/java/src/common/entity/animal/EntityHorse.java @@ -1,44 +1,44 @@ -package game.entity.animal; +package common.entity.animal; import java.util.function.Predicate; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAIRunAroundLikeCrazy; -import game.ai.EntityAISwimming; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.block.Block; -import game.block.SoundType; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.inventory.AnimalChest; -import game.inventory.IInvBasic; -import game.inventory.InventoryBasic; -import game.item.Item; -import game.item.ItemMonsterPlacer; -import game.item.ItemStack; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.pathfinding.PathNavigateGround; -import game.potion.Potion; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAIRunAroundLikeCrazy; +import common.ai.EntityAISwimming; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.block.Block; +import common.block.SoundType; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +import common.inventory.AnimalChest; +import common.inventory.IInvBasic; +import common.inventory.InventoryBasic; +import common.item.Item; +import common.item.ItemMonsterPlacer; +import common.item.ItemStack; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.pathfinding.PathNavigateGround; +import common.potion.Potion; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; public class EntityHorse extends EntityAnimal implements IInvBasic { diff --git a/java/src/game/entity/animal/EntityMooshroom.java b/java/src/common/entity/animal/EntityMooshroom.java similarity index 88% rename from java/src/game/entity/animal/EntityMooshroom.java rename to java/src/common/entity/animal/EntityMooshroom.java index 3b57c9b..b87afa5 100755 --- a/java/src/game/entity/animal/EntityMooshroom.java +++ b/java/src/common/entity/animal/EntityMooshroom.java @@ -1,15 +1,15 @@ -package game.entity.animal; +package common.entity.animal; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemShears; -import game.item.ItemStack; -import game.model.ParticleType; -import game.world.World; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemShears; +import common.item.ItemStack; +import common.model.ParticleType; +import common.world.World; public class EntityMooshroom extends EntityCow { diff --git a/java/src/game/entity/animal/EntityMouse.java b/java/src/common/entity/animal/EntityMouse.java similarity index 80% rename from java/src/game/entity/animal/EntityMouse.java rename to java/src/common/entity/animal/EntityMouse.java index f1c803f..86195f2 100755 --- a/java/src/game/entity/animal/EntityMouse.java +++ b/java/src/common/entity/animal/EntityMouse.java @@ -1,27 +1,27 @@ -package game.entity.animal; +package common.entity.animal; import java.util.Collections; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.block.Block; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.world.BlockPos; -import game.world.World; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.block.Block; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.world.BlockPos; +import common.world.World; public class EntityMouse extends EntityAnimal { public EntityMouse(World world) { diff --git a/java/src/game/entity/animal/EntityOcelot.java b/java/src/common/entity/animal/EntityOcelot.java similarity index 92% rename from java/src/game/entity/animal/EntityOcelot.java rename to java/src/common/entity/animal/EntityOcelot.java index 85b685c..78acf63 100755 --- a/java/src/game/entity/animal/EntityOcelot.java +++ b/java/src/common/entity/animal/EntityOcelot.java @@ -1,34 +1,34 @@ -package game.entity.animal; +package common.entity.animal; import java.util.function.Predicate; -import game.ai.EntityAIAvoidEntity; -import game.ai.EntityAIFollowOwner; -import game.ai.EntityAILeapAtTarget; -import game.ai.EntityAIMate; -import game.ai.EntityAIOcelotAttack; -import game.ai.EntityAIOcelotSit; -import game.ai.EntityAISwimming; -import game.ai.EntityAITargetNonTamed; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.Attributes; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathNavigateGround; -import game.world.World; +import common.ai.EntityAIAvoidEntity; +import common.ai.EntityAIFollowOwner; +import common.ai.EntityAILeapAtTarget; +import common.ai.EntityAIMate; +import common.ai.EntityAIOcelotAttack; +import common.ai.EntityAIOcelotSit; +import common.ai.EntityAISwimming; +import common.ai.EntityAITargetNonTamed; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.Attributes; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathNavigateGround; +import common.world.World; public class EntityOcelot extends EntityTameable { diff --git a/java/src/game/entity/animal/EntityPig.java b/java/src/common/entity/animal/EntityPig.java similarity index 90% rename from java/src/game/entity/animal/EntityPig.java rename to java/src/common/entity/animal/EntityPig.java index 6a9e189..b094e99 100755 --- a/java/src/game/entity/animal/EntityPig.java +++ b/java/src/common/entity/animal/EntityPig.java @@ -1,25 +1,25 @@ -package game.entity.animal; +package common.entity.animal; -import game.ai.EntityAIControlledByPlayer; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathNavigateGround; -import game.world.World; +import common.ai.EntityAIControlledByPlayer; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathNavigateGround; +import common.world.World; public class EntityPig extends EntityAnimal { diff --git a/java/src/game/entity/animal/EntityRabbit.java b/java/src/common/entity/animal/EntityRabbit.java similarity index 92% rename from java/src/game/entity/animal/EntityRabbit.java rename to java/src/common/entity/animal/EntityRabbit.java index 1a58e41..49e09cf 100755 --- a/java/src/game/entity/animal/EntityRabbit.java +++ b/java/src/common/entity/animal/EntityRabbit.java @@ -1,48 +1,48 @@ -package game.entity.animal; +package common.entity.animal; import java.util.function.Predicate; -import game.ai.EntityAIAttackOnCollide; -import game.ai.EntityAIAvoidEntity; -import game.ai.EntityAIHurtByTarget; -import game.ai.EntityAIMate; -import game.ai.EntityAIMoveToBlock; -import game.ai.EntityAINearestAttackableTarget; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.ai.EntityJumpHelper; -import game.ai.EntityMoveHelper; -import game.block.Block; -import game.block.BlockTallGrass; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.Attributes; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathEntity; -import game.pathfinding.PathNavigateGround; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.ai.EntityAIAttackOnCollide; +import common.ai.EntityAIAvoidEntity; +import common.ai.EntityAIHurtByTarget; +import common.ai.EntityAIMate; +import common.ai.EntityAIMoveToBlock; +import common.ai.EntityAINearestAttackableTarget; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.ai.EntityJumpHelper; +import common.ai.EntityMoveHelper; +import common.block.Block; +import common.block.BlockTallGrass; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.Attributes; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathEntity; +import common.pathfinding.PathNavigateGround; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.Vec3; +import common.world.World; public class EntityRabbit extends EntityAnimal { private static final int TYPES = 10; diff --git a/java/src/game/entity/animal/EntitySheep.java b/java/src/common/entity/animal/EntitySheep.java similarity index 91% rename from java/src/game/entity/animal/EntitySheep.java rename to java/src/common/entity/animal/EntitySheep.java index 71f19b8..2c2ab93 100755 --- a/java/src/game/entity/animal/EntitySheep.java +++ b/java/src/common/entity/animal/EntitySheep.java @@ -1,39 +1,39 @@ -package game.entity.animal; +package common.entity.animal; import java.util.Map; -import game.ai.EntityAIEatGrass; -import game.ai.EntityAIFollowParent; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIPanic; -import game.ai.EntityAISwimming; -import game.ai.EntityAITempt; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.biome.Biome; -import game.collect.Maps; -import game.color.DyeColor; -import game.entity.attributes.Attributes; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.CraftingRegistry; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.inventory.Container; -import game.inventory.InventoryCrafting; -import game.item.Item; -import game.item.ItemShears; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathNavigateGround; -import game.rng.Random; -import game.util.ExtMath; -import game.world.World; +import common.ai.EntityAIEatGrass; +import common.ai.EntityAIFollowParent; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIPanic; +import common.ai.EntityAISwimming; +import common.ai.EntityAITempt; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.biome.Biome; +import common.collect.Maps; +import common.color.DyeColor; +import common.entity.attributes.Attributes; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.CraftingRegistry; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +import common.inventory.Container; +import common.inventory.InventoryCrafting; +import common.item.Item; +import common.item.ItemShears; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathNavigateGround; +import common.rng.Random; +import common.util.ExtMath; +import common.world.World; public class EntitySheep extends EntityAnimal { diff --git a/java/src/game/entity/animal/EntitySquid.java b/java/src/common/entity/animal/EntitySquid.java similarity index 96% rename from java/src/game/entity/animal/EntitySquid.java rename to java/src/common/entity/animal/EntitySquid.java index 22ccf33..1650e15 100755 --- a/java/src/game/entity/animal/EntitySquid.java +++ b/java/src/common/entity/animal/EntitySquid.java @@ -1,15 +1,15 @@ -package game.entity.animal; +package common.entity.animal; -import game.ai.EntityAIBase; -import game.color.DyeColor; -import game.entity.npc.Alignment; -import game.entity.types.EntityWaterMob; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemStack; -import game.util.ExtMath; -import game.world.World; +import common.ai.EntityAIBase; +import common.color.DyeColor; +import common.entity.npc.Alignment; +import common.entity.types.EntityWaterMob; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemStack; +import common.util.ExtMath; +import common.world.World; public class EntitySquid extends EntityWaterMob { diff --git a/java/src/game/entity/animal/EntityWolf.java b/java/src/common/entity/animal/EntityWolf.java similarity index 94% rename from java/src/game/entity/animal/EntityWolf.java rename to java/src/common/entity/animal/EntityWolf.java index 5f2ddd7..c99ffad 100755 --- a/java/src/game/entity/animal/EntityWolf.java +++ b/java/src/common/entity/animal/EntityWolf.java @@ -1,40 +1,40 @@ -package game.entity.animal; +package common.entity.animal; import java.util.function.Predicate; -import game.ai.EntityAIAttackOnCollide; -import game.ai.EntityAIBeg; -import game.ai.EntityAIFollowOwner; -import game.ai.EntityAIHurtByTarget; -import game.ai.EntityAILeapAtTarget; -import game.ai.EntityAILookIdle; -import game.ai.EntityAIMate; -import game.ai.EntityAIOwnerHurtByTarget; -import game.ai.EntityAIOwnerHurtTarget; -import game.ai.EntityAISwimming; -import game.ai.EntityAITargetNonTamed; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.color.DyeColor; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.Attributes; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityAnimal; -import game.entity.types.EntityLiving; -import game.entity.types.EntityTameable; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemFood; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathNavigateGround; -import game.util.ExtMath; -import game.world.World; +import common.ai.EntityAIAttackOnCollide; +import common.ai.EntityAIBeg; +import common.ai.EntityAIFollowOwner; +import common.ai.EntityAIHurtByTarget; +import common.ai.EntityAILeapAtTarget; +import common.ai.EntityAILookIdle; +import common.ai.EntityAIMate; +import common.ai.EntityAIOwnerHurtByTarget; +import common.ai.EntityAIOwnerHurtTarget; +import common.ai.EntityAISwimming; +import common.ai.EntityAITargetNonTamed; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.color.DyeColor; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.Attributes; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityAnimal; +import common.entity.types.EntityLiving; +import common.entity.types.EntityTameable; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemFood; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathNavigateGround; +import common.util.ExtMath; +import common.world.World; public class EntityWolf extends EntityTameable { diff --git a/java/src/game/entity/attributes/Attribute.java b/java/src/common/entity/attributes/Attribute.java similarity index 95% rename from java/src/game/entity/attributes/Attribute.java rename to java/src/common/entity/attributes/Attribute.java index 81ea3b4..3e56630 100755 --- a/java/src/game/entity/attributes/Attribute.java +++ b/java/src/common/entity/attributes/Attribute.java @@ -1,9 +1,9 @@ -package game.entity.attributes; +package common.entity.attributes; import java.util.Map; -import game.collect.Maps; -import game.util.ExtMath; +import common.collect.Maps; +import common.util.ExtMath; public class Attribute { diff --git a/java/src/game/entity/attributes/AttributeInstance.java b/java/src/common/entity/attributes/AttributeInstance.java similarity index 97% rename from java/src/game/entity/attributes/AttributeInstance.java rename to java/src/common/entity/attributes/AttributeInstance.java index e2e2cb3..7204633 100755 --- a/java/src/game/entity/attributes/AttributeInstance.java +++ b/java/src/common/entity/attributes/AttributeInstance.java @@ -1,12 +1,12 @@ -package game.entity.attributes; +package common.entity.attributes; import java.util.Collection; import java.util.Map; import java.util.Set; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; public class AttributeInstance { diff --git a/java/src/game/entity/attributes/AttributeMap.java b/java/src/common/entity/attributes/AttributeMap.java similarity index 98% rename from java/src/game/entity/attributes/AttributeMap.java rename to java/src/common/entity/attributes/AttributeMap.java index af5666e..a19fcba 100755 --- a/java/src/game/entity/attributes/AttributeMap.java +++ b/java/src/common/entity/attributes/AttributeMap.java @@ -1,12 +1,13 @@ -package game.entity.attributes; +package common.entity.attributes; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.collect.Maps; -import game.collect.Sets; +import common.collect.Maps; +import common.collect.Sets; + +import java.util.Set; public class AttributeMap { diff --git a/java/src/game/entity/attributes/AttributeModifier.java b/java/src/common/entity/attributes/AttributeModifier.java similarity index 98% rename from java/src/game/entity/attributes/AttributeModifier.java rename to java/src/common/entity/attributes/AttributeModifier.java index 176417f..9081bd1 100755 --- a/java/src/game/entity/attributes/AttributeModifier.java +++ b/java/src/common/entity/attributes/AttributeModifier.java @@ -1,6 +1,6 @@ -package game.entity.attributes; +package common.entity.attributes; -import game.rng.Random; +import common.rng.Random; public class AttributeModifier { diff --git a/java/src/game/entity/attributes/Attributes.java b/java/src/common/entity/attributes/Attributes.java similarity index 98% rename from java/src/game/entity/attributes/Attributes.java rename to java/src/common/entity/attributes/Attributes.java index cf4736b..c23c629 100755 --- a/java/src/game/entity/attributes/Attributes.java +++ b/java/src/common/entity/attributes/Attributes.java @@ -1,10 +1,10 @@ -package game.entity.attributes; +package common.entity.attributes; import java.util.Collection; -import game.log.Log; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; +import common.log.Log; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; public class Attributes { diff --git a/java/src/game/entity/attributes/LowerStringMap.java b/java/src/common/entity/attributes/LowerStringMap.java similarity index 96% rename from java/src/game/entity/attributes/LowerStringMap.java rename to java/src/common/entity/attributes/LowerStringMap.java index 11110bb..091cc27 100755 --- a/java/src/game/entity/attributes/LowerStringMap.java +++ b/java/src/common/entity/attributes/LowerStringMap.java @@ -1,10 +1,10 @@ -package game.entity.attributes; +package common.entity.attributes; import java.util.Collection; import java.util.Map; import java.util.Set; -import game.collect.Maps; +import common.collect.Maps; public class LowerStringMap implements Map { diff --git a/java/src/game/entity/effect/EntityLightning.java b/java/src/common/entity/effect/EntityLightning.java similarity index 87% rename from java/src/game/entity/effect/EntityLightning.java rename to java/src/common/entity/effect/EntityLightning.java index dd405db..4e9eccd 100755 --- a/java/src/game/entity/effect/EntityLightning.java +++ b/java/src/common/entity/effect/EntityLightning.java @@ -1,18 +1,18 @@ -package game.entity.effect; +package common.entity.effect; import java.util.List; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.entity.types.EntityWeatherEffect; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.material.Material; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; -import game.world.WorldClient; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.entity.types.EntityWeatherEffect; +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.world.World; +import common.world.WorldClient; public class EntityLightning extends EntityWeatherEffect { diff --git a/java/src/game/entity/item/EntityBoat.java b/java/src/common/entity/item/EntityBoat.java similarity index 97% rename from java/src/game/entity/item/EntityBoat.java rename to java/src/common/entity/item/EntityBoat.java index ca7e129..98d133c 100755 --- a/java/src/game/entity/item/EntityBoat.java +++ b/java/src/common/entity/item/EntityBoat.java @@ -1,25 +1,25 @@ -package game.entity.item; +package common.entity.item; import java.util.List; -import game.block.Block; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityDamageSourceIndirect; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.Item; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.block.Block; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityDamageSourceIndirect; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.Item; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.World; public class EntityBoat extends Entity { diff --git a/java/src/game/entity/item/EntityCart.java b/java/src/common/entity/item/EntityCart.java similarity index 98% rename from java/src/game/entity/item/EntityCart.java rename to java/src/common/entity/item/EntityCart.java index d1f0058..113d137 100755 --- a/java/src/game/entity/item/EntityCart.java +++ b/java/src/common/entity/item/EntityCart.java @@ -1,26 +1,26 @@ -package game.entity.item; +package common.entity.item; -import game.block.Block; -import game.block.BlockRailBase; -import game.block.BlockRailPowered; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.tileentity.IWorldNameable; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.block.BlockRailBase; +import common.block.BlockRailPowered; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.tileentity.IWorldNameable; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.State; +import common.world.Vec3; +import common.world.World; public abstract class EntityCart extends Entity implements IWorldNameable { diff --git a/java/src/game/entity/item/EntityCartContainer.java b/java/src/common/entity/item/EntityCartContainer.java similarity index 93% rename from java/src/game/entity/item/EntityCartContainer.java rename to java/src/common/entity/item/EntityCartContainer.java index 26c633a..daf7d7c 100755 --- a/java/src/game/entity/item/EntityCartContainer.java +++ b/java/src/common/entity/item/EntityCartContainer.java @@ -1,19 +1,19 @@ -package game.entity.item; +package common.entity.item; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.Config; -import game.inventory.Container; -import game.inventory.InventoryHelper; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.tileentity.ILockableContainer; -import game.tileentity.LockCode; -import game.world.BlockPos; -import game.world.PortalType; -import game.world.World; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.init.Config; +import common.inventory.Container; +import common.inventory.InventoryHelper; +import common.item.ItemStack; +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.world.World; public abstract class EntityCartContainer extends EntityCart implements ILockableContainer { diff --git a/java/src/game/entity/item/EntityChestCart.java b/java/src/common/entity/item/EntityChestCart.java similarity index 74% rename from java/src/game/entity/item/EntityChestCart.java rename to java/src/common/entity/item/EntityChestCart.java index e39c128..783dbc1 100755 --- a/java/src/game/entity/item/EntityChestCart.java +++ b/java/src/common/entity/item/EntityChestCart.java @@ -1,17 +1,17 @@ -package game.entity.item; +package common.entity.item; -import game.block.BlockChest; -import game.entity.DamageSource; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.inventory.Container; -import game.inventory.ContainerChest; -import game.inventory.InventoryPlayer; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.BlockChest; +import common.entity.DamageSource; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.inventory.Container; +import common.inventory.ContainerChest; +import common.inventory.InventoryPlayer; +import common.world.Facing; +import common.world.State; +import common.world.World; public class EntityChestCart extends EntityCartContainer { diff --git a/java/src/game/entity/item/EntityCrystal.java b/java/src/common/entity/item/EntityCrystal.java similarity index 94% rename from java/src/game/entity/item/EntityCrystal.java rename to java/src/common/entity/item/EntityCrystal.java index b348d57..d7b4073 100755 --- a/java/src/game/entity/item/EntityCrystal.java +++ b/java/src/common/entity/item/EntityCrystal.java @@ -1,10 +1,10 @@ -package game.entity.item; +package common.entity.item; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.nbt.NBTTagCompound; +import common.world.World; public class EntityCrystal extends Entity { diff --git a/java/src/game/entity/item/EntityExplosion.java b/java/src/common/entity/item/EntityExplosion.java similarity index 91% rename from java/src/game/entity/item/EntityExplosion.java rename to java/src/common/entity/item/EntityExplosion.java index 260e5b1..e8892bf 100755 --- a/java/src/game/entity/item/EntityExplosion.java +++ b/java/src/common/entity/item/EntityExplosion.java @@ -1,10 +1,10 @@ -package game.entity.item; +package common.entity.item; -import game.entity.Entity; -import game.entity.EntityType; -import game.nbt.NBTTagCompound; -import game.world.Explosion; -import game.world.World; +import common.entity.Entity; +import common.entity.EntityType; +import common.nbt.NBTTagCompound; +import common.world.Explosion; +import common.world.World; public class EntityExplosion extends Entity { diff --git a/java/src/game/entity/item/EntityFalling.java b/java/src/common/entity/item/EntityFalling.java similarity index 93% rename from java/src/game/entity/item/EntityFalling.java rename to java/src/common/entity/item/EntityFalling.java index 8196747..ffb8a7b 100755 --- a/java/src/game/entity/item/EntityFalling.java +++ b/java/src/common/entity/item/EntityFalling.java @@ -1,29 +1,29 @@ -package game.entity.item; +package common.entity.item; import java.util.List; -import game.block.Block; -import game.block.BlockAnvil; -import game.block.BlockFalling; -import game.block.ITileEntityProvider; -import game.collect.Lists; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.IObjectData; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.item.ItemStack; -import game.material.Material; -import game.nbt.NBTBase; -import game.nbt.NBTTagCompound; -import game.tileentity.TileEntity; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockAnvil; +import common.block.BlockFalling; +import common.block.ITileEntityProvider; +import common.collect.Lists; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.IObjectData; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.item.ItemStack; +import common.material.Material; +import common.nbt.NBTBase; +import common.nbt.NBTTagCompound; +import common.tileentity.TileEntity; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class EntityFalling extends Entity implements IObjectData { diff --git a/java/src/game/entity/item/EntityFireworks.java b/java/src/common/entity/item/EntityFireworks.java similarity index 95% rename from java/src/game/entity/item/EntityFireworks.java rename to java/src/common/entity/item/EntityFireworks.java index dc20a18..1e1e2eb 100755 --- a/java/src/game/entity/item/EntityFireworks.java +++ b/java/src/common/entity/item/EntityFireworks.java @@ -1,14 +1,14 @@ -package game.entity.item; +package common.entity.item; -import game.entity.Entity; -import game.entity.EntityType; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.World; -import game.world.WorldClient; +import common.entity.Entity; +import common.entity.EntityType; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.World; +import common.world.WorldClient; public class EntityFireworks extends Entity { diff --git a/java/src/game/entity/item/EntityHopperCart.java b/java/src/common/entity/item/EntityHopperCart.java similarity index 91% rename from java/src/game/entity/item/EntityHopperCart.java rename to java/src/common/entity/item/EntityHopperCart.java index 9441c6a..4083659 100755 --- a/java/src/game/entity/item/EntityHopperCart.java +++ b/java/src/common/entity/item/EntityHopperCart.java @@ -1,22 +1,22 @@ -package game.entity.item; +package common.entity.item; import java.util.List; import java.util.function.Predicate; -import game.entity.DamageSource; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.inventory.Container; -import game.inventory.ContainerHopper; -import game.inventory.InventoryPlayer; -import game.nbt.NBTTagCompound; -import game.tileentity.IHopper; -import game.tileentity.TileEntityHopper; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.entity.DamageSource; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.inventory.Container; +import common.inventory.ContainerHopper; +import common.inventory.InventoryPlayer; +import common.nbt.NBTTagCompound; +import common.tileentity.IHopper; +import common.tileentity.TileEntityHopper; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class EntityHopperCart extends EntityCartContainer implements IHopper { diff --git a/java/src/game/entity/item/EntityItem.java b/java/src/common/entity/item/EntityItem.java similarity index 96% rename from java/src/game/entity/item/EntityItem.java rename to java/src/common/entity/item/EntityItem.java index fb04bbd..14abe9b 100755 --- a/java/src/game/entity/item/EntityItem.java +++ b/java/src/common/entity/item/EntityItem.java @@ -1,25 +1,25 @@ -package game.entity.item; +package common.entity.item; -import game.color.TextColor; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.log.Log; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.PortalType; -import game.world.World; -import game.world.WorldServer; +import common.color.TextColor; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.log.Log; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.PortalType; +import common.world.World; +import common.world.WorldServer; public class EntityItem extends Entity { diff --git a/java/src/game/entity/item/EntityLeashKnot.java b/java/src/common/entity/item/EntityLeashKnot.java similarity index 96% rename from java/src/game/entity/item/EntityLeashKnot.java rename to java/src/common/entity/item/EntityLeashKnot.java index ff89910..e3aebe6 100755 --- a/java/src/game/entity/item/EntityLeashKnot.java +++ b/java/src/common/entity/item/EntityLeashKnot.java @@ -1,19 +1,19 @@ -package game.entity.item; +package common.entity.item; -import game.block.BlockFence; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.block.BlockFence; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.World; public class EntityLeashKnot extends Entity { diff --git a/java/src/game/entity/item/EntityMinecart.java b/java/src/common/entity/item/EntityMinecart.java similarity index 93% rename from java/src/game/entity/item/EntityMinecart.java rename to java/src/common/entity/item/EntityMinecart.java index 52ae07e..008c898 100755 --- a/java/src/game/entity/item/EntityMinecart.java +++ b/java/src/common/entity/item/EntityMinecart.java @@ -1,8 +1,8 @@ -package game.entity.item; +package common.entity.item; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.world.World; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.world.World; public class EntityMinecart extends EntityCart { diff --git a/java/src/game/entity/item/EntityNuke.java b/java/src/common/entity/item/EntityNuke.java similarity index 94% rename from java/src/game/entity/item/EntityNuke.java rename to java/src/common/entity/item/EntityNuke.java index 9828a96..75ee50c 100755 --- a/java/src/game/entity/item/EntityNuke.java +++ b/java/src/common/entity/item/EntityNuke.java @@ -1,10 +1,10 @@ -package game.entity.item; +package common.entity.item; -import game.entity.Entity; -import game.entity.EntityType; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.entity.Entity; +import common.entity.EntityType; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.world.World; public class EntityNuke extends Entity { diff --git a/java/src/game/entity/item/EntityOrb.java b/java/src/common/entity/item/EntityOrb.java similarity index 93% rename from java/src/game/entity/item/EntityOrb.java rename to java/src/common/entity/item/EntityOrb.java index bd1f534..6a3ecf8 100755 --- a/java/src/game/entity/item/EntityOrb.java +++ b/java/src/common/entity/item/EntityOrb.java @@ -1,13 +1,13 @@ -package game.entity.item; +package common.entity.item; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.init.Config; -import game.model.ParticleType; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.init.Config; +import common.model.ParticleType; +import common.world.HitPosition; +import common.world.World; public class EntityOrb extends EntityThrowable { diff --git a/java/src/game/entity/item/EntityTnt.java b/java/src/common/entity/item/EntityTnt.java similarity index 93% rename from java/src/game/entity/item/EntityTnt.java rename to java/src/common/entity/item/EntityTnt.java index e306bf9..b68cb74 100755 --- a/java/src/game/entity/item/EntityTnt.java +++ b/java/src/common/entity/item/EntityTnt.java @@ -1,12 +1,12 @@ -package game.entity.item; +package common.entity.item; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.entity.types.IObjectData; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.entity.types.IObjectData; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.world.World; public class EntityTnt extends Entity implements IObjectData { diff --git a/java/src/game/entity/item/EntityTntCart.java b/java/src/common/entity/item/EntityTntCart.java similarity index 92% rename from java/src/game/entity/item/EntityTntCart.java rename to java/src/common/entity/item/EntityTntCart.java index 16fa7c7..4adfbc4 100755 --- a/java/src/game/entity/item/EntityTntCart.java +++ b/java/src/common/entity/item/EntityTntCart.java @@ -1,19 +1,19 @@ -package game.entity.item; +package common.entity.item; -import game.block.BlockRailBase; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.projectile.EntityArrow; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.world.BlockPos; -import game.world.Explosion; -import game.world.State; -import game.world.World; +import common.block.BlockRailBase; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.projectile.EntityArrow; +import common.init.Blocks; +import common.init.Config; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.world.BlockPos; +import common.world.Explosion; +import common.world.State; +import common.world.World; public class EntityTntCart extends EntityCart { diff --git a/java/src/game/entity/item/EntityXp.java b/java/src/common/entity/item/EntityXp.java similarity index 95% rename from java/src/game/entity/item/EntityXp.java rename to java/src/common/entity/item/EntityXp.java index 3ab09b2..ab9642c 100755 --- a/java/src/game/entity/item/EntityXp.java +++ b/java/src/common/entity/item/EntityXp.java @@ -1,20 +1,20 @@ -package game.entity.item; +package common.entity.item; -import game.color.TextColor; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.entity.types.IObjectData; -import game.init.Config; -import game.init.SoundEvent; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.PortalType; -import game.world.World; +import common.color.TextColor; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.entity.types.IObjectData; +import common.init.Config; +import common.init.SoundEvent; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.PortalType; +import common.world.World; public class EntityXp extends Entity implements IObjectData { diff --git a/java/src/game/entity/item/EntityXpBottle.java b/java/src/common/entity/item/EntityXpBottle.java similarity index 86% rename from java/src/game/entity/item/EntityXpBottle.java rename to java/src/common/entity/item/EntityXpBottle.java index f4c377d..09a969b 100755 --- a/java/src/game/entity/item/EntityXpBottle.java +++ b/java/src/common/entity/item/EntityXpBottle.java @@ -1,10 +1,10 @@ -package game.entity.item; +package common.entity.item; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.world.BlockPos; -import game.world.HitPosition; -import game.world.World; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.world.BlockPos; +import common.world.HitPosition; +import common.world.World; public class EntityXpBottle extends EntityThrowable { diff --git a/java/src/game/entity/npc/Alignment.java b/java/src/common/entity/npc/Alignment.java similarity index 95% rename from java/src/game/entity/npc/Alignment.java rename to java/src/common/entity/npc/Alignment.java index 8e96033..9c5fba6 100755 --- a/java/src/game/entity/npc/Alignment.java +++ b/java/src/common/entity/npc/Alignment.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; import java.util.Map; -import game.collect.Maps; -import game.color.TextColor; +import common.collect.Maps; +import common.color.TextColor; public enum Alignment { LAWFUL_GOOD("lgood", "Rechtsch. gut", 1, 1, TextColor.NEON), diff --git a/java/src/game/entity/npc/CharacterInfo.java b/java/src/common/entity/npc/CharacterInfo.java similarity index 86% rename from java/src/game/entity/npc/CharacterInfo.java rename to java/src/common/entity/npc/CharacterInfo.java index 44c375c..02318a6 100755 --- a/java/src/game/entity/npc/CharacterInfo.java +++ b/java/src/common/entity/npc/CharacterInfo.java @@ -1,7 +1,7 @@ -package game.entity.npc; +package common.entity.npc; -import game.init.SpeciesRegistry; -import game.item.ItemStack; +import common.init.SpeciesRegistry; +import common.item.ItemStack; public class CharacterInfo extends NpcInfo { public final boolean spawner; diff --git a/java/src/game/entity/npc/ClassInfo.java b/java/src/common/entity/npc/ClassInfo.java similarity index 80% rename from java/src/game/entity/npc/ClassInfo.java rename to java/src/common/entity/npc/ClassInfo.java index 7802003..e4561a0 100755 --- a/java/src/game/entity/npc/ClassInfo.java +++ b/java/src/common/entity/npc/ClassInfo.java @@ -1,4 +1,4 @@ -package game.entity.npc; +package common.entity.npc; public class ClassInfo { public final Enum type; diff --git a/java/src/game/entity/npc/Energy.java b/java/src/common/entity/npc/Energy.java similarity index 96% rename from java/src/game/entity/npc/Energy.java rename to java/src/common/entity/npc/Energy.java index da81e6e..1f060f2 100755 --- a/java/src/game/entity/npc/Energy.java +++ b/java/src/common/entity/npc/Energy.java @@ -1,4 +1,4 @@ -package game.entity.npc; +package common.entity.npc; public enum Energy { SPIRITUAL(-100, 'S', "spiritual", "SPR", 0x00ff00, 0x00ffff), // angelic diff --git a/java/src/game/entity/npc/EntityArachnoid.java b/java/src/common/entity/npc/EntityArachnoid.java similarity index 94% rename from java/src/game/entity/npc/EntityArachnoid.java rename to java/src/common/entity/npc/EntityArachnoid.java index ac04013..f56a9bf 100755 --- a/java/src/game/entity/npc/EntityArachnoid.java +++ b/java/src/common/entity/npc/EntityArachnoid.java @@ -1,16 +1,16 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIAttackOnCollide; -import game.ai.EntityAILeapAtTarget; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.pathfinding.PathNavigate; -import game.pathfinding.PathNavigateClimber; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.rng.Random; -import game.world.BlockPos; -import game.world.World; +import common.ai.EntityAIAttackOnCollide; +import common.ai.EntityAILeapAtTarget; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.pathfinding.PathNavigate; +import common.pathfinding.PathNavigateClimber; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.rng.Random; +import common.world.BlockPos; +import common.world.World; public class EntityArachnoid extends EntityNPC { diff --git a/java/src/game/entity/npc/EntityBloodElf.java b/java/src/common/entity/npc/EntityBloodElf.java similarity index 91% rename from java/src/game/entity/npc/EntityBloodElf.java rename to java/src/common/entity/npc/EntityBloodElf.java index 66e5a4e..4870276 100755 --- a/java/src/game/entity/npc/EntityBloodElf.java +++ b/java/src/common/entity/npc/EntityBloodElf.java @@ -1,10 +1,10 @@ -package game.entity.npc; +package common.entity.npc; -import game.init.Items; -import game.init.NameRegistry; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.init.Items; +import common.init.NameRegistry; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntityBloodElf extends EntityNPC { public EntityBloodElf(World worldIn) { diff --git a/java/src/game/entity/npc/EntityChaosMarine.java b/java/src/common/entity/npc/EntityChaosMarine.java similarity index 91% rename from java/src/game/entity/npc/EntityChaosMarine.java rename to java/src/common/entity/npc/EntityChaosMarine.java index a988ac3..cccb1b3 100755 --- a/java/src/game/entity/npc/EntityChaosMarine.java +++ b/java/src/common/entity/npc/EntityChaosMarine.java @@ -1,15 +1,15 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; -import game.collect.Lists; -import game.entity.attributes.Attributes; -import game.init.Items; -import game.init.SpeciesRegistry; -import game.item.ItemStack; -import game.rng.Random; -import game.util.Identifyable; -import game.world.World; +import common.collect.Lists; +import common.entity.attributes.Attributes; +import common.init.Items; +import common.init.SpeciesRegistry; +import common.item.ItemStack; +import common.rng.Random; +import common.util.Identifyable; +import common.world.World; public class EntityChaosMarine extends EntityNPC { public static enum Legion implements Identifyable { diff --git a/java/src/game/entity/npc/EntityCpu.java b/java/src/common/entity/npc/EntityCpu.java similarity index 89% rename from java/src/game/entity/npc/EntityCpu.java rename to java/src/common/entity/npc/EntityCpu.java index bd8ce4e..e9aaa3a 100755 --- a/java/src/game/entity/npc/EntityCpu.java +++ b/java/src/common/entity/npc/EntityCpu.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntityCpu extends EntityNPC { public EntityCpu(World worldIn) { diff --git a/java/src/game/entity/npc/EntityCultivator.java b/java/src/common/entity/npc/EntityCultivator.java similarity index 91% rename from java/src/game/entity/npc/EntityCultivator.java rename to java/src/common/entity/npc/EntityCultivator.java index 5ce5805..84206cd 100755 --- a/java/src/game/entity/npc/EntityCultivator.java +++ b/java/src/common/entity/npc/EntityCultivator.java @@ -1,14 +1,14 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAITakePlace; -import game.ai.EntityAITempt; -import game.ai.EntityAIWatchClosest2; -import game.entity.effect.EntityLightning; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.world.BlockPos; -import game.world.World; +import common.ai.EntityAITakePlace; +import common.ai.EntityAITempt; +import common.ai.EntityAIWatchClosest2; +import common.entity.effect.EntityLightning; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.world.BlockPos; +import common.world.World; public class EntityCultivator extends EntityNPC { public EntityCultivator(World worldIn) { diff --git a/java/src/game/entity/npc/EntityDarkMage.java b/java/src/common/entity/npc/EntityDarkMage.java similarity index 90% rename from java/src/game/entity/npc/EntityDarkMage.java rename to java/src/common/entity/npc/EntityDarkMage.java index 790cc12..5d5712b 100755 --- a/java/src/game/entity/npc/EntityDarkMage.java +++ b/java/src/common/entity/npc/EntityDarkMage.java @@ -1,11 +1,11 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.AISmallFireballAttack; -import game.init.SoundEvent; -import game.model.ParticleType; -import game.rng.Random; -import game.world.World; -import game.world.WorldClient; +import common.ai.AISmallFireballAttack; +import common.init.SoundEvent; +import common.model.ParticleType; +import common.rng.Random; +import common.world.World; +import common.world.WorldClient; public class EntityDarkMage extends EntityHoveringNPC { public EntityDarkMage(World worldIn) { diff --git a/java/src/game/entity/npc/EntityDwarf.java b/java/src/common/entity/npc/EntityDwarf.java similarity index 92% rename from java/src/game/entity/npc/EntityDwarf.java rename to java/src/common/entity/npc/EntityDwarf.java index 0872ad5..8e78631 100755 --- a/java/src/game/entity/npc/EntityDwarf.java +++ b/java/src/common/entity/npc/EntityDwarf.java @@ -1,8 +1,8 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.types.EntityLiving; -import game.rng.Random; -import game.world.World; +import common.entity.types.EntityLiving; +import common.rng.Random; +import common.world.World; public class EntityDwarf extends EntityNPC { public EntityDwarf(World worldIn) { diff --git a/java/src/game/entity/npc/EntityElf.java b/java/src/common/entity/npc/EntityElf.java similarity index 89% rename from java/src/game/entity/npc/EntityElf.java rename to java/src/common/entity/npc/EntityElf.java index d61c7a6..2a70a38 100755 --- a/java/src/game/entity/npc/EntityElf.java +++ b/java/src/common/entity/npc/EntityElf.java @@ -1,11 +1,11 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.NameRegistry; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.NameRegistry; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntityElf extends EntityNPC { public EntityElf(World worldIn) { diff --git a/java/src/game/entity/npc/EntityFireDemon.java b/java/src/common/entity/npc/EntityFireDemon.java similarity index 89% rename from java/src/game/entity/npc/EntityFireDemon.java rename to java/src/common/entity/npc/EntityFireDemon.java index 81a11db..e982fff 100755 --- a/java/src/game/entity/npc/EntityFireDemon.java +++ b/java/src/common/entity/npc/EntityFireDemon.java @@ -1,10 +1,10 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.AIFireballAttack; -import game.entity.DamageSource; -import game.entity.effect.EntityLightning; -import game.rng.Random; -import game.world.World; +import common.ai.AIFireballAttack; +import common.entity.DamageSource; +import common.entity.effect.EntityLightning; +import common.rng.Random; +import common.world.World; public class EntityFireDemon extends EntityFlyingNPC { public EntityFireDemon(World worldIn) { diff --git a/java/src/game/entity/npc/EntityFlyingNPC.java b/java/src/common/entity/npc/EntityFlyingNPC.java similarity index 95% rename from java/src/game/entity/npc/EntityFlyingNPC.java rename to java/src/common/entity/npc/EntityFlyingNPC.java index 886e41d..56dcfb3 100755 --- a/java/src/game/entity/npc/EntityFlyingNPC.java +++ b/java/src/common/entity/npc/EntityFlyingNPC.java @@ -1,16 +1,16 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIBase; -import game.ai.EntityMoveHelper; -import game.block.Block; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.potion.Potion; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.ai.EntityAIBase; +import common.ai.EntityMoveHelper; +import common.block.Block; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.potion.Potion; +import common.rng.Random; +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/java/src/game/entity/npc/EntityGargoyle.java b/java/src/common/entity/npc/EntityGargoyle.java similarity index 95% rename from java/src/game/entity/npc/EntityGargoyle.java rename to java/src/common/entity/npc/EntityGargoyle.java index 9443e01..0f6b358 100755 --- a/java/src/game/entity/npc/EntityGargoyle.java +++ b/java/src/common/entity/npc/EntityGargoyle.java @@ -1,14 +1,14 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.AIFlyingBoxAttack; -import game.entity.DamageSource; -import game.entity.attributes.Attributes; -import game.init.Config; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.World; +import common.ai.AIFlyingBoxAttack; +import common.entity.DamageSource; +import common.entity.attributes.Attributes; +import common.init.Config; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.world.World; public class EntityGargoyle extends EntityFlyingNPC { diff --git a/java/src/game/entity/npc/EntityGoblin.java b/java/src/common/entity/npc/EntityGoblin.java similarity index 87% rename from java/src/game/entity/npc/EntityGoblin.java rename to java/src/common/entity/npc/EntityGoblin.java index 44038c4..3b0db10 100755 --- a/java/src/game/entity/npc/EntityGoblin.java +++ b/java/src/common/entity/npc/EntityGoblin.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.rng.Random; -import game.world.World; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.rng.Random; +import common.world.World; public class EntityGoblin extends EntityNPC { public EntityGoblin(World worldIn) { diff --git a/java/src/game/entity/npc/EntityHaunter.java b/java/src/common/entity/npc/EntityHaunter.java similarity index 95% rename from java/src/game/entity/npc/EntityHaunter.java rename to java/src/common/entity/npc/EntityHaunter.java index 9d1c216..4f1e389 100755 --- a/java/src/game/entity/npc/EntityHaunter.java +++ b/java/src/common/entity/npc/EntityHaunter.java @@ -1,18 +1,18 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIExplode; -import game.entity.Entity; -import game.entity.attributes.Attributes; -import game.entity.effect.EntityLightning; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.World; -import game.world.WorldServer; +import common.ai.EntityAIExplode; +import common.entity.Entity; +import common.entity.attributes.Attributes; +import common.entity.effect.EntityLightning; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.world.World; +import common.world.WorldServer; public class EntityHaunter extends EntityNPC { // private int lastActiveTime; diff --git a/java/src/game/entity/npc/EntityHoveringNPC.java b/java/src/common/entity/npc/EntityHoveringNPC.java similarity index 97% rename from java/src/game/entity/npc/EntityHoveringNPC.java rename to java/src/common/entity/npc/EntityHoveringNPC.java index c413458..d35b423 100755 --- a/java/src/game/entity/npc/EntityHoveringNPC.java +++ b/java/src/common/entity/npc/EntityHoveringNPC.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.packet.CPacketAction; -import game.world.World; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.packet.CPacketAction; +import common.world.World; public abstract class EntityHoveringNPC extends EntityNPC { diff --git a/java/src/game/entity/npc/EntityHuman.java b/java/src/common/entity/npc/EntityHuman.java similarity index 91% rename from java/src/game/entity/npc/EntityHuman.java rename to java/src/common/entity/npc/EntityHuman.java index aa68011..18bbea1 100755 --- a/java/src/game/entity/npc/EntityHuman.java +++ b/java/src/common/entity/npc/EntityHuman.java @@ -1,14 +1,14 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.util.Identifyable; -import game.village.Village; -import game.world.BlockPos; -import game.world.World; -import game.world.WorldServer; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.util.Identifyable; +import common.village.Village; +import common.world.BlockPos; +import common.world.World; +import common.world.WorldServer; public class EntityHuman extends EntityNPC { public static enum ClassType implements Identifyable { diff --git a/java/src/game/entity/npc/EntityMage.java b/java/src/common/entity/npc/EntityMage.java similarity index 92% rename from java/src/game/entity/npc/EntityMage.java rename to java/src/common/entity/npc/EntityMage.java index 691d82f..09c4134 100755 --- a/java/src/game/entity/npc/EntityMage.java +++ b/java/src/common/entity/npc/EntityMage.java @@ -1,17 +1,17 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.effect.EntityLightning; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.ItemStack; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.rng.Random; -import game.world.World; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.effect.EntityLightning; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.ItemStack; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.rng.Random; +import common.world.World; public class EntityMage extends EntityNPC { diff --git a/java/src/game/entity/npc/EntityMagma.java b/java/src/common/entity/npc/EntityMagma.java similarity index 97% rename from java/src/game/entity/npc/EntityMagma.java rename to java/src/common/entity/npc/EntityMagma.java index 049852c..3610e17 100755 --- a/java/src/game/entity/npc/EntityMagma.java +++ b/java/src/common/entity/npc/EntityMagma.java @@ -1,7 +1,7 @@ -package game.entity.npc; +package common.entity.npc; -import game.model.ParticleType; -import game.world.World; +import common.model.ParticleType; +import common.world.World; public class EntityMagma extends EntitySlime { diff --git a/java/src/game/entity/npc/EntityMetalhead.java b/java/src/common/entity/npc/EntityMetalhead.java similarity index 89% rename from java/src/game/entity/npc/EntityMetalhead.java rename to java/src/common/entity/npc/EntityMetalhead.java index 0113cbe..0de0841 100755 --- a/java/src/game/entity/npc/EntityMetalhead.java +++ b/java/src/common/entity/npc/EntityMetalhead.java @@ -1,11 +1,11 @@ -package game.entity.npc; +package common.entity.npc; -import game.init.ItemRegistry; -import game.init.MetalType; -import game.item.ItemMetal; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.init.ItemRegistry; +import common.init.MetalType; +import common.item.ItemMetal; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntityMetalhead extends EntityNPC { public EntityMetalhead(World worldIn) { diff --git a/java/src/game/entity/npc/EntityMobNPC.java b/java/src/common/entity/npc/EntityMobNPC.java similarity index 96% rename from java/src/game/entity/npc/EntityMobNPC.java rename to java/src/common/entity/npc/EntityMobNPC.java index 2a39783..e36c35f 100755 --- a/java/src/game/entity/npc/EntityMobNPC.java +++ b/java/src/common/entity/npc/EntityMobNPC.java @@ -1,13 +1,13 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIHurtByTarget; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.ai.EntityAIHurtByTarget; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.nbt.NBTTagCompound; +import common.world.World; public abstract class EntityMobNPC extends EntityNPC { diff --git a/java/src/game/entity/npc/EntityNPC.java b/java/src/common/entity/npc/EntityNPC.java similarity index 97% rename from java/src/game/entity/npc/EntityNPC.java rename to java/src/common/entity/npc/EntityNPC.java index 196893c..26b4075 100755 --- a/java/src/game/entity/npc/EntityNPC.java +++ b/java/src/common/entity/npc/EntityNPC.java @@ -1,102 +1,102 @@ -package game.entity.npc; +package common.entity.npc; import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.function.Predicate; -import game.IClient; -import game.ai.AIRangedAttack; -import game.ai.EntityAIAttackOnCollide; -import game.ai.EntityAIAvoidEntity; -import game.ai.EntityAIHurtByTarget; -import game.ai.EntityAILookAtTalkingPlayer; -import game.ai.EntityAINagPlayer; -import game.ai.EntityAINearestAttackableTarget; -import game.ai.EntityAINpcInteract; -import game.ai.EntityAINpcMate; -import game.ai.EntityAIOpenDoor; -import game.ai.EntityAIPlay; -import game.ai.EntityAISwimming; -import game.ai.EntityAIWander; -import game.ai.EntityAIWatchClosest; -import game.ai.EntityAIWatchClosest2; -import game.block.Block; -import game.block.BlockBed; -import game.dimension.Space; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.animal.EntityDragonPart; -import game.entity.animal.EntityHorse; -import game.entity.animal.EntityPig; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.item.EntityBoat; -import game.entity.item.EntityCart; -import game.entity.item.EntityItem; -import game.entity.projectile.EntityArrow; -import game.entity.projectile.EntityBullet; -import game.entity.projectile.EntityHook; -import game.entity.projectile.EntityPotion; -import game.entity.projectile.EntitySnowball; -import game.entity.types.EntityLiving; -import game.entity.types.IEntityMultiPart; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.NameRegistry; -import game.init.SoundEvent; -import game.init.SpeciesRegistry; -import game.init.SpeciesRegistry.ModelType; -import game.init.TradeRegistry; -import game.inventory.Container; -import game.inventory.ContainerPlayer; -import game.inventory.IInventory; -import game.inventory.InventoryBasic; -import game.inventory.InventoryPlayer; -import game.inventory.InventoryWarpChest; -import game.item.Item; -import game.item.ItemAction; -import game.item.ItemArmor; -import game.item.ItemBow; -import game.item.ItemGunBase; -import game.item.ItemHoe; -import game.item.ItemShears; -import game.item.ItemStack; -import game.item.ItemSword; -import game.item.ItemTool; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.network.IClientPlayer; -import game.network.IPlayer; -import game.packet.CPacketAction; -import game.packet.CPacketBreak; -import game.packet.CPacketInput; -import game.packet.CPacketPlayer; -import game.packet.SPacketEntityEquipment; -import game.packet.SPacketEntityVelocity; -import game.pathfinding.PathNavigateGround; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.rng.Random; -import game.sound.MovingSoundMinecartRiding; -import game.tileentity.IInteractionObject; -import game.tileentity.LockCode; -import game.tileentity.TileEntitySign; -import game.util.ExtMath; -import game.village.MerchantRecipeList; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.PortalType; -import game.world.Vec3; -import game.world.World; -import game.world.WorldClient; -import game.world.WorldPos; -import game.world.WorldServer; +import common.IClient; +import common.ai.AIRangedAttack; +import common.ai.EntityAIAttackOnCollide; +import common.ai.EntityAIAvoidEntity; +import common.ai.EntityAIHurtByTarget; +import common.ai.EntityAILookAtTalkingPlayer; +import common.ai.EntityAINagPlayer; +import common.ai.EntityAINearestAttackableTarget; +import common.ai.EntityAINpcInteract; +import common.ai.EntityAINpcMate; +import common.ai.EntityAIOpenDoor; +import common.ai.EntityAIPlay; +import common.ai.EntityAISwimming; +import common.ai.EntityAIWander; +import common.ai.EntityAIWatchClosest; +import common.ai.EntityAIWatchClosest2; +import common.block.Block; +import common.block.BlockBed; +import common.dimension.Space; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.animal.EntityDragonPart; +import common.entity.animal.EntityHorse; +import common.entity.animal.EntityPig; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.item.EntityBoat; +import common.entity.item.EntityCart; +import common.entity.item.EntityItem; +import common.entity.projectile.EntityArrow; +import common.entity.projectile.EntityBullet; +import common.entity.projectile.EntityHook; +import common.entity.projectile.EntityPotion; +import common.entity.projectile.EntitySnowball; +import common.entity.types.EntityLiving; +import common.entity.types.IEntityMultiPart; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.NameRegistry; +import common.init.SoundEvent; +import common.init.SpeciesRegistry; +import common.init.TradeRegistry; +import common.init.SpeciesRegistry.ModelType; +import common.inventory.Container; +import common.inventory.ContainerPlayer; +import common.inventory.IInventory; +import common.inventory.InventoryBasic; +import common.inventory.InventoryPlayer; +import common.inventory.InventoryWarpChest; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemArmor; +import common.item.ItemBow; +import common.item.ItemGunBase; +import common.item.ItemHoe; +import common.item.ItemShears; +import common.item.ItemStack; +import common.item.ItemSword; +import common.item.ItemTool; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.network.IClientPlayer; +import common.network.IPlayer; +import common.packet.CPacketAction; +import common.packet.CPacketBreak; +import common.packet.CPacketInput; +import common.packet.CPacketPlayer; +import common.packet.SPacketEntityEquipment; +import common.packet.SPacketEntityVelocity; +import common.pathfinding.PathNavigateGround; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.rng.Random; +import common.sound.MovingSoundMinecartRiding; +import common.tileentity.IInteractionObject; +import common.tileentity.LockCode; +import common.tileentity.TileEntitySign; +import common.util.ExtMath; +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/java/src/game/entity/npc/EntityOrc.java b/java/src/common/entity/npc/EntityOrc.java similarity index 92% rename from java/src/game/entity/npc/EntityOrc.java rename to java/src/common/entity/npc/EntityOrc.java index 47cc5df..e6cc4c0 100755 --- a/java/src/game/entity/npc/EntityOrc.java +++ b/java/src/common/entity/npc/EntityOrc.java @@ -1,8 +1,8 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.attributes.Attributes; -import game.rng.Random; -import game.world.World; +import common.entity.attributes.Attributes; +import common.rng.Random; +import common.world.World; public class EntityOrc extends EntityNPC { public EntityOrc(World worldIn) { diff --git a/java/src/game/entity/npc/EntityPrimarch.java b/java/src/common/entity/npc/EntityPrimarch.java similarity index 96% rename from java/src/game/entity/npc/EntityPrimarch.java rename to java/src/common/entity/npc/EntityPrimarch.java index 9edcf12..b20a047 100755 --- a/java/src/game/entity/npc/EntityPrimarch.java +++ b/java/src/common/entity/npc/EntityPrimarch.java @@ -1,12 +1,12 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; -import game.collect.Lists; -import game.entity.attributes.Attributes; -import game.rng.Random; -import game.util.Identifyable; -import game.world.World; +import common.collect.Lists; +import common.entity.attributes.Attributes; +import common.rng.Random; +import common.util.Identifyable; +import common.world.World; public class EntityPrimarch extends EntityMobNPC { public static enum Founding implements Identifyable { diff --git a/java/src/game/entity/npc/EntitySlime.java b/java/src/common/entity/npc/EntitySlime.java similarity index 97% rename from java/src/game/entity/npc/EntitySlime.java rename to java/src/common/entity/npc/EntitySlime.java index 578b1b9..0c9d04d 100755 --- a/java/src/game/entity/npc/EntitySlime.java +++ b/java/src/common/entity/npc/EntitySlime.java @@ -1,23 +1,23 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIBase; -import game.ai.EntityMoveHelper; -import game.biome.Biome; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.init.SoundEvent; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.pathfinding.PathNavigateGround; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Chunk; -import game.world.World; -import game.world.WorldServer; +import common.ai.EntityAIBase; +import common.ai.EntityMoveHelper; +import common.biome.Biome; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.init.SoundEvent; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.pathfinding.PathNavigateGround; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Chunk; +import common.world.World; +import common.world.WorldServer; public class EntitySlime extends EntityNPC { diff --git a/java/src/game/entity/npc/EntitySpaceMarine.java b/java/src/common/entity/npc/EntitySpaceMarine.java similarity index 91% rename from java/src/game/entity/npc/EntitySpaceMarine.java rename to java/src/common/entity/npc/EntitySpaceMarine.java index 18cbf31..9bc645f 100755 --- a/java/src/game/entity/npc/EntitySpaceMarine.java +++ b/java/src/common/entity/npc/EntitySpaceMarine.java @@ -1,15 +1,15 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; -import game.collect.Lists; -import game.entity.attributes.Attributes; -import game.init.Items; -import game.init.SpeciesRegistry; -import game.item.ItemStack; -import game.rng.Random; -import game.util.Identifyable; -import game.world.World; +import common.collect.Lists; +import common.entity.attributes.Attributes; +import common.init.Items; +import common.init.SpeciesRegistry; +import common.item.ItemStack; +import common.rng.Random; +import common.util.Identifyable; +import common.world.World; public class EntitySpaceMarine extends EntityNPC { public static enum Legion implements Identifyable { diff --git a/java/src/game/entity/npc/EntitySpirit.java b/java/src/common/entity/npc/EntitySpirit.java similarity index 92% rename from java/src/game/entity/npc/EntitySpirit.java rename to java/src/common/entity/npc/EntitySpirit.java index 9f27ab5..a2003b3 100755 --- a/java/src/game/entity/npc/EntitySpirit.java +++ b/java/src/common/entity/npc/EntitySpirit.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntitySpirit extends EntityNPC { public EntitySpirit(World worldIn) { diff --git a/java/src/game/entity/npc/EntityTiefling.java b/java/src/common/entity/npc/EntityTiefling.java similarity index 92% rename from java/src/game/entity/npc/EntityTiefling.java rename to java/src/common/entity/npc/EntityTiefling.java index f41e20f..7a075df 100755 --- a/java/src/game/entity/npc/EntityTiefling.java +++ b/java/src/common/entity/npc/EntityTiefling.java @@ -1,8 +1,8 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.attributes.Attributes; -import game.rng.Random; -import game.world.World; +import common.entity.attributes.Attributes; +import common.rng.Random; +import common.world.World; public class EntityTiefling extends EntityMobNPC { public EntityTiefling(World worldIn) { diff --git a/java/src/game/entity/npc/EntityUndead.java b/java/src/common/entity/npc/EntityUndead.java similarity index 87% rename from java/src/game/entity/npc/EntityUndead.java rename to java/src/common/entity/npc/EntityUndead.java index 47d471c..d35adeb 100755 --- a/java/src/game/entity/npc/EntityUndead.java +++ b/java/src/common/entity/npc/EntityUndead.java @@ -1,14 +1,14 @@ -package game.entity.npc; +package common.entity.npc; -import game.ai.EntityAIAvoidEntity; -import game.entity.animal.EntityWolf; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; -import game.world.WorldServer; +import common.ai.EntityAIAvoidEntity; +import common.entity.animal.EntityWolf; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; +import common.world.WorldServer; public class EntityUndead extends EntityNPC { diff --git a/java/src/game/entity/npc/EntityVampire.java b/java/src/common/entity/npc/EntityVampire.java similarity index 90% rename from java/src/game/entity/npc/EntityVampire.java rename to java/src/common/entity/npc/EntityVampire.java index 38c57d7..374a691 100755 --- a/java/src/game/entity/npc/EntityVampire.java +++ b/java/src/common/entity/npc/EntityVampire.java @@ -1,9 +1,9 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.attributes.Attributes; -import game.entity.effect.EntityLightning; -import game.rng.Random; -import game.world.World; +import common.entity.attributes.Attributes; +import common.entity.effect.EntityLightning; +import common.rng.Random; +import common.world.World; public class EntityVampire extends EntityNPC { public EntityVampire(World worldIn) { diff --git a/java/src/game/entity/npc/EntityWoodElf.java b/java/src/common/entity/npc/EntityWoodElf.java similarity index 88% rename from java/src/game/entity/npc/EntityWoodElf.java rename to java/src/common/entity/npc/EntityWoodElf.java index 0e4fc0a..c131b6a 100755 --- a/java/src/game/entity/npc/EntityWoodElf.java +++ b/java/src/common/entity/npc/EntityWoodElf.java @@ -1,11 +1,11 @@ -package game.entity.npc; +package common.entity.npc; -import game.entity.types.EntityLiving; -import game.init.Items; -import game.init.NameRegistry; -import game.item.ItemStack; -import game.rng.Random; -import game.world.World; +import common.entity.types.EntityLiving; +import common.init.Items; +import common.init.NameRegistry; +import common.item.ItemStack; +import common.rng.Random; +import common.world.World; public class EntityWoodElf extends EntityNPC { public EntityWoodElf(World worldIn) { diff --git a/java/src/game/entity/npc/EntityZombie.java b/java/src/common/entity/npc/EntityZombie.java similarity index 96% rename from java/src/game/entity/npc/EntityZombie.java rename to java/src/common/entity/npc/EntityZombie.java index 8ca32f5..449d5b6 100755 --- a/java/src/game/entity/npc/EntityZombie.java +++ b/java/src/common/entity/npc/EntityZombie.java @@ -1,20 +1,20 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; import java.util.function.Predicate; -import game.ai.EntityAIMoveThroughVillage; -import game.entity.DamageSource; -import game.entity.animal.EntityChicken; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; -import game.world.WorldServer; +import common.ai.EntityAIMoveThroughVillage; +import common.entity.DamageSource; +import common.entity.animal.EntityChicken; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; +import common.world.WorldServer; public class EntityZombie extends EntityNPC { diff --git a/java/src/game/entity/npc/NpcInfo.java b/java/src/common/entity/npc/NpcInfo.java similarity index 89% rename from java/src/game/entity/npc/NpcInfo.java rename to java/src/common/entity/npc/NpcInfo.java index b6b985a..f0ba67c 100644 --- a/java/src/game/entity/npc/NpcInfo.java +++ b/java/src/common/entity/npc/NpcInfo.java @@ -1,6 +1,6 @@ -package game.entity.npc; +package common.entity.npc; -import game.item.ItemStack; +import common.item.ItemStack; public class NpcInfo { public final Enum type; diff --git a/java/src/game/entity/npc/PlayerCharacter.java b/java/src/common/entity/npc/PlayerCharacter.java similarity index 89% rename from java/src/game/entity/npc/PlayerCharacter.java rename to java/src/common/entity/npc/PlayerCharacter.java index cc39e4e..75ce463 100644 --- a/java/src/game/entity/npc/PlayerCharacter.java +++ b/java/src/common/entity/npc/PlayerCharacter.java @@ -1,6 +1,6 @@ -package game.entity.npc; +package common.entity.npc; -import game.world.BlockPos; +import common.world.BlockPos; public class PlayerCharacter { public final String name; diff --git a/java/src/game/entity/npc/SpeciesInfo.java b/java/src/common/entity/npc/SpeciesInfo.java similarity index 92% rename from java/src/game/entity/npc/SpeciesInfo.java rename to java/src/common/entity/npc/SpeciesInfo.java index 9e8242f..1c9cbad 100755 --- a/java/src/game/entity/npc/SpeciesInfo.java +++ b/java/src/common/entity/npc/SpeciesInfo.java @@ -1,14 +1,14 @@ -package game.entity.npc; +package common.entity.npc; import java.util.List; -import game.collect.BiMap; -import game.collect.HashBiMap; -import game.collect.Lists; -import game.init.SpeciesRegistry; -import game.init.SpeciesRegistry.ModelType; -import game.rng.Random; -import game.util.Identifyable; +import common.collect.BiMap; +import common.collect.HashBiMap; +import common.collect.Lists; +import common.init.SpeciesRegistry; +import common.init.SpeciesRegistry.ModelType; +import common.rng.Random; +import common.util.Identifyable; public class SpeciesInfo { public final BiMap classnames; diff --git a/java/src/game/entity/projectile/EntityArrow.java b/java/src/common/entity/projectile/EntityArrow.java similarity index 96% rename from java/src/game/entity/projectile/EntityArrow.java rename to java/src/common/entity/projectile/EntityArrow.java index 59180f1..6e3dd50 100755 --- a/java/src/game/entity/projectile/EntityArrow.java +++ b/java/src/common/entity/projectile/EntityArrow.java @@ -1,31 +1,31 @@ -package game.entity.projectile; +package common.entity.projectile; import java.util.List; -import game.block.Block; -import game.enchantment.EnchantmentHelper; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.entity.types.IObjectData; -import game.entity.types.IProjectile; -import game.init.BlockRegistry; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.enchantment.EnchantmentHelper; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.entity.types.IObjectData; +import common.entity.types.IProjectile; +import common.init.BlockRegistry; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.State; +import common.world.Vec3; +import common.world.World; public class EntityArrow extends Entity implements IProjectile, IObjectData { diff --git a/java/src/game/entity/projectile/EntityBox.java b/java/src/common/entity/projectile/EntityBox.java similarity index 94% rename from java/src/game/entity/projectile/EntityBox.java rename to java/src/common/entity/projectile/EntityBox.java index ccb85f1..17c92d9 100755 --- a/java/src/game/entity/projectile/EntityBox.java +++ b/java/src/common/entity/projectile/EntityBox.java @@ -1,13 +1,13 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.npc.EntityGargoyle; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.npc.EntityGargoyle; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.world.HitPosition; +import common.world.World; public class EntityBox extends EntityProjectile { diff --git a/java/src/game/entity/projectile/EntityBullet.java b/java/src/common/entity/projectile/EntityBullet.java similarity index 96% rename from java/src/game/entity/projectile/EntityBullet.java rename to java/src/common/entity/projectile/EntityBullet.java index 035e8a9..040336e 100755 --- a/java/src/game/entity/projectile/EntityBullet.java +++ b/java/src/common/entity/projectile/EntityBullet.java @@ -1,22 +1,22 @@ -package game.entity.projectile; +package common.entity.projectile; import java.util.List; -import game.enchantment.EnchantmentHelper; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.entity.types.IObjectData; -import game.entity.types.IProjectile; -import game.init.Config; -import game.init.SoundEvent; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; +import common.enchantment.EnchantmentHelper; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.entity.types.IObjectData; +import common.entity.types.IProjectile; +import common.init.Config; +import common.init.SoundEvent; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; public class EntityBullet extends Entity implements IProjectile, IObjectData { diff --git a/java/src/game/entity/projectile/EntityDie.java b/java/src/common/entity/projectile/EntityDie.java similarity index 89% rename from java/src/game/entity/projectile/EntityDie.java rename to java/src/common/entity/projectile/EntityDie.java index f242b73..80ad963 100755 --- a/java/src/game/entity/projectile/EntityDie.java +++ b/java/src/common/entity/projectile/EntityDie.java @@ -1,17 +1,17 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.entity.types.IObjectData; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemDie; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.entity.types.IObjectData; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemDie; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.world.HitPosition; +import common.world.World; public class EntityDie extends EntityThrowable implements IObjectData { diff --git a/java/src/game/entity/projectile/EntityDynamite.java b/java/src/common/entity/projectile/EntityDynamite.java similarity index 82% rename from java/src/game/entity/projectile/EntityDynamite.java rename to java/src/common/entity/projectile/EntityDynamite.java index abe2a29..3c24d55 100755 --- a/java/src/game/entity/projectile/EntityDynamite.java +++ b/java/src/common/entity/projectile/EntityDynamite.java @@ -1,17 +1,17 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.entity.types.IObjectData; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.entity.types.IObjectData; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.world.HitPosition; +import common.world.World; public class EntityDynamite extends EntityThrowable implements IObjectData { diff --git a/java/src/game/entity/projectile/EntityEgg.java b/java/src/common/entity/projectile/EntityEgg.java similarity index 82% rename from java/src/game/entity/projectile/EntityEgg.java rename to java/src/common/entity/projectile/EntityEgg.java index 2b5f183..5f22a96 100755 --- a/java/src/game/entity/projectile/EntityEgg.java +++ b/java/src/common/entity/projectile/EntityEgg.java @@ -1,15 +1,15 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.animal.EntityChicken; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.init.Config; -import game.init.ItemRegistry; -import game.init.Items; -import game.model.ParticleType; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.animal.EntityChicken; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.init.Config; +import common.init.ItemRegistry; +import common.init.Items; +import common.model.ParticleType; +import common.world.HitPosition; +import common.world.World; public class EntityEgg extends EntityThrowable { diff --git a/java/src/game/entity/projectile/EntityFireCharge.java b/java/src/common/entity/projectile/EntityFireCharge.java similarity index 91% rename from java/src/game/entity/projectile/EntityFireCharge.java rename to java/src/common/entity/projectile/EntityFireCharge.java index 4776022..999c561 100755 --- a/java/src/game/entity/projectile/EntityFireCharge.java +++ b/java/src/common/entity/projectile/EntityFireCharge.java @@ -1,12 +1,12 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.world.BlockPos; -import game.world.HitPosition; -import game.world.World; +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.world.World; public class EntityFireCharge extends EntityProjectile { diff --git a/java/src/game/entity/projectile/EntityFireball.java b/java/src/common/entity/projectile/EntityFireball.java similarity index 89% rename from java/src/game/entity/projectile/EntityFireball.java rename to java/src/common/entity/projectile/EntityFireball.java index 93cc5d9..3aa02c6 100755 --- a/java/src/game/entity/projectile/EntityFireball.java +++ b/java/src/common/entity/projectile/EntityFireball.java @@ -1,11 +1,11 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.types.EntityLiving; -import game.init.Config; -import game.nbt.NBTTagCompound; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.types.EntityLiving; +import common.init.Config; +import common.nbt.NBTTagCompound; +import common.world.HitPosition; +import common.world.World; public class EntityFireball extends EntityProjectile { diff --git a/java/src/game/entity/projectile/EntityHook.java b/java/src/common/entity/projectile/EntityHook.java similarity index 96% rename from java/src/game/entity/projectile/EntityHook.java rename to java/src/common/entity/projectile/EntityHook.java index d5ef76a..d348d73 100755 --- a/java/src/game/entity/projectile/EntityHook.java +++ b/java/src/common/entity/projectile/EntityHook.java @@ -1,32 +1,32 @@ -package game.entity.projectile; +package common.entity.projectile; import java.util.List; -import game.block.Block; -import game.enchantment.EnchantmentHelper; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.item.EntityItem; -import game.entity.item.EntityXp; -import game.entity.npc.EntityNPC; -import game.entity.types.IObjectData; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; -import game.worldgen.LootConstants; +import common.block.Block; +import common.enchantment.EnchantmentHelper; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.item.EntityItem; +import common.entity.item.EntityXp; +import common.entity.npc.EntityNPC; +import common.entity.types.IObjectData; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; +import common.worldgen.LootConstants; public class EntityHook extends Entity implements IObjectData { diff --git a/java/src/game/entity/projectile/EntityPotion.java b/java/src/common/entity/projectile/EntityPotion.java similarity index 92% rename from java/src/game/entity/projectile/EntityPotion.java rename to java/src/common/entity/projectile/EntityPotion.java index 21f86b5..93e1fbb 100755 --- a/java/src/game/entity/projectile/EntityPotion.java +++ b/java/src/common/entity/projectile/EntityPotion.java @@ -1,19 +1,19 @@ -package game.entity.projectile; +package common.entity.projectile; import java.util.List; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.entity.types.IObjectData; -import game.init.Items; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.World; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.entity.types.IObjectData; +import common.init.Items; +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.world.World; public class EntityPotion extends EntityThrowable implements IObjectData { diff --git a/java/src/game/entity/projectile/EntityProjectile.java b/java/src/common/entity/projectile/EntityProjectile.java similarity index 96% rename from java/src/game/entity/projectile/EntityProjectile.java rename to java/src/common/entity/projectile/EntityProjectile.java index 97d0578..a8ab021 100755 --- a/java/src/game/entity/projectile/EntityProjectile.java +++ b/java/src/common/entity/projectile/EntityProjectile.java @@ -1,22 +1,22 @@ -package game.entity.projectile; +package common.entity.projectile; import java.util.List; -import game.block.Block; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; public abstract class EntityProjectile extends Entity { diff --git a/java/src/game/entity/projectile/EntitySnowball.java b/java/src/common/entity/projectile/EntitySnowball.java similarity index 80% rename from java/src/game/entity/projectile/EntitySnowball.java rename to java/src/common/entity/projectile/EntitySnowball.java index 9c0ee15..b1801de 100755 --- a/java/src/game/entity/projectile/EntitySnowball.java +++ b/java/src/common/entity/projectile/EntitySnowball.java @@ -1,12 +1,12 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.entity.DamageSource; -import game.entity.types.EntityLiving; -import game.entity.types.EntityThrowable; -import game.init.Config; -import game.model.ParticleType; -import game.world.HitPosition; -import game.world.World; +import common.entity.DamageSource; +import common.entity.types.EntityLiving; +import common.entity.types.EntityThrowable; +import common.init.Config; +import common.model.ParticleType; +import common.world.HitPosition; +import common.world.World; public class EntitySnowball extends EntityThrowable { diff --git a/java/src/game/entity/projectile/RngFishable.java b/java/src/common/entity/projectile/RngFishable.java similarity index 88% rename from java/src/game/entity/projectile/RngFishable.java rename to java/src/common/entity/projectile/RngFishable.java index 9d4c6c8..700ec68 100755 --- a/java/src/game/entity/projectile/RngFishable.java +++ b/java/src/common/entity/projectile/RngFishable.java @@ -1,9 +1,9 @@ -package game.entity.projectile; +package common.entity.projectile; -import game.enchantment.EnchantmentHelper; -import game.item.ItemStack; -import game.rng.Random; -import game.rng.RngItem; +import common.enchantment.EnchantmentHelper; +import common.item.ItemStack; +import common.rng.Random; +import common.rng.RngItem; public class RngFishable extends RngItem { diff --git a/java/src/game/entity/types/CombatEntry.java b/java/src/common/entity/types/CombatEntry.java similarity index 91% rename from java/src/game/entity/types/CombatEntry.java rename to java/src/common/entity/types/CombatEntry.java index 5239d4f..d630ff5 100755 --- a/java/src/game/entity/types/CombatEntry.java +++ b/java/src/common/entity/types/CombatEntry.java @@ -1,6 +1,6 @@ -package game.entity.types; +package common.entity.types; -import game.entity.DamageSource; +import common.entity.DamageSource; public class CombatEntry { private final DamageSource source; diff --git a/java/src/game/entity/types/EntityAnimal.java b/java/src/common/entity/types/EntityAnimal.java similarity index 94% rename from java/src/game/entity/types/EntityAnimal.java rename to java/src/common/entity/types/EntityAnimal.java index 85c8944..f3565c6 100755 --- a/java/src/game/entity/types/EntityAnimal.java +++ b/java/src/common/entity/types/EntityAnimal.java @@ -1,21 +1,21 @@ -package game.entity.types; +package common.entity.types; import java.util.Set; -import game.block.Block; -import game.collect.Sets; -import game.entity.DamageSource; -import game.entity.EntityType; -import game.entity.npc.Alignment; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.ItemStack; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +import common.block.Block; +import common.collect.Sets; +import common.entity.DamageSource; +import common.entity.EntityType; +import common.entity.npc.Alignment; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.ItemStack; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; public abstract class EntityAnimal extends EntityLiving { diff --git a/java/src/game/entity/types/EntityBodyHelper.java b/java/src/common/entity/types/EntityBodyHelper.java similarity index 97% rename from java/src/game/entity/types/EntityBodyHelper.java rename to java/src/common/entity/types/EntityBodyHelper.java index 0fa1d8c..26160ea 100755 --- a/java/src/game/entity/types/EntityBodyHelper.java +++ b/java/src/common/entity/types/EntityBodyHelper.java @@ -1,6 +1,6 @@ -package game.entity.types; +package common.entity.types; -import game.util.ExtMath; +import common.util.ExtMath; public class EntityBodyHelper { diff --git a/java/src/game/entity/types/EntityLiving.java b/java/src/common/entity/types/EntityLiving.java similarity index 97% rename from java/src/game/entity/types/EntityLiving.java rename to java/src/common/entity/types/EntityLiving.java index baa92d7..2bb0f27 100755 --- a/java/src/game/entity/types/EntityLiving.java +++ b/java/src/common/entity/types/EntityLiving.java @@ -1,4 +1,4 @@ -package game.entity.types; +package common.entity.types; import java.util.Collection; import java.util.Iterator; @@ -6,67 +6,67 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -import game.ai.EntityAIBase; -import game.ai.EntityAIMoveTowardsRestriction; -import game.ai.EntityAITasks; -import game.ai.EntityJumpHelper; -import game.ai.EntityLookHelper; -import game.ai.EntityMoveHelper; -import game.ai.EntitySenses; -import game.block.Block; -import game.block.SoundType; -import game.collect.Lists; -import game.collect.Maps; -import game.color.TextColor; -import game.enchantment.EnchantmentHelper; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityDamageSource; -import game.entity.animal.EntityWolf; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.AttributeMap; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.item.EntityItem; -import game.entity.item.EntityLeashKnot; -import game.entity.item.EntityXp; -import game.entity.npc.Alignment; -import game.entity.npc.Energy; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityArrow; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.item.Item; -import game.item.ItemArmor; -import game.item.ItemMonsterPlacer; -import game.item.ItemStack; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.network.IPlayer; -import game.packet.S1BPacketEntityAttach; -import game.packet.SPacketAnimation; -import game.packet.SPacketCollectItem; -import game.pathfinding.PathNavigate; -import game.pathfinding.PathNavigateGround; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.potion.PotionHelper; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.ai.EntityAIBase; +import common.ai.EntityAIMoveTowardsRestriction; +import common.ai.EntityAITasks; +import common.ai.EntityJumpHelper; +import common.ai.EntityLookHelper; +import common.ai.EntityMoveHelper; +import common.ai.EntitySenses; +import common.block.Block; +import common.block.SoundType; +import common.collect.Lists; +import common.collect.Maps; +import common.color.TextColor; +import common.enchantment.EnchantmentHelper; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityDamageSource; +import common.entity.animal.EntityWolf; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.AttributeMap; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.item.EntityItem; +import common.entity.item.EntityLeashKnot; +import common.entity.item.EntityXp; +import common.entity.npc.Alignment; +import common.entity.npc.Energy; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityArrow; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +import common.item.Item; +import common.item.ItemArmor; +import common.item.ItemMonsterPlacer; +import common.item.ItemStack; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.network.IPlayer; +import common.packet.S1BPacketEntityAttach; +import common.packet.SPacketAnimation; +import common.packet.SPacketCollectItem; +import common.pathfinding.PathNavigate; +import common.pathfinding.PathNavigateGround; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.potion.PotionHelper; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.State; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; public abstract class EntityLiving extends Entity { diff --git a/java/src/game/entity/types/EntityTameable.java b/java/src/common/entity/types/EntityTameable.java similarity index 97% rename from java/src/game/entity/types/EntityTameable.java rename to java/src/common/entity/types/EntityTameable.java index ab00c53..877b9c9 100755 --- a/java/src/game/entity/types/EntityTameable.java +++ b/java/src/common/entity/types/EntityTameable.java @@ -1,9 +1,9 @@ -package game.entity.types; +package common.entity.types; -import game.ai.EntityAISit; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.ai.EntityAISit; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.world.World; public abstract class EntityTameable extends EntityAnimal implements IEntityOwnable { diff --git a/java/src/game/entity/types/EntityThrowable.java b/java/src/common/entity/types/EntityThrowable.java similarity index 96% rename from java/src/game/entity/types/EntityThrowable.java rename to java/src/common/entity/types/EntityThrowable.java index 79395d4..3eac442 100755 --- a/java/src/game/entity/types/EntityThrowable.java +++ b/java/src/common/entity/types/EntityThrowable.java @@ -1,22 +1,22 @@ -package game.entity.types; +package common.entity.types; import java.util.List; -import game.block.Block; -import game.block.BlockPortal; -import game.entity.Entity; -import game.entity.EntityType; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.State; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.block.BlockPortal; +import common.entity.Entity; +import common.entity.EntityType; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.State; +import common.world.Vec3; +import common.world.World; public abstract class EntityThrowable extends Entity implements IProjectile { diff --git a/java/src/game/entity/types/EntityWaterMob.java b/java/src/common/entity/types/EntityWaterMob.java similarity index 92% rename from java/src/game/entity/types/EntityWaterMob.java rename to java/src/common/entity/types/EntityWaterMob.java index bca942d..7b9e27e 100755 --- a/java/src/game/entity/types/EntityWaterMob.java +++ b/java/src/common/entity/types/EntityWaterMob.java @@ -1,10 +1,10 @@ -package game.entity.types; +package common.entity.types; -import game.entity.DamageSource; -import game.entity.EntityType; -import game.entity.npc.EntityNPC; -import game.init.Config; -import game.world.World; +import common.entity.DamageSource; +import common.entity.EntityType; +import common.entity.npc.EntityNPC; +import common.init.Config; +import common.world.World; public abstract class EntityWaterMob extends EntityLiving { diff --git a/java/src/game/entity/types/EntityWeatherEffect.java b/java/src/common/entity/types/EntityWeatherEffect.java similarity index 81% rename from java/src/game/entity/types/EntityWeatherEffect.java rename to java/src/common/entity/types/EntityWeatherEffect.java index b958937..3604e81 100755 --- a/java/src/game/entity/types/EntityWeatherEffect.java +++ b/java/src/common/entity/types/EntityWeatherEffect.java @@ -1,9 +1,9 @@ -package game.entity.types; +package common.entity.types; -import game.entity.Entity; -import game.entity.EntityType; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.entity.Entity; +import common.entity.EntityType; +import common.nbt.NBTTagCompound; +import common.world.World; public abstract class EntityWeatherEffect extends Entity { public EntityWeatherEffect(World world) { diff --git a/java/src/game/entity/types/IEntityFX.java b/java/src/common/entity/types/IEntityFX.java similarity index 84% rename from java/src/game/entity/types/IEntityFX.java rename to java/src/common/entity/types/IEntityFX.java index cf4aece..2676179 100644 --- a/java/src/game/entity/types/IEntityFX.java +++ b/java/src/common/entity/types/IEntityFX.java @@ -1,4 +1,4 @@ -package game.entity.types; +package common.entity.types; public interface IEntityFX { diff --git a/java/src/game/entity/types/IEntityMultiPart.java b/java/src/common/entity/types/IEntityMultiPart.java similarity index 54% rename from java/src/game/entity/types/IEntityMultiPart.java rename to java/src/common/entity/types/IEntityMultiPart.java index a8b4692..5ad5770 100755 --- a/java/src/game/entity/types/IEntityMultiPart.java +++ b/java/src/common/entity/types/IEntityMultiPart.java @@ -1,8 +1,8 @@ -package game.entity.types; +package common.entity.types; -import game.entity.DamageSource; -import game.entity.animal.EntityDragonPart; -import game.world.World; +import common.entity.DamageSource; +import common.entity.animal.EntityDragonPart; +import common.world.World; public interface IEntityMultiPart { diff --git a/java/src/game/entity/types/IEntityOwnable.java b/java/src/common/entity/types/IEntityOwnable.java similarity index 60% rename from java/src/game/entity/types/IEntityOwnable.java rename to java/src/common/entity/types/IEntityOwnable.java index a048caa..4dd194d 100755 --- a/java/src/game/entity/types/IEntityOwnable.java +++ b/java/src/common/entity/types/IEntityOwnable.java @@ -1,6 +1,6 @@ -package game.entity.types; +package common.entity.types; -import game.entity.Entity; +import common.entity.Entity; public interface IEntityOwnable { diff --git a/java/src/game/entity/types/IObjectData.java b/java/src/common/entity/types/IObjectData.java similarity index 65% rename from java/src/game/entity/types/IObjectData.java rename to java/src/common/entity/types/IObjectData.java index 1e206e9..2174539 100755 --- a/java/src/game/entity/types/IObjectData.java +++ b/java/src/common/entity/types/IObjectData.java @@ -1,4 +1,4 @@ -package game.entity.types; +package common.entity.types; public interface IObjectData { int getPacketData(); diff --git a/java/src/game/entity/types/IProjectile.java b/java/src/common/entity/types/IProjectile.java similarity index 81% rename from java/src/game/entity/types/IProjectile.java rename to java/src/common/entity/types/IProjectile.java index d4d6b9d..3f71083 100755 --- a/java/src/game/entity/types/IProjectile.java +++ b/java/src/common/entity/types/IProjectile.java @@ -1,4 +1,4 @@ -package game.entity.types; +package common.entity.types; public interface IProjectile { void setThrowableHeading(double x, double y, double z, float velocity, float inaccuracy); diff --git a/java/src/game/future/AbstractFuture.java b/java/src/common/future/AbstractFuture.java similarity index 99% rename from java/src/game/future/AbstractFuture.java rename to java/src/common/future/AbstractFuture.java index e63a476..280f3af 100644 --- a/java/src/game/future/AbstractFuture.java +++ b/java/src/common/future/AbstractFuture.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/java/src/game/future/ExecutionError.java b/java/src/common/future/ExecutionError.java similarity index 98% rename from java/src/game/future/ExecutionError.java rename to java/src/common/future/ExecutionError.java index cf8eae0..73fe3f1 100644 --- a/java/src/game/future/ExecutionError.java +++ b/java/src/common/future/ExecutionError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; /** * {@link Error} variant of {@link java.util.concurrent.ExecutionException}. As diff --git a/java/src/game/future/ExecutionList.java b/java/src/common/future/ExecutionList.java similarity index 99% rename from java/src/game/future/ExecutionList.java rename to java/src/common/future/ExecutionList.java index 79e86cf..46a757c 100644 --- a/java/src/game/future/ExecutionList.java +++ b/java/src/common/future/ExecutionList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.concurrent.Executor; import java.util.logging.Level; diff --git a/java/src/game/future/FutureCallback.java b/java/src/common/future/FutureCallback.java similarity index 98% rename from java/src/game/future/FutureCallback.java rename to java/src/common/future/FutureCallback.java index cdb9092..6e5b529 100644 --- a/java/src/game/future/FutureCallback.java +++ b/java/src/common/future/FutureCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; /** * A callback for accepting the results of a {@link java.util.concurrent.Future} diff --git a/java/src/game/future/Futures.java b/java/src/common/future/Futures.java similarity index 99% rename from java/src/game/future/Futures.java rename to java/src/common/future/Futures.java index 08fe41f..6dbce5f 100644 --- a/java/src/game/future/Futures.java +++ b/java/src/common/future/Futures.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.ArrayList; import java.util.List; @@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import game.collect.ImmutableList; -import game.collect.Sets; +import common.collect.ImmutableList; +import common.collect.Sets; /** * Static utility methods pertaining to the {@link Future} interface. diff --git a/java/src/game/future/ListenableFuture.java b/java/src/common/future/ListenableFuture.java similarity index 99% rename from java/src/game/future/ListenableFuture.java rename to java/src/common/future/ListenableFuture.java index ab19dd2..c841794 100644 --- a/java/src/game/future/ListenableFuture.java +++ b/java/src/common/future/ListenableFuture.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.concurrent.Executor; import java.util.concurrent.Future; diff --git a/java/src/game/future/ListenableFutureTask.java b/java/src/common/future/ListenableFutureTask.java similarity index 99% rename from java/src/game/future/ListenableFutureTask.java rename to java/src/common/future/ListenableFutureTask.java index 38b0621..e2b9450 100644 --- a/java/src/game/future/ListenableFutureTask.java +++ b/java/src/common/future/ListenableFutureTask.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.concurrent.Callable; import java.util.concurrent.Executor; diff --git a/java/src/game/future/MoreExecutors.java b/java/src/common/future/MoreExecutors.java similarity index 99% rename from java/src/game/future/MoreExecutors.java rename to java/src/common/future/MoreExecutors.java index 5e3e49a..ad8b8f1 100644 --- a/java/src/game/future/MoreExecutors.java +++ b/java/src/common/future/MoreExecutors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.util.Collections; import java.util.List; diff --git a/java/src/game/future/ThreadFactoryBuilder.java b/java/src/common/future/ThreadFactoryBuilder.java similarity index 99% rename from java/src/game/future/ThreadFactoryBuilder.java rename to java/src/common/future/ThreadFactoryBuilder.java index 611bdf0..a115d0f 100644 --- a/java/src/game/future/ThreadFactoryBuilder.java +++ b/java/src/common/future/ThreadFactoryBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Executors; diff --git a/java/src/game/future/UncheckedExecutionException.java b/java/src/common/future/UncheckedExecutionException.java similarity index 98% rename from java/src/game/future/UncheckedExecutionException.java rename to java/src/common/future/UncheckedExecutionException.java index 4f25bf8..b080867 100644 --- a/java/src/game/future/UncheckedExecutionException.java +++ b/java/src/common/future/UncheckedExecutionException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.future; +package common.future; /** * Unchecked variant of {@link java.util.concurrent.ExecutionException}. As with diff --git a/java/src/game/init/BlockRegistry.java b/java/src/common/init/BlockRegistry.java similarity index 97% rename from java/src/game/init/BlockRegistry.java rename to java/src/common/init/BlockRegistry.java index 1008a5f..2486248 100755 --- a/java/src/game/init/BlockRegistry.java +++ b/java/src/common/init/BlockRegistry.java @@ -1,11 +1,11 @@ -package game.init; +package common.init; -import game.block.*; -import game.color.DyeColor; -import game.init.FluidRegistry.LiquidType; -import game.item.CheatTab; -import game.material.Material; -import game.world.State; +import common.block.*; +import common.color.DyeColor; +import common.init.FluidRegistry.LiquidType; +import common.item.CheatTab; +import common.material.Material; +import common.world.State; public abstract class BlockRegistry { private static final String AIR_ID = "air"; diff --git a/java/src/game/init/Blocks.java b/java/src/common/init/Blocks.java similarity index 94% rename from java/src/game/init/Blocks.java rename to java/src/common/init/Blocks.java index adf4bff..eb86097 100755 --- a/java/src/game/init/Blocks.java +++ b/java/src/common/init/Blocks.java @@ -1,42 +1,42 @@ -package game.init; +package common.init; -import game.block.Block; -import game.block.BlockBeacon; -import game.block.BlockBed; -import game.block.BlockBlackenedSoil; -import game.block.BlockBush; -import game.block.BlockCactus; -import game.block.BlockCauldron; -import game.block.BlockChest; -import game.block.BlockDaylightDetector; -import game.block.BlockDeadBush; -import game.block.BlockDoublePlant; -import game.block.BlockDryLeaves; -import game.block.BlockDynamicLiquid; -import game.block.BlockFire; -import game.block.BlockFlower; -import game.block.BlockGrass; -import game.block.BlockHopper; -import game.block.BlockLeaves; -import game.block.BlockMycelium; -import game.block.BlockOre; -import game.block.BlockPistonBase; -import game.block.BlockPistonHead; -import game.block.BlockPistonMoving; -import game.block.BlockPortal; -import game.block.BlockRedstoneComparator; -import game.block.BlockRedstoneRepeater; -import game.block.BlockRedstoneWire; -import game.block.BlockReed; -import game.block.BlockSand; -import game.block.BlockSkull; -import game.block.BlockSlab; -import game.block.BlockStainedGlass; -import game.block.BlockStainedGlassPane; -import game.block.BlockStaticLiquid; -import game.block.BlockTallGrass; -import game.block.BlockTianReactor; -import game.block.BlockTripWireHook; +import common.block.Block; +import common.block.BlockBeacon; +import common.block.BlockBed; +import common.block.BlockBlackenedSoil; +import common.block.BlockBush; +import common.block.BlockCactus; +import common.block.BlockCauldron; +import common.block.BlockChest; +import common.block.BlockDaylightDetector; +import common.block.BlockDeadBush; +import common.block.BlockDoublePlant; +import common.block.BlockDryLeaves; +import common.block.BlockDynamicLiquid; +import common.block.BlockFire; +import common.block.BlockFlower; +import common.block.BlockGrass; +import common.block.BlockHopper; +import common.block.BlockLeaves; +import common.block.BlockMycelium; +import common.block.BlockOre; +import common.block.BlockPistonBase; +import common.block.BlockPistonHead; +import common.block.BlockPistonMoving; +import common.block.BlockPortal; +import common.block.BlockRedstoneComparator; +import common.block.BlockRedstoneRepeater; +import common.block.BlockRedstoneWire; +import common.block.BlockReed; +import common.block.BlockSand; +import common.block.BlockSkull; +import common.block.BlockSlab; +import common.block.BlockStainedGlass; +import common.block.BlockStainedGlassPane; +import common.block.BlockStaticLiquid; +import common.block.BlockTallGrass; +import common.block.BlockTianReactor; +import common.block.BlockTripWireHook; public abstract class Blocks { diff --git a/java/src/game/init/Config.java b/java/src/common/init/Config.java similarity index 99% rename from java/src/game/init/Config.java rename to java/src/common/init/Config.java index e59968e..5415de3 100755 --- a/java/src/game/init/Config.java +++ b/java/src/common/init/Config.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; import static java.lang.annotation.ElementType.FIELD; @@ -11,10 +11,10 @@ import java.lang.reflect.Modifier; import java.util.Map; import java.util.TreeMap; -import game.packet.SPacketWorld; -import game.util.ExtMath; -import game.world.WorldServer; -import game.IServer; +import common.IServer; +import common.packet.SPacketWorld; +import common.util.ExtMath; +import common.world.WorldServer; public abstract class Config { public static enum ValueType { diff --git a/java/src/game/init/CraftingRegistry.java b/java/src/common/init/CraftingRegistry.java similarity index 99% rename from java/src/game/init/CraftingRegistry.java rename to java/src/common/init/CraftingRegistry.java index 58f80df..7e5ea06 100755 --- a/java/src/game/init/CraftingRegistry.java +++ b/java/src/common/init/CraftingRegistry.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; import java.util.Collections; import java.util.Comparator; @@ -6,29 +6,29 @@ import java.util.List; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.block.BlockBed; -import game.block.BlockDirt; -import game.block.BlockDoublePlant; -import game.block.BlockFlower; -import game.block.BlockQuartz; -import game.block.BlockSand; -import game.block.BlockSandStone; -import game.block.BlockStoneBrick; -import game.block.BlockWall; -import game.collect.Lists; -import game.collect.Maps; -import game.color.DyeColor; -import game.entity.animal.EntitySheep; -import game.inventory.InventoryCrafting; -import game.item.Item; -import game.item.ItemArmor; -import game.item.ItemDye; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.tileentity.TileEntityBanner; -import game.world.World; +import common.block.Block; +import common.block.BlockBed; +import common.block.BlockDirt; +import common.block.BlockDoublePlant; +import common.block.BlockFlower; +import common.block.BlockQuartz; +import common.block.BlockSand; +import common.block.BlockSandStone; +import common.block.BlockStoneBrick; +import common.block.BlockWall; +import common.collect.Lists; +import common.collect.Maps; +import common.color.DyeColor; +import common.entity.animal.EntitySheep; +import common.inventory.InventoryCrafting; +import common.item.Item; +import common.item.ItemArmor; +import common.item.ItemDye; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.tileentity.TileEntityBanner; +import common.world.World; public abstract class CraftingRegistry { diff --git a/java/src/game/init/DecoType.java b/java/src/common/init/DecoType.java similarity index 95% rename from java/src/game/init/DecoType.java rename to java/src/common/init/DecoType.java index 1765119..2ae9779 100755 --- a/java/src/game/init/DecoType.java +++ b/java/src/common/init/DecoType.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public enum DecoType { FLOOR("floor_tiles", "Schwarz-weiße Bodenfliesen"), diff --git a/java/src/game/init/DispenserRegistry.java b/java/src/common/init/DispenserRegistry.java similarity index 91% rename from java/src/game/init/DispenserRegistry.java rename to java/src/common/init/DispenserRegistry.java index eef268e..74a0bdb 100755 --- a/java/src/game/init/DispenserRegistry.java +++ b/java/src/common/init/DispenserRegistry.java @@ -1,45 +1,45 @@ -package game.init; +package common.init; -import game.block.Block; -import game.block.BlockDispenser; -import game.block.BlockDynamicLiquid; -import game.block.BlockLiquid; -import game.block.BlockTNT; -import game.color.DyeColor; -import game.dispenser.BehaviorDefaultDispenseItem; -import game.dispenser.BehaviorProjectileDispense; -import game.dispenser.IBehaviorDispenseItem; -import game.dispenser.IBlockSource; -import game.dispenser.IPosition; -import game.entity.Entity; -import game.entity.item.EntityBoat; -import game.entity.item.EntityFireworks; -import game.entity.item.EntityTnt; -import game.entity.item.EntityXpBottle; -import game.entity.projectile.EntityArrow; -import game.entity.projectile.EntityDie; -import game.entity.projectile.EntityDynamite; -import game.entity.projectile.EntityEgg; -import game.entity.projectile.EntityFireCharge; -import game.entity.projectile.EntityPotion; -import game.entity.projectile.EntitySnowball; -import game.entity.types.EntityLiving; -import game.entity.types.IProjectile; -import game.item.Item; -import game.item.ItemBucket; -import game.item.ItemDie; -import game.item.ItemDye; -import game.item.ItemMonsterPlacer; -import game.item.ItemPotion; -import game.item.ItemStack; -import game.material.Material; -import game.rng.Random; -import game.tileentity.TileEntityDispenser; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockDispenser; +import common.block.BlockDynamicLiquid; +import common.block.BlockLiquid; +import common.block.BlockTNT; +import common.color.DyeColor; +import common.dispenser.BehaviorDefaultDispenseItem; +import common.dispenser.BehaviorProjectileDispense; +import common.dispenser.IBehaviorDispenseItem; +import common.dispenser.IBlockSource; +import common.dispenser.IPosition; +import common.entity.Entity; +import common.entity.item.EntityBoat; +import common.entity.item.EntityFireworks; +import common.entity.item.EntityTnt; +import common.entity.item.EntityXpBottle; +import common.entity.projectile.EntityArrow; +import common.entity.projectile.EntityDie; +import common.entity.projectile.EntityDynamite; +import common.entity.projectile.EntityEgg; +import common.entity.projectile.EntityFireCharge; +import common.entity.projectile.EntityPotion; +import common.entity.projectile.EntitySnowball; +import common.entity.types.EntityLiving; +import common.entity.types.IProjectile; +import common.item.Item; +import common.item.ItemBucket; +import common.item.ItemDie; +import common.item.ItemDye; +import common.item.ItemMonsterPlacer; +import common.item.ItemPotion; +import common.item.ItemStack; +import common.material.Material; +import common.rng.Random; +import common.tileentity.TileEntityDispenser; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public abstract class DispenserRegistry { public static final RegistryDefaulted REGISTRY = new RegistryDefaulted(new BehaviorDefaultDispenseItem()); diff --git a/java/src/game/init/EntityEggInfo.java b/java/src/common/init/EntityEggInfo.java similarity index 94% rename from java/src/game/init/EntityEggInfo.java rename to java/src/common/init/EntityEggInfo.java index 380ab00..8f7b708 100755 --- a/java/src/game/init/EntityEggInfo.java +++ b/java/src/common/init/EntityEggInfo.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public class EntityEggInfo { diff --git a/java/src/game/init/EntityRegistry.java b/java/src/common/init/EntityRegistry.java similarity index 84% rename from java/src/game/init/EntityRegistry.java rename to java/src/common/init/EntityRegistry.java index 86d8e97..7e58afe 100755 --- a/java/src/game/init/EntityRegistry.java +++ b/java/src/common/init/EntityRegistry.java @@ -1,56 +1,56 @@ -package game.init; +package common.init; import java.util.Map; import java.util.Set; -import game.collect.Maps; -import game.entity.Entity; -import game.entity.animal.EntityBat; -import game.entity.animal.EntityChicken; -import game.entity.animal.EntityCow; -import game.entity.animal.EntityDragon; -import game.entity.animal.EntityHorse; -import game.entity.animal.EntityMooshroom; -import game.entity.animal.EntityMouse; -import game.entity.animal.EntityOcelot; -import game.entity.animal.EntityPig; -import game.entity.animal.EntityRabbit; -import game.entity.animal.EntitySheep; -import game.entity.animal.EntitySquid; -import game.entity.animal.EntityWolf; -import game.entity.item.EntityBoat; -import game.entity.item.EntityChestCart; -import game.entity.item.EntityCrystal; -import game.entity.item.EntityExplosion; -import game.entity.item.EntityFalling; -import game.entity.item.EntityFireworks; -import game.entity.item.EntityHopperCart; -import game.entity.item.EntityItem; -import game.entity.item.EntityLeashKnot; -import game.entity.item.EntityMinecart; -import game.entity.item.EntityNuke; -import game.entity.item.EntityOrb; -import game.entity.item.EntityTnt; -import game.entity.item.EntityTntCart; -import game.entity.item.EntityXp; -import game.entity.item.EntityXpBottle; -import game.entity.npc.SpeciesInfo; -import game.entity.projectile.EntityArrow; -import game.entity.projectile.EntityBox; -import game.entity.projectile.EntityBullet; -import game.entity.projectile.EntityDie; -import game.entity.projectile.EntityDynamite; -import game.entity.projectile.EntityEgg; -import game.entity.projectile.EntityFireCharge; -import game.entity.projectile.EntityFireball; -import game.entity.projectile.EntityHook; -import game.entity.projectile.EntityPotion; -import game.entity.projectile.EntitySnowball; -import game.entity.types.EntityLiving; -import game.entity.types.IObjectData; -import game.log.Log; -import game.nbt.NBTTagCompound; -import game.world.World; +import common.collect.Maps; +import common.entity.Entity; +import common.entity.animal.EntityBat; +import common.entity.animal.EntityChicken; +import common.entity.animal.EntityCow; +import common.entity.animal.EntityDragon; +import common.entity.animal.EntityHorse; +import common.entity.animal.EntityMooshroom; +import common.entity.animal.EntityMouse; +import common.entity.animal.EntityOcelot; +import common.entity.animal.EntityPig; +import common.entity.animal.EntityRabbit; +import common.entity.animal.EntitySheep; +import common.entity.animal.EntitySquid; +import common.entity.animal.EntityWolf; +import common.entity.item.EntityBoat; +import common.entity.item.EntityChestCart; +import common.entity.item.EntityCrystal; +import common.entity.item.EntityExplosion; +import common.entity.item.EntityFalling; +import common.entity.item.EntityFireworks; +import common.entity.item.EntityHopperCart; +import common.entity.item.EntityItem; +import common.entity.item.EntityLeashKnot; +import common.entity.item.EntityMinecart; +import common.entity.item.EntityNuke; +import common.entity.item.EntityOrb; +import common.entity.item.EntityTnt; +import common.entity.item.EntityTntCart; +import common.entity.item.EntityXp; +import common.entity.item.EntityXpBottle; +import common.entity.npc.SpeciesInfo; +import common.entity.projectile.EntityArrow; +import common.entity.projectile.EntityBox; +import common.entity.projectile.EntityBullet; +import common.entity.projectile.EntityDie; +import common.entity.projectile.EntityDynamite; +import common.entity.projectile.EntityEgg; +import common.entity.projectile.EntityFireCharge; +import common.entity.projectile.EntityFireball; +import common.entity.projectile.EntityHook; +import common.entity.projectile.EntityPotion; +import common.entity.projectile.EntitySnowball; +import common.entity.types.EntityLiving; +import common.entity.types.IObjectData; +import common.log.Log; +import common.nbt.NBTTagCompound; +import common.world.World; public abstract class EntityRegistry { private static final Map> STRING_TO_CLASS = Maps.>newHashMap(); diff --git a/java/src/game/init/FlammabilityRegistry.java b/java/src/common/init/FlammabilityRegistry.java similarity index 96% rename from java/src/game/init/FlammabilityRegistry.java rename to java/src/common/init/FlammabilityRegistry.java index a0d5536..8403c97 100755 --- a/java/src/game/init/FlammabilityRegistry.java +++ b/java/src/common/init/FlammabilityRegistry.java @@ -1,6 +1,6 @@ -package game.init; +package common.init; -import game.block.Block; +import common.block.Block; public abstract class FlammabilityRegistry { private static void setFlammable(Block blockIn, int encouragement, int flammability) { diff --git a/java/src/game/init/FluidRegistry.java b/java/src/common/init/FluidRegistry.java similarity index 89% rename from java/src/game/init/FluidRegistry.java rename to java/src/common/init/FluidRegistry.java index 88545a9..e585f54 100755 --- a/java/src/game/init/FluidRegistry.java +++ b/java/src/common/init/FluidRegistry.java @@ -1,15 +1,15 @@ -package game.init; +package common.init; import java.util.List; import java.util.Map; -import game.block.Block; -import game.block.BlockDynamicLiquid; -import game.block.BlockLiquid; -import game.block.BlockStaticLiquid; -import game.collect.Lists; -import game.collect.Maps; -import game.material.Material; +import common.block.Block; +import common.block.BlockDynamicLiquid; +import common.block.BlockLiquid; +import common.block.BlockStaticLiquid; +import common.collect.Lists; +import common.collect.Maps; +import common.material.Material; public abstract class FluidRegistry { public static enum LiquidType { diff --git a/java/src/game/init/IObjectIntIterable.java b/java/src/common/init/IObjectIntIterable.java similarity index 75% rename from java/src/game/init/IObjectIntIterable.java rename to java/src/common/init/IObjectIntIterable.java index 201259a..20e5fbf 100755 --- a/java/src/game/init/IObjectIntIterable.java +++ b/java/src/common/init/IObjectIntIterable.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public interface IObjectIntIterable extends Iterable { diff --git a/java/src/game/init/IRegistry.java b/java/src/common/init/IRegistry.java similarity index 89% rename from java/src/game/init/IRegistry.java rename to java/src/common/init/IRegistry.java index bec97a9..9dc54b3 100755 --- a/java/src/game/init/IRegistry.java +++ b/java/src/common/init/IRegistry.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public interface IRegistry extends Iterable { diff --git a/java/src/game/init/ItemRegistry.java b/java/src/common/init/ItemRegistry.java similarity index 88% rename from java/src/game/init/ItemRegistry.java rename to java/src/common/init/ItemRegistry.java index 161ba68..1621698 100755 --- a/java/src/game/init/ItemRegistry.java +++ b/java/src/common/init/ItemRegistry.java @@ -1,129 +1,129 @@ -package game.init; +package common.init; import java.util.Map; import java.util.Set; import java.util.function.Function; -import game.block.Block; -import game.block.BlockBed; -import game.block.BlockButton; -import game.block.BlockDirt; -import game.block.BlockDoor; -import game.block.BlockDoublePlant; -import game.block.BlockFence; -import game.block.BlockFlower; -import game.block.BlockLeaves; -import game.block.BlockOre; -import game.block.BlockSand; -import game.block.BlockSandStone; -import game.block.BlockSapling; -import game.block.BlockSlab; -import game.block.BlockStoneBrick; -import game.block.BlockWall; -import game.collect.Maps; -import game.collect.Sets; -import game.color.DyeColor; -import game.color.TextColor; -import game.entity.item.EntityCart; -import game.entity.npc.CharacterInfo; -import game.entity.npc.SpeciesInfo; -import game.item.CheatTab; -import game.item.Item; -import game.item.ItemAmmo; -import game.item.ItemAnvilBlock; -import game.item.ItemAppleGold; -import game.item.ItemArmor; -import game.item.ItemAxe; -import game.item.ItemBanHammer; -import game.item.ItemBanner; -import game.item.ItemBed; -import game.item.ItemBlock; -import game.item.ItemBoat; -import game.item.ItemBoltgun; -import game.item.ItemBook; -import game.item.ItemBow; -import game.item.ItemBucket; -import game.item.ItemBucketMilk; -import game.item.ItemButton; -import game.item.ItemCamera; -import game.item.ItemCarrotOnAStick; -import game.item.ItemChargedOrb; -import game.item.ItemChest; -import game.item.ItemCloth; -import game.item.ItemCoal; -import game.item.ItemColored; -import game.item.ItemDie; -import game.item.ItemDispenser; -import game.item.ItemDoor; -import game.item.ItemDoublePlant; -import game.item.ItemDye; -import game.item.ItemDynamite; -import game.item.ItemEditWand; -import game.item.ItemEffect; -import game.item.ItemEgg; -import game.item.ItemEnchantedBook; -import game.item.ItemExpBottle; -import game.item.ItemExterminator; -import game.item.ItemFence; -import game.item.ItemFireball; -import game.item.ItemFirework; -import game.item.ItemFireworkCharge; -import game.item.ItemFishFood; -import game.item.ItemFishingRod; -import game.item.ItemFlintAndSteel; -import game.item.ItemFood; -import game.item.ItemFragile; -import game.item.ItemGlassBottle; -import game.item.ItemHoe; -import game.item.ItemHorseArmor; -import game.item.ItemHugeMushroom; -import game.item.ItemInfoWand; -import game.item.ItemKey; -import game.item.ItemLead; -import game.item.ItemLeaves; -import game.item.ItemLightning; -import game.item.ItemLilyPad; -import game.item.ItemMagnet; -import game.item.ItemMagnetic; -import game.item.ItemMetal; -import game.item.ItemMetalBlock; -import game.item.ItemMinecart; -import game.item.ItemMonsterPlacer; -import game.item.ItemMultiTexture; -import game.item.ItemNameTag; -import game.item.ItemNpcSpawner; -import game.item.ItemNugget; -import game.item.ItemPickaxe; -import game.item.ItemPiston; -import game.item.ItemPotion; -import game.item.ItemPressurePlate; -import game.item.ItemRecord; -import game.item.ItemRedstone; -import game.item.ItemReed; -import game.item.ItemRod; -import game.item.ItemSaddle; -import game.item.ItemSeedFood; -import game.item.ItemSeeds; -import game.item.ItemShears; -import game.item.ItemSign; -import game.item.ItemSkull; -import game.item.ItemSlab; -import game.item.ItemSmall; -import game.item.ItemSnow; -import game.item.ItemSnowball; -import game.item.ItemSoup; -import game.item.ItemSpaceNavigator; -import game.item.ItemSpade; -import game.item.ItemStack; -import game.item.ItemStick; -import game.item.ItemSword; -import game.item.ItemTNT; -import game.item.ItemTiny; -import game.item.ItemWall; -import game.item.ItemWeatherToken; -import game.potion.Potion; -import game.potion.PotionHelper; -import game.world.Weather; +import common.block.Block; +import common.block.BlockBed; +import common.block.BlockButton; +import common.block.BlockDirt; +import common.block.BlockDoor; +import common.block.BlockDoublePlant; +import common.block.BlockFence; +import common.block.BlockFlower; +import common.block.BlockLeaves; +import common.block.BlockOre; +import common.block.BlockSand; +import common.block.BlockSandStone; +import common.block.BlockSapling; +import common.block.BlockSlab; +import common.block.BlockStoneBrick; +import common.block.BlockWall; +import common.collect.Maps; +import common.collect.Sets; +import common.color.DyeColor; +import common.color.TextColor; +import common.entity.item.EntityCart; +import common.entity.npc.CharacterInfo; +import common.entity.npc.SpeciesInfo; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAmmo; +import common.item.ItemAnvilBlock; +import common.item.ItemAppleGold; +import common.item.ItemArmor; +import common.item.ItemAxe; +import common.item.ItemBanHammer; +import common.item.ItemBanner; +import common.item.ItemBed; +import common.item.ItemBlock; +import common.item.ItemBoat; +import common.item.ItemBoltgun; +import common.item.ItemBook; +import common.item.ItemBow; +import common.item.ItemBucket; +import common.item.ItemBucketMilk; +import common.item.ItemButton; +import common.item.ItemCamera; +import common.item.ItemCarrotOnAStick; +import common.item.ItemChargedOrb; +import common.item.ItemChest; +import common.item.ItemCloth; +import common.item.ItemCoal; +import common.item.ItemColored; +import common.item.ItemDie; +import common.item.ItemDispenser; +import common.item.ItemDoor; +import common.item.ItemDoublePlant; +import common.item.ItemDye; +import common.item.ItemDynamite; +import common.item.ItemEditWand; +import common.item.ItemEffect; +import common.item.ItemEgg; +import common.item.ItemEnchantedBook; +import common.item.ItemExpBottle; +import common.item.ItemExterminator; +import common.item.ItemFence; +import common.item.ItemFireball; +import common.item.ItemFirework; +import common.item.ItemFireworkCharge; +import common.item.ItemFishFood; +import common.item.ItemFishingRod; +import common.item.ItemFlintAndSteel; +import common.item.ItemFood; +import common.item.ItemFragile; +import common.item.ItemGlassBottle; +import common.item.ItemHoe; +import common.item.ItemHorseArmor; +import common.item.ItemHugeMushroom; +import common.item.ItemInfoWand; +import common.item.ItemKey; +import common.item.ItemLead; +import common.item.ItemLeaves; +import common.item.ItemLightning; +import common.item.ItemLilyPad; +import common.item.ItemMagnet; +import common.item.ItemMagnetic; +import common.item.ItemMetal; +import common.item.ItemMetalBlock; +import common.item.ItemMinecart; +import common.item.ItemMonsterPlacer; +import common.item.ItemMultiTexture; +import common.item.ItemNameTag; +import common.item.ItemNpcSpawner; +import common.item.ItemNugget; +import common.item.ItemPickaxe; +import common.item.ItemPiston; +import common.item.ItemPotion; +import common.item.ItemPressurePlate; +import common.item.ItemRecord; +import common.item.ItemRedstone; +import common.item.ItemReed; +import common.item.ItemRod; +import common.item.ItemSaddle; +import common.item.ItemSeedFood; +import common.item.ItemSeeds; +import common.item.ItemShears; +import common.item.ItemSign; +import common.item.ItemSkull; +import common.item.ItemSlab; +import common.item.ItemSmall; +import common.item.ItemSnow; +import common.item.ItemSnowball; +import common.item.ItemSoup; +import common.item.ItemSpaceNavigator; +import common.item.ItemSpade; +import common.item.ItemStack; +import common.item.ItemStick; +import common.item.ItemSword; +import common.item.ItemTNT; +import common.item.ItemTiny; +import common.item.ItemWall; +import common.item.ItemWeatherToken; +import common.potion.Potion; +import common.potion.PotionHelper; +import common.world.Weather; public abstract class ItemRegistry { public static final RegistryNamespaced REGISTRY = new RegistryNamespaced(); diff --git a/java/src/game/init/Items.java b/java/src/common/init/Items.java similarity index 98% rename from java/src/game/init/Items.java rename to java/src/common/init/Items.java index 8ee522f..099bf36 100755 --- a/java/src/game/init/Items.java +++ b/java/src/common/init/Items.java @@ -1,13 +1,13 @@ -package game.init; +package common.init; -import game.item.Item; -import game.item.ItemAmmo; -import game.item.ItemArmor; -import game.item.ItemBow; -import game.item.ItemEnchantedBook; -import game.item.ItemFishingRod; -import game.item.ItemPotion; -import game.item.ItemShears; +import common.item.Item; +import common.item.ItemAmmo; +import common.item.ItemArmor; +import common.item.ItemBow; +import common.item.ItemEnchantedBook; +import common.item.ItemFishingRod; +import common.item.ItemPotion; +import common.item.ItemShears; public abstract class Items { diff --git a/java/src/game/init/MetalType.java b/java/src/common/init/MetalType.java similarity index 98% rename from java/src/game/init/MetalType.java rename to java/src/common/init/MetalType.java index 3b6ea86..77b63bf 100755 --- a/java/src/game/init/MetalType.java +++ b/java/src/common/init/MetalType.java @@ -1,6 +1,6 @@ -package game.init; +package common.init; -import game.color.TextColor; +import common.color.TextColor; public enum MetalType { IRON("iron", 26, "Fe", "Eisen", 0, new ToolMaterial(2, 8.0f, 0.0f, 250, 6.0F, 2, 14, true, 15, 9, 2, 6, 5, 2).setMagnetic()), diff --git a/java/src/game/init/NameRegistry.java b/java/src/common/init/NameRegistry.java similarity index 99% rename from java/src/game/init/NameRegistry.java rename to java/src/common/init/NameRegistry.java index fcd8d2f..5b9583e 100755 --- a/java/src/game/init/NameRegistry.java +++ b/java/src/common/init/NameRegistry.java @@ -1,6 +1,6 @@ -package game.init; +package common.init; -import game.rng.Random; +import common.rng.Random; /** * This class is released under the GNU general public license (GPL) diff --git a/java/src/game/init/ObjectIntIdentityMap.java b/java/src/common/init/ObjectIntIdentityMap.java similarity index 89% rename from java/src/game/init/ObjectIntIdentityMap.java rename to java/src/common/init/ObjectIntIdentityMap.java index 42b0642..c6cb6b2 100755 --- a/java/src/game/init/ObjectIntIdentityMap.java +++ b/java/src/common/init/ObjectIntIdentityMap.java @@ -1,12 +1,12 @@ -package game.init; +package common.init; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; -import game.collect.Iterators; -import game.collect.Lists; -import game.util.Predicates; +import common.collect.Iterators; +import common.collect.Lists; +import common.util.Predicates; public class ObjectIntIdentityMap implements IObjectIntIterable { diff --git a/java/src/game/init/OreType.java b/java/src/common/init/OreType.java similarity index 98% rename from java/src/game/init/OreType.java rename to java/src/common/init/OreType.java index 95b80ff..764b288 100755 --- a/java/src/game/init/OreType.java +++ b/java/src/common/init/OreType.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public enum OreType { DIAMOND("diamond", "Diamant", new ToolMaterial(3, 12.0f, 2.0f, 1561, 8.0F, 3, 10, true, 33, 10, 3, 8, 6, 3), "diamond", 3, 1, 0), diff --git a/java/src/game/init/Registry.java b/java/src/common/init/Registry.java similarity index 98% rename from java/src/game/init/Registry.java rename to java/src/common/init/Registry.java index 7623cd8..43ddaf4 100755 --- a/java/src/game/init/Registry.java +++ b/java/src/common/init/Registry.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; import java.awt.Desktop; import java.io.File; @@ -14,7 +14,7 @@ import java.util.Locale; import javax.imageio.ImageIO; -import game.log.NettyLogger; +import common.log.NettyLogger; public abstract class Registry { private static boolean crashed; diff --git a/java/src/game/init/RegistryDefaulted.java b/java/src/common/init/RegistryDefaulted.java similarity index 95% rename from java/src/game/init/RegistryDefaulted.java rename to java/src/common/init/RegistryDefaulted.java index 08b45a3..9b313bc 100755 --- a/java/src/game/init/RegistryDefaulted.java +++ b/java/src/common/init/RegistryDefaulted.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public class RegistryDefaulted extends RegistrySimple { diff --git a/java/src/game/init/RegistryNamespaced.java b/java/src/common/init/RegistryNamespaced.java similarity index 96% rename from java/src/game/init/RegistryNamespaced.java rename to java/src/common/init/RegistryNamespaced.java index 0b48909..e7c7806 100755 --- a/java/src/game/init/RegistryNamespaced.java +++ b/java/src/common/init/RegistryNamespaced.java @@ -1,10 +1,10 @@ -package game.init; +package common.init; import java.util.Iterator; import java.util.Map; -import game.collect.BiMap; -import game.collect.HashBiMap; +import common.collect.BiMap; +import common.collect.HashBiMap; public class RegistryNamespaced extends RegistrySimple implements IObjectIntIterable { diff --git a/java/src/game/init/RegistryNamespacedDefaultedByKey.java b/java/src/common/init/RegistryNamespacedDefaultedByKey.java similarity index 98% rename from java/src/game/init/RegistryNamespacedDefaultedByKey.java rename to java/src/common/init/RegistryNamespacedDefaultedByKey.java index 8d8d89c..f616966 100755 --- a/java/src/game/init/RegistryNamespacedDefaultedByKey.java +++ b/java/src/common/init/RegistryNamespacedDefaultedByKey.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public class RegistryNamespacedDefaultedByKey extends RegistryNamespaced { diff --git a/java/src/game/init/RegistrySimple.java b/java/src/common/init/RegistrySimple.java similarity index 96% rename from java/src/game/init/RegistrySimple.java rename to java/src/common/init/RegistrySimple.java index 5b41625..9bc6efc 100755 --- a/java/src/game/init/RegistrySimple.java +++ b/java/src/common/init/RegistrySimple.java @@ -1,11 +1,11 @@ -package game.init; +package common.init; import java.util.Collections; import java.util.Iterator; import java.util.Map; import java.util.Set; -import game.collect.Maps; +import common.collect.Maps; public class RegistrySimple implements IRegistry { diff --git a/java/src/game/init/ReorderRegistry.java b/java/src/common/init/ReorderRegistry.java similarity index 97% rename from java/src/game/init/ReorderRegistry.java rename to java/src/common/init/ReorderRegistry.java index 9e35668..181e48c 100755 --- a/java/src/game/init/ReorderRegistry.java +++ b/java/src/common/init/ReorderRegistry.java @@ -1,17 +1,17 @@ -package game.init; +package common.init; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.block.BlockBed; -import game.block.BlockDoor; -import game.color.DyeColor; -import game.world.Facing; -import game.world.State; -import game.world.Vec3i; +import common.block.Block; +import common.block.BlockBed; +import common.block.BlockDoor; +import common.color.DyeColor; +import common.world.Facing; +import common.world.State; +import common.world.Vec3i; public abstract class ReorderRegistry { private static final Set PLACE_LAST = new HashSet(); diff --git a/java/src/game/init/RotationRegistry.java b/java/src/common/init/RotationRegistry.java similarity index 81% rename from java/src/game/init/RotationRegistry.java rename to java/src/common/init/RotationRegistry.java index e8b38ff..be4d0a9 100755 --- a/java/src/game/init/RotationRegistry.java +++ b/java/src/common/init/RotationRegistry.java @@ -1,37 +1,37 @@ -package game.init; +package common.init; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import game.block.Block; -import game.block.BlockDoor; -import game.block.BlockLever; -import game.block.BlockLog; -import game.block.BlockPortal; -import game.block.BlockQuartz; -import game.block.BlockRail; -import game.block.BlockRailBase; -import game.block.BlockRailDetector; -import game.block.BlockRailPowered; -import game.block.BlockRotatedPillar; -import game.clipboard.Rotation; -import game.clipboard.RotationValue; -import game.clipboard.Vector; -import game.collect.Lists; -import game.collect.Maps; -import game.properties.IProperty; -import game.properties.PropertyDirection; -import game.world.Facing; -import game.world.State; -import game.world.Vec3i; +import common.block.Block; +import common.block.BlockDoor; +import common.block.BlockLever; +import common.block.BlockLog; +import common.block.BlockPortal; +import common.block.BlockQuartz; +import common.block.BlockRail; +import common.block.BlockRailBase; +import common.block.BlockRailDetector; +import common.block.BlockRailPowered; +import common.block.BlockRotatedPillar; +import common.clipboard.Rotation; +import common.clipboard.RotationValue; +import common.clipboard.Vector; +import common.collect.Lists; +import common.collect.Maps; +import common.properties.IProperty; +import common.properties.PropertyDirection; +import common.world.Facing; +import common.world.State; +import common.world.Vec3i; public abstract class RotationRegistry { private static final Map MAP = new HashMap(); static void register() { - for(Block block : game.init.BlockRegistry.REGISTRY) { + for(Block block : common.init.BlockRegistry.REGISTRY) { for(IProperty prop : block.getPropertyMap()) { Predicate predicate = null; if(prop == BlockDoor.FACING) { @@ -113,7 +113,7 @@ public abstract class RotationRegistry { } } if(!values.isEmpty()) { - int legacyId = game.init.BlockRegistry.getIdFromBlock(block); + int legacyId = common.init.BlockRegistry.getIdFromBlock(block); Rotation state = new Rotation(values.toArray(new RotationValue[values.size()]), predicate); // Log.CONFIG.debug("Block " + game.init.BlockRegistry.REGISTRY.getNameForObject(block) + "/" + legacyId + " mask = " + String.format("0x%x", mask)); // for(RotationValue value : values) { diff --git a/java/src/game/init/SmeltingRegistry.java b/java/src/common/init/SmeltingRegistry.java similarity index 95% rename from java/src/game/init/SmeltingRegistry.java rename to java/src/common/init/SmeltingRegistry.java index 1d2e404..f47f6b2 100755 --- a/java/src/game/init/SmeltingRegistry.java +++ b/java/src/common/init/SmeltingRegistry.java @@ -1,16 +1,17 @@ -package game.init; +package common.init; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.block.Block; -import game.block.BlockStoneBrick; -import game.collect.Maps; -import game.color.DyeColor; -import game.item.Item; -import game.item.ItemFishFood; -import game.item.ItemStack; +import common.block.Block; +import common.block.BlockStoneBrick; +import common.collect.Maps; +import common.color.DyeColor; +import common.item.Item; +import common.item.ItemFishFood; +import common.item.ItemStack; + +import java.util.Set; public abstract class SmeltingRegistry { diff --git a/java/src/game/init/SoundEvent.java b/java/src/common/init/SoundEvent.java similarity index 99% rename from java/src/game/init/SoundEvent.java rename to java/src/common/init/SoundEvent.java index ddeb5b2..b5cb1b9 100755 --- a/java/src/game/init/SoundEvent.java +++ b/java/src/common/init/SoundEvent.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public enum SoundEvent { CLOTH("cloth1", "cloth2", "cloth3", "cloth4"), diff --git a/java/src/game/init/SpeciesRegistry.java b/java/src/common/init/SpeciesRegistry.java similarity index 85% rename from java/src/game/init/SpeciesRegistry.java rename to java/src/common/init/SpeciesRegistry.java index 5afa09e..9126171 100755 --- a/java/src/game/init/SpeciesRegistry.java +++ b/java/src/common/init/SpeciesRegistry.java @@ -1,40 +1,40 @@ -package game.init; +package common.init; import java.util.List; import java.util.Map; import java.util.Set; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.entity.npc.EntityArachnoid; -import game.entity.npc.EntityBloodElf; -import game.entity.npc.EntityChaosMarine; -import game.entity.npc.EntityCpu; -import game.entity.npc.EntityCultivator; -import game.entity.npc.EntityDarkMage; -import game.entity.npc.EntityDwarf; -import game.entity.npc.EntityElf; -import game.entity.npc.EntityFireDemon; -import game.entity.npc.EntityGargoyle; -import game.entity.npc.EntityGoblin; -import game.entity.npc.EntityHaunter; -import game.entity.npc.EntityHuman; -import game.entity.npc.EntityMage; -import game.entity.npc.EntityMagma; -import game.entity.npc.EntityMetalhead; -import game.entity.npc.EntityNPC; -import game.entity.npc.EntityOrc; -import game.entity.npc.EntityPrimarch; -import game.entity.npc.EntitySlime; -import game.entity.npc.EntitySpaceMarine; -import game.entity.npc.EntitySpirit; -import game.entity.npc.EntityTiefling; -import game.entity.npc.EntityUndead; -import game.entity.npc.EntityVampire; -import game.entity.npc.EntityWoodElf; -import game.entity.npc.EntityZombie; -import game.entity.npc.SpeciesInfo; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.entity.npc.EntityArachnoid; +import common.entity.npc.EntityBloodElf; +import common.entity.npc.EntityChaosMarine; +import common.entity.npc.EntityCpu; +import common.entity.npc.EntityCultivator; +import common.entity.npc.EntityDarkMage; +import common.entity.npc.EntityDwarf; +import common.entity.npc.EntityElf; +import common.entity.npc.EntityFireDemon; +import common.entity.npc.EntityGargoyle; +import common.entity.npc.EntityGoblin; +import common.entity.npc.EntityHaunter; +import common.entity.npc.EntityHuman; +import common.entity.npc.EntityMage; +import common.entity.npc.EntityMagma; +import common.entity.npc.EntityMetalhead; +import common.entity.npc.EntityNPC; +import common.entity.npc.EntityOrc; +import common.entity.npc.EntityPrimarch; +import common.entity.npc.EntitySlime; +import common.entity.npc.EntitySpaceMarine; +import common.entity.npc.EntitySpirit; +import common.entity.npc.EntityTiefling; +import common.entity.npc.EntityUndead; +import common.entity.npc.EntityVampire; +import common.entity.npc.EntityWoodElf; +import common.entity.npc.EntityZombie; +import common.entity.npc.SpeciesInfo; public abstract class SpeciesRegistry { public static enum ModelType { diff --git a/java/src/game/init/TileRegistry.java b/java/src/common/init/TileRegistry.java similarity index 69% rename from java/src/game/init/TileRegistry.java rename to java/src/common/init/TileRegistry.java index 8da4f9d..2f74da8 100755 --- a/java/src/game/init/TileRegistry.java +++ b/java/src/common/init/TileRegistry.java @@ -1,26 +1,26 @@ -package game.init; +package common.init; import java.util.Map; -import game.collect.Maps; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBanner; -import game.tileentity.TileEntityBeacon; -import game.tileentity.TileEntityBrewingStand; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntityComparator; -import game.tileentity.TileEntityDaylightDetector; -import game.tileentity.TileEntityDispenser; -import game.tileentity.TileEntityDropper; -import game.tileentity.TileEntityEnchantmentTable; -import game.tileentity.TileEntityFurnace; -import game.tileentity.TileEntityHopper; -import game.tileentity.TileEntityMobSpawner; -import game.tileentity.TileEntityNote; -import game.tileentity.TileEntityPiston; -import game.tileentity.TileEntitySign; -import game.tileentity.TileEntitySkull; -import game.tileentity.TileEntityTianReactor; +import common.collect.Maps; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityBanner; +import common.tileentity.TileEntityBeacon; +import common.tileentity.TileEntityBrewingStand; +import common.tileentity.TileEntityChest; +import common.tileentity.TileEntityComparator; +import common.tileentity.TileEntityDaylightDetector; +import common.tileentity.TileEntityDispenser; +import common.tileentity.TileEntityDropper; +import common.tileentity.TileEntityEnchantmentTable; +import common.tileentity.TileEntityFurnace; +import common.tileentity.TileEntityHopper; +import common.tileentity.TileEntityMobSpawner; +import common.tileentity.TileEntityNote; +import common.tileentity.TileEntityPiston; +import common.tileentity.TileEntitySign; +import common.tileentity.TileEntitySkull; +import common.tileentity.TileEntityTianReactor; public abstract class TileRegistry { public static final Map> nameToClassMap = Maps.>newHashMap(); diff --git a/java/src/game/init/ToolMaterial.java b/java/src/common/init/ToolMaterial.java similarity index 98% rename from java/src/game/init/ToolMaterial.java rename to java/src/common/init/ToolMaterial.java index 85fade6..7b3b548 100755 --- a/java/src/game/init/ToolMaterial.java +++ b/java/src/common/init/ToolMaterial.java @@ -1,9 +1,9 @@ -package game.init; +package common.init; import java.util.Set; -import game.collect.Sets; -import game.item.Item; +import common.collect.Sets; +import common.item.Item; public class ToolMaterial { diff --git a/java/src/game/init/ToolType.java b/java/src/common/init/ToolType.java similarity index 97% rename from java/src/game/init/ToolType.java rename to java/src/common/init/ToolType.java index 94cff02..893269f 100755 --- a/java/src/game/init/ToolType.java +++ b/java/src/common/init/ToolType.java @@ -1,4 +1,4 @@ -package game.init; +package common.init; public enum ToolType { WOOD("wood", "Holz", new ToolMaterial(0, 59, 2.0F, 0, 15, true), WoodType.getNames("planks")), diff --git a/java/src/game/init/TradeRegistry.java b/java/src/common/init/TradeRegistry.java similarity index 96% rename from java/src/game/init/TradeRegistry.java rename to java/src/common/init/TradeRegistry.java index 5ff6029..9d20098 100755 --- a/java/src/game/init/TradeRegistry.java +++ b/java/src/common/init/TradeRegistry.java @@ -1,14 +1,14 @@ -package game.init; +package common.init; -import game.color.DyeColor; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.enchantment.RngEnchantment; -import game.item.Item; -import game.item.ItemStack; -import game.rng.Random; -import game.village.MerchantRecipe; -import game.village.MerchantRecipeList; +import common.color.DyeColor; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.enchantment.RngEnchantment; +import common.item.Item; +import common.item.ItemStack; +import common.rng.Random; +import common.village.MerchantRecipe; +import common.village.MerchantRecipeList; public abstract class TradeRegistry { public interface ITradeList { diff --git a/java/src/game/init/UniverseRegistry.java b/java/src/common/init/UniverseRegistry.java similarity index 97% rename from java/src/game/init/UniverseRegistry.java rename to java/src/common/init/UniverseRegistry.java index 396de6c..9f8451e 100755 --- a/java/src/game/init/UniverseRegistry.java +++ b/java/src/common/init/UniverseRegistry.java @@ -1,40 +1,41 @@ -package game.init; +package common.init; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.biome.Biome; -import game.block.BlockColored; -import game.block.BlockSand; -import game.block.LeavesType; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.color.DyeColor; -import game.dimension.Area; -import game.dimension.DimType; -import game.dimension.Dimension; -import game.dimension.Dimension.GeneratorType; -import game.dimension.Dimension.ReplacerType; -import game.dimension.Domain; -import game.dimension.Galaxy; -import game.dimension.Moon; -import game.dimension.Planet; -import game.dimension.Sector; -import game.dimension.Semi; -import game.dimension.Space; -import game.dimension.Star; -import game.log.Log; -import game.nbt.NBTException; -import game.nbt.NBTParser; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.world.PortalType; -import game.world.State; -import game.world.Weather; +import common.biome.Biome; +import common.block.BlockColored; +import common.block.BlockSand; +import common.block.LeavesType; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.color.DyeColor; +import common.dimension.Area; +import common.dimension.DimType; +import common.dimension.Dimension; +import common.dimension.Domain; +import common.dimension.Galaxy; +import common.dimension.Moon; +import common.dimension.Planet; +import common.dimension.Sector; +import common.dimension.Semi; +import common.dimension.Space; +import common.dimension.Star; +import common.dimension.Dimension.GeneratorType; +import common.dimension.Dimension.ReplacerType; +import common.log.Log; +import common.nbt.NBTException; +import common.nbt.NBTParser; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; +import common.world.PortalType; +import common.world.State; +import common.world.Weather; + +import java.util.Set; public abstract class UniverseRegistry { public static final int MORE_DIM_ID = 1000; diff --git a/java/src/game/init/WoodType.java b/java/src/common/init/WoodType.java similarity index 96% rename from java/src/game/init/WoodType.java rename to java/src/common/init/WoodType.java index 53105c9..aa76f8d 100755 --- a/java/src/game/init/WoodType.java +++ b/java/src/common/init/WoodType.java @@ -1,6 +1,6 @@ -package game.init; +package common.init; -import game.color.Colorizer; +import common.color.Colorizer; public enum WoodType { OAK("oak", "Eichen", null, 20, "apple"), diff --git a/java/src/game/inventory/AnimalChest.java b/java/src/common/inventory/AnimalChest.java similarity index 92% rename from java/src/game/inventory/AnimalChest.java rename to java/src/common/inventory/AnimalChest.java index 1e3edb9..8823e5c 100755 --- a/java/src/game/inventory/AnimalChest.java +++ b/java/src/common/inventory/AnimalChest.java @@ -1,4 +1,4 @@ -package game.inventory; +package common.inventory; public class AnimalChest extends InventoryBasic { diff --git a/java/src/game/inventory/Container.java b/java/src/common/inventory/Container.java similarity index 99% rename from java/src/game/inventory/Container.java rename to java/src/common/inventory/Container.java index 8472563..80ae090 100755 --- a/java/src/game/inventory/Container.java +++ b/java/src/common/inventory/Container.java @@ -1,15 +1,15 @@ -package game.inventory; +package common.inventory; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; -import game.entity.npc.EntityNPC; -import game.item.Item; -import game.item.ItemStack; -import game.tileentity.TileEntity; -import game.util.ExtMath; +import common.collect.Lists; +import common.collect.Sets; +import common.entity.npc.EntityNPC; +import common.item.Item; +import common.item.ItemStack; +import common.tileentity.TileEntity; +import common.util.ExtMath; public abstract class Container { diff --git a/java/src/game/inventory/ContainerBrewingStand.java b/java/src/common/inventory/ContainerBrewingStand.java similarity index 98% rename from java/src/game/inventory/ContainerBrewingStand.java rename to java/src/common/inventory/ContainerBrewingStand.java index 79b09a4..d4c461a 100755 --- a/java/src/game/inventory/ContainerBrewingStand.java +++ b/java/src/common/inventory/ContainerBrewingStand.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.item.ItemStack; public class ContainerBrewingStand extends Container { diff --git a/java/src/game/inventory/ContainerChest.java b/java/src/common/inventory/ContainerChest.java similarity index 96% rename from java/src/game/inventory/ContainerChest.java rename to java/src/common/inventory/ContainerChest.java index ed12ad5..f53fe5e 100755 --- a/java/src/game/inventory/ContainerChest.java +++ b/java/src/common/inventory/ContainerChest.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class ContainerChest extends Container { diff --git a/java/src/game/inventory/ContainerDispenser.java b/java/src/common/inventory/ContainerDispenser.java similarity index 95% rename from java/src/game/inventory/ContainerDispenser.java rename to java/src/common/inventory/ContainerDispenser.java index 34a52c8..6caa6dc 100755 --- a/java/src/game/inventory/ContainerDispenser.java +++ b/java/src/common/inventory/ContainerDispenser.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class ContainerDispenser extends Container { diff --git a/java/src/game/inventory/ContainerEnchantment.java b/java/src/common/inventory/ContainerEnchantment.java similarity index 97% rename from java/src/game/inventory/ContainerEnchantment.java rename to java/src/common/inventory/ContainerEnchantment.java index 4e7bcea..551053a 100755 --- a/java/src/game/inventory/ContainerEnchantment.java +++ b/java/src/common/inventory/ContainerEnchantment.java @@ -1,16 +1,16 @@ -package game.inventory; +package common.inventory; import java.util.List; -import game.enchantment.EnchantmentHelper; -import game.enchantment.RngEnchantment; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.item.ItemStack; -import game.rng.Random; -import game.world.BlockPos; -import game.world.World; +import common.enchantment.EnchantmentHelper; +import common.enchantment.RngEnchantment; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.item.ItemStack; +import common.rng.Random; +import common.world.BlockPos; +import common.world.World; public class ContainerEnchantment extends Container { diff --git a/java/src/game/inventory/ContainerFurnace.java b/java/src/common/inventory/ContainerFurnace.java similarity index 96% rename from java/src/game/inventory/ContainerFurnace.java rename to java/src/common/inventory/ContainerFurnace.java index 860c51b..ae7cc2d 100755 --- a/java/src/game/inventory/ContainerFurnace.java +++ b/java/src/common/inventory/ContainerFurnace.java @@ -1,9 +1,9 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.init.SmeltingRegistry; -import game.item.ItemStack; -import game.tileentity.TileEntityFurnace; +import common.entity.npc.EntityNPC; +import common.init.SmeltingRegistry; +import common.item.ItemStack; +import common.tileentity.TileEntityFurnace; public class ContainerFurnace extends Container { diff --git a/java/src/game/inventory/ContainerHopper.java b/java/src/common/inventory/ContainerHopper.java similarity index 96% rename from java/src/game/inventory/ContainerHopper.java rename to java/src/common/inventory/ContainerHopper.java index e3b0a09..99d9283 100755 --- a/java/src/game/inventory/ContainerHopper.java +++ b/java/src/common/inventory/ContainerHopper.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class ContainerHopper extends Container { diff --git a/java/src/game/inventory/ContainerHorseInventory.java b/java/src/common/inventory/ContainerHorseInventory.java similarity index 96% rename from java/src/game/inventory/ContainerHorseInventory.java rename to java/src/common/inventory/ContainerHorseInventory.java index a53e790..928b183 100755 --- a/java/src/game/inventory/ContainerHorseInventory.java +++ b/java/src/common/inventory/ContainerHorseInventory.java @@ -1,9 +1,9 @@ -package game.inventory; +package common.inventory; -import game.entity.animal.EntityHorse; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.item.ItemStack; +import common.entity.animal.EntityHorse; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.item.ItemStack; public class ContainerHorseInventory extends Container { diff --git a/java/src/game/inventory/ContainerLocalMenu.java b/java/src/common/inventory/ContainerLocalMenu.java similarity index 87% rename from java/src/game/inventory/ContainerLocalMenu.java rename to java/src/common/inventory/ContainerLocalMenu.java index 08d7992..c8f636e 100755 --- a/java/src/game/inventory/ContainerLocalMenu.java +++ b/java/src/common/inventory/ContainerLocalMenu.java @@ -1,11 +1,11 @@ -package game.inventory; +package common.inventory; import java.util.Map; -import game.collect.Maps; -import game.entity.npc.EntityNPC; -import game.tileentity.ILockableContainer; -import game.tileentity.LockCode; +import common.collect.Maps; +import common.entity.npc.EntityNPC; +import common.tileentity.ILockableContainer; +import common.tileentity.LockCode; public class ContainerLocalMenu extends InventoryBasic implements ILockableContainer { diff --git a/java/src/game/inventory/ContainerMachine.java b/java/src/common/inventory/ContainerMachine.java similarity index 95% rename from java/src/game/inventory/ContainerMachine.java rename to java/src/common/inventory/ContainerMachine.java index 1b7085b..0a71f19 100755 --- a/java/src/game/inventory/ContainerMachine.java +++ b/java/src/common/inventory/ContainerMachine.java @@ -1,9 +1,9 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.tileentity.TileEntityMachine; -import game.tileentity.TileEntityMachine.Status; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.tileentity.TileEntityMachine; +import common.tileentity.TileEntityMachine.Status; public class ContainerMachine extends Container { diff --git a/java/src/game/inventory/ContainerMerchant.java b/java/src/common/inventory/ContainerMerchant.java similarity index 97% rename from java/src/game/inventory/ContainerMerchant.java rename to java/src/common/inventory/ContainerMerchant.java index 44ae587..dd43752 100755 --- a/java/src/game/inventory/ContainerMerchant.java +++ b/java/src/common/inventory/ContainerMerchant.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.world.World; public class ContainerMerchant extends Container { diff --git a/java/src/game/inventory/ContainerPlayer.java b/java/src/common/inventory/ContainerPlayer.java similarity index 96% rename from java/src/game/inventory/ContainerPlayer.java rename to java/src/common/inventory/ContainerPlayer.java index c5ce694..2a1253d 100755 --- a/java/src/game/inventory/ContainerPlayer.java +++ b/java/src/common/inventory/ContainerPlayer.java @@ -1,13 +1,13 @@ -package game.inventory; +package common.inventory; import java.util.List; -import game.collect.Lists; -import game.entity.attributes.AttributeMap; -import game.entity.npc.EntityNPC; -import game.init.CraftingRegistry; -import game.item.ItemArmor; -import game.item.ItemStack; +import common.collect.Lists; +import common.entity.attributes.AttributeMap; +import common.entity.npc.EntityNPC; +import common.init.CraftingRegistry; +import common.item.ItemArmor; +import common.item.ItemStack; public class ContainerPlayer extends Container { diff --git a/java/src/game/inventory/ContainerRepair.java b/java/src/common/inventory/ContainerRepair.java similarity index 97% rename from java/src/game/inventory/ContainerRepair.java rename to java/src/common/inventory/ContainerRepair.java index 50e25f0..c2fa9d2 100755 --- a/java/src/game/inventory/ContainerRepair.java +++ b/java/src/common/inventory/ContainerRepair.java @@ -1,19 +1,19 @@ -package game.inventory; +package common.inventory; import java.util.Iterator; import java.util.Map; -import game.block.BlockAnvil; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.ItemStack; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.BlockAnvil; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Config; +import common.init.Items; +import common.item.ItemStack; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class ContainerRepair extends Container { diff --git a/java/src/game/inventory/ContainerWorkbench.java b/java/src/common/inventory/ContainerWorkbench.java similarity index 95% rename from java/src/game/inventory/ContainerWorkbench.java rename to java/src/common/inventory/ContainerWorkbench.java index 16904af..2162e9e 100755 --- a/java/src/game/inventory/ContainerWorkbench.java +++ b/java/src/common/inventory/ContainerWorkbench.java @@ -1,11 +1,11 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.CraftingRegistry; -import game.item.ItemStack; -import game.world.BlockPos; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.CraftingRegistry; +import common.item.ItemStack; +import common.world.BlockPos; +import common.world.World; public class ContainerWorkbench extends Container { diff --git a/java/src/game/inventory/ICrafting.java b/java/src/common/inventory/ICrafting.java similarity index 87% rename from java/src/game/inventory/ICrafting.java rename to java/src/common/inventory/ICrafting.java index 68b1ffd..ce90d83 100755 --- a/java/src/game/inventory/ICrafting.java +++ b/java/src/common/inventory/ICrafting.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; import java.util.List; -import game.item.ItemStack; +import common.item.ItemStack; public interface ICrafting { diff --git a/java/src/game/inventory/IInvBasic.java b/java/src/common/inventory/IInvBasic.java similarity index 87% rename from java/src/game/inventory/IInvBasic.java rename to java/src/common/inventory/IInvBasic.java index b0a8f76..880e0a2 100755 --- a/java/src/game/inventory/IInvBasic.java +++ b/java/src/common/inventory/IInvBasic.java @@ -1,4 +1,4 @@ -package game.inventory; +package common.inventory; public interface IInvBasic { diff --git a/java/src/game/inventory/IInventory.java b/java/src/common/inventory/IInventory.java similarity index 92% rename from java/src/game/inventory/IInventory.java rename to java/src/common/inventory/IInventory.java index b9ed4bb..e65cf6e 100755 --- a/java/src/game/inventory/IInventory.java +++ b/java/src/common/inventory/IInventory.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.tileentity.IWorldNameable; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.tileentity.IWorldNameable; public interface IInventory extends IWorldNameable { diff --git a/java/src/game/inventory/ISidedInventory.java b/java/src/common/inventory/ISidedInventory.java similarity index 86% rename from java/src/game/inventory/ISidedInventory.java rename to java/src/common/inventory/ISidedInventory.java index 076b4ae..ad72573 100755 --- a/java/src/game/inventory/ISidedInventory.java +++ b/java/src/common/inventory/ISidedInventory.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.item.ItemStack; -import game.world.Facing; +import common.item.ItemStack; +import common.world.Facing; public interface ISidedInventory extends IInventory { diff --git a/java/src/game/inventory/InventoryBasic.java b/java/src/common/inventory/InventoryBasic.java similarity index 98% rename from java/src/game/inventory/InventoryBasic.java rename to java/src/common/inventory/InventoryBasic.java index c7667da..15853bd 100755 --- a/java/src/game/inventory/InventoryBasic.java +++ b/java/src/common/inventory/InventoryBasic.java @@ -1,10 +1,10 @@ -package game.inventory; +package common.inventory; import java.util.List; -import game.collect.Lists; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.collect.Lists; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class InventoryBasic implements IInventory { diff --git a/java/src/game/inventory/InventoryCraftResult.java b/java/src/common/inventory/InventoryCraftResult.java similarity index 97% rename from java/src/game/inventory/InventoryCraftResult.java rename to java/src/common/inventory/InventoryCraftResult.java index fe1a88f..6b41b16 100755 --- a/java/src/game/inventory/InventoryCraftResult.java +++ b/java/src/common/inventory/InventoryCraftResult.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class InventoryCraftResult implements IInventory { diff --git a/java/src/game/inventory/InventoryCrafting.java b/java/src/common/inventory/InventoryCrafting.java similarity index 98% rename from java/src/game/inventory/InventoryCrafting.java rename to java/src/common/inventory/InventoryCrafting.java index debb209..e1b6d39 100755 --- a/java/src/game/inventory/InventoryCrafting.java +++ b/java/src/common/inventory/InventoryCrafting.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class InventoryCrafting implements IInventory { diff --git a/java/src/game/inventory/InventoryHelper.java b/java/src/common/inventory/InventoryHelper.java similarity index 89% rename from java/src/game/inventory/InventoryHelper.java rename to java/src/common/inventory/InventoryHelper.java index 28e04fa..0bfc5d8 100755 --- a/java/src/game/inventory/InventoryHelper.java +++ b/java/src/common/inventory/InventoryHelper.java @@ -1,12 +1,12 @@ -package game.inventory; +package common.inventory; -import game.entity.Entity; -import game.entity.item.EntityItem; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.BlockPos; -import game.world.World; +import common.entity.Entity; +import common.entity.item.EntityItem; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.world.BlockPos; +import common.world.World; public class InventoryHelper { diff --git a/java/src/game/inventory/InventoryLargeChest.java b/java/src/common/inventory/InventoryLargeChest.java similarity index 96% rename from java/src/game/inventory/InventoryLargeChest.java rename to java/src/common/inventory/InventoryLargeChest.java index 3de2405..85d9844 100755 --- a/java/src/game/inventory/InventoryLargeChest.java +++ b/java/src/common/inventory/InventoryLargeChest.java @@ -1,10 +1,10 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.tileentity.ILockableContainer; -import game.tileentity.LockCode; -import game.tileentity.TileEntityChest; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.tileentity.ILockableContainer; +import common.tileentity.LockCode; +import common.tileentity.TileEntityChest; public class InventoryLargeChest implements ILockableContainer { diff --git a/java/src/game/inventory/InventoryMerchant.java b/java/src/common/inventory/InventoryMerchant.java similarity index 97% rename from java/src/game/inventory/InventoryMerchant.java rename to java/src/common/inventory/InventoryMerchant.java index 58a4ef1..223bf4d 100755 --- a/java/src/game/inventory/InventoryMerchant.java +++ b/java/src/common/inventory/InventoryMerchant.java @@ -1,9 +1,9 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.village.MerchantRecipe; -import game.village.MerchantRecipeList; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.village.MerchantRecipe; +import common.village.MerchantRecipeList; public class InventoryMerchant implements IInventory { diff --git a/java/src/game/inventory/InventoryPlayer.java b/java/src/common/inventory/InventoryPlayer.java similarity index 98% rename from java/src/game/inventory/InventoryPlayer.java rename to java/src/common/inventory/InventoryPlayer.java index 5450415..7b651c8 100755 --- a/java/src/game/inventory/InventoryPlayer.java +++ b/java/src/common/inventory/InventoryPlayer.java @@ -1,12 +1,12 @@ -package game.inventory; +package common.inventory; -import game.block.Block; -import game.entity.npc.EntityNPC; -import game.item.Item; -import game.item.ItemArmor; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; +import common.block.Block; +import common.entity.npc.EntityNPC; +import common.item.Item; +import common.item.ItemArmor; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; public class InventoryPlayer implements IInventory { diff --git a/java/src/game/inventory/InventoryWarpChest.java b/java/src/common/inventory/InventoryWarpChest.java similarity index 91% rename from java/src/game/inventory/InventoryWarpChest.java rename to java/src/common/inventory/InventoryWarpChest.java index 0685445..11656be 100755 --- a/java/src/game/inventory/InventoryWarpChest.java +++ b/java/src/common/inventory/InventoryWarpChest.java @@ -1,11 +1,11 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.world.BlockPos; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.world.BlockPos; public class InventoryWarpChest extends InventoryBasic { diff --git a/java/src/game/inventory/Slot.java b/java/src/common/inventory/Slot.java similarity index 97% rename from java/src/game/inventory/Slot.java rename to java/src/common/inventory/Slot.java index 1c22e6b..9176b08 100755 --- a/java/src/game/inventory/Slot.java +++ b/java/src/common/inventory/Slot.java @@ -1,7 +1,7 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; public class Slot { diff --git a/java/src/game/inventory/SlotCrafting.java b/java/src/common/inventory/SlotCrafting.java similarity index 97% rename from java/src/game/inventory/SlotCrafting.java rename to java/src/common/inventory/SlotCrafting.java index 4bc90b2..a598f45 100755 --- a/java/src/game/inventory/SlotCrafting.java +++ b/java/src/common/inventory/SlotCrafting.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.init.CraftingRegistry; -import game.item.ItemStack; +import common.entity.npc.EntityNPC; +import common.init.CraftingRegistry; +import common.item.ItemStack; public class SlotCrafting extends Slot { diff --git a/java/src/game/inventory/SlotFurnaceFuel.java b/java/src/common/inventory/SlotFurnaceFuel.java similarity index 85% rename from java/src/game/inventory/SlotFurnaceFuel.java rename to java/src/common/inventory/SlotFurnaceFuel.java index 422a196..23edd12 100755 --- a/java/src/game/inventory/SlotFurnaceFuel.java +++ b/java/src/common/inventory/SlotFurnaceFuel.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.init.Items; -import game.item.ItemStack; -import game.tileentity.TileEntityFurnace; +import common.init.Items; +import common.item.ItemStack; +import common.tileentity.TileEntityFurnace; public class SlotFurnaceFuel extends Slot { diff --git a/java/src/game/inventory/SlotFurnaceOutput.java b/java/src/common/inventory/SlotFurnaceOutput.java similarity index 93% rename from java/src/game/inventory/SlotFurnaceOutput.java rename to java/src/common/inventory/SlotFurnaceOutput.java index e8ff6b2..930318a 100755 --- a/java/src/game/inventory/SlotFurnaceOutput.java +++ b/java/src/common/inventory/SlotFurnaceOutput.java @@ -1,11 +1,11 @@ -package game.inventory; +package common.inventory; -import game.entity.item.EntityXp; -import game.entity.npc.EntityNPC; -import game.init.Config; -import game.init.SmeltingRegistry; -import game.item.ItemStack; -import game.util.ExtMath; +import common.entity.item.EntityXp; +import common.entity.npc.EntityNPC; +import common.init.Config; +import common.init.SmeltingRegistry; +import common.item.ItemStack; +import common.util.ExtMath; public class SlotFurnaceOutput extends Slot { diff --git a/java/src/game/inventory/SlotMerchantResult.java b/java/src/common/inventory/SlotMerchantResult.java similarity index 96% rename from java/src/game/inventory/SlotMerchantResult.java rename to java/src/common/inventory/SlotMerchantResult.java index 11c65a6..01998ee 100755 --- a/java/src/game/inventory/SlotMerchantResult.java +++ b/java/src/common/inventory/SlotMerchantResult.java @@ -1,8 +1,8 @@ -package game.inventory; +package common.inventory; -import game.entity.npc.EntityNPC; -import game.item.ItemStack; -import game.village.MerchantRecipe; +import common.entity.npc.EntityNPC; +import common.item.ItemStack; +import common.village.MerchantRecipe; public class SlotMerchantResult extends Slot { diff --git a/java/src/game/item/CheatTab.java b/java/src/common/item/CheatTab.java similarity index 96% rename from java/src/game/item/CheatTab.java rename to java/src/common/item/CheatTab.java index 2c9363c..3e4ea89 100755 --- a/java/src/game/item/CheatTab.java +++ b/java/src/common/item/CheatTab.java @@ -1,10 +1,10 @@ -package game.item; +package common.item; import java.util.List; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; public enum CheatTab { diff --git a/java/src/game/item/Item.java b/java/src/common/item/Item.java similarity index 96% rename from java/src/game/item/Item.java rename to java/src/common/item/Item.java index 7f68355..a0885d9 100755 --- a/java/src/game/item/Item.java +++ b/java/src/common/item/Item.java @@ -1,29 +1,29 @@ -package game.item; +package common.item; import java.util.List; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.collect.Maps; -import game.collect.Sets; -import game.color.TextColor; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.model.ItemMeshDefinition; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.collect.Maps; +import common.collect.Sets; +import common.color.TextColor; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.model.ItemMeshDefinition; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; public class Item { diff --git a/java/src/game/item/ItemAction.java b/java/src/common/item/ItemAction.java similarity index 74% rename from java/src/game/item/ItemAction.java rename to java/src/common/item/ItemAction.java index 7e05c46..faf64d2 100755 --- a/java/src/game/item/ItemAction.java +++ b/java/src/common/item/ItemAction.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public enum ItemAction { NONE, EAT, DRINK, BLOCK, AIM; diff --git a/java/src/game/item/ItemAmmo.java b/java/src/common/item/ItemAmmo.java similarity index 95% rename from java/src/game/item/ItemAmmo.java rename to java/src/common/item/ItemAmmo.java index 0df9250..9f1b64b 100755 --- a/java/src/game/item/ItemAmmo.java +++ b/java/src/common/item/ItemAmmo.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public class ItemAmmo extends ItemMagnetic { private final int damage; diff --git a/java/src/game/item/ItemAnvilBlock.java b/java/src/common/item/ItemAnvilBlock.java similarity index 92% rename from java/src/game/item/ItemAnvilBlock.java rename to java/src/common/item/ItemAnvilBlock.java index 898f96e..8bf8549 100755 --- a/java/src/game/item/ItemAnvilBlock.java +++ b/java/src/common/item/ItemAnvilBlock.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.block.Block; +import common.block.Block; public class ItemAnvilBlock extends ItemMultiTexture { diff --git a/java/src/game/item/ItemAppleGold.java b/java/src/common/item/ItemAppleGold.java similarity index 89% rename from java/src/game/item/ItemAppleGold.java rename to java/src/common/item/ItemAppleGold.java index 5528983..a2b796a 100755 --- a/java/src/game/item/ItemAppleGold.java +++ b/java/src/common/item/ItemAppleGold.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.world.World; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.world.World; public class ItemAppleGold extends ItemFood { diff --git a/java/src/game/item/ItemArmor.java b/java/src/common/item/ItemArmor.java similarity index 93% rename from java/src/game/item/ItemArmor.java rename to java/src/common/item/ItemArmor.java index cc0f01b..8fc63a8 100755 --- a/java/src/game/item/ItemArmor.java +++ b/java/src/common/item/ItemArmor.java @@ -1,29 +1,29 @@ -package game.item; +package common.item; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import game.block.BlockDispenser; -import game.collect.Sets; -import game.dispenser.BehaviorDefaultDispenseItem; -import game.dispenser.IBehaviorDispenseItem; -import game.dispenser.IBlockSource; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.DispenserRegistry; -import game.init.ToolMaterial; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.nbt.NBTTagCompound; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.block.BlockDispenser; +import common.collect.Sets; +import common.dispenser.BehaviorDefaultDispenseItem; +import common.dispenser.IBehaviorDispenseItem; +import common.dispenser.IBlockSource; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.DispenserRegistry; +import common.init.ToolMaterial; +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.world.World; public class ItemArmor extends Item { diff --git a/java/src/game/item/ItemAxe.java b/java/src/common/item/ItemAxe.java similarity index 88% rename from java/src/game/item/ItemAxe.java rename to java/src/common/item/ItemAxe.java index ead3549..2a2ccc6 100755 --- a/java/src/game/item/ItemAxe.java +++ b/java/src/common/item/ItemAxe.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.block.Block; -import game.init.ToolMaterial; +import common.block.Block; +import common.init.ToolMaterial; public class ItemAxe extends ItemTool { diff --git a/java/src/game/item/ItemBanHammer.java b/java/src/common/item/ItemBanHammer.java similarity index 78% rename from java/src/game/item/ItemBanHammer.java rename to java/src/common/item/ItemBanHammer.java index 573af3f..db93716 100755 --- a/java/src/game/item/ItemBanHammer.java +++ b/java/src/common/item/ItemBanHammer.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.entity.DamageSource; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.world.BoundingBox; -import game.world.Vec3; -import game.world.WorldServer; +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.world.WorldServer; public class ItemBanHammer extends ItemWand { public ItemBanHammer() { diff --git a/java/src/game/item/ItemBanner.java b/java/src/common/item/ItemBanner.java similarity index 92% rename from java/src/game/item/ItemBanner.java rename to java/src/common/item/ItemBanner.java index 46f28bf..6a41313 100755 --- a/java/src/game/item/ItemBanner.java +++ b/java/src/common/item/ItemBanner.java @@ -1,23 +1,23 @@ -package game.item; +package common.item; import java.util.List; -import game.block.BlockStandingSign; -import game.block.BlockWallSign; -import game.color.DyeColor; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.model.ItemMeshDefinition; -import game.model.Model; -import game.model.ModelProvider; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBanner; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.block.BlockStandingSign; +import common.block.BlockWallSign; +import common.color.DyeColor; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.model.ItemMeshDefinition; +import common.model.Model; +import common.model.ModelProvider; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityBanner; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.World; public class ItemBanner extends ItemBlock { diff --git a/java/src/game/item/ItemBed.java b/java/src/common/item/ItemBed.java similarity index 90% rename from java/src/game/item/ItemBed.java rename to java/src/common/item/ItemBed.java index 8e5f276..04a9b51 100755 --- a/java/src/game/item/ItemBed.java +++ b/java/src/common/item/ItemBed.java @@ -1,13 +1,13 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockBed; -import game.entity.npc.EntityNPC; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockBed; +import common.entity.npc.EntityNPC; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class ItemBed extends Item { diff --git a/java/src/game/item/ItemBlock.java b/java/src/common/item/ItemBlock.java similarity index 93% rename from java/src/game/item/ItemBlock.java rename to java/src/common/item/ItemBlock.java index b619ade..0a2de57 100755 --- a/java/src/game/item/ItemBlock.java +++ b/java/src/common/item/ItemBlock.java @@ -1,22 +1,22 @@ -package game.item; +package common.item; import java.util.List; -import game.block.Block; -import game.color.TextColor; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.nbt.NBTTagCompound; -import game.tileentity.TileEntity; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.color.TextColor; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.model.Model; +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.world.State; +import common.world.World; public class ItemBlock extends Item { diff --git a/java/src/game/item/ItemBoat.java b/java/src/common/item/ItemBoat.java similarity index 92% rename from java/src/game/item/ItemBoat.java rename to java/src/common/item/ItemBoat.java index d33ba25..21894ed 100755 --- a/java/src/game/item/ItemBoat.java +++ b/java/src/common/item/ItemBoat.java @@ -1,17 +1,17 @@ -package game.item; +package common.item; import java.util.List; -import game.entity.Entity; -import game.entity.item.EntityBoat; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.HitPosition; -import game.world.Vec3; -import game.world.World; +import common.entity.Entity; +import common.entity.item.EntityBoat; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.HitPosition; +import common.world.Vec3; +import common.world.World; public class ItemBoat extends Item { diff --git a/java/src/game/item/ItemBoltgun.java b/java/src/common/item/ItemBoltgun.java similarity index 80% rename from java/src/game/item/ItemBoltgun.java rename to java/src/common/item/ItemBoltgun.java index 3d25c5d..4c4f387 100755 --- a/java/src/game/item/ItemBoltgun.java +++ b/java/src/common/item/ItemBoltgun.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.init.Items; +import common.init.Items; public class ItemBoltgun extends ItemGunBase { public ItemBoltgun() { diff --git a/java/src/game/item/ItemBook.java b/java/src/common/item/ItemBook.java similarity index 94% rename from java/src/game/item/ItemBook.java rename to java/src/common/item/ItemBook.java index cc4dd7d..f1d7b20 100755 --- a/java/src/game/item/ItemBook.java +++ b/java/src/common/item/ItemBook.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public class ItemBook extends Item { diff --git a/java/src/game/item/ItemBow.java b/java/src/common/item/ItemBow.java similarity index 91% rename from java/src/game/item/ItemBow.java rename to java/src/common/item/ItemBow.java index 4670914..ddd477d 100755 --- a/java/src/game/item/ItemBow.java +++ b/java/src/common/item/ItemBow.java @@ -1,17 +1,17 @@ -package game.item; +package common.item; import java.util.List; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityArrow; -import game.init.Items; -import game.init.SoundEvent; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.world.World; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityArrow; +import common.init.Items; +import common.init.SoundEvent; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.world.World; public class ItemBow extends Item { diff --git a/java/src/game/item/ItemBucket.java b/java/src/common/item/ItemBucket.java similarity index 94% rename from java/src/game/item/ItemBucket.java rename to java/src/common/item/ItemBucket.java index ee2f4de..f66c84a 100755 --- a/java/src/game/item/ItemBucket.java +++ b/java/src/common/item/ItemBucket.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; import java.util.ArrayDeque; import java.util.ArrayList; @@ -7,28 +7,28 @@ import java.util.List; import java.util.Queue; import java.util.Set; -import game.block.Block; -import game.block.BlockDynamicLiquid; -import game.block.BlockLiquid; -import game.block.BlockStaticLiquid; -import game.collect.Sets; -import game.entity.npc.EntityNPC; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.FluidRegistry; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.world.BlockPos; -import game.world.HitPosition; -import game.world.State; -import game.world.Vec3i; -import game.world.World; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDynamicLiquid; +import common.block.BlockLiquid; +import common.block.BlockStaticLiquid; +import common.collect.Sets; +import common.entity.npc.EntityNPC; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.FluidRegistry; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +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.world.State; +import common.world.Vec3i; +import common.world.World; +import common.world.WorldServer; public class ItemBucket extends Item { diff --git a/java/src/game/item/ItemBucketMilk.java b/java/src/common/item/ItemBucketMilk.java similarity index 87% rename from java/src/game/item/ItemBucketMilk.java rename to java/src/common/item/ItemBucketMilk.java index d6aea49..ada9fb5 100755 --- a/java/src/game/item/ItemBucketMilk.java +++ b/java/src/common/item/ItemBucketMilk.java @@ -1,15 +1,15 @@ -package game.item; +package common.item; import java.util.Map; import java.util.Set; -import game.collect.Sets; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.world.World; +import common.collect.Sets; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.world.World; public class ItemBucketMilk extends Item { diff --git a/java/src/game/item/ItemButton.java b/java/src/common/item/ItemButton.java similarity index 81% rename from java/src/game/item/ItemButton.java rename to java/src/common/item/ItemButton.java index 7645145..34c50ce 100755 --- a/java/src/game/item/ItemButton.java +++ b/java/src/common/item/ItemButton.java @@ -1,8 +1,8 @@ -package game.item; +package common.item; -import game.block.BlockButton; -import game.model.Model; -import game.model.ModelProvider; +import common.block.BlockButton; +import common.model.Model; +import common.model.ModelProvider; public class ItemButton extends ItemBlock { private final BlockButton button; diff --git a/java/src/game/item/ItemCamera.java b/java/src/common/item/ItemCamera.java similarity index 85% rename from java/src/game/item/ItemCamera.java rename to java/src/common/item/ItemCamera.java index 482f7b8..30fbb78 100755 --- a/java/src/game/item/ItemCamera.java +++ b/java/src/common/item/ItemCamera.java @@ -1,8 +1,8 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.world.BlockPos; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.world.BlockPos; +import common.world.World; public class ItemCamera extends ItemMagnetic { public ItemCamera() { diff --git a/java/src/game/item/ItemCarrotOnAStick.java b/java/src/common/item/ItemCarrotOnAStick.java similarity index 90% rename from java/src/game/item/ItemCarrotOnAStick.java rename to java/src/common/item/ItemCarrotOnAStick.java index 6eb5c1d..1a7983e 100755 --- a/java/src/game/item/ItemCarrotOnAStick.java +++ b/java/src/common/item/ItemCarrotOnAStick.java @@ -1,10 +1,10 @@ -package game.item; +package common.item; -import game.entity.animal.EntityPig; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.model.Transforms; -import game.world.World; +import common.entity.animal.EntityPig; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.model.Transforms; +import common.world.World; public class ItemCarrotOnAStick extends Item { diff --git a/java/src/game/item/ItemChargedOrb.java b/java/src/common/item/ItemChargedOrb.java similarity index 93% rename from java/src/game/item/ItemChargedOrb.java rename to java/src/common/item/ItemChargedOrb.java index 7cd9990..e156296 100755 --- a/java/src/game/item/ItemChargedOrb.java +++ b/java/src/common/item/ItemChargedOrb.java @@ -1,17 +1,17 @@ -package game.item; +package common.item; -import game.block.BlockPortalFrame; -import game.color.TextColor; -import game.entity.item.EntityOrb; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.init.SoundEvent; -import game.model.ParticleType; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.BlockPortalFrame; +import common.color.TextColor; +import common.entity.item.EntityOrb; +import common.entity.npc.EntityNPC; +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.world.State; +import common.world.World; public class ItemChargedOrb extends ItemFragile { diff --git a/java/src/game/item/ItemChest.java b/java/src/common/item/ItemChest.java similarity index 70% rename from java/src/game/item/ItemChest.java rename to java/src/common/item/ItemChest.java index 50c11e7..57e502c 100755 --- a/java/src/game/item/ItemChest.java +++ b/java/src/common/item/ItemChest.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.block.Block; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; +import common.block.Block; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; public class ItemChest extends ItemBlock { public ItemChest(Block block) { diff --git a/java/src/game/item/ItemCloth.java b/java/src/common/item/ItemCloth.java similarity index 90% rename from java/src/game/item/ItemCloth.java rename to java/src/common/item/ItemCloth.java index 791a8cd..6c20acb 100755 --- a/java/src/game/item/ItemCloth.java +++ b/java/src/common/item/ItemCloth.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.block.Block; -import game.color.DyeColor; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.color.DyeColor; +import common.model.Model; +import common.model.ModelProvider; public class ItemCloth extends ItemBlock { diff --git a/java/src/game/item/ItemCoal.java b/java/src/common/item/ItemCoal.java similarity index 92% rename from java/src/game/item/ItemCoal.java rename to java/src/common/item/ItemCoal.java index 637ddaa..bef0689 100755 --- a/java/src/game/item/ItemCoal.java +++ b/java/src/common/item/ItemCoal.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; import java.util.List; -import game.model.Model; -import game.model.ModelProvider; +import common.model.Model; +import common.model.ModelProvider; public class ItemCoal extends Item { diff --git a/java/src/game/item/ItemColored.java b/java/src/common/item/ItemColored.java similarity index 97% rename from java/src/game/item/ItemColored.java rename to java/src/common/item/ItemColored.java index 4bddb9e..97f58a3 100755 --- a/java/src/game/item/ItemColored.java +++ b/java/src/common/item/ItemColored.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.block.Block; +import common.block.Block; public class ItemColored extends ItemBlock { diff --git a/java/src/game/item/ItemControl.java b/java/src/common/item/ItemControl.java similarity index 77% rename from java/src/game/item/ItemControl.java rename to java/src/common/item/ItemControl.java index 064f390..ececfaa 100755 --- a/java/src/game/item/ItemControl.java +++ b/java/src/common/item/ItemControl.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public enum ItemControl { PRIMARY, SECONDARY, TERTIARY, QUARTERNARY; diff --git a/java/src/game/item/ItemDie.java b/java/src/common/item/ItemDie.java similarity index 85% rename from java/src/game/item/ItemDie.java rename to java/src/common/item/ItemDie.java index 86c7b86..5565fb4 100755 --- a/java/src/game/item/ItemDie.java +++ b/java/src/common/item/ItemDie.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityDie; -import game.init.SoundEvent; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.util.ExtMath; -import game.world.World; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityDie; +import common.init.SoundEvent; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.util.ExtMath; +import common.world.World; public class ItemDie extends Item { diff --git a/java/src/game/item/ItemDispenser.java b/java/src/common/item/ItemDispenser.java similarity index 78% rename from java/src/game/item/ItemDispenser.java rename to java/src/common/item/ItemDispenser.java index fd60883..1a90ccf 100755 --- a/java/src/game/item/ItemDispenser.java +++ b/java/src/common/item/ItemDispenser.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.block.Block; +import common.block.Block; public class ItemDispenser extends ItemBlock { public ItemDispenser(Block block) { diff --git a/java/src/game/item/ItemDoor.java b/java/src/common/item/ItemDoor.java similarity index 91% rename from java/src/game/item/ItemDoor.java rename to java/src/common/item/ItemDoor.java index 8cff1fb..54a41a7 100755 --- a/java/src/game/item/ItemDoor.java +++ b/java/src/common/item/ItemDoor.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockDoor; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +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.world.State; +import common.world.World; public class ItemDoor extends Item { diff --git a/java/src/game/item/ItemDoublePlant.java b/java/src/common/item/ItemDoublePlant.java similarity index 81% rename from java/src/game/item/ItemDoublePlant.java rename to java/src/common/item/ItemDoublePlant.java index 3ac9222..fe2b963 100755 --- a/java/src/game/item/ItemDoublePlant.java +++ b/java/src/common/item/ItemDoublePlant.java @@ -1,13 +1,13 @@ -package game.item; +package common.item; import java.util.function.Function; -import game.block.Block; -import game.block.BlockDoublePlant; -import game.block.BlockDoublePlant.EnumPlantType; -import game.color.Colorizer; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.block.BlockDoublePlant; +import common.block.BlockDoublePlant.EnumPlantType; +import common.color.Colorizer; +import common.model.Model; +import common.model.ModelProvider; public class ItemDoublePlant extends ItemMultiTexture { diff --git a/java/src/game/item/ItemDye.java b/java/src/common/item/ItemDye.java similarity index 91% rename from java/src/game/item/ItemDye.java rename to java/src/common/item/ItemDye.java index b74ef3e..d2fa2e2 100755 --- a/java/src/game/item/ItemDye.java +++ b/java/src/common/item/ItemDye.java @@ -1,27 +1,27 @@ -package game.item; +package common.item; import java.util.List; -import game.block.Block; -import game.block.BlockBed; -import game.block.IGrowable; -import game.color.DyeColor; -import game.entity.animal.EntitySheep; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.model.ParticleType; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityBeacon; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockBed; +import common.block.IGrowable; +import common.color.DyeColor; +import common.entity.animal.EntitySheep; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.material.Material; +import common.model.Model; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class ItemDye extends Item { diff --git a/java/src/game/item/ItemDynamite.java b/java/src/common/item/ItemDynamite.java similarity index 87% rename from java/src/game/item/ItemDynamite.java rename to java/src/common/item/ItemDynamite.java index d6b695a..56a3d46 100755 --- a/java/src/game/item/ItemDynamite.java +++ b/java/src/common/item/ItemDynamite.java @@ -1,13 +1,13 @@ -package game.item; +package common.item; import java.util.List; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityDynamite; -import game.init.SoundEvent; -import game.model.Model; -import game.model.ModelProvider; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityDynamite; +import common.init.SoundEvent; +import common.model.Model; +import common.model.ModelProvider; +import common.world.World; public class ItemDynamite extends Item { diff --git a/java/src/game/item/ItemEditWand.java b/java/src/common/item/ItemEditWand.java similarity index 88% rename from java/src/game/item/ItemEditWand.java rename to java/src/common/item/ItemEditWand.java index e5248f7..bf73170 100755 --- a/java/src/game/item/ItemEditWand.java +++ b/java/src/common/item/ItemEditWand.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.model.Transforms; -import game.world.BlockPos; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.model.Transforms; +import common.world.BlockPos; +import common.world.World; public class ItemEditWand extends Item { public ItemEditWand() { diff --git a/java/src/game/item/ItemEffect.java b/java/src/common/item/ItemEffect.java similarity index 85% rename from java/src/game/item/ItemEffect.java rename to java/src/common/item/ItemEffect.java index fd5d017..c68b31a 100755 --- a/java/src/game/item/ItemEffect.java +++ b/java/src/common/item/ItemEffect.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public class ItemEffect extends Item { diff --git a/java/src/game/item/ItemEgg.java b/java/src/common/item/ItemEgg.java similarity index 83% rename from java/src/game/item/ItemEgg.java rename to java/src/common/item/ItemEgg.java index 2f95774..ec3c8ff 100755 --- a/java/src/game/item/ItemEgg.java +++ b/java/src/common/item/ItemEgg.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityEgg; -import game.init.SoundEvent; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityEgg; +import common.init.SoundEvent; +import common.world.World; public class ItemEgg extends Item { diff --git a/java/src/game/item/ItemEnchantedBook.java b/java/src/common/item/ItemEnchantedBook.java similarity index 94% rename from java/src/game/item/ItemEnchantedBook.java rename to java/src/common/item/ItemEnchantedBook.java index ebdf3e9..c923726 100755 --- a/java/src/game/item/ItemEnchantedBook.java +++ b/java/src/common/item/ItemEnchantedBook.java @@ -1,17 +1,17 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.enchantment.RngEnchantment; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.model.ItemMeshDefinition; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; +import common.color.TextColor; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.enchantment.RngEnchantment; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.model.ItemMeshDefinition; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; public class ItemEnchantedBook extends Item { diff --git a/java/src/game/item/ItemExpBottle.java b/java/src/common/item/ItemExpBottle.java similarity index 84% rename from java/src/game/item/ItemExpBottle.java rename to java/src/common/item/ItemExpBottle.java index 9d5fd72..ce0b567 100755 --- a/java/src/game/item/ItemExpBottle.java +++ b/java/src/common/item/ItemExpBottle.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.entity.item.EntityXpBottle; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.world.World; +import common.entity.item.EntityXpBottle; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.world.World; public class ItemExpBottle extends Item { diff --git a/java/src/game/item/ItemExterminator.java b/java/src/common/item/ItemExterminator.java similarity index 84% rename from java/src/game/item/ItemExterminator.java rename to java/src/common/item/ItemExterminator.java index 002554b..6892a5d 100755 --- a/java/src/game/item/ItemExterminator.java +++ b/java/src/common/item/ItemExterminator.java @@ -1,11 +1,11 @@ -package game.item; +package common.item; -import game.color.TextColor; -import game.dimension.Space; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.world.World; -import game.world.WorldServer; +import common.color.TextColor; +import common.dimension.Space; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.world.World; +import common.world.WorldServer; public class ItemExterminator extends ItemMagnetic { public ItemExterminator() { diff --git a/java/src/game/item/ItemFence.java b/java/src/common/item/ItemFence.java similarity index 90% rename from java/src/game/item/ItemFence.java rename to java/src/common/item/ItemFence.java index 846c9dc..38089d5 100755 --- a/java/src/game/item/ItemFence.java +++ b/java/src/common/item/ItemFence.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockFence; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.block.BlockFence; +import common.model.Model; +import common.model.ModelProvider; public class ItemFence extends ItemBlock { public ItemFence(Block block) { diff --git a/java/src/game/item/ItemFireball.java b/java/src/common/item/ItemFireball.java similarity index 83% rename from java/src/game/item/ItemFireball.java rename to java/src/common/item/ItemFireball.java index dc9dc57..e3d7746 100755 --- a/java/src/game/item/ItemFireball.java +++ b/java/src/common/item/ItemFireball.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.SoundEvent; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +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.world.World; public class ItemFireball extends Item { diff --git a/java/src/game/item/ItemFirework.java b/java/src/common/item/ItemFirework.java similarity index 89% rename from java/src/game/item/ItemFirework.java rename to java/src/common/item/ItemFirework.java index 5f606c9..7adeda8 100755 --- a/java/src/game/item/ItemFirework.java +++ b/java/src/common/item/ItemFirework.java @@ -1,15 +1,15 @@ -package game.item; +package common.item; import java.util.List; -import game.collect.Lists; -import game.entity.item.EntityFireworks; -import game.entity.npc.EntityNPC; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.collect.Lists; +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.world.World; public class ItemFirework extends Item { diff --git a/java/src/game/item/ItemFireworkCharge.java b/java/src/common/item/ItemFireworkCharge.java similarity index 95% rename from java/src/game/item/ItemFireworkCharge.java rename to java/src/common/item/ItemFireworkCharge.java index e239551..9d0a7f8 100755 --- a/java/src/game/item/ItemFireworkCharge.java +++ b/java/src/common/item/ItemFireworkCharge.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; import java.util.List; -import game.color.DyeColor; -import game.entity.npc.EntityNPC; -import game.model.Model; -import game.model.ModelProvider; -import game.nbt.NBTBase; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagIntArray; +import common.color.DyeColor; +import common.entity.npc.EntityNPC; +import common.model.Model; +import common.model.ModelProvider; +import common.nbt.NBTBase; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagIntArray; public class ItemFireworkCharge extends Item { diff --git a/java/src/game/item/ItemFishFood.java b/java/src/common/item/ItemFishFood.java similarity index 94% rename from java/src/game/item/ItemFishFood.java rename to java/src/common/item/ItemFishFood.java index c5464fa..2a0f9b4 100755 --- a/java/src/game/item/ItemFishFood.java +++ b/java/src/common/item/ItemFishFood.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; import java.util.List; import java.util.Map; -import game.collect.Maps; -import game.entity.npc.EntityNPC; -import game.model.Model; -import game.model.ModelProvider; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.potion.PotionHelper; -import game.world.World; +import common.collect.Maps; +import common.entity.npc.EntityNPC; +import common.model.Model; +import common.model.ModelProvider; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.potion.PotionHelper; +import common.world.World; public class ItemFishFood extends ItemFood { diff --git a/java/src/game/item/ItemFishingRod.java b/java/src/common/item/ItemFishingRod.java similarity index 90% rename from java/src/game/item/ItemFishingRod.java rename to java/src/common/item/ItemFishingRod.java index da31478..91f0c75 100755 --- a/java/src/game/item/ItemFishingRod.java +++ b/java/src/common/item/ItemFishingRod.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; import java.util.List; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityHook; -import game.init.SoundEvent; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityHook; +import common.init.SoundEvent; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.world.World; public class ItemFishingRod extends Item { diff --git a/java/src/game/item/ItemFlintAndSteel.java b/java/src/common/item/ItemFlintAndSteel.java similarity index 81% rename from java/src/game/item/ItemFlintAndSteel.java rename to java/src/common/item/ItemFlintAndSteel.java index 677ca10..ac5e63e 100755 --- a/java/src/game/item/ItemFlintAndSteel.java +++ b/java/src/common/item/ItemFlintAndSteel.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.SoundEvent; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +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.world.World; public class ItemFlintAndSteel extends Item { diff --git a/java/src/game/item/ItemFood.java b/java/src/common/item/ItemFood.java similarity index 94% rename from java/src/game/item/ItemFood.java rename to java/src/common/item/ItemFood.java index 346a215..cf71fa5 100755 --- a/java/src/game/item/ItemFood.java +++ b/java/src/common/item/ItemFood.java @@ -1,10 +1,10 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.world.World; public class ItemFood extends Item { diff --git a/java/src/game/item/ItemFragile.java b/java/src/common/item/ItemFragile.java similarity index 82% rename from java/src/game/item/ItemFragile.java rename to java/src/common/item/ItemFragile.java index 1b0087b..3905b3a 100755 --- a/java/src/game/item/ItemFragile.java +++ b/java/src/common/item/ItemFragile.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public class ItemFragile extends Item { public boolean isFragile() { diff --git a/java/src/game/item/ItemGlassBottle.java b/java/src/common/item/ItemGlassBottle.java similarity index 88% rename from java/src/game/item/ItemGlassBottle.java rename to java/src/common/item/ItemGlassBottle.java index 5d765c6..84e73ed 100755 --- a/java/src/game/item/ItemGlassBottle.java +++ b/java/src/common/item/ItemGlassBottle.java @@ -1,13 +1,13 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.material.Material; -import game.model.Model; -import game.model.ModelProvider; -import game.world.BlockPos; -import game.world.HitPosition; -import game.world.World; +import common.entity.npc.EntityNPC; +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.world.World; public class ItemGlassBottle extends Item { diff --git a/java/src/game/item/ItemGunBase.java b/java/src/common/item/ItemGunBase.java similarity index 88% rename from java/src/game/item/ItemGunBase.java rename to java/src/common/item/ItemGunBase.java index 437bb77..26fbc81 100755 --- a/java/src/game/item/ItemGunBase.java +++ b/java/src/common/item/ItemGunBase.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentHelper; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityBullet; -import game.init.SoundEvent; -import game.model.Transforms; -import game.world.World; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityBullet; +import common.init.SoundEvent; +import common.model.Transforms; +import common.world.World; public abstract class ItemGunBase extends Item { diff --git a/java/src/game/item/ItemHoe.java b/java/src/common/item/ItemHoe.java similarity index 89% rename from java/src/game/item/ItemHoe.java rename to java/src/common/item/ItemHoe.java index 30ab087..c0cee67 100755 --- a/java/src/game/item/ItemHoe.java +++ b/java/src/common/item/ItemHoe.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockDirt; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.ToolMaterial; -import game.material.Material; -import game.model.Transforms; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockDirt; +import common.entity.npc.EntityNPC; +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.world.State; +import common.world.World; public class ItemHoe extends Item { diff --git a/java/src/game/item/ItemHorseArmor.java b/java/src/common/item/ItemHorseArmor.java similarity index 87% rename from java/src/game/item/ItemHorseArmor.java rename to java/src/common/item/ItemHorseArmor.java index d987a42..a976e1a 100755 --- a/java/src/game/item/ItemHorseArmor.java +++ b/java/src/common/item/ItemHorseArmor.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.init.ToolMaterial; +import common.init.ToolMaterial; public class ItemHorseArmor extends Item { private final ToolMaterial material; diff --git a/java/src/game/item/ItemHugeMushroom.java b/java/src/common/item/ItemHugeMushroom.java similarity index 79% rename from java/src/game/item/ItemHugeMushroom.java rename to java/src/common/item/ItemHugeMushroom.java index 06f4969..9ed6841 100755 --- a/java/src/game/item/ItemHugeMushroom.java +++ b/java/src/common/item/ItemHugeMushroom.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.block.Block; +import common.block.Block; public class ItemHugeMushroom extends ItemBlock { public ItemHugeMushroom(Block block) { diff --git a/java/src/game/item/ItemInfoWand.java b/java/src/common/item/ItemInfoWand.java similarity index 76% rename from java/src/game/item/ItemInfoWand.java rename to java/src/common/item/ItemInfoWand.java index c203564..3b93afb 100755 --- a/java/src/game/item/ItemInfoWand.java +++ b/java/src/common/item/ItemInfoWand.java @@ -1,11 +1,11 @@ -package game.item; +package common.item; -import game.biome.Biome; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.WorldServer; +import common.biome.Biome; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.world.BlockPos; +import common.world.Vec3; +import common.world.WorldServer; public class ItemInfoWand extends ItemWand { public ItemInfoWand() { diff --git a/java/src/game/item/ItemKey.java b/java/src/common/item/ItemKey.java similarity index 69% rename from java/src/game/item/ItemKey.java rename to java/src/common/item/ItemKey.java index 27438c7..3eef65b 100755 --- a/java/src/game/item/ItemKey.java +++ b/java/src/common/item/ItemKey.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemKey extends ItemMagnetic { public Transforms getTransform() { diff --git a/java/src/game/item/ItemLead.java b/java/src/common/item/ItemLead.java similarity index 84% rename from java/src/game/item/ItemLead.java rename to java/src/common/item/ItemLead.java index 03c7103..fb8e6e8 100755 --- a/java/src/game/item/ItemLead.java +++ b/java/src/common/item/ItemLead.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockFence; -import game.entity.item.EntityLeashKnot; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.World; +import common.block.Block; +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.world.World; public class ItemLead extends Item { diff --git a/java/src/game/item/ItemLeaves.java b/java/src/common/item/ItemLeaves.java similarity index 93% rename from java/src/game/item/ItemLeaves.java rename to java/src/common/item/ItemLeaves.java index b2b08fc..16e91d0 100755 --- a/java/src/game/item/ItemLeaves.java +++ b/java/src/common/item/ItemLeaves.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.block.BlockLeaves; -import game.block.LeavesType; +import common.block.BlockLeaves; +import common.block.LeavesType; public class ItemLeaves extends ItemBlock { diff --git a/java/src/game/item/ItemLightning.java b/java/src/common/item/ItemLightning.java similarity index 77% rename from java/src/game/item/ItemLightning.java rename to java/src/common/item/ItemLightning.java index f796fd4..e3c8080 100755 --- a/java/src/game/item/ItemLightning.java +++ b/java/src/common/item/ItemLightning.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.world.Vec3; -import game.world.WorldServer; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.world.Vec3; +import common.world.WorldServer; public class ItemLightning extends ItemWand { public ItemLightning() { diff --git a/java/src/game/item/ItemLilyPad.java b/java/src/common/item/ItemLilyPad.java similarity index 86% rename from java/src/game/item/ItemLilyPad.java rename to java/src/common/item/ItemLilyPad.java index 3e533a6..d56843e 100755 --- a/java/src/game/item/ItemLilyPad.java +++ b/java/src/common/item/ItemLilyPad.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockDirectional; -import game.block.BlockLiquid; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.world.BlockPos; -import game.world.HitPosition; -import game.world.State; -import game.world.World; +import common.block.Block; +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.world.State; +import common.world.World; public class ItemLilyPad extends ItemColored { diff --git a/java/src/game/item/ItemMagnet.java b/java/src/common/item/ItemMagnet.java similarity index 88% rename from java/src/game/item/ItemMagnet.java rename to java/src/common/item/ItemMagnet.java index 2a03a84..bf9c45a 100755 --- a/java/src/game/item/ItemMagnet.java +++ b/java/src/common/item/ItemMagnet.java @@ -1,15 +1,15 @@ -package game.item; +package common.item; import java.util.List; import java.util.function.Predicate; -import game.entity.Entity; -import game.entity.animal.EntityChicken; -import game.entity.npc.EntityNPC; -import game.model.Transforms; -import game.world.BoundingBox; -import game.world.Vec3; -import game.world.World; +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.world.World; public class ItemMagnet extends Item { private final boolean chicken; diff --git a/java/src/game/item/ItemMagnetic.java b/java/src/common/item/ItemMagnetic.java similarity index 82% rename from java/src/game/item/ItemMagnetic.java rename to java/src/common/item/ItemMagnetic.java index 9bc1b6b..bcf2d1c 100755 --- a/java/src/game/item/ItemMagnetic.java +++ b/java/src/common/item/ItemMagnetic.java @@ -1,4 +1,4 @@ -package game.item; +package common.item; public class ItemMagnetic extends Item { public boolean isMagnetic() { diff --git a/java/src/game/item/ItemMetal.java b/java/src/common/item/ItemMetal.java similarity index 82% rename from java/src/game/item/ItemMetal.java rename to java/src/common/item/ItemMetal.java index 428ac93..9d798b3 100755 --- a/java/src/game/item/ItemMetal.java +++ b/java/src/common/item/ItemMetal.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; import java.util.List; import java.util.Map; import java.util.Set; -import game.collect.Sets; -import game.color.TextColor; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.init.MetalType; +import common.collect.Sets; +import common.color.TextColor; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.init.MetalType; public class ItemMetal extends Item { private final MetalType metal; diff --git a/java/src/game/item/ItemMetalBlock.java b/java/src/common/item/ItemMetalBlock.java similarity index 83% rename from java/src/game/item/ItemMetalBlock.java rename to java/src/common/item/ItemMetalBlock.java index 68a09cb..4a6a37e 100755 --- a/java/src/game/item/ItemMetalBlock.java +++ b/java/src/common/item/ItemMetalBlock.java @@ -1,17 +1,17 @@ -package game.item; +package common.item; import java.util.List; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.collect.Sets; -import game.color.TextColor; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.init.MetalType; +import common.block.Block; +import common.collect.Sets; +import common.color.TextColor; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.init.MetalType; public class ItemMetalBlock extends ItemBlock { private final MetalType metal; diff --git a/java/src/game/item/ItemMinecart.java b/java/src/common/item/ItemMinecart.java similarity index 91% rename from java/src/game/item/ItemMinecart.java rename to java/src/common/item/ItemMinecart.java index 8193a71..66e8a4d 100755 --- a/java/src/game/item/ItemMinecart.java +++ b/java/src/common/item/ItemMinecart.java @@ -1,18 +1,18 @@ -package game.item; +package common.item; -import game.block.BlockDispenser; -import game.block.BlockRailBase; -import game.dispenser.BehaviorDefaultDispenseItem; -import game.dispenser.IBehaviorDispenseItem; -import game.dispenser.IBlockSource; -import game.entity.item.EntityCart; -import game.entity.npc.EntityNPC; -import game.init.DispenserRegistry; -import game.material.Material; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.BlockDispenser; +import common.block.BlockRailBase; +import common.dispenser.BehaviorDefaultDispenseItem; +import common.dispenser.IBehaviorDispenseItem; +import common.dispenser.IBlockSource; +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.world.State; +import common.world.World; public class ItemMinecart extends Item { diff --git a/java/src/game/item/ItemMonsterPlacer.java b/java/src/common/item/ItemMonsterPlacer.java similarity index 92% rename from java/src/game/item/ItemMonsterPlacer.java rename to java/src/common/item/ItemMonsterPlacer.java index a1768de..f24d1d6 100755 --- a/java/src/game/item/ItemMonsterPlacer.java +++ b/java/src/common/item/ItemMonsterPlacer.java @@ -1,28 +1,28 @@ -package game.item; +package common.item; import java.util.List; -import game.block.BlockFence; -import game.block.BlockLiquid; -import game.color.TextColor; -import game.dimension.Dimension; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.EntityEggInfo; -import game.init.EntityRegistry; -import game.init.UniverseRegistry; -import game.model.Model; -import game.model.ModelProvider; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMobSpawner; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.HitPosition; -import game.world.State; -import game.world.World; +import common.block.BlockFence; +import common.block.BlockLiquid; +import common.color.TextColor; +import common.dimension.Dimension; +import common.entity.Entity; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.EntityEggInfo; +import common.init.EntityRegistry; +import common.init.UniverseRegistry; +import common.model.Model; +import common.model.ModelProvider; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityMobSpawner; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.HitPosition; +import common.world.State; +import common.world.World; public class ItemMonsterPlacer extends Item { diff --git a/java/src/game/item/ItemMultiTexture.java b/java/src/common/item/ItemMultiTexture.java similarity index 97% rename from java/src/game/item/ItemMultiTexture.java rename to java/src/common/item/ItemMultiTexture.java index 4fc0196..4a85c9f 100755 --- a/java/src/game/item/ItemMultiTexture.java +++ b/java/src/common/item/ItemMultiTexture.java @@ -1,8 +1,8 @@ -package game.item; +package common.item; import java.util.function.Function; -import game.block.Block; +import common.block.Block; public class ItemMultiTexture extends ItemBlock { diff --git a/java/src/game/item/ItemNameTag.java b/java/src/common/item/ItemNameTag.java similarity index 89% rename from java/src/game/item/ItemNameTag.java rename to java/src/common/item/ItemNameTag.java index 641f803..8b6d2dd 100755 --- a/java/src/game/item/ItemNameTag.java +++ b/java/src/common/item/ItemNameTag.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; public class ItemNameTag extends Item { diff --git a/java/src/game/item/ItemNpcSpawner.java b/java/src/common/item/ItemNpcSpawner.java similarity index 90% rename from java/src/game/item/ItemNpcSpawner.java rename to java/src/common/item/ItemNpcSpawner.java index 5758549..31fa225 100755 --- a/java/src/game/item/ItemNpcSpawner.java +++ b/java/src/common/item/ItemNpcSpawner.java @@ -1,27 +1,27 @@ -package game.item; +package common.item; import java.lang.reflect.InvocationTargetException; import java.util.List; -import game.block.BlockFence; -import game.block.BlockLiquid; -import game.color.TextColor; -import game.dimension.Dimension; -import game.entity.Entity; -import game.entity.npc.CharacterInfo; -import game.entity.npc.EntityNPC; -import game.entity.npc.EntityNPC.CharacterTypeData; -import game.entity.types.EntityLiving; -import game.init.EntityRegistry; -import game.init.UniverseRegistry; -import game.model.Model; -import game.model.ModelProvider; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.HitPosition; -import game.world.State; -import game.world.World; +import common.block.BlockFence; +import common.block.BlockLiquid; +import common.color.TextColor; +import common.dimension.Dimension; +import common.entity.Entity; +import common.entity.npc.CharacterInfo; +import common.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC.CharacterTypeData; +import common.entity.types.EntityLiving; +import common.init.EntityRegistry; +import common.init.UniverseRegistry; +import common.model.Model; +import common.model.ModelProvider; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.HitPosition; +import common.world.State; +import common.world.World; public class ItemNpcSpawner extends Item { diff --git a/java/src/game/item/ItemNugget.java b/java/src/common/item/ItemNugget.java similarity index 69% rename from java/src/game/item/ItemNugget.java rename to java/src/common/item/ItemNugget.java index ad2f783..2fd2aef 100755 --- a/java/src/game/item/ItemNugget.java +++ b/java/src/common/item/ItemNugget.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemNugget extends Item { public Transforms getTransform() { diff --git a/java/src/game/item/ItemPickaxe.java b/java/src/common/item/ItemPickaxe.java similarity index 96% rename from java/src/game/item/ItemPickaxe.java rename to java/src/common/item/ItemPickaxe.java index 222e01b..1abbc61 100755 --- a/java/src/game/item/ItemPickaxe.java +++ b/java/src/common/item/ItemPickaxe.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.block.Block; -import game.init.ToolMaterial; +import common.block.Block; +import common.init.ToolMaterial; public class ItemPickaxe extends ItemTool { diff --git a/java/src/game/item/ItemPiston.java b/java/src/common/item/ItemPiston.java similarity index 84% rename from java/src/game/item/ItemPiston.java rename to java/src/common/item/ItemPiston.java index e5b6723..1b83d88 100755 --- a/java/src/game/item/ItemPiston.java +++ b/java/src/common/item/ItemPiston.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.block.Block; -import game.init.Blocks; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.init.Blocks; +import common.model.Model; +import common.model.ModelProvider; public class ItemPiston extends ItemBlock { diff --git a/java/src/game/item/ItemPotion.java b/java/src/common/item/ItemPotion.java similarity index 96% rename from java/src/game/item/ItemPotion.java rename to java/src/common/item/ItemPotion.java index 556090e..40aa95f 100755 --- a/java/src/game/item/ItemPotion.java +++ b/java/src/common/item/ItemPotion.java @@ -1,27 +1,28 @@ -package game.item; +package common.item; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.collect.Maps; -import game.collect.Sets; -import game.color.TextColor; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntityPotion; -import game.init.Items; -import game.init.SoundEvent; -import game.model.ItemMeshDefinition; -import game.model.Model; -import game.model.ModelProvider; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.potion.PotionHelper; -import game.world.World; +import common.collect.Maps; +import common.collect.Sets; +import common.color.TextColor; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntityPotion; +import common.init.Items; +import common.init.SoundEvent; +import common.model.ItemMeshDefinition; +import common.model.Model; +import common.model.ModelProvider; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.potion.PotionHelper; +import common.world.World; + +import java.util.Set; public class ItemPotion extends Item { diff --git a/java/src/game/item/ItemPressurePlate.java b/java/src/common/item/ItemPressurePlate.java similarity index 78% rename from java/src/game/item/ItemPressurePlate.java rename to java/src/common/item/ItemPressurePlate.java index 0488c5b..5a246b2 100755 --- a/java/src/game/item/ItemPressurePlate.java +++ b/java/src/common/item/ItemPressurePlate.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockBasePressurePlate; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.block.BlockBasePressurePlate; +import common.model.Model; +import common.model.ModelProvider; public class ItemPressurePlate extends ItemBlock { public ItemPressurePlate(Block block) { diff --git a/java/src/game/item/ItemRecord.java b/java/src/common/item/ItemRecord.java similarity index 75% rename from java/src/game/item/ItemRecord.java rename to java/src/common/item/ItemRecord.java index 1cd10dd..ae209bc 100755 --- a/java/src/game/item/ItemRecord.java +++ b/java/src/common/item/ItemRecord.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.model.Model; -import game.model.ModelProvider; +import common.model.Model; +import common.model.ModelProvider; public class ItemRecord extends Item { public ItemRecord() { diff --git a/java/src/game/item/ItemRedstone.java b/java/src/common/item/ItemRedstone.java similarity index 85% rename from java/src/game/item/ItemRedstone.java rename to java/src/common/item/ItemRedstone.java index 0c8fe07..53fc6be 100755 --- a/java/src/game/item/ItemRedstone.java +++ b/java/src/common/item/ItemRedstone.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.block.Block; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +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.world.World; public class ItemRedstone extends Item { diff --git a/java/src/game/item/ItemReed.java b/java/src/common/item/ItemReed.java similarity index 88% rename from java/src/game/item/ItemReed.java rename to java/src/common/item/ItemReed.java index 99722fd..1538e73 100755 --- a/java/src/game/item/ItemReed.java +++ b/java/src/common/item/ItemReed.java @@ -1,14 +1,14 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockSnow; -import game.entity.Entity; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +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.world.State; +import common.world.World; public class ItemReed extends Item { diff --git a/java/src/game/item/ItemRod.java b/java/src/common/item/ItemRod.java similarity index 68% rename from java/src/game/item/ItemRod.java rename to java/src/common/item/ItemRod.java index 8e5934f..567d491 100755 --- a/java/src/game/item/ItemRod.java +++ b/java/src/common/item/ItemRod.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemRod extends Item { public Transforms getTransform() { diff --git a/java/src/game/item/ItemSaddle.java b/java/src/common/item/ItemSaddle.java similarity index 89% rename from java/src/game/item/ItemSaddle.java rename to java/src/common/item/ItemSaddle.java index 60c9022..f872541 100755 --- a/java/src/game/item/ItemSaddle.java +++ b/java/src/common/item/ItemSaddle.java @@ -1,8 +1,8 @@ -package game.item; +package common.item; -import game.entity.animal.EntityPig; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; +import common.entity.animal.EntityPig; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; public class ItemSaddle extends Item { diff --git a/java/src/game/item/ItemSeedFood.java b/java/src/common/item/ItemSeedFood.java similarity index 87% rename from java/src/game/item/ItemSeedFood.java rename to java/src/common/item/ItemSeedFood.java index c268093..abe4ad1 100755 --- a/java/src/game/item/ItemSeedFood.java +++ b/java/src/common/item/ItemSeedFood.java @@ -1,10 +1,10 @@ -package game.item; +package common.item; -import game.block.Block; -import game.entity.npc.EntityNPC; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.block.Block; +import common.entity.npc.EntityNPC; +import common.world.BlockPos; +import common.world.Facing; +import common.world.World; public class ItemSeedFood extends ItemFood { diff --git a/java/src/game/item/ItemSeeds.java b/java/src/common/item/ItemSeeds.java similarity index 85% rename from java/src/game/item/ItemSeeds.java rename to java/src/common/item/ItemSeeds.java index c9e243c..9cbcadf 100755 --- a/java/src/game/item/ItemSeeds.java +++ b/java/src/common/item/ItemSeeds.java @@ -1,11 +1,11 @@ -package game.item; +package common.item; -import game.block.Block; -import game.entity.npc.EntityNPC; -import game.model.Transforms; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.block.Block; +import common.entity.npc.EntityNPC; +import common.model.Transforms; +import common.world.BlockPos; +import common.world.Facing; +import common.world.World; public class ItemSeeds extends Item { diff --git a/java/src/game/item/ItemShears.java b/java/src/common/item/ItemShears.java similarity index 88% rename from java/src/game/item/ItemShears.java rename to java/src/common/item/ItemShears.java index 4e7ecf3..dc40068 100755 --- a/java/src/game/item/ItemShears.java +++ b/java/src/common/item/ItemShears.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.block.Block; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.ToolMaterial; -import game.material.Material; -import game.world.BlockPos; -import game.world.World; +import common.block.Block; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.ToolMaterial; +import common.material.Material; +import common.world.BlockPos; +import common.world.World; public class ItemShears extends Item { diff --git a/java/src/game/item/ItemSign.java b/java/src/common/item/ItemSign.java similarity index 85% rename from java/src/game/item/ItemSign.java rename to java/src/common/item/ItemSign.java index 81e2b7f..07affb8 100755 --- a/java/src/game/item/ItemSign.java +++ b/java/src/common/item/ItemSign.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockStandingSign; -import game.block.BlockWallSign; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.tileentity.TileEntity; -import game.tileentity.TileEntitySign; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.block.Block; +import common.block.BlockStandingSign; +import common.block.BlockWallSign; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.tileentity.TileEntity; +import common.tileentity.TileEntitySign; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.World; public class ItemSign extends Item { diff --git a/java/src/game/item/ItemSkull.java b/java/src/common/item/ItemSkull.java similarity index 91% rename from java/src/game/item/ItemSkull.java rename to java/src/common/item/ItemSkull.java index 0def762..da83cc3 100755 --- a/java/src/game/item/ItemSkull.java +++ b/java/src/common/item/ItemSkull.java @@ -1,19 +1,19 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockSkull; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.model.Model; -import game.model.ModelProvider; -import game.model.Transforms; -import game.tileentity.TileEntity; -import game.tileentity.TileEntitySkull; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockSkull; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.model.Model; +import common.model.ModelProvider; +import common.model.Transforms; +import common.tileentity.TileEntity; +import common.tileentity.TileEntitySkull; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class ItemSkull extends Item { diff --git a/java/src/game/item/ItemSlab.java b/java/src/common/item/ItemSlab.java similarity index 96% rename from java/src/game/item/ItemSlab.java rename to java/src/common/item/ItemSlab.java index 6665cf7..fa3d824 100755 --- a/java/src/game/item/ItemSlab.java +++ b/java/src/common/item/ItemSlab.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockSlab; -import game.entity.npc.EntityNPC; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.block.BlockSlab; +import common.entity.npc.EntityNPC; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.World; public class ItemSlab extends ItemBlock { diff --git a/java/src/game/item/ItemSmall.java b/java/src/common/item/ItemSmall.java similarity index 68% rename from java/src/game/item/ItemSmall.java rename to java/src/common/item/ItemSmall.java index 0278dbc..8ddcaa2 100755 --- a/java/src/game/item/ItemSmall.java +++ b/java/src/common/item/ItemSmall.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemSmall extends Item { public Transforms getTransform() { diff --git a/java/src/game/item/ItemSnow.java b/java/src/common/item/ItemSnow.java similarity index 89% rename from java/src/game/item/ItemSnow.java rename to java/src/common/item/ItemSnow.java index b51dcf1..4dbd517 100755 --- a/java/src/game/item/ItemSnow.java +++ b/java/src/common/item/ItemSnow.java @@ -1,13 +1,13 @@ -package game.item; +package common.item; -import game.block.Block; -import game.block.BlockSnow; -import game.entity.npc.EntityNPC; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; -import game.world.World; +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.world.State; +import common.world.World; public class ItemSnow extends ItemBlock { diff --git a/java/src/game/item/ItemSnowball.java b/java/src/common/item/ItemSnowball.java similarity index 82% rename from java/src/game/item/ItemSnowball.java rename to java/src/common/item/ItemSnowball.java index 7d1cb5e..efdf480 100755 --- a/java/src/game/item/ItemSnowball.java +++ b/java/src/common/item/ItemSnowball.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.entity.projectile.EntitySnowball; -import game.init.SoundEvent; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.entity.projectile.EntitySnowball; +import common.init.SoundEvent; +import common.world.World; public class ItemSnowball extends Item { diff --git a/java/src/game/item/ItemSoup.java b/java/src/common/item/ItemSoup.java similarity index 81% rename from java/src/game/item/ItemSoup.java rename to java/src/common/item/ItemSoup.java index 0cd6946..daf6eba 100755 --- a/java/src/game/item/ItemSoup.java +++ b/java/src/common/item/ItemSoup.java @@ -1,9 +1,9 @@ -package game.item; +package common.item; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.model.Transforms; -import game.world.World; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.model.Transforms; +import common.world.World; public class ItemSoup extends ItemFood { diff --git a/java/src/game/item/ItemSpaceNavigator.java b/java/src/common/item/ItemSpaceNavigator.java similarity index 91% rename from java/src/game/item/ItemSpaceNavigator.java rename to java/src/common/item/ItemSpaceNavigator.java index 0a78457..5702a15 100755 --- a/java/src/game/item/ItemSpaceNavigator.java +++ b/java/src/common/item/ItemSpaceNavigator.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.init.UniverseRegistry; -import game.world.BlockPos; -import game.world.World; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.init.UniverseRegistry; +import common.world.BlockPos; +import common.world.World; public class ItemSpaceNavigator extends ItemMagnetic { public static String formatImperialTime(World world, boolean days) { diff --git a/java/src/game/item/ItemSpade.java b/java/src/common/item/ItemSpade.java similarity index 86% rename from java/src/game/item/ItemSpade.java rename to java/src/common/item/ItemSpade.java index 0ffae40..f2633c7 100755 --- a/java/src/game/item/ItemSpade.java +++ b/java/src/common/item/ItemSpade.java @@ -1,8 +1,8 @@ -package game.item; +package common.item; -import game.block.Block; -import game.init.ToolMaterial; -import game.material.Material; +import common.block.Block; +import common.init.ToolMaterial; +import common.material.Material; public class ItemSpade extends ItemTool { diff --git a/java/src/game/item/ItemStack.java b/java/src/common/item/ItemStack.java similarity index 98% rename from java/src/game/item/ItemStack.java rename to java/src/common/item/ItemStack.java index 11c034a..a24ad02 100755 --- a/java/src/game/item/ItemStack.java +++ b/java/src/common/item/ItemStack.java @@ -1,32 +1,33 @@ -package game.item; +package common.item; import java.text.DecimalFormat; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.color.TextColor; -import game.enchantment.Enchantment; -import game.enchantment.EnchantmentDurability; -import game.enchantment.EnchantmentHelper; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.BlockRegistry; -import game.init.ItemRegistry; -import game.nbt.NBTBase; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.World; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.color.TextColor; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentDurability; +import common.enchantment.EnchantmentHelper; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.BlockRegistry; +import common.init.ItemRegistry; +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.world.World; + +import java.util.Set; public final class ItemStack { diff --git a/java/src/game/item/ItemStick.java b/java/src/common/item/ItemStick.java similarity index 68% rename from java/src/game/item/ItemStick.java rename to java/src/common/item/ItemStick.java index fe18c93..20113f5 100755 --- a/java/src/game/item/ItemStick.java +++ b/java/src/common/item/ItemStick.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemStick extends Item { public Transforms getTransform() { diff --git a/java/src/game/item/ItemSword.java b/java/src/common/item/ItemSword.java similarity index 90% rename from java/src/game/item/ItemSword.java rename to java/src/common/item/ItemSword.java index a3e942b..fb9c576 100755 --- a/java/src/game/item/ItemSword.java +++ b/java/src/common/item/ItemSword.java @@ -1,21 +1,21 @@ -package game.item; +package common.item; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.collect.Sets; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.ToolMaterial; -import game.material.Material; -import game.model.Transforms; -import game.world.BlockPos; -import game.world.World; +import common.block.Block; +import common.collect.Sets; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.ToolMaterial; +import common.material.Material; +import common.model.Transforms; +import common.world.BlockPos; +import common.world.World; public class ItemSword extends Item { diff --git a/java/src/game/item/ItemTNT.java b/java/src/common/item/ItemTNT.java similarity index 88% rename from java/src/game/item/ItemTNT.java rename to java/src/common/item/ItemTNT.java index 4e3548a..6aa1b7d 100755 --- a/java/src/game/item/ItemTNT.java +++ b/java/src/common/item/ItemTNT.java @@ -1,7 +1,7 @@ -package game.item; +package common.item; -import game.block.Block; -import game.color.TextColor; +import common.block.Block; +import common.color.TextColor; public class ItemTNT extends ItemBlock { diff --git a/java/src/game/item/ItemTiny.java b/java/src/common/item/ItemTiny.java similarity index 68% rename from java/src/game/item/ItemTiny.java rename to java/src/common/item/ItemTiny.java index 5afe04c..96b9e8f 100755 --- a/java/src/game/item/ItemTiny.java +++ b/java/src/common/item/ItemTiny.java @@ -1,6 +1,6 @@ -package game.item; +package common.item; -import game.model.Transforms; +import common.model.Transforms; public class ItemTiny extends Item { public Transforms getTransform() { diff --git a/java/src/game/item/ItemTool.java b/java/src/common/item/ItemTool.java similarity index 89% rename from java/src/game/item/ItemTool.java rename to java/src/common/item/ItemTool.java index ae32886..039ca45 100755 --- a/java/src/game/item/ItemTool.java +++ b/java/src/common/item/ItemTool.java @@ -1,18 +1,18 @@ -package game.item; +package common.item; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.collect.Sets; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.init.ToolMaterial; -import game.model.Transforms; -import game.world.BlockPos; -import game.world.World; +import common.block.Block; +import common.collect.Sets; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.init.ToolMaterial; +import common.model.Transforms; +import common.world.BlockPos; +import common.world.World; public abstract class ItemTool extends Item { diff --git a/java/src/game/item/ItemWall.java b/java/src/common/item/ItemWall.java similarity index 86% rename from java/src/game/item/ItemWall.java rename to java/src/common/item/ItemWall.java index af0d374..0579baa 100755 --- a/java/src/game/item/ItemWall.java +++ b/java/src/common/item/ItemWall.java @@ -1,11 +1,11 @@ -package game.item; +package common.item; import java.util.function.Function; -import game.block.Block; -import game.block.BlockWall; -import game.model.Model; -import game.model.ModelProvider; +import common.block.Block; +import common.block.BlockWall; +import common.model.Model; +import common.model.ModelProvider; public class ItemWall extends ItemMultiTexture { public ItemWall(Block block, Block block2, Function nameFunction) { diff --git a/java/src/game/item/ItemWand.java b/java/src/common/item/ItemWand.java similarity index 89% rename from java/src/game/item/ItemWand.java rename to java/src/common/item/ItemWand.java index 1e0b191..34eb6f6 100755 --- a/java/src/game/item/ItemWand.java +++ b/java/src/common/item/ItemWand.java @@ -1,16 +1,16 @@ -package game.item; +package common.item; import java.util.List; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.model.Transforms; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; -import game.world.Vec3; -import game.world.World; -import game.world.WorldServer; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.model.Transforms; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; +import common.world.Vec3; +import common.world.World; +import common.world.WorldServer; public abstract class ItemWand extends Item { public ItemWand() { diff --git a/java/src/game/item/ItemWeatherToken.java b/java/src/common/item/ItemWeatherToken.java similarity index 83% rename from java/src/game/item/ItemWeatherToken.java rename to java/src/common/item/ItemWeatherToken.java index 2bc3fb7..50ddb53 100755 --- a/java/src/game/item/ItemWeatherToken.java +++ b/java/src/common/item/ItemWeatherToken.java @@ -1,11 +1,11 @@ -package game.item; +package common.item; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.world.Weather; -import game.world.World; -import game.world.WorldServer; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.world.Weather; +import common.world.World; +import common.world.WorldServer; public class ItemWeatherToken extends ItemMagnetic { private final Weather weather; diff --git a/java/src/game/item/RngLoot.java b/java/src/common/item/RngLoot.java similarity index 94% rename from java/src/game/item/RngLoot.java rename to java/src/common/item/RngLoot.java index b4599cd..8c59985 100755 --- a/java/src/game/item/RngLoot.java +++ b/java/src/common/item/RngLoot.java @@ -1,12 +1,12 @@ -package game.item; +package common.item; import java.util.Collections; -import game.inventory.IInventory; -import game.rng.Random; -import game.rng.RngItem; -import game.rng.WeightedList; -import game.tileentity.TileEntityDispenser; +import common.inventory.IInventory; +import common.rng.Random; +import common.rng.RngItem; +import common.rng.WeightedList; +import common.tileentity.TileEntityDispenser; public class RngLoot extends RngItem { diff --git a/java/src/game/log/Log.java b/java/src/common/log/Log.java similarity index 97% rename from java/src/game/log/Log.java rename to java/src/common/log/Log.java index 099f10b..c6deea4 100644 --- a/java/src/game/log/Log.java +++ b/java/src/common/log/Log.java @@ -1,14 +1,14 @@ -package game.log; +package common.log; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; -import game.collect.Lists; -import game.color.TextColor; -import game.future.ListenableFuture; -import game.network.IThreadListener; -import game.util.Util; +import common.collect.Lists; +import common.color.TextColor; +import common.future.ListenableFuture; +import common.network.IThreadListener; +import common.util.Util; public enum Log { SYSTEM("System"), diff --git a/java/src/game/log/LogLevel.java b/java/src/common/log/LogLevel.java similarity index 87% rename from java/src/game/log/LogLevel.java rename to java/src/common/log/LogLevel.java index c299bf0..c16ba5a 100644 --- a/java/src/game/log/LogLevel.java +++ b/java/src/common/log/LogLevel.java @@ -1,8 +1,8 @@ -package game.log; +package common.log; -import game.color.TextColor; -import game.util.Displayable; -import game.util.Identifyable; +import common.color.TextColor; +import common.util.Displayable; +import common.util.Identifyable; public enum LogLevel implements Displayable, Identifyable { SILENT("silent", "Nichts", "UNK?", TextColor.BLACK), diff --git a/java/src/game/log/Message.java b/java/src/common/log/Message.java similarity index 89% rename from java/src/game/log/Message.java rename to java/src/common/log/Message.java index 47146fe..939962d 100644 --- a/java/src/game/log/Message.java +++ b/java/src/common/log/Message.java @@ -1,4 +1,4 @@ -package game.log; +package common.log; public class Message { public final String message; diff --git a/java/src/game/log/NettyLogger.java b/java/src/common/log/NettyLogger.java similarity index 99% rename from java/src/game/log/NettyLogger.java rename to java/src/common/log/NettyLogger.java index dde460e..8371653 100644 --- a/java/src/game/log/NettyLogger.java +++ b/java/src/common/log/NettyLogger.java @@ -1,4 +1,4 @@ -package game.log; +package common.log; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/java/src/game/material/Material.java b/java/src/common/material/Material.java similarity index 99% rename from java/src/game/material/Material.java rename to java/src/common/material/Material.java index a9205f3..c71b80c 100755 --- a/java/src/game/material/Material.java +++ b/java/src/common/material/Material.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class Material { diff --git a/java/src/game/material/MaterialColdFluid.java b/java/src/common/material/MaterialColdFluid.java similarity index 93% rename from java/src/game/material/MaterialColdFluid.java rename to java/src/common/material/MaterialColdFluid.java index 5d27283..9187ad2 100755 --- a/java/src/game/material/MaterialColdFluid.java +++ b/java/src/common/material/MaterialColdFluid.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class MaterialColdFluid extends Material { public MaterialColdFluid() { diff --git a/java/src/game/material/MaterialHotFluid.java b/java/src/common/material/MaterialHotFluid.java similarity index 93% rename from java/src/game/material/MaterialHotFluid.java rename to java/src/common/material/MaterialHotFluid.java index e7a31b1..03b6ca1 100755 --- a/java/src/game/material/MaterialHotFluid.java +++ b/java/src/common/material/MaterialHotFluid.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class MaterialHotFluid extends Material { public MaterialHotFluid() { diff --git a/java/src/game/material/MaterialLogic.java b/java/src/common/material/MaterialLogic.java similarity index 95% rename from java/src/game/material/MaterialLogic.java rename to java/src/common/material/MaterialLogic.java index a5572c6..137eb9a 100755 --- a/java/src/game/material/MaterialLogic.java +++ b/java/src/common/material/MaterialLogic.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class MaterialLogic extends Material { diff --git a/java/src/game/material/MaterialPortal.java b/java/src/common/material/MaterialPortal.java similarity index 95% rename from java/src/game/material/MaterialPortal.java rename to java/src/common/material/MaterialPortal.java index 56d0362..778d739 100755 --- a/java/src/game/material/MaterialPortal.java +++ b/java/src/common/material/MaterialPortal.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class MaterialPortal extends Material { diff --git a/java/src/game/material/MaterialTransparent.java b/java/src/common/material/MaterialTransparent.java similarity index 96% rename from java/src/game/material/MaterialTransparent.java rename to java/src/common/material/MaterialTransparent.java index 2ab99c4..82af6d1 100755 --- a/java/src/game/material/MaterialTransparent.java +++ b/java/src/common/material/MaterialTransparent.java @@ -1,4 +1,4 @@ -package game.material; +package common.material; public class MaterialTransparent extends Material { diff --git a/java/src/game/model/BlockLayer.java b/java/src/common/model/BlockLayer.java similarity index 93% rename from java/src/game/model/BlockLayer.java rename to java/src/common/model/BlockLayer.java index 3be6166..ec9f03a 100755 --- a/java/src/game/model/BlockLayer.java +++ b/java/src/common/model/BlockLayer.java @@ -1,4 +1,4 @@ -package game.model; +package common.model; public enum BlockLayer { diff --git a/java/src/game/model/ItemMeshDefinition.java b/java/src/common/model/ItemMeshDefinition.java similarity index 62% rename from java/src/game/model/ItemMeshDefinition.java rename to java/src/common/model/ItemMeshDefinition.java index 91b59e2..cd7942e 100755 --- a/java/src/game/model/ItemMeshDefinition.java +++ b/java/src/common/model/ItemMeshDefinition.java @@ -1,6 +1,6 @@ -package game.model; +package common.model; -import game.item.ItemStack; +import common.item.ItemStack; public interface ItemMeshDefinition { diff --git a/java/src/game/model/Model.java b/java/src/common/model/Model.java similarity index 99% rename from java/src/game/model/Model.java rename to java/src/common/model/Model.java index c0c78a8..378a18a 100644 --- a/java/src/game/model/Model.java +++ b/java/src/common/model/Model.java @@ -1,6 +1,6 @@ -package game.model; +package common.model; -import game.world.Facing; +import common.world.Facing; public abstract class Model { public abstract Model noOcclude(); diff --git a/java/src/game/model/ModelProvider.java b/java/src/common/model/ModelProvider.java similarity index 95% rename from java/src/game/model/ModelProvider.java rename to java/src/common/model/ModelProvider.java index d08c37f..5805eaf 100644 --- a/java/src/game/model/ModelProvider.java +++ b/java/src/common/model/ModelProvider.java @@ -1,7 +1,7 @@ -package game.model; +package common.model; -import game.world.Facing; -import game.world.Facing.Axis; +import common.world.Facing; +import common.world.Facing.Axis; public interface ModelProvider { Model getModel(String primary); diff --git a/java/src/game/model/ModelRotation.java b/java/src/common/model/ModelRotation.java similarity index 95% rename from java/src/game/model/ModelRotation.java rename to java/src/common/model/ModelRotation.java index 4551b8a..0329240 100755 --- a/java/src/game/model/ModelRotation.java +++ b/java/src/common/model/ModelRotation.java @@ -1,12 +1,12 @@ -package game.model; +package common.model; import java.util.Map; -import game.collect.Maps; -import game.util.ExtMath; -import game.util.Matrix4f; -import game.util.Vector3f; -import game.world.Facing; +import common.collect.Maps; +import common.util.ExtMath; +import common.util.Matrix4f; +import common.util.Vector3f; +import common.world.Facing; public enum ModelRotation { diff --git a/java/src/game/model/ParticleType.java b/java/src/common/model/ParticleType.java similarity index 97% rename from java/src/game/model/ParticleType.java rename to java/src/common/model/ParticleType.java index 792b8e1..cace491 100755 --- a/java/src/game/model/ParticleType.java +++ b/java/src/common/model/ParticleType.java @@ -1,10 +1,10 @@ -package game.model; +package common.model; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; +import common.collect.Lists; +import common.collect.Maps; public enum ParticleType { diff --git a/java/src/game/model/Transform.java b/java/src/common/model/Transform.java similarity index 95% rename from java/src/game/model/Transform.java rename to java/src/common/model/Transform.java index e546145..4bb0994 100755 --- a/java/src/game/model/Transform.java +++ b/java/src/common/model/Transform.java @@ -1,6 +1,6 @@ -package game.model; +package common.model; -import game.util.Vector3f; +import common.util.Vector3f; public class Transform { public static final Transform IDENTITY = new Transform(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); diff --git a/java/src/game/model/Transforms.java b/java/src/common/model/Transforms.java similarity index 99% rename from java/src/game/model/Transforms.java rename to java/src/common/model/Transforms.java index 60c722c..6333c89 100755 --- a/java/src/game/model/Transforms.java +++ b/java/src/common/model/Transforms.java @@ -1,4 +1,4 @@ -package game.model; +package common.model; public enum Transforms { DEFAULT( diff --git a/java/src/game/nbt/NBTBase.java b/java/src/common/nbt/NBTBase.java similarity index 99% rename from java/src/game/nbt/NBTBase.java rename to java/src/common/nbt/NBTBase.java index 9e9e144..4fe8be1 100755 --- a/java/src/game/nbt/NBTBase.java +++ b/java/src/common/nbt/NBTBase.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTException.java b/java/src/common/nbt/NBTException.java similarity index 86% rename from java/src/game/nbt/NBTException.java rename to java/src/common/nbt/NBTException.java index af15215..0290c39 100755 --- a/java/src/game/nbt/NBTException.java +++ b/java/src/common/nbt/NBTException.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; public class NBTException extends Exception { diff --git a/java/src/game/nbt/NBTLoader.java b/java/src/common/nbt/NBTLoader.java similarity index 99% rename from java/src/game/nbt/NBTLoader.java rename to java/src/common/nbt/NBTLoader.java index c135579..a1d0073 100755 --- a/java/src/game/nbt/NBTLoader.java +++ b/java/src/common/nbt/NBTLoader.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/java/src/game/nbt/NBTParser.java b/java/src/common/nbt/NBTParser.java similarity index 99% rename from java/src/game/nbt/NBTParser.java rename to java/src/common/nbt/NBTParser.java index e4a2e97..8bb650f 100755 --- a/java/src/game/nbt/NBTParser.java +++ b/java/src/common/nbt/NBTParser.java @@ -1,9 +1,9 @@ -package game.nbt; +package common.nbt; import java.util.Stack; import java.util.regex.Pattern; -import game.collect.Lists; +import common.collect.Lists; public class NBTParser { diff --git a/java/src/game/nbt/NBTSizeTracker.java b/java/src/common/nbt/NBTSizeTracker.java similarity index 97% rename from java/src/game/nbt/NBTSizeTracker.java rename to java/src/common/nbt/NBTSizeTracker.java index 6075e06..140df95 100755 --- a/java/src/game/nbt/NBTSizeTracker.java +++ b/java/src/common/nbt/NBTSizeTracker.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; public class NBTSizeTracker { diff --git a/java/src/game/nbt/NBTTagByte.java b/java/src/common/nbt/NBTTagByte.java similarity index 98% rename from java/src/game/nbt/NBTTagByte.java rename to java/src/common/nbt/NBTTagByte.java index 7bf606b..b5a0644 100755 --- a/java/src/game/nbt/NBTTagByte.java +++ b/java/src/common/nbt/NBTTagByte.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagByteArray.java b/java/src/common/nbt/NBTTagByteArray.java similarity index 98% rename from java/src/game/nbt/NBTTagByteArray.java rename to java/src/common/nbt/NBTTagByteArray.java index eb68b0f..c5c0417 100755 --- a/java/src/game/nbt/NBTTagByteArray.java +++ b/java/src/common/nbt/NBTTagByteArray.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagCompound.java b/java/src/common/nbt/NBTTagCompound.java similarity index 99% rename from java/src/game/nbt/NBTTagCompound.java rename to java/src/common/nbt/NBTTagCompound.java index 4606414..b64ce1c 100755 --- a/java/src/game/nbt/NBTTagCompound.java +++ b/java/src/common/nbt/NBTTagCompound.java @@ -1,13 +1,14 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import game.collect.Maps; +import common.collect.Maps; + +import java.util.Set; public class NBTTagCompound extends NBTBase { diff --git a/java/src/game/nbt/NBTTagDouble.java b/java/src/common/nbt/NBTTagDouble.java similarity index 97% rename from java/src/game/nbt/NBTTagDouble.java rename to java/src/common/nbt/NBTTagDouble.java index 13d6180..2a711b3 100755 --- a/java/src/game/nbt/NBTTagDouble.java +++ b/java/src/common/nbt/NBTTagDouble.java @@ -1,10 +1,10 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import game.util.ExtMath; +import common.util.ExtMath; public class NBTTagDouble extends NBTBase.NBTPrimitive { diff --git a/java/src/game/nbt/NBTTagEnd.java b/java/src/common/nbt/NBTTagEnd.java similarity index 97% rename from java/src/game/nbt/NBTTagEnd.java rename to java/src/common/nbt/NBTTagEnd.java index dfcf2c4..69fc4a7 100755 --- a/java/src/game/nbt/NBTTagEnd.java +++ b/java/src/common/nbt/NBTTagEnd.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagFloat.java b/java/src/common/nbt/NBTTagFloat.java similarity index 97% rename from java/src/game/nbt/NBTTagFloat.java rename to java/src/common/nbt/NBTTagFloat.java index c9fce4e..a51869e 100755 --- a/java/src/game/nbt/NBTTagFloat.java +++ b/java/src/common/nbt/NBTTagFloat.java @@ -1,10 +1,10 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import game.util.ExtMath; +import common.util.ExtMath; public class NBTTagFloat extends NBTBase.NBTPrimitive { diff --git a/java/src/game/nbt/NBTTagInt.java b/java/src/common/nbt/NBTTagInt.java similarity index 98% rename from java/src/game/nbt/NBTTagInt.java rename to java/src/common/nbt/NBTTagInt.java index d5622fe..50dc226 100755 --- a/java/src/game/nbt/NBTTagInt.java +++ b/java/src/common/nbt/NBTTagInt.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagIntArray.java b/java/src/common/nbt/NBTTagIntArray.java similarity index 98% rename from java/src/game/nbt/NBTTagIntArray.java rename to java/src/common/nbt/NBTTagIntArray.java index d0c85b8..657abbe 100755 --- a/java/src/game/nbt/NBTTagIntArray.java +++ b/java/src/common/nbt/NBTTagIntArray.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagList.java b/java/src/common/nbt/NBTTagList.java similarity index 99% rename from java/src/game/nbt/NBTTagList.java rename to java/src/common/nbt/NBTTagList.java index 2ce7cfa..c20a725 100755 --- a/java/src/game/nbt/NBTTagList.java +++ b/java/src/common/nbt/NBTTagList.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; @@ -6,8 +6,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import game.collect.Lists; -import game.log.Log; +import common.collect.Lists; +import common.log.Log; public class NBTTagList extends NBTBase { diff --git a/java/src/game/nbt/NBTTagLong.java b/java/src/common/nbt/NBTTagLong.java similarity index 98% rename from java/src/game/nbt/NBTTagLong.java rename to java/src/common/nbt/NBTTagLong.java index 989c6c4..aa9313a 100755 --- a/java/src/game/nbt/NBTTagLong.java +++ b/java/src/common/nbt/NBTTagLong.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagShort.java b/java/src/common/nbt/NBTTagShort.java similarity index 98% rename from java/src/game/nbt/NBTTagShort.java rename to java/src/common/nbt/NBTTagShort.java index 3ebc2ab..684aa95 100755 --- a/java/src/game/nbt/NBTTagShort.java +++ b/java/src/common/nbt/NBTTagShort.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTTagString.java b/java/src/common/nbt/NBTTagString.java similarity index 98% rename from java/src/game/nbt/NBTTagString.java rename to java/src/common/nbt/NBTTagString.java index 4eef986..5968697 100755 --- a/java/src/game/nbt/NBTTagString.java +++ b/java/src/common/nbt/NBTTagString.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; import java.io.DataInput; import java.io.DataOutput; diff --git a/java/src/game/nbt/NBTUtil.java b/java/src/common/nbt/NBTUtil.java similarity index 99% rename from java/src/game/nbt/NBTUtil.java rename to java/src/common/nbt/NBTUtil.java index f6f4f74..8d3eaf8 100755 --- a/java/src/game/nbt/NBTUtil.java +++ b/java/src/common/nbt/NBTUtil.java @@ -1,4 +1,4 @@ -package game.nbt; +package common.nbt; public final class NBTUtil { diff --git a/java/src/game/network/IClientLoginHandler.java b/java/src/common/network/IClientLoginHandler.java similarity index 58% rename from java/src/game/network/IClientLoginHandler.java rename to java/src/common/network/IClientLoginHandler.java index b06b99e..99ac69d 100644 --- a/java/src/game/network/IClientLoginHandler.java +++ b/java/src/common/network/IClientLoginHandler.java @@ -1,8 +1,8 @@ -package game.network; +package common.network; -import game.packet.RPacketDisconnect; -import game.packet.RPacketEnableCompression; -import game.packet.RPacketLoginSuccess; +import common.packet.RPacketDisconnect; +import common.packet.RPacketEnableCompression; +import common.packet.RPacketLoginSuccess; public interface IClientLoginHandler { diff --git a/java/src/game/network/IClientPlayer.java b/java/src/common/network/IClientPlayer.java similarity index 76% rename from java/src/game/network/IClientPlayer.java rename to java/src/common/network/IClientPlayer.java index 4fb6331..881d9cb 100644 --- a/java/src/game/network/IClientPlayer.java +++ b/java/src/common/network/IClientPlayer.java @@ -1,72 +1,72 @@ -package game.network; +package common.network; -import game.entity.animal.EntityHorse; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.packet.S14PacketEntity; -import game.packet.S18PacketEntityTeleport; -import game.packet.S19PacketEntityHeadLook; -import game.packet.S1APacketEntityStatus; -import game.packet.S1BPacketEntityAttach; -import game.packet.S1CPacketEntityMetadata; -import game.packet.S1DPacketEntityEffect; -import game.packet.S1EPacketRemoveEntityEffect; -import game.packet.S20PacketEntityProperties; -import game.packet.S27PacketExplosion; -import game.packet.S28PacketEffect; -import game.packet.S29PacketSoundEffect; -import game.packet.S2APacketParticles; -import game.packet.S2BPacketChangeGameState; -import game.packet.S2CPacketSpawnGlobalEntity; -import game.packet.S2DPacketOpenWindow; -import game.packet.S2EPacketCloseWindow; -import game.packet.S2FPacketSetSlot; -import game.packet.S30PacketWindowItems; -import game.packet.S31PacketWindowProperty; -import game.packet.S32PacketConfirmTransaction; -import game.packet.S33PacketUpdateSign; -import game.packet.S35PacketUpdateTileEntity; -import game.packet.S36PacketSignEditorOpen; -import game.packet.S38PacketPlayerListItem; -import game.packet.S39PacketPlayerAbilities; -import game.packet.S3APacketTabComplete; -import game.packet.S43PacketUpdateEntityNBT; -import game.packet.SPacketAnimation; -import game.packet.SPacketBiomes; -import game.packet.SPacketBlockAction; -import game.packet.SPacketBlockBreakAnim; -import game.packet.SPacketBlockChange; -import game.packet.SPacketCamera; -import game.packet.SPacketCharacterList; -import game.packet.SPacketChunkData; -import game.packet.SPacketCollectItem; -import game.packet.SPacketDestroyEntities; -import game.packet.SPacketDimensionName; -import game.packet.SPacketDisconnect; -import game.packet.SPacketEntityEquipment; -import game.packet.SPacketEntityVelocity; -import game.packet.SPacketHeldItemChange; -import game.packet.SPacketJoinGame; -import game.packet.SPacketKeepAlive; -import game.packet.SPacketLoading; -import game.packet.SPacketMapChunkBulk; -import game.packet.SPacketMessage; -import game.packet.SPacketMultiBlockChange; -import game.packet.SPacketPlayerPosLook; -import game.packet.SPacketRespawn; -import game.packet.SPacketServerTick; -import game.packet.SPacketSetExperience; -import game.packet.SPacketSkin; -import game.packet.SPacketSpawnMob; -import game.packet.SPacketSpawnObject; -import game.packet.SPacketSpawnPlayer; -import game.packet.SPacketTimeUpdate; -import game.packet.SPacketTrades; -import game.packet.SPacketUpdateHealth; -import game.packet.SPacketWorld; -import game.tileentity.IInteractionObject; -import game.world.BlockPos; -import game.world.World; +import common.entity.animal.EntityHorse; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.packet.S14PacketEntity; +import common.packet.S18PacketEntityTeleport; +import common.packet.S19PacketEntityHeadLook; +import common.packet.S1APacketEntityStatus; +import common.packet.S1BPacketEntityAttach; +import common.packet.S1CPacketEntityMetadata; +import common.packet.S1DPacketEntityEffect; +import common.packet.S1EPacketRemoveEntityEffect; +import common.packet.S20PacketEntityProperties; +import common.packet.S27PacketExplosion; +import common.packet.S28PacketEffect; +import common.packet.S29PacketSoundEffect; +import common.packet.S2APacketParticles; +import common.packet.S2BPacketChangeGameState; +import common.packet.S2CPacketSpawnGlobalEntity; +import common.packet.S2DPacketOpenWindow; +import common.packet.S2EPacketCloseWindow; +import common.packet.S2FPacketSetSlot; +import common.packet.S30PacketWindowItems; +import common.packet.S31PacketWindowProperty; +import common.packet.S32PacketConfirmTransaction; +import common.packet.S33PacketUpdateSign; +import common.packet.S35PacketUpdateTileEntity; +import common.packet.S36PacketSignEditorOpen; +import common.packet.S38PacketPlayerListItem; +import common.packet.S39PacketPlayerAbilities; +import common.packet.S3APacketTabComplete; +import common.packet.S43PacketUpdateEntityNBT; +import common.packet.SPacketAnimation; +import common.packet.SPacketBiomes; +import common.packet.SPacketBlockAction; +import common.packet.SPacketBlockBreakAnim; +import common.packet.SPacketBlockChange; +import common.packet.SPacketCamera; +import common.packet.SPacketCharacterList; +import common.packet.SPacketChunkData; +import common.packet.SPacketCollectItem; +import common.packet.SPacketDestroyEntities; +import common.packet.SPacketDimensionName; +import common.packet.SPacketDisconnect; +import common.packet.SPacketEntityEquipment; +import common.packet.SPacketEntityVelocity; +import common.packet.SPacketHeldItemChange; +import common.packet.SPacketJoinGame; +import common.packet.SPacketKeepAlive; +import common.packet.SPacketLoading; +import common.packet.SPacketMapChunkBulk; +import common.packet.SPacketMessage; +import common.packet.SPacketMultiBlockChange; +import common.packet.SPacketPlayerPosLook; +import common.packet.SPacketRespawn; +import common.packet.SPacketServerTick; +import common.packet.SPacketSetExperience; +import common.packet.SPacketSkin; +import common.packet.SPacketSpawnMob; +import common.packet.SPacketSpawnObject; +import common.packet.SPacketSpawnPlayer; +import common.packet.SPacketTimeUpdate; +import common.packet.SPacketTrades; +import common.packet.SPacketUpdateHealth; +import common.packet.SPacketWorld; +import common.tileentity.IInteractionObject; +import common.world.BlockPos; +import common.world.World; public interface IClientPlayer { void addToSendQueue(Packet packet); diff --git a/java/src/game/network/IHandshakeHandler.java b/java/src/common/network/IHandshakeHandler.java similarity index 58% rename from java/src/game/network/IHandshakeHandler.java rename to java/src/common/network/IHandshakeHandler.java index 73af36d..b6815e8 100644 --- a/java/src/game/network/IHandshakeHandler.java +++ b/java/src/common/network/IHandshakeHandler.java @@ -1,6 +1,6 @@ -package game.network; +package common.network; -import game.packet.HPacketHandshake; +import common.packet.HPacketHandshake; public interface IHandshakeHandler { diff --git a/java/src/game/network/ILoginHandler.java b/java/src/common/network/ILoginHandler.java similarity index 58% rename from java/src/game/network/ILoginHandler.java rename to java/src/common/network/ILoginHandler.java index 45f6ff3..5361bc1 100644 --- a/java/src/game/network/ILoginHandler.java +++ b/java/src/common/network/ILoginHandler.java @@ -1,6 +1,6 @@ -package game.network; +package common.network; -import game.packet.LPacketPasswordResponse; +import common.packet.LPacketPasswordResponse; public interface ILoginHandler { diff --git a/java/src/game/network/IPlayer.java b/java/src/common/network/IPlayer.java similarity index 77% rename from java/src/game/network/IPlayer.java rename to java/src/common/network/IPlayer.java index 2ec04ba..e819468 100644 --- a/java/src/game/network/IPlayer.java +++ b/java/src/common/network/IPlayer.java @@ -1,35 +1,35 @@ -package game.network; +package common.network; import java.util.List; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.SoundEvent; -import game.inventory.Container; -import game.inventory.IInventory; -import game.item.ItemStack; -import game.packet.CPacketAction; -import game.packet.CPacketBook; -import game.packet.CPacketBreak; -import game.packet.CPacketCheat; -import game.packet.CPacketClick; -import game.packet.CPacketComplete; -import game.packet.CPacketInput; -import game.packet.CPacketKeepAlive; -import game.packet.CPacketMessage; -import game.packet.CPacketPlace; -import game.packet.CPacketPlayer; -import game.packet.CPacketSign; -import game.packet.CPacketSkin; -import game.potion.PotionEffect; -import game.tileentity.IInteractionObject; -import game.tileentity.TileEntitySign; -import game.util.CharValidator; -import game.world.BlockPos; -import game.world.ChunkPos; -import game.world.PortalType; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.SoundEvent; +import common.inventory.Container; +import common.inventory.IInventory; +import common.item.ItemStack; +import common.packet.CPacketAction; +import common.packet.CPacketBook; +import common.packet.CPacketBreak; +import common.packet.CPacketCheat; +import common.packet.CPacketClick; +import common.packet.CPacketComplete; +import common.packet.CPacketInput; +import common.packet.CPacketKeepAlive; +import common.packet.CPacketMessage; +import common.packet.CPacketPlace; +import common.packet.CPacketPlayer; +import common.packet.CPacketSign; +import common.packet.CPacketSkin; +import common.potion.PotionEffect; +import common.tileentity.IInteractionObject; +import common.tileentity.TileEntitySign; +import common.util.CharValidator; +import common.world.BlockPos; +import common.world.ChunkPos; +import common.world.PortalType; public interface IPlayer { public static class UserValidator implements CharValidator { diff --git a/java/src/game/network/IThreadListener.java b/java/src/common/network/IThreadListener.java similarity index 73% rename from java/src/game/network/IThreadListener.java rename to java/src/common/network/IThreadListener.java index 2f19842..e6f14d4 100755 --- a/java/src/game/network/IThreadListener.java +++ b/java/src/common/network/IThreadListener.java @@ -1,6 +1,6 @@ -package game.network; +package common.network; -import game.future.ListenableFuture; +import common.future.ListenableFuture; public interface IThreadListener { diff --git a/java/src/game/network/NetConnection.java b/java/src/common/network/NetConnection.java similarity index 98% rename from java/src/game/network/NetConnection.java rename to java/src/common/network/NetConnection.java index 3941f3f..89c055a 100755 --- a/java/src/game/network/NetConnection.java +++ b/java/src/common/network/NetConnection.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.net.InetAddress; import java.net.SocketAddress; @@ -7,10 +7,10 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.regex.Pattern; -import game.future.ThreadFactoryBuilder; -import game.log.Log; -import game.network.NetHandler.ThreadQuickExitException; -import game.util.LazyLoadBase; +import common.future.ThreadFactoryBuilder; +import common.log.Log; +import common.network.NetHandler.ThreadQuickExitException; +import common.util.LazyLoadBase; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; diff --git a/java/src/game/network/NetHandler.java b/java/src/common/network/NetHandler.java similarity index 97% rename from java/src/game/network/NetHandler.java rename to java/src/common/network/NetHandler.java index 0d47cb4..1454ec5 100755 --- a/java/src/game/network/NetHandler.java +++ b/java/src/common/network/NetHandler.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; public abstract class NetHandler { private static final ThreadQuickExitException EXIT = new ThreadQuickExitException(); diff --git a/java/src/game/network/NettyCompressionDecoder.java b/java/src/common/network/NettyCompressionDecoder.java similarity index 98% rename from java/src/game/network/NettyCompressionDecoder.java rename to java/src/common/network/NettyCompressionDecoder.java index 0d7d95e..d77de45 100755 --- a/java/src/game/network/NettyCompressionDecoder.java +++ b/java/src/common/network/NettyCompressionDecoder.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.util.List; import java.util.zip.DataFormatException; diff --git a/java/src/game/network/NettyCompressionEncoder.java b/java/src/common/network/NettyCompressionEncoder.java similarity index 98% rename from java/src/game/network/NettyCompressionEncoder.java rename to java/src/common/network/NettyCompressionEncoder.java index b19cfd2..9719f99 100755 --- a/java/src/game/network/NettyCompressionEncoder.java +++ b/java/src/common/network/NettyCompressionEncoder.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.util.zip.Deflater; diff --git a/java/src/game/network/Packet.java b/java/src/common/network/Packet.java similarity index 90% rename from java/src/game/network/Packet.java rename to java/src/common/network/Packet.java index ced4621..4ba381f 100755 --- a/java/src/game/network/Packet.java +++ b/java/src/common/network/Packet.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.io.IOException; diff --git a/java/src/game/network/PacketBuffer.java b/java/src/common/network/PacketBuffer.java similarity index 98% rename from java/src/game/network/PacketBuffer.java rename to java/src/common/network/PacketBuffer.java index ccc6b8e..a845416 100755 --- a/java/src/game/network/PacketBuffer.java +++ b/java/src/common/network/PacketBuffer.java @@ -1,14 +1,14 @@ -package game.network; +package common.network; import java.io.IOException; import java.nio.charset.Charset; -import game.init.ItemRegistry; -import game.item.ItemStack; -import game.nbt.NBTLoader; -import game.nbt.NBTSizeTracker; -import game.nbt.NBTTagCompound; -import game.world.BlockPos; +import common.init.ItemRegistry; +import common.item.ItemStack; +import common.nbt.NBTLoader; +import common.nbt.NBTSizeTracker; +import common.nbt.NBTTagCompound; +import common.world.BlockPos; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.ByteBufOutputStream; diff --git a/java/src/game/network/PacketDecoder.java b/java/src/common/network/PacketDecoder.java similarity index 98% rename from java/src/game/network/PacketDecoder.java rename to java/src/common/network/PacketDecoder.java index 3fb1715..e00089d 100755 --- a/java/src/game/network/PacketDecoder.java +++ b/java/src/common/network/PacketDecoder.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.io.IOException; import java.util.List; diff --git a/java/src/game/network/PacketEncoder.java b/java/src/common/network/PacketEncoder.java similarity index 96% rename from java/src/game/network/PacketEncoder.java rename to java/src/common/network/PacketEncoder.java index e00af33..ff7cdbf 100755 --- a/java/src/game/network/PacketEncoder.java +++ b/java/src/common/network/PacketEncoder.java @@ -1,8 +1,8 @@ -package game.network; +package common.network; import java.io.IOException; -import game.log.Log; +import common.log.Log; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; diff --git a/java/src/game/network/PacketPrepender.java b/java/src/common/network/PacketPrepender.java similarity index 97% rename from java/src/game/network/PacketPrepender.java rename to java/src/common/network/PacketPrepender.java index 9dd9ab7..670f337 100755 --- a/java/src/game/network/PacketPrepender.java +++ b/java/src/common/network/PacketPrepender.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/java/src/game/network/PacketRegistry.java b/java/src/common/network/PacketRegistry.java similarity index 69% rename from java/src/game/network/PacketRegistry.java rename to java/src/common/network/PacketRegistry.java index 28ae74b..60f2e0d 100755 --- a/java/src/game/network/PacketRegistry.java +++ b/java/src/common/network/PacketRegistry.java @@ -1,89 +1,89 @@ -package game.network; +package common.network; import java.util.Map; -import game.collect.BiMap; -import game.collect.HashBiMap; -import game.collect.Maps; -import game.packet.CPacketAction; -import game.packet.CPacketBook; -import game.packet.CPacketBreak; -import game.packet.CPacketCheat; -import game.packet.CPacketClick; -import game.packet.CPacketComplete; -import game.packet.CPacketInput; -import game.packet.CPacketKeepAlive; -import game.packet.CPacketMessage; -import game.packet.CPacketPlace; -import game.packet.CPacketPlayer; -import game.packet.CPacketSign; -import game.packet.CPacketSkin; -import game.packet.HPacketHandshake; -import game.packet.LPacketPasswordResponse; -import game.packet.RPacketDisconnect; -import game.packet.RPacketEnableCompression; -import game.packet.RPacketLoginSuccess; -import game.packet.S14PacketEntity; -import game.packet.S18PacketEntityTeleport; -import game.packet.S19PacketEntityHeadLook; -import game.packet.S1APacketEntityStatus; -import game.packet.S1BPacketEntityAttach; -import game.packet.S1CPacketEntityMetadata; -import game.packet.S1DPacketEntityEffect; -import game.packet.S1EPacketRemoveEntityEffect; -import game.packet.S20PacketEntityProperties; -import game.packet.S27PacketExplosion; -import game.packet.S28PacketEffect; -import game.packet.S29PacketSoundEffect; -import game.packet.S2APacketParticles; -import game.packet.S2BPacketChangeGameState; -import game.packet.S2CPacketSpawnGlobalEntity; -import game.packet.S2DPacketOpenWindow; -import game.packet.S2EPacketCloseWindow; -import game.packet.S2FPacketSetSlot; -import game.packet.S30PacketWindowItems; -import game.packet.S31PacketWindowProperty; -import game.packet.S32PacketConfirmTransaction; -import game.packet.S33PacketUpdateSign; -import game.packet.S35PacketUpdateTileEntity; -import game.packet.S36PacketSignEditorOpen; -import game.packet.S38PacketPlayerListItem; -import game.packet.S39PacketPlayerAbilities; -import game.packet.S3APacketTabComplete; -import game.packet.S43PacketUpdateEntityNBT; -import game.packet.SPacketAnimation; -import game.packet.SPacketBiomes; -import game.packet.SPacketBlockAction; -import game.packet.SPacketBlockBreakAnim; -import game.packet.SPacketBlockChange; -import game.packet.SPacketCamera; -import game.packet.SPacketCharacterList; -import game.packet.SPacketChunkData; -import game.packet.SPacketCollectItem; -import game.packet.SPacketDestroyEntities; -import game.packet.SPacketDimensionName; -import game.packet.SPacketDisconnect; -import game.packet.SPacketEntityEquipment; -import game.packet.SPacketEntityVelocity; -import game.packet.SPacketHeldItemChange; -import game.packet.SPacketJoinGame; -import game.packet.SPacketKeepAlive; -import game.packet.SPacketLoading; -import game.packet.SPacketMapChunkBulk; -import game.packet.SPacketMessage; -import game.packet.SPacketMultiBlockChange; -import game.packet.SPacketPlayerPosLook; -import game.packet.SPacketRespawn; -import game.packet.SPacketServerTick; -import game.packet.SPacketSetExperience; -import game.packet.SPacketSkin; -import game.packet.SPacketSpawnMob; -import game.packet.SPacketSpawnObject; -import game.packet.SPacketSpawnPlayer; -import game.packet.SPacketTimeUpdate; -import game.packet.SPacketTrades; -import game.packet.SPacketUpdateHealth; -import game.packet.SPacketWorld; +import common.collect.BiMap; +import common.collect.HashBiMap; +import common.collect.Maps; +import common.packet.CPacketAction; +import common.packet.CPacketBook; +import common.packet.CPacketBreak; +import common.packet.CPacketCheat; +import common.packet.CPacketClick; +import common.packet.CPacketComplete; +import common.packet.CPacketInput; +import common.packet.CPacketKeepAlive; +import common.packet.CPacketMessage; +import common.packet.CPacketPlace; +import common.packet.CPacketPlayer; +import common.packet.CPacketSign; +import common.packet.CPacketSkin; +import common.packet.HPacketHandshake; +import common.packet.LPacketPasswordResponse; +import common.packet.RPacketDisconnect; +import common.packet.RPacketEnableCompression; +import common.packet.RPacketLoginSuccess; +import common.packet.S14PacketEntity; +import common.packet.S18PacketEntityTeleport; +import common.packet.S19PacketEntityHeadLook; +import common.packet.S1APacketEntityStatus; +import common.packet.S1BPacketEntityAttach; +import common.packet.S1CPacketEntityMetadata; +import common.packet.S1DPacketEntityEffect; +import common.packet.S1EPacketRemoveEntityEffect; +import common.packet.S20PacketEntityProperties; +import common.packet.S27PacketExplosion; +import common.packet.S28PacketEffect; +import common.packet.S29PacketSoundEffect; +import common.packet.S2APacketParticles; +import common.packet.S2BPacketChangeGameState; +import common.packet.S2CPacketSpawnGlobalEntity; +import common.packet.S2DPacketOpenWindow; +import common.packet.S2EPacketCloseWindow; +import common.packet.S2FPacketSetSlot; +import common.packet.S30PacketWindowItems; +import common.packet.S31PacketWindowProperty; +import common.packet.S32PacketConfirmTransaction; +import common.packet.S33PacketUpdateSign; +import common.packet.S35PacketUpdateTileEntity; +import common.packet.S36PacketSignEditorOpen; +import common.packet.S38PacketPlayerListItem; +import common.packet.S39PacketPlayerAbilities; +import common.packet.S3APacketTabComplete; +import common.packet.S43PacketUpdateEntityNBT; +import common.packet.SPacketAnimation; +import common.packet.SPacketBiomes; +import common.packet.SPacketBlockAction; +import common.packet.SPacketBlockBreakAnim; +import common.packet.SPacketBlockChange; +import common.packet.SPacketCamera; +import common.packet.SPacketCharacterList; +import common.packet.SPacketChunkData; +import common.packet.SPacketCollectItem; +import common.packet.SPacketDestroyEntities; +import common.packet.SPacketDimensionName; +import common.packet.SPacketDisconnect; +import common.packet.SPacketEntityEquipment; +import common.packet.SPacketEntityVelocity; +import common.packet.SPacketHeldItemChange; +import common.packet.SPacketJoinGame; +import common.packet.SPacketKeepAlive; +import common.packet.SPacketLoading; +import common.packet.SPacketMapChunkBulk; +import common.packet.SPacketMessage; +import common.packet.SPacketMultiBlockChange; +import common.packet.SPacketPlayerPosLook; +import common.packet.SPacketRespawn; +import common.packet.SPacketServerTick; +import common.packet.SPacketSetExperience; +import common.packet.SPacketSkin; +import common.packet.SPacketSpawnMob; +import common.packet.SPacketSpawnObject; +import common.packet.SPacketSpawnPlayer; +import common.packet.SPacketTimeUpdate; +import common.packet.SPacketTrades; +import common.packet.SPacketUpdateHealth; +import common.packet.SPacketWorld; public enum PacketRegistry { diff --git a/java/src/game/network/PacketSplitter.java b/java/src/common/network/PacketSplitter.java similarity index 98% rename from java/src/game/network/PacketSplitter.java rename to java/src/common/network/PacketSplitter.java index dec0660..7540257 100755 --- a/java/src/game/network/PacketSplitter.java +++ b/java/src/common/network/PacketSplitter.java @@ -1,4 +1,4 @@ -package game.network; +package common.network; import java.util.List; diff --git a/java/src/game/packet/APacketEmpty.java b/java/src/common/packet/APacketEmpty.java similarity index 73% rename from java/src/game/packet/APacketEmpty.java rename to java/src/common/packet/APacketEmpty.java index 8fede40..dfc7ceb 100755 --- a/java/src/game/packet/APacketEmpty.java +++ b/java/src/common/packet/APacketEmpty.java @@ -1,9 +1,9 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.Packet; +import common.network.PacketBuffer; public abstract class APacketEmpty implements Packet { public final void readPacketData(PacketBuffer buf) throws IOException { diff --git a/java/src/game/packet/APacketVarInt.java b/java/src/common/packet/APacketVarInt.java similarity index 84% rename from java/src/game/packet/APacketVarInt.java rename to java/src/common/packet/APacketVarInt.java index 87d9b79..e3196af 100755 --- a/java/src/game/packet/APacketVarInt.java +++ b/java/src/common/packet/APacketVarInt.java @@ -1,9 +1,9 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.Packet; +import common.network.PacketBuffer; public abstract class APacketVarInt implements Packet { private int value; diff --git a/java/src/game/packet/CPacketAction.java b/java/src/common/packet/CPacketAction.java similarity index 94% rename from java/src/game/packet/CPacketAction.java rename to java/src/common/packet/CPacketAction.java index 34b6229..1df60fb 100755 --- a/java/src/game/packet/CPacketAction.java +++ b/java/src/common/packet/CPacketAction.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketAction implements Packet { diff --git a/java/src/game/packet/CPacketBook.java b/java/src/common/packet/CPacketBook.java similarity index 89% rename from java/src/game/packet/CPacketBook.java rename to java/src/common/packet/CPacketBook.java index 1bd02f4..771fa06 100755 --- a/java/src/game/packet/CPacketBook.java +++ b/java/src/common/packet/CPacketBook.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketBook implements Packet { diff --git a/java/src/game/packet/CPacketBreak.java b/java/src/common/packet/CPacketBreak.java similarity index 89% rename from java/src/game/packet/CPacketBreak.java rename to java/src/common/packet/CPacketBreak.java index bb4b869..1de2c0b 100755 --- a/java/src/game/packet/CPacketBreak.java +++ b/java/src/common/packet/CPacketBreak.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; -import game.world.BlockPos; -import game.world.Facing; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; +import common.world.Facing; public class CPacketBreak implements Packet { diff --git a/java/src/game/packet/CPacketCheat.java b/java/src/common/packet/CPacketCheat.java similarity index 86% rename from java/src/game/packet/CPacketCheat.java rename to java/src/common/packet/CPacketCheat.java index 3ce4a6e..f2b0715 100755 --- a/java/src/game/packet/CPacketCheat.java +++ b/java/src/common/packet/CPacketCheat.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.item.ItemStack; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketCheat implements Packet { diff --git a/java/src/game/packet/CPacketClick.java b/java/src/common/packet/CPacketClick.java similarity index 93% rename from java/src/game/packet/CPacketClick.java rename to java/src/common/packet/CPacketClick.java index 8d03eb6..cb4e282 100755 --- a/java/src/game/packet/CPacketClick.java +++ b/java/src/common/packet/CPacketClick.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.item.ItemStack; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketClick implements Packet { diff --git a/java/src/game/packet/CPacketComplete.java b/java/src/common/packet/CPacketComplete.java similarity index 89% rename from java/src/game/packet/CPacketComplete.java rename to java/src/common/packet/CPacketComplete.java index f4bcd82..74190cc 100755 --- a/java/src/game/packet/CPacketComplete.java +++ b/java/src/common/packet/CPacketComplete.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; -import game.world.BlockPos; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class CPacketComplete implements Packet { diff --git a/java/src/game/packet/CPacketInput.java b/java/src/common/packet/CPacketInput.java similarity index 92% rename from java/src/game/packet/CPacketInput.java rename to java/src/common/packet/CPacketInput.java index 5618427..1bc90df 100755 --- a/java/src/game/packet/CPacketInput.java +++ b/java/src/common/packet/CPacketInput.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketInput implements Packet { diff --git a/java/src/game/packet/CPacketKeepAlive.java b/java/src/common/packet/CPacketKeepAlive.java similarity index 83% rename from java/src/game/packet/CPacketKeepAlive.java rename to java/src/common/packet/CPacketKeepAlive.java index 6cbf08d..6e6a9ad 100755 --- a/java/src/game/packet/CPacketKeepAlive.java +++ b/java/src/common/packet/CPacketKeepAlive.java @@ -1,6 +1,6 @@ -package game.packet; +package common.packet; -import game.network.IPlayer; +import common.network.IPlayer; public class CPacketKeepAlive extends APacketVarInt { diff --git a/java/src/game/packet/CPacketMessage.java b/java/src/common/packet/CPacketMessage.java similarity index 91% rename from java/src/game/packet/CPacketMessage.java rename to java/src/common/packet/CPacketMessage.java index 427b22e..c7141ea 100755 --- a/java/src/game/packet/CPacketMessage.java +++ b/java/src/common/packet/CPacketMessage.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketMessage implements Packet { diff --git a/java/src/game/packet/CPacketPlace.java b/java/src/common/packet/CPacketPlace.java similarity index 92% rename from java/src/game/packet/CPacketPlace.java rename to java/src/common/packet/CPacketPlace.java index 8dd4e11..9c91b4b 100755 --- a/java/src/game/packet/CPacketPlace.java +++ b/java/src/common/packet/CPacketPlace.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; -import game.world.BlockPos; +import common.item.ItemStack; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class CPacketPlace implements Packet { diff --git a/java/src/game/packet/CPacketPlayer.java b/java/src/common/packet/CPacketPlayer.java similarity index 97% rename from java/src/game/packet/CPacketPlayer.java rename to java/src/common/packet/CPacketPlayer.java index 6298845..58c70e7 100755 --- a/java/src/game/packet/CPacketPlayer.java +++ b/java/src/common/packet/CPacketPlayer.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketPlayer implements Packet { diff --git a/java/src/game/packet/CPacketSign.java b/java/src/common/packet/CPacketSign.java similarity index 90% rename from java/src/game/packet/CPacketSign.java rename to java/src/common/packet/CPacketSign.java index dd60ed6..3158172 100755 --- a/java/src/game/packet/CPacketSign.java +++ b/java/src/common/packet/CPacketSign.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; -import game.world.BlockPos; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class CPacketSign implements Packet { diff --git a/java/src/game/packet/CPacketSkin.java b/java/src/common/packet/CPacketSkin.java similarity index 90% rename from java/src/game/packet/CPacketSkin.java rename to java/src/common/packet/CPacketSkin.java index 180c49b..30e476c 100755 --- a/java/src/game/packet/CPacketSkin.java +++ b/java/src/common/packet/CPacketSkin.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class CPacketSkin implements Packet { private byte[] texture; diff --git a/java/src/game/packet/HPacketHandshake.java b/java/src/common/packet/HPacketHandshake.java similarity index 85% rename from java/src/game/packet/HPacketHandshake.java rename to java/src/common/packet/HPacketHandshake.java index 36a3994..e2a0018 100755 --- a/java/src/game/packet/HPacketHandshake.java +++ b/java/src/common/packet/HPacketHandshake.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IHandshakeHandler; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IHandshakeHandler; +import common.network.Packet; +import common.network.PacketBuffer; public class HPacketHandshake implements Packet { private int protocol; diff --git a/java/src/game/packet/LPacketPasswordResponse.java b/java/src/common/packet/LPacketPasswordResponse.java similarity index 90% rename from java/src/game/packet/LPacketPasswordResponse.java rename to java/src/common/packet/LPacketPasswordResponse.java index f2735b4..073009c 100755 --- a/java/src/game/packet/LPacketPasswordResponse.java +++ b/java/src/common/packet/LPacketPasswordResponse.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IPlayer; -import game.network.ILoginHandler; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.ILoginHandler; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class LPacketPasswordResponse implements Packet { diff --git a/java/src/game/packet/RPacketDisconnect.java b/java/src/common/packet/RPacketDisconnect.java similarity index 87% rename from java/src/game/packet/RPacketDisconnect.java rename to java/src/common/packet/RPacketDisconnect.java index a81019b..3e1c8cb 100755 --- a/java/src/game/packet/RPacketDisconnect.java +++ b/java/src/common/packet/RPacketDisconnect.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientLoginHandler; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientLoginHandler; +import common.network.Packet; +import common.network.PacketBuffer; public class RPacketDisconnect implements Packet { diff --git a/java/src/game/packet/RPacketEnableCompression.java b/java/src/common/packet/RPacketEnableCompression.java similarity index 83% rename from java/src/game/packet/RPacketEnableCompression.java rename to java/src/common/packet/RPacketEnableCompression.java index 4fed689..8aceabb 100755 --- a/java/src/game/packet/RPacketEnableCompression.java +++ b/java/src/common/packet/RPacketEnableCompression.java @@ -1,6 +1,6 @@ -package game.packet; +package common.packet; -import game.network.IClientLoginHandler; +import common.network.IClientLoginHandler; public class RPacketEnableCompression extends APacketVarInt { diff --git a/java/src/game/packet/RPacketLoginSuccess.java b/java/src/common/packet/RPacketLoginSuccess.java similarity index 74% rename from java/src/game/packet/RPacketLoginSuccess.java rename to java/src/common/packet/RPacketLoginSuccess.java index 4bff216..6e46fa0 100755 --- a/java/src/game/packet/RPacketLoginSuccess.java +++ b/java/src/common/packet/RPacketLoginSuccess.java @@ -1,6 +1,6 @@ -package game.packet; +package common.packet; -import game.network.IClientLoginHandler; +import common.network.IClientLoginHandler; public class RPacketLoginSuccess extends APacketEmpty { diff --git a/java/src/game/packet/S14PacketEntity.java b/java/src/common/packet/S14PacketEntity.java similarity index 96% rename from java/src/game/packet/S14PacketEntity.java rename to java/src/common/packet/S14PacketEntity.java index e720185..68507af 100755 --- a/java/src/game/packet/S14PacketEntity.java +++ b/java/src/common/packet/S14PacketEntity.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class S14PacketEntity implements Packet { diff --git a/java/src/game/packet/S18PacketEntityTeleport.java b/java/src/common/packet/S18PacketEntityTeleport.java similarity index 93% rename from java/src/game/packet/S18PacketEntityTeleport.java rename to java/src/common/packet/S18PacketEntityTeleport.java index 955fd66..67f4118 100755 --- a/java/src/game/packet/S18PacketEntityTeleport.java +++ b/java/src/common/packet/S18PacketEntityTeleport.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; public class S18PacketEntityTeleport implements Packet { diff --git a/java/src/game/packet/S19PacketEntityHeadLook.java b/java/src/common/packet/S19PacketEntityHeadLook.java similarity index 86% rename from java/src/game/packet/S19PacketEntityHeadLook.java rename to java/src/common/packet/S19PacketEntityHeadLook.java index 97f4853..885659e 100755 --- a/java/src/game/packet/S19PacketEntityHeadLook.java +++ b/java/src/common/packet/S19PacketEntityHeadLook.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class S19PacketEntityHeadLook implements Packet { diff --git a/java/src/game/packet/S1APacketEntityStatus.java b/java/src/common/packet/S1APacketEntityStatus.java similarity index 86% rename from java/src/game/packet/S1APacketEntityStatus.java rename to java/src/common/packet/S1APacketEntityStatus.java index 4fd3017..1775cec 100755 --- a/java/src/game/packet/S1APacketEntityStatus.java +++ b/java/src/common/packet/S1APacketEntityStatus.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class S1APacketEntityStatus implements Packet { diff --git a/java/src/game/packet/S1BPacketEntityAttach.java b/java/src/common/packet/S1BPacketEntityAttach.java similarity index 90% rename from java/src/game/packet/S1BPacketEntityAttach.java rename to java/src/common/packet/S1BPacketEntityAttach.java index a0e6c6b..24c0807 100755 --- a/java/src/game/packet/S1BPacketEntityAttach.java +++ b/java/src/common/packet/S1BPacketEntityAttach.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S1BPacketEntityAttach implements Packet { diff --git a/java/src/game/packet/S1CPacketEntityMetadata.java b/java/src/common/packet/S1CPacketEntityMetadata.java similarity index 90% rename from java/src/game/packet/S1CPacketEntityMetadata.java rename to java/src/common/packet/S1CPacketEntityMetadata.java index 3eda517..645e1a2 100755 --- a/java/src/game/packet/S1CPacketEntityMetadata.java +++ b/java/src/common/packet/S1CPacketEntityMetadata.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.entity.DataWatcher; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.entity.DataWatcher; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S1CPacketEntityMetadata implements Packet { diff --git a/java/src/game/packet/S1DPacketEntityEffect.java b/java/src/common/packet/S1DPacketEntityEffect.java similarity index 92% rename from java/src/game/packet/S1DPacketEntityEffect.java rename to java/src/common/packet/S1DPacketEntityEffect.java index 661aa94..faf5dc6 100755 --- a/java/src/game/packet/S1DPacketEntityEffect.java +++ b/java/src/common/packet/S1DPacketEntityEffect.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.potion.Potion; -import game.potion.PotionEffect; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.potion.Potion; +import common.potion.PotionEffect; public class S1DPacketEntityEffect implements Packet { diff --git a/java/src/game/packet/S1EPacketRemoveEntityEffect.java b/java/src/common/packet/S1EPacketRemoveEntityEffect.java similarity index 86% rename from java/src/game/packet/S1EPacketRemoveEntityEffect.java rename to java/src/common/packet/S1EPacketRemoveEntityEffect.java index a7872cf..9cd091e 100755 --- a/java/src/game/packet/S1EPacketRemoveEntityEffect.java +++ b/java/src/common/packet/S1EPacketRemoveEntityEffect.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.potion.Potion; -import game.potion.PotionEffect; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.potion.Potion; +import common.potion.PotionEffect; public class S1EPacketRemoveEntityEffect implements Packet { diff --git a/java/src/game/packet/S20PacketEntityProperties.java b/java/src/common/packet/S20PacketEntityProperties.java similarity index 93% rename from java/src/game/packet/S20PacketEntityProperties.java rename to java/src/common/packet/S20PacketEntityProperties.java index 6fa51f3..0d0a1f0 100755 --- a/java/src/game/packet/S20PacketEntityProperties.java +++ b/java/src/common/packet/S20PacketEntityProperties.java @@ -1,15 +1,15 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.Collection; import java.util.List; -import game.collect.Lists; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.AttributeModifier; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.collect.Lists; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.AttributeModifier; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S20PacketEntityProperties implements Packet { diff --git a/java/src/game/packet/S27PacketExplosion.java b/java/src/common/packet/S27PacketExplosion.java similarity index 94% rename from java/src/game/packet/S27PacketExplosion.java rename to java/src/common/packet/S27PacketExplosion.java index 24aa5ee..4d76e68 100755 --- a/java/src/game/packet/S27PacketExplosion.java +++ b/java/src/common/packet/S27PacketExplosion.java @@ -1,15 +1,15 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import game.collect.Lists; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; -import game.world.Vec3; +import common.collect.Lists; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; +import common.world.Vec3; public class S27PacketExplosion implements Packet { diff --git a/java/src/game/packet/S28PacketEffect.java b/java/src/common/packet/S28PacketEffect.java similarity index 86% rename from java/src/game/packet/S28PacketEffect.java rename to java/src/common/packet/S28PacketEffect.java index a64be06..6e9915f 100755 --- a/java/src/game/packet/S28PacketEffect.java +++ b/java/src/common/packet/S28PacketEffect.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class S28PacketEffect implements Packet { private int soundType; diff --git a/java/src/game/packet/S29PacketSoundEffect.java b/java/src/common/packet/S29PacketSoundEffect.java similarity index 92% rename from java/src/game/packet/S29PacketSoundEffect.java rename to java/src/common/packet/S29PacketSoundEffect.java index e0581b6..c39ca1a 100755 --- a/java/src/game/packet/S29PacketSoundEffect.java +++ b/java/src/common/packet/S29PacketSoundEffect.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.init.SoundEvent; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.init.SoundEvent; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S29PacketSoundEffect implements Packet { diff --git a/java/src/game/packet/S2APacketParticles.java b/java/src/common/packet/S2APacketParticles.java similarity index 96% rename from java/src/game/packet/S2APacketParticles.java rename to java/src/common/packet/S2APacketParticles.java index 198ecf8..0d6329c 100755 --- a/java/src/game/packet/S2APacketParticles.java +++ b/java/src/common/packet/S2APacketParticles.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.model.ParticleType; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.model.ParticleType; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S2APacketParticles implements Packet { diff --git a/java/src/game/packet/S2BPacketChangeGameState.java b/java/src/common/packet/S2BPacketChangeGameState.java similarity index 90% rename from java/src/game/packet/S2BPacketChangeGameState.java rename to java/src/common/packet/S2BPacketChangeGameState.java index 4c9272c..488573a 100755 --- a/java/src/game/packet/S2BPacketChangeGameState.java +++ b/java/src/common/packet/S2BPacketChangeGameState.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; public class S2BPacketChangeGameState implements Packet { diff --git a/java/src/game/packet/S2CPacketSpawnGlobalEntity.java b/java/src/common/packet/S2CPacketSpawnGlobalEntity.java similarity index 91% rename from java/src/game/packet/S2CPacketSpawnGlobalEntity.java rename to java/src/common/packet/S2CPacketSpawnGlobalEntity.java index df86f15..4741c44 100755 --- a/java/src/game/packet/S2CPacketSpawnGlobalEntity.java +++ b/java/src/common/packet/S2CPacketSpawnGlobalEntity.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; public class S2CPacketSpawnGlobalEntity implements Packet { diff --git a/java/src/game/packet/S2DPacketOpenWindow.java b/java/src/common/packet/S2DPacketOpenWindow.java similarity index 95% rename from java/src/game/packet/S2DPacketOpenWindow.java rename to java/src/common/packet/S2DPacketOpenWindow.java index c1f7c70..38246fe 100755 --- a/java/src/game/packet/S2DPacketOpenWindow.java +++ b/java/src/common/packet/S2DPacketOpenWindow.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class S2DPacketOpenWindow implements Packet { diff --git a/java/src/game/packet/S2EPacketCloseWindow.java b/java/src/common/packet/S2EPacketCloseWindow.java similarity index 87% rename from java/src/game/packet/S2EPacketCloseWindow.java rename to java/src/common/packet/S2EPacketCloseWindow.java index a6652cc..7629715 100755 --- a/java/src/game/packet/S2EPacketCloseWindow.java +++ b/java/src/common/packet/S2EPacketCloseWindow.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S2EPacketCloseWindow implements Packet { diff --git a/java/src/game/packet/S2FPacketSetSlot.java b/java/src/common/packet/S2FPacketSetSlot.java similarity index 89% rename from java/src/game/packet/S2FPacketSetSlot.java rename to java/src/common/packet/S2FPacketSetSlot.java index 6b307f1..def36be 100755 --- a/java/src/game/packet/S2FPacketSetSlot.java +++ b/java/src/common/packet/S2FPacketSetSlot.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.item.ItemStack; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S2FPacketSetSlot implements Packet { diff --git a/java/src/game/packet/S30PacketWindowItems.java b/java/src/common/packet/S30PacketWindowItems.java similarity index 91% rename from java/src/game/packet/S30PacketWindowItems.java rename to java/src/common/packet/S30PacketWindowItems.java index a7dc2c1..c3e37f3 100755 --- a/java/src/game/packet/S30PacketWindowItems.java +++ b/java/src/common/packet/S30PacketWindowItems.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.item.ItemStack; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.item.ItemStack; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S30PacketWindowItems implements Packet { diff --git a/java/src/game/packet/S31PacketWindowProperty.java b/java/src/common/packet/S31PacketWindowProperty.java similarity index 91% rename from java/src/game/packet/S31PacketWindowProperty.java rename to java/src/common/packet/S31PacketWindowProperty.java index 50b5ed1..e8b02ff 100755 --- a/java/src/game/packet/S31PacketWindowProperty.java +++ b/java/src/common/packet/S31PacketWindowProperty.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S31PacketWindowProperty implements Packet { diff --git a/java/src/game/packet/S32PacketConfirmTransaction.java b/java/src/common/packet/S32PacketConfirmTransaction.java similarity index 92% rename from java/src/game/packet/S32PacketConfirmTransaction.java rename to java/src/common/packet/S32PacketConfirmTransaction.java index f323a67..2bf7c0f 100755 --- a/java/src/game/packet/S32PacketConfirmTransaction.java +++ b/java/src/common/packet/S32PacketConfirmTransaction.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S32PacketConfirmTransaction implements Packet { diff --git a/java/src/game/packet/S33PacketUpdateSign.java b/java/src/common/packet/S33PacketUpdateSign.java similarity index 91% rename from java/src/game/packet/S33PacketUpdateSign.java rename to java/src/common/packet/S33PacketUpdateSign.java index 798140b..dc8b266 100755 --- a/java/src/game/packet/S33PacketUpdateSign.java +++ b/java/src/common/packet/S33PacketUpdateSign.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; -import game.world.World; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; +import common.world.World; public class S33PacketUpdateSign implements Packet { diff --git a/java/src/game/packet/S35PacketUpdateTileEntity.java b/java/src/common/packet/S35PacketUpdateTileEntity.java similarity index 85% rename from java/src/game/packet/S35PacketUpdateTileEntity.java rename to java/src/common/packet/S35PacketUpdateTileEntity.java index eb8e079..7c0aa3d 100755 --- a/java/src/game/packet/S35PacketUpdateTileEntity.java +++ b/java/src/common/packet/S35PacketUpdateTileEntity.java @@ -1,14 +1,14 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.init.TileRegistry; -import game.nbt.NBTTagCompound; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.tileentity.TileEntity; -import game.world.BlockPos; +import common.init.TileRegistry; +import common.nbt.NBTTagCompound; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.tileentity.TileEntity; +import common.world.BlockPos; public class S35PacketUpdateTileEntity implements Packet { diff --git a/java/src/game/packet/S36PacketSignEditorOpen.java b/java/src/common/packet/S36PacketSignEditorOpen.java similarity index 86% rename from java/src/game/packet/S36PacketSignEditorOpen.java rename to java/src/common/packet/S36PacketSignEditorOpen.java index 6d5b2d4..29d3f03 100755 --- a/java/src/game/packet/S36PacketSignEditorOpen.java +++ b/java/src/common/packet/S36PacketSignEditorOpen.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class S36PacketSignEditorOpen implements Packet { diff --git a/java/src/game/packet/S38PacketPlayerListItem.java b/java/src/common/packet/S38PacketPlayerListItem.java similarity index 87% rename from java/src/game/packet/S38PacketPlayerListItem.java rename to java/src/common/packet/S38PacketPlayerListItem.java index afcde9f..f83caa5 100755 --- a/java/src/game/packet/S38PacketPlayerListItem.java +++ b/java/src/common/packet/S38PacketPlayerListItem.java @@ -1,15 +1,15 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import game.collect.Maps; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.network.IPlayer; +import common.collect.Maps; +import common.network.IClientPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S38PacketPlayerListItem implements Packet { private final Map players = Maps.newHashMap(); diff --git a/java/src/game/packet/S39PacketPlayerAbilities.java b/java/src/common/packet/S39PacketPlayerAbilities.java similarity index 84% rename from java/src/game/packet/S39PacketPlayerAbilities.java rename to java/src/common/packet/S39PacketPlayerAbilities.java index 740aa08..24f0537 100755 --- a/java/src/game/packet/S39PacketPlayerAbilities.java +++ b/java/src/common/packet/S39PacketPlayerAbilities.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.npc.EntityNPC; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.entity.npc.EntityNPC; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S39PacketPlayerAbilities implements Packet { private boolean flying; diff --git a/java/src/game/packet/S3APacketTabComplete.java b/java/src/common/packet/S3APacketTabComplete.java similarity index 90% rename from java/src/game/packet/S3APacketTabComplete.java rename to java/src/common/packet/S3APacketTabComplete.java index 680df6a..76beea3 100755 --- a/java/src/game/packet/S3APacketTabComplete.java +++ b/java/src/common/packet/S3APacketTabComplete.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class S3APacketTabComplete implements Packet { diff --git a/java/src/game/packet/S43PacketUpdateEntityNBT.java b/java/src/common/packet/S43PacketUpdateEntityNBT.java similarity index 85% rename from java/src/game/packet/S43PacketUpdateEntityNBT.java rename to java/src/common/packet/S43PacketUpdateEntityNBT.java index 1982acc..ad56eac 100755 --- a/java/src/game/packet/S43PacketUpdateEntityNBT.java +++ b/java/src/common/packet/S43PacketUpdateEntityNBT.java @@ -1,13 +1,13 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.nbt.NBTTagCompound; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.nbt.NBTTagCompound; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class S43PacketUpdateEntityNBT implements Packet { diff --git a/java/src/game/packet/SPacketAnimation.java b/java/src/common/packet/SPacketAnimation.java similarity index 89% rename from java/src/game/packet/SPacketAnimation.java rename to java/src/common/packet/SPacketAnimation.java index f04fa3f..ad62a60 100755 --- a/java/src/game/packet/SPacketAnimation.java +++ b/java/src/common/packet/SPacketAnimation.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketAnimation implements Packet { diff --git a/java/src/game/packet/SPacketBiomes.java b/java/src/common/packet/SPacketBiomes.java similarity index 87% rename from java/src/game/packet/SPacketBiomes.java rename to java/src/common/packet/SPacketBiomes.java index 9af8bdf..3d83aed 100755 --- a/java/src/game/packet/SPacketBiomes.java +++ b/java/src/common/packet/SPacketBiomes.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketBiomes implements Packet { private int chunkX; diff --git a/java/src/game/packet/SPacketBlockAction.java b/java/src/common/packet/SPacketBlockAction.java similarity index 89% rename from java/src/game/packet/SPacketBlockAction.java rename to java/src/common/packet/SPacketBlockAction.java index b20f782..5de2cac 100755 --- a/java/src/game/packet/SPacketBlockAction.java +++ b/java/src/common/packet/SPacketBlockAction.java @@ -1,13 +1,13 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.block.Block; -import game.init.BlockRegistry; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.block.Block; +import common.init.BlockRegistry; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class SPacketBlockAction implements Packet { diff --git a/java/src/game/packet/SPacketBlockBreakAnim.java b/java/src/common/packet/SPacketBlockBreakAnim.java similarity index 90% rename from java/src/game/packet/SPacketBlockBreakAnim.java rename to java/src/common/packet/SPacketBlockBreakAnim.java index 8621320..d6f613c 100755 --- a/java/src/game/packet/SPacketBlockBreakAnim.java +++ b/java/src/common/packet/SPacketBlockBreakAnim.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class SPacketBlockBreakAnim implements Packet { diff --git a/java/src/game/packet/SPacketBlockChange.java b/java/src/common/packet/SPacketBlockChange.java similarity index 84% rename from java/src/game/packet/SPacketBlockChange.java rename to java/src/common/packet/SPacketBlockChange.java index 801050a..d60fd10 100755 --- a/java/src/game/packet/SPacketBlockChange.java +++ b/java/src/common/packet/SPacketBlockChange.java @@ -1,14 +1,14 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.init.BlockRegistry; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.init.BlockRegistry; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public class SPacketBlockChange implements Packet { diff --git a/java/src/game/packet/SPacketCamera.java b/java/src/common/packet/SPacketCamera.java similarity index 80% rename from java/src/game/packet/SPacketCamera.java rename to java/src/common/packet/SPacketCamera.java index a22f016..40edc45 100755 --- a/java/src/game/packet/SPacketCamera.java +++ b/java/src/common/packet/SPacketCamera.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class SPacketCamera implements Packet { diff --git a/java/src/game/packet/SPacketCharacterList.java b/java/src/common/packet/SPacketCharacterList.java similarity index 89% rename from java/src/game/packet/SPacketCharacterList.java rename to java/src/common/packet/SPacketCharacterList.java index e9f3c74..b5b13b8 100644 --- a/java/src/game/packet/SPacketCharacterList.java +++ b/java/src/common/packet/SPacketCharacterList.java @@ -1,18 +1,18 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import game.collect.Maps; -import game.entity.npc.Alignment; -import game.entity.npc.PlayerCharacter; -import game.network.IClientPlayer; -import game.network.IPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; +import common.collect.Maps; +import common.entity.npc.Alignment; +import common.entity.npc.PlayerCharacter; +import common.network.IClientPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; public class SPacketCharacterList implements Packet { private final Map players = Maps.newHashMap(); diff --git a/java/src/game/packet/SPacketChunkData.java b/java/src/common/packet/SPacketChunkData.java similarity index 95% rename from java/src/game/packet/SPacketChunkData.java rename to java/src/common/packet/SPacketChunkData.java index c0122d8..1996522 100755 --- a/java/src/game/packet/SPacketChunkData.java +++ b/java/src/common/packet/SPacketChunkData.java @@ -1,14 +1,14 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.collect.Lists; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockArray; -import game.world.Chunk; +import common.collect.Lists; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockArray; +import common.world.Chunk; public class SPacketChunkData implements Packet { diff --git a/java/src/game/packet/SPacketCollectItem.java b/java/src/common/packet/SPacketCollectItem.java similarity index 91% rename from java/src/game/packet/SPacketCollectItem.java rename to java/src/common/packet/SPacketCollectItem.java index 3763c56..4c0deb7 100755 --- a/java/src/game/packet/SPacketCollectItem.java +++ b/java/src/common/packet/SPacketCollectItem.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketCollectItem implements Packet { diff --git a/java/src/game/packet/SPacketDestroyEntities.java b/java/src/common/packet/SPacketDestroyEntities.java similarity index 90% rename from java/src/game/packet/SPacketDestroyEntities.java rename to java/src/common/packet/SPacketDestroyEntities.java index 4afc384..9927461 100755 --- a/java/src/game/packet/SPacketDestroyEntities.java +++ b/java/src/common/packet/SPacketDestroyEntities.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketDestroyEntities implements Packet { diff --git a/java/src/game/packet/SPacketDimensionName.java b/java/src/common/packet/SPacketDimensionName.java similarity index 86% rename from java/src/game/packet/SPacketDimensionName.java rename to java/src/common/packet/SPacketDimensionName.java index e0160a2..feb1c80 100755 --- a/java/src/game/packet/SPacketDimensionName.java +++ b/java/src/common/packet/SPacketDimensionName.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.dimension.Dimension; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.dimension.Dimension; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketDimensionName implements Packet { private String fullName; diff --git a/java/src/game/packet/SPacketDisconnect.java b/java/src/common/packet/SPacketDisconnect.java similarity index 77% rename from java/src/game/packet/SPacketDisconnect.java rename to java/src/common/packet/SPacketDisconnect.java index 1ff1234..5b690b7 100755 --- a/java/src/game/packet/SPacketDisconnect.java +++ b/java/src/common/packet/SPacketDisconnect.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketDisconnect implements Packet { diff --git a/java/src/game/packet/SPacketEntityEquipment.java b/java/src/common/packet/SPacketEntityEquipment.java similarity index 90% rename from java/src/game/packet/SPacketEntityEquipment.java rename to java/src/common/packet/SPacketEntityEquipment.java index d90e86d..0ee5fd8 100755 --- a/java/src/game/packet/SPacketEntityEquipment.java +++ b/java/src/common/packet/SPacketEntityEquipment.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.item.ItemStack; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketEntityEquipment implements Packet { diff --git a/java/src/game/packet/SPacketEntityVelocity.java b/java/src/common/packet/SPacketEntityVelocity.java similarity index 93% rename from java/src/game/packet/SPacketEntityVelocity.java rename to java/src/common/packet/SPacketEntityVelocity.java index ccca607..8b6520c 100755 --- a/java/src/game/packet/SPacketEntityVelocity.java +++ b/java/src/common/packet/SPacketEntityVelocity.java @@ -1,11 +1,11 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketEntityVelocity implements Packet { diff --git a/java/src/game/packet/SPacketHeldItemChange.java b/java/src/common/packet/SPacketHeldItemChange.java similarity index 88% rename from java/src/game/packet/SPacketHeldItemChange.java rename to java/src/common/packet/SPacketHeldItemChange.java index 8c36e08..a2066f1 100755 --- a/java/src/game/packet/SPacketHeldItemChange.java +++ b/java/src/common/packet/SPacketHeldItemChange.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketHeldItemChange implements Packet { diff --git a/java/src/game/packet/SPacketJoinGame.java b/java/src/common/packet/SPacketJoinGame.java similarity index 86% rename from java/src/game/packet/SPacketJoinGame.java rename to java/src/common/packet/SPacketJoinGame.java index 6c9e0ac..1f452fd 100755 --- a/java/src/game/packet/SPacketJoinGame.java +++ b/java/src/common/packet/SPacketJoinGame.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.dimension.Dimension; -import game.nbt.NBTTagCompound; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.dimension.Dimension; +import common.nbt.NBTTagCompound; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketJoinGame implements Packet { private int entityId; diff --git a/java/src/game/packet/SPacketKeepAlive.java b/java/src/common/packet/SPacketKeepAlive.java similarity index 83% rename from java/src/game/packet/SPacketKeepAlive.java rename to java/src/common/packet/SPacketKeepAlive.java index 9c5cbb9..6451e5e 100755 --- a/java/src/game/packet/SPacketKeepAlive.java +++ b/java/src/common/packet/SPacketKeepAlive.java @@ -1,6 +1,6 @@ -package game.packet; +package common.packet; -import game.network.IClientPlayer; +import common.network.IClientPlayer; public class SPacketKeepAlive extends APacketVarInt { diff --git a/java/src/game/packet/SPacketLoading.java b/java/src/common/packet/SPacketLoading.java similarity index 92% rename from java/src/game/packet/SPacketLoading.java rename to java/src/common/packet/SPacketLoading.java index ae2214c..4daa761 100644 --- a/java/src/game/packet/SPacketLoading.java +++ b/java/src/common/packet/SPacketLoading.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketLoading implements Packet { private String message; diff --git a/java/src/game/packet/SPacketMapChunkBulk.java b/java/src/common/packet/SPacketMapChunkBulk.java similarity index 95% rename from java/src/game/packet/SPacketMapChunkBulk.java rename to java/src/common/packet/SPacketMapChunkBulk.java index 4b119fe..aebfac5 100755 --- a/java/src/game/packet/SPacketMapChunkBulk.java +++ b/java/src/common/packet/SPacketMapChunkBulk.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.Chunk; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.Chunk; public class SPacketMapChunkBulk implements Packet { diff --git a/java/src/game/packet/SPacketMessage.java b/java/src/common/packet/SPacketMessage.java similarity index 86% rename from java/src/game/packet/SPacketMessage.java rename to java/src/common/packet/SPacketMessage.java index d73032e..3832c29 100755 --- a/java/src/game/packet/SPacketMessage.java +++ b/java/src/common/packet/SPacketMessage.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketMessage implements Packet { public static enum Type { diff --git a/java/src/game/packet/SPacketMultiBlockChange.java b/java/src/common/packet/SPacketMultiBlockChange.java similarity index 91% rename from java/src/game/packet/SPacketMultiBlockChange.java rename to java/src/common/packet/SPacketMultiBlockChange.java index 1fcf7fd..8769e0a 100755 --- a/java/src/game/packet/SPacketMultiBlockChange.java +++ b/java/src/common/packet/SPacketMultiBlockChange.java @@ -1,15 +1,15 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.init.BlockRegistry; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.BlockPos; -import game.world.Chunk; -import game.world.ChunkPos; -import game.world.State; +import common.init.BlockRegistry; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.BlockPos; +import common.world.Chunk; +import common.world.ChunkPos; +import common.world.State; public class SPacketMultiBlockChange implements Packet { diff --git a/java/src/game/packet/SPacketPlayerPosLook.java b/java/src/common/packet/SPacketPlayerPosLook.java similarity index 96% rename from java/src/game/packet/SPacketPlayerPosLook.java rename to java/src/common/packet/SPacketPlayerPosLook.java index 74b4b2d..29d51ba 100755 --- a/java/src/game/packet/SPacketPlayerPosLook.java +++ b/java/src/common/packet/SPacketPlayerPosLook.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.EnumSet; import java.util.Set; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketPlayerPosLook implements Packet { diff --git a/java/src/game/packet/SPacketRespawn.java b/java/src/common/packet/SPacketRespawn.java similarity index 86% rename from java/src/game/packet/SPacketRespawn.java rename to java/src/common/packet/SPacketRespawn.java index d577276..3e8d3fd 100755 --- a/java/src/game/packet/SPacketRespawn.java +++ b/java/src/common/packet/SPacketRespawn.java @@ -1,12 +1,12 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.dimension.Dimension; -import game.nbt.NBTTagCompound; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.dimension.Dimension; +import common.nbt.NBTTagCompound; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketRespawn implements Packet { diff --git a/java/src/game/packet/SPacketServerTick.java b/java/src/common/packet/SPacketServerTick.java similarity index 81% rename from java/src/game/packet/SPacketServerTick.java rename to java/src/common/packet/SPacketServerTick.java index 03ad7ec..0a9eac1 100644 --- a/java/src/game/packet/SPacketServerTick.java +++ b/java/src/common/packet/SPacketServerTick.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketServerTick implements Packet { private int time; diff --git a/java/src/game/packet/SPacketSetExperience.java b/java/src/common/packet/SPacketSetExperience.java similarity index 92% rename from java/src/game/packet/SPacketSetExperience.java rename to java/src/common/packet/SPacketSetExperience.java index b317b66..1b60ca9 100755 --- a/java/src/game/packet/SPacketSetExperience.java +++ b/java/src/common/packet/SPacketSetExperience.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketSetExperience implements Packet { diff --git a/java/src/game/packet/SPacketSkin.java b/java/src/common/packet/SPacketSkin.java similarity index 86% rename from java/src/game/packet/SPacketSkin.java rename to java/src/common/packet/SPacketSkin.java index 23b619f..2efdcc9 100755 --- a/java/src/game/packet/SPacketSkin.java +++ b/java/src/common/packet/SPacketSkin.java @@ -1,13 +1,13 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.network.IClientPlayer; -import game.network.IPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.world.World; +import common.entity.Entity; +import common.network.IClientPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.world.World; public class SPacketSkin implements Packet { diff --git a/java/src/game/packet/SPacketSpawnMob.java b/java/src/common/packet/SPacketSpawnMob.java similarity index 93% rename from java/src/game/packet/SPacketSpawnMob.java rename to java/src/common/packet/SPacketSpawnMob.java index 2bd5afe..b26ba57 100755 --- a/java/src/game/packet/SPacketSpawnMob.java +++ b/java/src/common/packet/SPacketSpawnMob.java @@ -1,15 +1,15 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.entity.DataWatcher; -import game.entity.types.EntityLiving; -import game.init.EntityRegistry; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; +import common.entity.DataWatcher; +import common.entity.types.EntityLiving; +import common.init.EntityRegistry; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; public class SPacketSpawnMob implements Packet { diff --git a/java/src/game/packet/SPacketSpawnObject.java b/java/src/common/packet/SPacketSpawnObject.java similarity index 91% rename from java/src/game/packet/SPacketSpawnObject.java rename to java/src/common/packet/SPacketSpawnObject.java index 238e1ef..5058f62 100755 --- a/java/src/game/packet/SPacketSpawnObject.java +++ b/java/src/common/packet/SPacketSpawnObject.java @@ -1,18 +1,18 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.entity.Entity; -import game.entity.item.EntityLeashKnot; -import game.entity.projectile.EntityProjectile; -import game.entity.types.IObjectData; -import game.init.EntityRegistry; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Vec3; +import common.entity.Entity; +import common.entity.item.EntityLeashKnot; +import common.entity.projectile.EntityProjectile; +import common.entity.types.IObjectData; +import common.init.EntityRegistry; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Vec3; public class SPacketSpawnObject implements Packet { diff --git a/java/src/game/packet/SPacketSpawnPlayer.java b/java/src/common/packet/SPacketSpawnPlayer.java similarity index 90% rename from java/src/game/packet/SPacketSpawnPlayer.java rename to java/src/common/packet/SPacketSpawnPlayer.java index 89702e6..7c1ab02 100755 --- a/java/src/game/packet/SPacketSpawnPlayer.java +++ b/java/src/common/packet/SPacketSpawnPlayer.java @@ -1,18 +1,18 @@ -package game.packet; +package common.packet; import java.io.IOException; import java.util.List; -import game.entity.DataWatcher; -import game.entity.npc.EntityNPC; -import game.init.EntityRegistry; -import game.init.ItemRegistry; -import game.item.ItemStack; -import game.network.IClientPlayer; -import game.network.IPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.util.ExtMath; +import common.entity.DataWatcher; +import common.entity.npc.EntityNPC; +import common.init.EntityRegistry; +import common.init.ItemRegistry; +import common.item.ItemStack; +import common.network.IClientPlayer; +import common.network.IPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.util.ExtMath; public class SPacketSpawnPlayer implements Packet { diff --git a/java/src/game/packet/SPacketTimeUpdate.java b/java/src/common/packet/SPacketTimeUpdate.java similarity index 86% rename from java/src/game/packet/SPacketTimeUpdate.java rename to java/src/common/packet/SPacketTimeUpdate.java index f8b28fa..3885c3a 100755 --- a/java/src/game/packet/SPacketTimeUpdate.java +++ b/java/src/common/packet/SPacketTimeUpdate.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketTimeUpdate implements Packet { private long worldTime; diff --git a/java/src/game/packet/SPacketTrades.java b/java/src/common/packet/SPacketTrades.java similarity index 91% rename from java/src/game/packet/SPacketTrades.java rename to java/src/common/packet/SPacketTrades.java index 4c64a65..94a5e65 100755 --- a/java/src/game/packet/SPacketTrades.java +++ b/java/src/common/packet/SPacketTrades.java @@ -1,13 +1,13 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.item.ItemStack; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; -import game.village.MerchantRecipe; -import game.village.MerchantRecipeList; +import common.item.ItemStack; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; +import common.village.MerchantRecipe; +import common.village.MerchantRecipeList; public class SPacketTrades implements Packet { diff --git a/java/src/game/packet/SPacketUpdateHealth.java b/java/src/common/packet/SPacketUpdateHealth.java similarity index 82% rename from java/src/game/packet/SPacketUpdateHealth.java rename to java/src/common/packet/SPacketUpdateHealth.java index cda549b..532f069 100755 --- a/java/src/game/packet/SPacketUpdateHealth.java +++ b/java/src/common/packet/SPacketUpdateHealth.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketUpdateHealth implements Packet { private int health; diff --git a/java/src/game/packet/SPacketWorld.java b/java/src/common/packet/SPacketWorld.java similarity index 89% rename from java/src/game/packet/SPacketWorld.java rename to java/src/common/packet/SPacketWorld.java index 3c68f29..17ff613 100755 --- a/java/src/game/packet/SPacketWorld.java +++ b/java/src/common/packet/SPacketWorld.java @@ -1,10 +1,10 @@ -package game.packet; +package common.packet; import java.io.IOException; -import game.network.IClientPlayer; -import game.network.Packet; -import game.network.PacketBuffer; +import common.network.IClientPlayer; +import common.network.Packet; +import common.network.PacketBuffer; public class SPacketWorld implements Packet { private float gravity; diff --git a/java/src/game/pathfinding/NodeProcessor.java b/java/src/common/pathfinding/NodeProcessor.java similarity index 93% rename from java/src/game/pathfinding/NodeProcessor.java rename to java/src/common/pathfinding/NodeProcessor.java index 3bf08d0..8dc172e 100755 --- a/java/src/game/pathfinding/NodeProcessor.java +++ b/java/src/common/pathfinding/NodeProcessor.java @@ -1,8 +1,8 @@ -package game.pathfinding; +package common.pathfinding; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.IntHashMap; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.IntHashMap; public abstract class NodeProcessor { diff --git a/java/src/game/pathfinding/Path.java b/java/src/common/pathfinding/Path.java similarity index 99% rename from java/src/game/pathfinding/Path.java rename to java/src/common/pathfinding/Path.java index 65e0cf9..ed5d9c3 100755 --- a/java/src/game/pathfinding/Path.java +++ b/java/src/common/pathfinding/Path.java @@ -1,4 +1,4 @@ -package game.pathfinding; +package common.pathfinding; public class Path { diff --git a/java/src/game/pathfinding/PathCache.java b/java/src/common/pathfinding/PathCache.java similarity index 76% rename from java/src/game/pathfinding/PathCache.java rename to java/src/common/pathfinding/PathCache.java index 55d88e8..1dc0239 100755 --- a/java/src/game/pathfinding/PathCache.java +++ b/java/src/common/pathfinding/PathCache.java @@ -1,12 +1,12 @@ -package game.pathfinding; +package common.pathfinding; -import game.init.Blocks; -import game.world.BlockPos; -import game.world.Chunk; -import game.world.ChunkCache; -import game.world.IBlockAccess; -import game.world.State; -import game.world.World; +import common.init.Blocks; +import common.world.BlockPos; +import common.world.Chunk; +import common.world.ChunkCache; +import common.world.IBlockAccess; +import common.world.State; +import common.world.World; public class PathCache extends ChunkCache implements IBlockAccess { diff --git a/java/src/game/pathfinding/PathEntity.java b/java/src/common/pathfinding/PathEntity.java similarity index 97% rename from java/src/game/pathfinding/PathEntity.java rename to java/src/common/pathfinding/PathEntity.java index 6f71dc7..593e6e3 100755 --- a/java/src/game/pathfinding/PathEntity.java +++ b/java/src/common/pathfinding/PathEntity.java @@ -1,7 +1,7 @@ -package game.pathfinding; +package common.pathfinding; -import game.entity.Entity; -import game.world.Vec3; +import common.entity.Entity; +import common.world.Vec3; public class PathEntity { diff --git a/java/src/game/pathfinding/PathFinder.java b/java/src/common/pathfinding/PathFinder.java similarity index 98% rename from java/src/game/pathfinding/PathFinder.java rename to java/src/common/pathfinding/PathFinder.java index a18a568..db9798e 100755 --- a/java/src/game/pathfinding/PathFinder.java +++ b/java/src/common/pathfinding/PathFinder.java @@ -1,7 +1,7 @@ -package game.pathfinding; +package common.pathfinding; -import game.entity.Entity; -import game.world.BlockPos; +import common.entity.Entity; +import common.world.BlockPos; public class PathFinder { diff --git a/java/src/game/pathfinding/PathNavigate.java b/java/src/common/pathfinding/PathNavigate.java similarity index 96% rename from java/src/game/pathfinding/PathNavigate.java rename to java/src/common/pathfinding/PathNavigate.java index 484e8ce..fb749ca 100755 --- a/java/src/game/pathfinding/PathNavigate.java +++ b/java/src/common/pathfinding/PathNavigate.java @@ -1,16 +1,16 @@ -package game.pathfinding; +package common.pathfinding; import java.util.List; -import game.entity.Entity; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.Attributes; -import game.entity.types.EntityLiving; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Vec3; -import game.world.World; +import common.entity.Entity; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.Attributes; +import common.entity.types.EntityLiving; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Vec3; +import common.world.World; public abstract class PathNavigate { diff --git a/java/src/game/pathfinding/PathNavigateClimber.java b/java/src/common/pathfinding/PathNavigateClimber.java similarity index 92% rename from java/src/game/pathfinding/PathNavigateClimber.java rename to java/src/common/pathfinding/PathNavigateClimber.java index 45d1726..02388f6 100755 --- a/java/src/game/pathfinding/PathNavigateClimber.java +++ b/java/src/common/pathfinding/PathNavigateClimber.java @@ -1,10 +1,10 @@ -package game.pathfinding; +package common.pathfinding; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; public class PathNavigateClimber extends PathNavigateGround { diff --git a/java/src/game/pathfinding/PathNavigateGround.java b/java/src/common/pathfinding/PathNavigateGround.java similarity index 96% rename from java/src/game/pathfinding/PathNavigateGround.java rename to java/src/common/pathfinding/PathNavigateGround.java index 989c21f..0fd0d79 100755 --- a/java/src/game/pathfinding/PathNavigateGround.java +++ b/java/src/common/pathfinding/PathNavigateGround.java @@ -1,14 +1,14 @@ -package game.pathfinding; +package common.pathfinding; -import game.block.Block; -import game.entity.animal.EntityChicken; -import game.entity.npc.EntityZombie; -import game.entity.types.EntityLiving; -import game.material.Material; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Vec3; -import game.world.World; +import common.block.Block; +import common.entity.animal.EntityChicken; +import common.entity.npc.EntityZombie; +import common.entity.types.EntityLiving; +import common.material.Material; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Vec3; +import common.world.World; public class PathNavigateGround extends PathNavigate { diff --git a/java/src/game/pathfinding/PathPoint.java b/java/src/common/pathfinding/PathPoint.java similarity index 97% rename from java/src/game/pathfinding/PathPoint.java rename to java/src/common/pathfinding/PathPoint.java index 453383c..92e9731 100755 --- a/java/src/game/pathfinding/PathPoint.java +++ b/java/src/common/pathfinding/PathPoint.java @@ -1,6 +1,6 @@ -package game.pathfinding; +package common.pathfinding; -import game.util.ExtMath; +import common.util.ExtMath; public class PathPoint { diff --git a/java/src/game/pathfinding/SwimNodeProcessor.java b/java/src/common/pathfinding/SwimNodeProcessor.java similarity index 94% rename from java/src/game/pathfinding/SwimNodeProcessor.java rename to java/src/common/pathfinding/SwimNodeProcessor.java index 4790091..57e13ae 100755 --- a/java/src/game/pathfinding/SwimNodeProcessor.java +++ b/java/src/common/pathfinding/SwimNodeProcessor.java @@ -1,10 +1,10 @@ -package game.pathfinding; +package common.pathfinding; -import game.block.Block; -import game.entity.Entity; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.Facing; +import common.block.Block; +import common.entity.Entity; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.Facing; public class SwimNodeProcessor extends NodeProcessor { diff --git a/java/src/game/pathfinding/WalkNodeProcessor.java b/java/src/common/pathfinding/WalkNodeProcessor.java similarity index 96% rename from java/src/game/pathfinding/WalkNodeProcessor.java rename to java/src/common/pathfinding/WalkNodeProcessor.java index 815abec..1f6a96e 100755 --- a/java/src/game/pathfinding/WalkNodeProcessor.java +++ b/java/src/common/pathfinding/WalkNodeProcessor.java @@ -1,17 +1,17 @@ -package game.pathfinding; +package common.pathfinding; -import game.block.Block; -import game.block.BlockDoor; -import game.block.BlockFence; -import game.block.BlockFenceGate; -import game.block.BlockRailBase; -import game.block.BlockWall; -import game.entity.Entity; -import game.init.Blocks; -import game.material.Material; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.IBlockAccess; +import common.block.Block; +import common.block.BlockDoor; +import common.block.BlockFence; +import common.block.BlockFenceGate; +import common.block.BlockRailBase; +import common.block.BlockWall; +import common.entity.Entity; +import common.init.Blocks; +import common.material.Material; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.IBlockAccess; public class WalkNodeProcessor extends NodeProcessor { diff --git a/java/src/game/pattern/BlockStateHelper.java b/java/src/common/pattern/BlockStateHelper.java similarity index 91% rename from java/src/game/pattern/BlockStateHelper.java rename to java/src/common/pattern/BlockStateHelper.java index 2e3972e..df47558 100755 --- a/java/src/game/pattern/BlockStateHelper.java +++ b/java/src/common/pattern/BlockStateHelper.java @@ -1,13 +1,13 @@ -package game.pattern; +package common.pattern; import java.util.Map; import java.util.Map.Entry; import java.util.function.Predicate; -import game.block.Block; -import game.collect.Maps; -import game.properties.IProperty; -import game.world.State; +import common.block.Block; +import common.collect.Maps; +import common.properties.IProperty; +import common.world.State; public class BlockStateHelper implements Predicate { diff --git a/java/src/game/potion/Potion.java b/java/src/common/potion/Potion.java similarity index 95% rename from java/src/game/potion/Potion.java rename to java/src/common/potion/Potion.java index b298f83..cf03a29 100755 --- a/java/src/game/potion/Potion.java +++ b/java/src/common/potion/Potion.java @@ -1,18 +1,18 @@ -package game.potion; +package common.potion; import java.util.Map; import java.util.Map.Entry; -import game.collect.Maps; -import game.entity.DamageSource; -import game.entity.attributes.Attribute; -import game.entity.attributes.AttributeInstance; -import game.entity.attributes.AttributeMap; -import game.entity.attributes.AttributeModifier; -import game.entity.attributes.Attributes; -import game.entity.projectile.EntityPotion; -import game.entity.types.EntityLiving; -import game.init.Config; +import common.collect.Maps; +import common.entity.DamageSource; +import common.entity.attributes.Attribute; +import common.entity.attributes.AttributeInstance; +import common.entity.attributes.AttributeMap; +import common.entity.attributes.AttributeModifier; +import common.entity.attributes.Attributes; +import common.entity.projectile.EntityPotion; +import common.entity.types.EntityLiving; +import common.init.Config; public enum Potion { SPEED("speed", "Schnelligkeit", "Trank der Schnelligkeit", false, 8171462, new PotionModifier(Attributes.MOVEMENT_SPEED, "PotSpd", 0.2, true)), diff --git a/java/src/game/potion/PotionEffect.java b/java/src/common/potion/PotionEffect.java similarity index 97% rename from java/src/game/potion/PotionEffect.java rename to java/src/common/potion/PotionEffect.java index fdc7468..ccbfae5 100755 --- a/java/src/game/potion/PotionEffect.java +++ b/java/src/common/potion/PotionEffect.java @@ -1,8 +1,8 @@ -package game.potion; +package common.potion; -import game.entity.types.EntityLiving; -import game.log.Log; -import game.nbt.NBTTagCompound; +import common.entity.types.EntityLiving; +import common.log.Log; +import common.nbt.NBTTagCompound; public class PotionEffect { private final Potion potion; diff --git a/java/src/game/potion/PotionHelper.java b/java/src/common/potion/PotionHelper.java similarity index 99% rename from java/src/game/potion/PotionHelper.java rename to java/src/common/potion/PotionHelper.java index a907121..967a346 100755 --- a/java/src/game/potion/PotionHelper.java +++ b/java/src/common/potion/PotionHelper.java @@ -1,11 +1,11 @@ -package game.potion; +package common.potion; import java.util.Collection; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; +import common.collect.Lists; +import common.collect.Maps; public class PotionHelper { diff --git a/java/src/game/properties/IProperty.java b/java/src/common/properties/IProperty.java similarity index 90% rename from java/src/game/properties/IProperty.java rename to java/src/common/properties/IProperty.java index 8869760..af1e388 100755 --- a/java/src/game/properties/IProperty.java +++ b/java/src/common/properties/IProperty.java @@ -1,4 +1,4 @@ -package game.properties; +package common.properties; import java.util.Collection; diff --git a/java/src/game/properties/PropertyBool.java b/java/src/common/properties/PropertyBool.java similarity index 91% rename from java/src/game/properties/PropertyBool.java rename to java/src/common/properties/PropertyBool.java index 4d3a8a5..2db7c37 100755 --- a/java/src/game/properties/PropertyBool.java +++ b/java/src/common/properties/PropertyBool.java @@ -1,8 +1,8 @@ -package game.properties; +package common.properties; import java.util.Collection; -import game.collect.ImmutableSet; +import common.collect.ImmutableSet; public class PropertyBool extends PropertyHelper { diff --git a/java/src/game/properties/PropertyDirection.java b/java/src/common/properties/PropertyDirection.java similarity index 87% rename from java/src/game/properties/PropertyDirection.java rename to java/src/common/properties/PropertyDirection.java index fbcb34a..4c08522 100755 --- a/java/src/game/properties/PropertyDirection.java +++ b/java/src/common/properties/PropertyDirection.java @@ -1,12 +1,12 @@ -package game.properties; +package common.properties; import java.util.Collection; import java.util.function.Predicate; -import game.collect.Filter; -import game.collect.Lists; -import game.util.Predicates; -import game.world.Facing; +import common.collect.Filter; +import common.collect.Lists; +import common.util.Predicates; +import common.world.Facing; public class PropertyDirection extends PropertyEnum { diff --git a/java/src/game/properties/PropertyEnum.java b/java/src/common/properties/PropertyEnum.java similarity index 89% rename from java/src/game/properties/PropertyEnum.java rename to java/src/common/properties/PropertyEnum.java index 6501431..eccbeeb 100755 --- a/java/src/game/properties/PropertyEnum.java +++ b/java/src/common/properties/PropertyEnum.java @@ -1,15 +1,15 @@ -package game.properties; +package common.properties; import java.util.Collection; import java.util.Map; import java.util.function.Predicate; -import game.collect.Filter; -import game.collect.ImmutableSet; -import game.collect.Lists; -import game.collect.Maps; -import game.util.Identifyable; -import game.util.Predicates; +import common.collect.Filter; +import common.collect.ImmutableSet; +import common.collect.Lists; +import common.collect.Maps; +import common.util.Identifyable; +import common.util.Predicates; public class PropertyEnum & Identifyable> extends PropertyHelper { diff --git a/java/src/game/properties/PropertyHelper.java b/java/src/common/properties/PropertyHelper.java similarity index 97% rename from java/src/game/properties/PropertyHelper.java rename to java/src/common/properties/PropertyHelper.java index 5de1517..671ff28 100755 --- a/java/src/game/properties/PropertyHelper.java +++ b/java/src/common/properties/PropertyHelper.java @@ -1,4 +1,4 @@ -package game.properties; +package common.properties; public abstract class PropertyHelper> implements IProperty { diff --git a/java/src/game/properties/PropertyInteger.java b/java/src/common/properties/PropertyInteger.java similarity index 95% rename from java/src/game/properties/PropertyInteger.java rename to java/src/common/properties/PropertyInteger.java index d3ff44f..c6bd59b 100755 --- a/java/src/game/properties/PropertyInteger.java +++ b/java/src/common/properties/PropertyInteger.java @@ -1,10 +1,10 @@ -package game.properties; +package common.properties; import java.util.Collection; import java.util.Set; -import game.collect.ImmutableSet; -import game.collect.Sets; +import common.collect.ImmutableSet; +import common.collect.Sets; public class PropertyInteger extends PropertyHelper { diff --git a/java/src/game/rng/ImprovedGen.java b/java/src/common/rng/ImprovedGen.java similarity index 99% rename from java/src/game/rng/ImprovedGen.java rename to java/src/common/rng/ImprovedGen.java index a709119..d86559b 100755 --- a/java/src/game/rng/ImprovedGen.java +++ b/java/src/common/rng/ImprovedGen.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; class ImprovedGen { private static final double[] dir3X = new double[] { 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 0.0D, diff --git a/java/src/game/rng/ImprovedGenOld.java b/java/src/common/rng/ImprovedGenOld.java similarity index 96% rename from java/src/game/rng/ImprovedGenOld.java rename to java/src/common/rng/ImprovedGenOld.java index 2809b54..fb3c406 100755 --- a/java/src/game/rng/ImprovedGenOld.java +++ b/java/src/common/rng/ImprovedGenOld.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; class ImprovedGenOld { private final int permutations[]; diff --git a/java/src/game/rng/NoiseGen.java b/java/src/common/rng/NoiseGen.java similarity index 95% rename from java/src/game/rng/NoiseGen.java rename to java/src/common/rng/NoiseGen.java index cb247f9..114d7f4 100755 --- a/java/src/game/rng/NoiseGen.java +++ b/java/src/common/rng/NoiseGen.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public abstract class NoiseGen { public abstract void generate(double[] noise, int xoff, int yoff, int zoff, int xsize, int ysize, int zsize, double xscale, double yscale, diff --git a/java/src/game/rng/OctaveGen.java b/java/src/common/rng/OctaveGen.java similarity index 98% rename from java/src/game/rng/OctaveGen.java rename to java/src/common/rng/OctaveGen.java index df68d2a..6e58b5a 100755 --- a/java/src/game/rng/OctaveGen.java +++ b/java/src/common/rng/OctaveGen.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public class OctaveGen extends NoiseGen { private final ImprovedGen[] generators; diff --git a/java/src/game/rng/OctaveGenOld.java b/java/src/common/rng/OctaveGenOld.java similarity index 94% rename from java/src/game/rng/OctaveGenOld.java rename to java/src/common/rng/OctaveGenOld.java index ebca8c7..f8a8787 100755 --- a/java/src/game/rng/OctaveGenOld.java +++ b/java/src/common/rng/OctaveGenOld.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public class OctaveGenOld extends NoiseGen { private final ImprovedGenOld generators[]; diff --git a/java/src/game/rng/PerlinGen.java b/java/src/common/rng/PerlinGen.java similarity index 98% rename from java/src/game/rng/PerlinGen.java rename to java/src/common/rng/PerlinGen.java index e2513cc..0149806 100755 --- a/java/src/game/rng/PerlinGen.java +++ b/java/src/common/rng/PerlinGen.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public class PerlinGen { private final SimplexGen[] generators; diff --git a/java/src/game/rng/PerlinGenOld.java b/java/src/common/rng/PerlinGenOld.java similarity index 94% rename from java/src/game/rng/PerlinGenOld.java rename to java/src/common/rng/PerlinGenOld.java index 44d5002..02ff25b 100755 --- a/java/src/game/rng/PerlinGenOld.java +++ b/java/src/common/rng/PerlinGenOld.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public class PerlinGenOld { private final SimplexGenOld generators[]; diff --git a/java/src/game/rng/Random.java b/java/src/common/rng/Random.java similarity index 99% rename from java/src/game/rng/Random.java rename to java/src/common/rng/Random.java index b9a6c5a..875f2f1 100755 --- a/java/src/game/rng/Random.java +++ b/java/src/common/rng/Random.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/java/src/game/rng/RngItem.java b/java/src/common/rng/RngItem.java similarity index 84% rename from java/src/game/rng/RngItem.java rename to java/src/common/rng/RngItem.java index f74db06..920d53c 100755 --- a/java/src/game/rng/RngItem.java +++ b/java/src/common/rng/RngItem.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; public abstract class RngItem { public final int weight; diff --git a/java/src/game/rng/SimplexGen.java b/java/src/common/rng/SimplexGen.java similarity index 99% rename from java/src/game/rng/SimplexGen.java rename to java/src/common/rng/SimplexGen.java index f29c828..a1f3b20 100755 --- a/java/src/game/rng/SimplexGen.java +++ b/java/src/common/rng/SimplexGen.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; class SimplexGen { private static final int[][] DIRS = new int[][] { { 1, 1, 0 }, { -1, 1, 0 }, { 1, -1, 0 }, { -1, -1, 0 }, { 1, 0, 1 }, { -1, 0, 1 }, { 1, 0, -1 }, diff --git a/java/src/game/rng/SimplexGenOld.java b/java/src/common/rng/SimplexGenOld.java similarity index 95% rename from java/src/game/rng/SimplexGenOld.java rename to java/src/common/rng/SimplexGenOld.java index 3ac1dd2..e597895 100755 --- a/java/src/game/rng/SimplexGenOld.java +++ b/java/src/common/rng/SimplexGenOld.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; class SimplexGenOld { private static final int DIRS[][] = { { 1, 1, 0 }, { -1, 1, 0 }, { 1, -1, 0 }, { -1, -1, 0 }, { 1, 0, 1 }, { -1, 0, 1 }, { 1, 0, -1 }, diff --git a/java/src/game/rng/WeightedList.java b/java/src/common/rng/WeightedList.java similarity index 99% rename from java/src/game/rng/WeightedList.java rename to java/src/common/rng/WeightedList.java index 575c324..2eb9f3e 100755 --- a/java/src/game/rng/WeightedList.java +++ b/java/src/common/rng/WeightedList.java @@ -1,4 +1,4 @@ -package game.rng; +package common.rng; import java.util.ArrayList; import java.util.Collection; diff --git a/java/src/game/sound/EventType.java b/java/src/common/sound/EventType.java similarity index 71% rename from java/src/game/sound/EventType.java rename to java/src/common/sound/EventType.java index e234d21..5028abc 100644 --- a/java/src/game/sound/EventType.java +++ b/java/src/common/sound/EventType.java @@ -1,4 +1,4 @@ -package game.sound; +package common.sound; public enum EventType { SOUND_EFFECT, UI_INTERFACE; diff --git a/java/src/game/sound/MovingSound.java b/java/src/common/sound/MovingSound.java similarity index 84% rename from java/src/game/sound/MovingSound.java rename to java/src/common/sound/MovingSound.java index c3f5fc9..b8dc64c 100755 --- a/java/src/game/sound/MovingSound.java +++ b/java/src/common/sound/MovingSound.java @@ -1,6 +1,6 @@ -package game.sound; +package common.sound; -import game.init.SoundEvent; +import common.init.SoundEvent; public abstract class MovingSound extends Sound { diff --git a/java/src/game/sound/MovingSoundMinecart.java b/java/src/common/sound/MovingSoundMinecart.java similarity index 90% rename from java/src/game/sound/MovingSoundMinecart.java rename to java/src/common/sound/MovingSoundMinecart.java index aa4f110..605044b 100755 --- a/java/src/game/sound/MovingSoundMinecart.java +++ b/java/src/common/sound/MovingSoundMinecart.java @@ -1,8 +1,8 @@ -package game.sound; +package common.sound; -import game.entity.item.EntityCart; -import game.init.SoundEvent; -import game.util.ExtMath; +import common.entity.item.EntityCart; +import common.init.SoundEvent; +import common.util.ExtMath; public class MovingSoundMinecart extends MovingSound { diff --git a/java/src/game/sound/MovingSoundMinecartRiding.java b/java/src/common/sound/MovingSoundMinecartRiding.java similarity index 87% rename from java/src/game/sound/MovingSoundMinecartRiding.java rename to java/src/common/sound/MovingSoundMinecartRiding.java index 42ba8be..ec4c6ab 100755 --- a/java/src/game/sound/MovingSoundMinecartRiding.java +++ b/java/src/common/sound/MovingSoundMinecartRiding.java @@ -1,9 +1,9 @@ -package game.sound; +package common.sound; -import game.entity.item.EntityCart; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.util.ExtMath; +import common.entity.item.EntityCart; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.util.ExtMath; public class MovingSoundMinecartRiding extends MovingSound { diff --git a/java/src/game/sound/PositionedSound.java b/java/src/common/sound/PositionedSound.java similarity index 92% rename from java/src/game/sound/PositionedSound.java rename to java/src/common/sound/PositionedSound.java index ff4a221..86a76c9 100755 --- a/java/src/game/sound/PositionedSound.java +++ b/java/src/common/sound/PositionedSound.java @@ -1,6 +1,6 @@ -package game.sound; +package common.sound; -import game.init.SoundEvent; +import common.init.SoundEvent; public class PositionedSound extends Sound { public PositionedSound(SoundEvent event, EventType type) { diff --git a/java/src/game/sound/Sound.java b/java/src/common/sound/Sound.java similarity index 94% rename from java/src/game/sound/Sound.java rename to java/src/common/sound/Sound.java index fb4247f..d7b8477 100755 --- a/java/src/game/sound/Sound.java +++ b/java/src/common/sound/Sound.java @@ -1,6 +1,6 @@ -package game.sound; +package common.sound; -import game.init.SoundEvent; +import common.init.SoundEvent; public abstract class Sound { diff --git a/java/src/game/tileentity/IHopper.java b/java/src/common/tileentity/IHopper.java similarity index 82% rename from java/src/game/tileentity/IHopper.java rename to java/src/common/tileentity/IHopper.java index 0990c7a..a314d15 100755 --- a/java/src/game/tileentity/IHopper.java +++ b/java/src/common/tileentity/IHopper.java @@ -1,7 +1,7 @@ -package game.tileentity; +package common.tileentity; -import game.inventory.IInventory; -import game.world.World; +import common.inventory.IInventory; +import common.world.World; public interface IHopper extends IInventory { diff --git a/java/src/game/tileentity/IInteractionObject.java b/java/src/common/tileentity/IInteractionObject.java similarity index 55% rename from java/src/game/tileentity/IInteractionObject.java rename to java/src/common/tileentity/IInteractionObject.java index 5b273e6..fc0e98e 100755 --- a/java/src/game/tileentity/IInteractionObject.java +++ b/java/src/common/tileentity/IInteractionObject.java @@ -1,8 +1,8 @@ -package game.tileentity; +package common.tileentity; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.InventoryPlayer; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.InventoryPlayer; public interface IInteractionObject extends IWorldNameable { diff --git a/java/src/game/tileentity/ILockableContainer.java b/java/src/common/tileentity/ILockableContainer.java similarity index 73% rename from java/src/game/tileentity/ILockableContainer.java rename to java/src/common/tileentity/ILockableContainer.java index 54e6125..df4cbca 100755 --- a/java/src/game/tileentity/ILockableContainer.java +++ b/java/src/common/tileentity/ILockableContainer.java @@ -1,6 +1,6 @@ -package game.tileentity; +package common.tileentity; -import game.inventory.IInventory; +import common.inventory.IInventory; public interface ILockableContainer extends IInventory, IInteractionObject { diff --git a/java/src/game/tileentity/ITickable.java b/java/src/common/tileentity/ITickable.java similarity index 65% rename from java/src/game/tileentity/ITickable.java rename to java/src/common/tileentity/ITickable.java index 65c97a4..7227b5e 100755 --- a/java/src/game/tileentity/ITickable.java +++ b/java/src/common/tileentity/ITickable.java @@ -1,4 +1,4 @@ -package game.tileentity; +package common.tileentity; public interface ITickable { diff --git a/java/src/game/tileentity/IWorldNameable.java b/java/src/common/tileentity/IWorldNameable.java similarity index 70% rename from java/src/game/tileentity/IWorldNameable.java rename to java/src/common/tileentity/IWorldNameable.java index 48d70eb..4fa737b 100755 --- a/java/src/game/tileentity/IWorldNameable.java +++ b/java/src/common/tileentity/IWorldNameable.java @@ -1,4 +1,4 @@ -package game.tileentity; +package common.tileentity; public interface IWorldNameable { diff --git a/java/src/game/tileentity/LocalBlockIntercommunication.java b/java/src/common/tileentity/LocalBlockIntercommunication.java similarity index 87% rename from java/src/game/tileentity/LocalBlockIntercommunication.java rename to java/src/common/tileentity/LocalBlockIntercommunication.java index 7c1d406..caa5a25 100755 --- a/java/src/game/tileentity/LocalBlockIntercommunication.java +++ b/java/src/common/tileentity/LocalBlockIntercommunication.java @@ -1,8 +1,8 @@ -package game.tileentity; +package common.tileentity; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.InventoryPlayer; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.InventoryPlayer; public class LocalBlockIntercommunication implements IInteractionObject { diff --git a/java/src/game/tileentity/LockCode.java b/java/src/common/tileentity/LockCode.java similarity index 92% rename from java/src/game/tileentity/LockCode.java rename to java/src/common/tileentity/LockCode.java index 39b276e..cc8da4e 100755 --- a/java/src/game/tileentity/LockCode.java +++ b/java/src/common/tileentity/LockCode.java @@ -1,6 +1,6 @@ -package game.tileentity; +package common.tileentity; -import game.nbt.NBTTagCompound; +import common.nbt.NBTTagCompound; public class LockCode { diff --git a/java/src/game/tileentity/MachineResource.java b/java/src/common/tileentity/MachineResource.java similarity index 97% rename from java/src/game/tileentity/MachineResource.java rename to java/src/common/tileentity/MachineResource.java index 72390f1..07075bd 100755 --- a/java/src/game/tileentity/MachineResource.java +++ b/java/src/common/tileentity/MachineResource.java @@ -1,6 +1,6 @@ -package game.tileentity; +package common.tileentity; -import game.nbt.NBTTagCompound; +import common.nbt.NBTTagCompound; public class MachineResource { public static enum Type { diff --git a/java/src/game/tileentity/TileEntity.java b/java/src/common/tileentity/TileEntity.java similarity index 94% rename from java/src/game/tileentity/TileEntity.java rename to java/src/common/tileentity/TileEntity.java index 8b25565..ea72613 100755 --- a/java/src/game/tileentity/TileEntity.java +++ b/java/src/common/tileentity/TileEntity.java @@ -1,14 +1,14 @@ -package game.tileentity; +package common.tileentity; -import game.block.Block; -import game.init.Blocks; -import game.init.TileRegistry; -import game.log.Log; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.world.BlockPos; -import game.world.State; -import game.world.World; +import common.block.Block; +import common.init.Blocks; +import common.init.TileRegistry; +import common.log.Log; +import common.nbt.NBTTagCompound; +import common.network.Packet; +import common.world.BlockPos; +import common.world.State; +import common.world.World; public abstract class TileEntity { diff --git a/java/src/game/tileentity/TileEntityBanner.java b/java/src/common/tileentity/TileEntityBanner.java similarity index 97% rename from java/src/game/tileentity/TileEntityBanner.java rename to java/src/common/tileentity/TileEntityBanner.java index 24b8210..90e0668 100755 --- a/java/src/game/tileentity/TileEntityBanner.java +++ b/java/src/common/tileentity/TileEntityBanner.java @@ -1,17 +1,17 @@ -package game.tileentity; +package common.tileentity; import java.util.List; -import game.block.BlockFlower; -import game.collect.Lists; -import game.color.DyeColor; -import game.init.Blocks; -import game.init.Items; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.network.Packet; -import game.packet.S35PacketUpdateTileEntity; +import common.block.BlockFlower; +import common.collect.Lists; +import common.color.DyeColor; +import common.init.Blocks; +import common.init.Items; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.network.Packet; +import common.packet.S35PacketUpdateTileEntity; public class TileEntityBanner extends TileEntity { diff --git a/java/src/game/tileentity/TileEntityBeacon.java b/java/src/common/tileentity/TileEntityBeacon.java similarity index 97% rename from java/src/game/tileentity/TileEntityBeacon.java rename to java/src/common/tileentity/TileEntityBeacon.java index 6b57ffa..23ecca3 100755 --- a/java/src/game/tileentity/TileEntityBeacon.java +++ b/java/src/common/tileentity/TileEntityBeacon.java @@ -1,21 +1,21 @@ -package game.tileentity; +package common.tileentity; import java.util.List; -import game.block.Block; -import game.color.DyeColor; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.packet.S35PacketUpdateTileEntity; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.State; -import game.world.World; -import game.world.WorldServer; +import common.block.Block; +import common.color.DyeColor; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.nbt.NBTTagCompound; +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.world.State; +import common.world.World; +import common.world.WorldServer; public class TileEntityBeacon extends TileEntity implements ITickable { diff --git a/java/src/game/tileentity/TileEntityBrewingStand.java b/java/src/common/tileentity/TileEntityBrewingStand.java similarity index 95% rename from java/src/game/tileentity/TileEntityBrewingStand.java rename to java/src/common/tileentity/TileEntityBrewingStand.java index c24d117..8af4271 100755 --- a/java/src/game/tileentity/TileEntityBrewingStand.java +++ b/java/src/common/tileentity/TileEntityBrewingStand.java @@ -1,24 +1,24 @@ -package game.tileentity; +package common.tileentity; import java.util.Arrays; import java.util.List; -import game.block.BlockBrewingStand; -import game.entity.npc.EntityNPC; -import game.init.Items; -import game.inventory.Container; -import game.inventory.ContainerBrewingStand; -import game.inventory.ISidedInventory; -import game.inventory.InventoryPlayer; -import game.item.Item; -import game.item.ItemPotion; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.potion.PotionEffect; -import game.potion.PotionHelper; -import game.world.Facing; -import game.world.State; +import common.block.BlockBrewingStand; +import common.entity.npc.EntityNPC; +import common.init.Items; +import common.inventory.Container; +import common.inventory.ContainerBrewingStand; +import common.inventory.ISidedInventory; +import common.inventory.InventoryPlayer; +import common.item.Item; +import common.item.ItemPotion; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.potion.PotionEffect; +import common.potion.PotionHelper; +import common.world.Facing; +import common.world.State; public class TileEntityBrewingStand extends TileEntityLockable implements ITickable, ISidedInventory { diff --git a/java/src/game/tileentity/TileEntityChest.java b/java/src/common/tileentity/TileEntityChest.java similarity index 96% rename from java/src/game/tileentity/TileEntityChest.java rename to java/src/common/tileentity/TileEntityChest.java index e0481a8..c1e465f 100755 --- a/java/src/game/tileentity/TileEntityChest.java +++ b/java/src/common/tileentity/TileEntityChest.java @@ -1,20 +1,20 @@ -package game.tileentity; +package common.tileentity; -import game.block.Block; -import game.block.BlockChest; -import game.entity.npc.EntityNPC; -import game.init.SoundEvent; -import game.inventory.Container; -import game.inventory.ContainerChest; -import game.inventory.IInventory; -import game.inventory.InventoryLargeChest; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; +import common.block.Block; +import common.block.BlockChest; +import common.entity.npc.EntityNPC; +import common.init.SoundEvent; +import common.inventory.Container; +import common.inventory.ContainerChest; +import common.inventory.IInventory; +import common.inventory.InventoryLargeChest; +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; public class TileEntityChest extends TileEntityLockable implements ITickable, IInventory { diff --git a/java/src/game/tileentity/TileEntityComparator.java b/java/src/common/tileentity/TileEntityComparator.java similarity index 91% rename from java/src/game/tileentity/TileEntityComparator.java rename to java/src/common/tileentity/TileEntityComparator.java index 4506c20..55b488d 100755 --- a/java/src/game/tileentity/TileEntityComparator.java +++ b/java/src/common/tileentity/TileEntityComparator.java @@ -1,6 +1,6 @@ -package game.tileentity; +package common.tileentity; -import game.nbt.NBTTagCompound; +import common.nbt.NBTTagCompound; public class TileEntityComparator extends TileEntity { diff --git a/java/src/game/tileentity/TileEntityDaylightDetector.java b/java/src/common/tileentity/TileEntityDaylightDetector.java similarity index 86% rename from java/src/game/tileentity/TileEntityDaylightDetector.java rename to java/src/common/tileentity/TileEntityDaylightDetector.java index 493f01c..02ca54d 100755 --- a/java/src/game/tileentity/TileEntityDaylightDetector.java +++ b/java/src/common/tileentity/TileEntityDaylightDetector.java @@ -1,7 +1,7 @@ -package game.tileentity; +package common.tileentity; -import game.block.BlockDaylightDetector; -import game.world.WorldServer; +import common.block.BlockDaylightDetector; +import common.world.WorldServer; public class TileEntityDaylightDetector extends TileEntity implements ITickable { diff --git a/java/src/game/tileentity/TileEntityDispenser.java b/java/src/common/tileentity/TileEntityDispenser.java similarity index 94% rename from java/src/game/tileentity/TileEntityDispenser.java rename to java/src/common/tileentity/TileEntityDispenser.java index c903470..d7910b0 100755 --- a/java/src/game/tileentity/TileEntityDispenser.java +++ b/java/src/common/tileentity/TileEntityDispenser.java @@ -1,14 +1,14 @@ -package game.tileentity; +package common.tileentity; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.ContainerDispenser; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.ContainerDispenser; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; public class TileEntityDispenser extends TileEntityLockable implements IInventory { diff --git a/java/src/game/tileentity/TileEntityDropper.java b/java/src/common/tileentity/TileEntityDropper.java similarity index 92% rename from java/src/game/tileentity/TileEntityDropper.java rename to java/src/common/tileentity/TileEntityDropper.java index e33a09e..7842d1a 100755 --- a/java/src/game/tileentity/TileEntityDropper.java +++ b/java/src/common/tileentity/TileEntityDropper.java @@ -1,4 +1,4 @@ -package game.tileentity; +package common.tileentity; public class TileEntityDropper extends TileEntityDispenser { diff --git a/java/src/game/tileentity/TileEntityEnchantmentTable.java b/java/src/common/tileentity/TileEntityEnchantmentTable.java similarity index 94% rename from java/src/game/tileentity/TileEntityEnchantmentTable.java rename to java/src/common/tileentity/TileEntityEnchantmentTable.java index 8e18c65..b3ae645 100755 --- a/java/src/game/tileentity/TileEntityEnchantmentTable.java +++ b/java/src/common/tileentity/TileEntityEnchantmentTable.java @@ -1,12 +1,12 @@ -package game.tileentity; +package common.tileentity; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.ContainerEnchantment; -import game.inventory.InventoryPlayer; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.util.ExtMath; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.ContainerEnchantment; +import common.inventory.InventoryPlayer; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.util.ExtMath; public class TileEntityEnchantmentTable extends TileEntity implements ITickable, IInteractionObject { diff --git a/java/src/game/tileentity/TileEntityFurnace.java b/java/src/common/tileentity/TileEntityFurnace.java similarity index 94% rename from java/src/game/tileentity/TileEntityFurnace.java rename to java/src/common/tileentity/TileEntityFurnace.java index a7225f7..f2dae36 100755 --- a/java/src/game/tileentity/TileEntityFurnace.java +++ b/java/src/common/tileentity/TileEntityFurnace.java @@ -1,32 +1,32 @@ -package game.tileentity; +package common.tileentity; -import game.block.Block; -import game.block.BlockFurnace; -import game.block.BlockSapling; -import game.block.BlockSlab; -import game.entity.npc.EntityNPC; -import game.init.Blocks; -import game.init.Items; -import game.init.SmeltingRegistry; -import game.init.ToolType; -import game.inventory.Container; -import game.inventory.ContainerFurnace; -import game.inventory.IInventory; -import game.inventory.ISidedInventory; -import game.inventory.InventoryPlayer; -import game.inventory.SlotFurnaceFuel; -import game.item.Item; -import game.item.ItemBlock; -import game.item.ItemBucket; -import game.item.ItemHoe; -import game.item.ItemStack; -import game.item.ItemSword; -import game.item.ItemTool; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.util.ExtMath; -import game.world.Facing; +import common.block.Block; +import common.block.BlockFurnace; +import common.block.BlockSapling; +import common.block.BlockSlab; +import common.entity.npc.EntityNPC; +import common.init.Blocks; +import common.init.Items; +import common.init.SmeltingRegistry; +import common.init.ToolType; +import common.inventory.Container; +import common.inventory.ContainerFurnace; +import common.inventory.IInventory; +import common.inventory.ISidedInventory; +import common.inventory.InventoryPlayer; +import common.inventory.SlotFurnaceFuel; +import common.item.Item; +import common.item.ItemBlock; +import common.item.ItemBucket; +import common.item.ItemHoe; +import common.item.ItemStack; +import common.item.ItemSword; +import common.item.ItemTool; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.util.ExtMath; +import common.world.Facing; public class TileEntityFurnace extends TileEntityLockable implements ITickable, ISidedInventory { diff --git a/java/src/game/tileentity/TileEntityHopper.java b/java/src/common/tileentity/TileEntityHopper.java similarity index 96% rename from java/src/game/tileentity/TileEntityHopper.java rename to java/src/common/tileentity/TileEntityHopper.java index 80d75de..736bc88 100755 --- a/java/src/game/tileentity/TileEntityHopper.java +++ b/java/src/common/tileentity/TileEntityHopper.java @@ -1,28 +1,28 @@ -package game.tileentity; +package common.tileentity; import java.util.List; import java.util.function.Predicate; -import game.block.Block; -import game.block.BlockChest; -import game.block.BlockHopper; -import game.entity.Entity; -import game.entity.item.EntityItem; -import game.entity.npc.EntityNPC; -import game.init.Config; -import game.inventory.Container; -import game.inventory.ContainerHopper; -import game.inventory.IInventory; -import game.inventory.ISidedInventory; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.World; +import common.block.Block; +import common.block.BlockChest; +import common.block.BlockHopper; +import common.entity.Entity; +import common.entity.item.EntityItem; +import common.entity.npc.EntityNPC; +import common.init.Config; +import common.inventory.Container; +import common.inventory.ContainerHopper; +import common.inventory.IInventory; +import common.inventory.ISidedInventory; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.BoundingBox; +import common.world.Facing; +import common.world.World; public class TileEntityHopper extends TileEntityLockable implements IHopper, ITickable { diff --git a/java/src/game/tileentity/TileEntityLockable.java b/java/src/common/tileentity/TileEntityLockable.java similarity index 94% rename from java/src/game/tileentity/TileEntityLockable.java rename to java/src/common/tileentity/TileEntityLockable.java index 5b9a1ea..64bb470 100755 --- a/java/src/game/tileentity/TileEntityLockable.java +++ b/java/src/common/tileentity/TileEntityLockable.java @@ -1,6 +1,6 @@ -package game.tileentity; +package common.tileentity; -import game.nbt.NBTTagCompound; +import common.nbt.NBTTagCompound; public abstract class TileEntityLockable extends TileEntity implements IInteractionObject, ILockableContainer { diff --git a/java/src/game/tileentity/TileEntityMachine.java b/java/src/common/tileentity/TileEntityMachine.java similarity index 94% rename from java/src/game/tileentity/TileEntityMachine.java rename to java/src/common/tileentity/TileEntityMachine.java index 367afb6..45d9d6b 100755 --- a/java/src/game/tileentity/TileEntityMachine.java +++ b/java/src/common/tileentity/TileEntityMachine.java @@ -1,17 +1,17 @@ -package game.tileentity; +package common.tileentity; -import game.color.TextColor; -import game.entity.npc.EntityNPC; -import game.inventory.Container; -import game.inventory.ContainerMachine; -import game.inventory.InventoryPlayer; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.network.Packet; -import game.packet.S35PacketUpdateTileEntity; -import game.rng.Random; -import game.util.ExtMath; +import common.color.TextColor; +import common.entity.npc.EntityNPC; +import common.inventory.Container; +import common.inventory.ContainerMachine; +import common.inventory.InventoryPlayer; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.network.Packet; +import common.packet.S35PacketUpdateTileEntity; +import common.rng.Random; +import common.util.ExtMath; public abstract class TileEntityMachine extends TileEntityLockable implements IHopper, ITickable { public static enum Status { diff --git a/java/src/game/tileentity/TileEntityMobSpawner.java b/java/src/common/tileentity/TileEntityMobSpawner.java similarity index 94% rename from java/src/game/tileentity/TileEntityMobSpawner.java rename to java/src/common/tileentity/TileEntityMobSpawner.java index e8a8765..1105fa3 100755 --- a/java/src/game/tileentity/TileEntityMobSpawner.java +++ b/java/src/common/tileentity/TileEntityMobSpawner.java @@ -1,17 +1,17 @@ -package game.tileentity; +package common.tileentity; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.EntityRegistry; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.packet.S35PacketUpdateTileEntity; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.World; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.EntityRegistry; +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.world.World; public class TileEntityMobSpawner extends TileEntity implements ITickable { diff --git a/java/src/game/tileentity/TileEntityNote.java b/java/src/common/tileentity/TileEntityNote.java similarity index 88% rename from java/src/game/tileentity/TileEntityNote.java rename to java/src/common/tileentity/TileEntityNote.java index ee2bf52..c3d4238 100755 --- a/java/src/game/tileentity/TileEntityNote.java +++ b/java/src/common/tileentity/TileEntityNote.java @@ -1,11 +1,11 @@ -package game.tileentity; +package common.tileentity; -import game.init.Blocks; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.World; +import common.init.Blocks; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.World; public class TileEntityNote extends TileEntity { diff --git a/java/src/game/tileentity/TileEntityPiston.java b/java/src/common/tileentity/TileEntityPiston.java similarity index 96% rename from java/src/game/tileentity/TileEntityPiston.java rename to java/src/common/tileentity/TileEntityPiston.java index 98fdb26..e84301f 100755 --- a/java/src/game/tileentity/TileEntityPiston.java +++ b/java/src/common/tileentity/TileEntityPiston.java @@ -1,15 +1,15 @@ -package game.tileentity; +package common.tileentity; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.nbt.NBTTagCompound; -import game.world.BoundingBox; -import game.world.Facing; -import game.world.State; +import common.collect.Lists; +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.world.State; public class TileEntityPiston extends TileEntity implements ITickable { diff --git a/java/src/game/tileentity/TileEntitySign.java b/java/src/common/tileentity/TileEntitySign.java similarity index 95% rename from java/src/game/tileentity/TileEntitySign.java rename to java/src/common/tileentity/TileEntitySign.java index b0b9fa7..4c5301a 100755 --- a/java/src/game/tileentity/TileEntitySign.java +++ b/java/src/common/tileentity/TileEntitySign.java @@ -1,9 +1,9 @@ -package game.tileentity; +package common.tileentity; -import game.entity.npc.EntityNPC; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.packet.S33PacketUpdateSign; +import common.entity.npc.EntityNPC; +import common.nbt.NBTTagCompound; +import common.network.Packet; +import common.packet.S33PacketUpdateSign; public class TileEntitySign extends TileEntity { public final String[] signText = new String[] {"", "", "", ""}; diff --git a/java/src/game/tileentity/TileEntitySkull.java b/java/src/common/tileentity/TileEntitySkull.java similarity index 91% rename from java/src/game/tileentity/TileEntitySkull.java rename to java/src/common/tileentity/TileEntitySkull.java index 66becb1..48f9349 100755 --- a/java/src/game/tileentity/TileEntitySkull.java +++ b/java/src/common/tileentity/TileEntitySkull.java @@ -1,8 +1,8 @@ -package game.tileentity; +package common.tileentity; -import game.nbt.NBTTagCompound; -import game.network.Packet; -import game.packet.S35PacketUpdateTileEntity; +import common.nbt.NBTTagCompound; +import common.network.Packet; +import common.packet.S35PacketUpdateTileEntity; public class TileEntitySkull extends TileEntity { diff --git a/java/src/game/tileentity/TileEntityTianReactor.java b/java/src/common/tileentity/TileEntityTianReactor.java similarity index 88% rename from java/src/game/tileentity/TileEntityTianReactor.java rename to java/src/common/tileentity/TileEntityTianReactor.java index 6896773..b2d4939 100755 --- a/java/src/game/tileentity/TileEntityTianReactor.java +++ b/java/src/common/tileentity/TileEntityTianReactor.java @@ -1,10 +1,10 @@ -package game.tileentity; +package common.tileentity; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.ItemStack; -import game.tileentity.MachineResource.Type; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.ItemStack; +import common.tileentity.MachineResource.Type; public class TileEntityTianReactor extends TileEntityMachine { public TileEntityTianReactor() { diff --git a/java/src/game/util/CharValidator.java b/java/src/common/util/CharValidator.java similarity index 95% rename from java/src/game/util/CharValidator.java rename to java/src/common/util/CharValidator.java index 2a22181..e2c8407 100644 --- a/java/src/game/util/CharValidator.java +++ b/java/src/common/util/CharValidator.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public interface CharValidator { boolean valid(char ch); diff --git a/java/src/game/util/DC32.java b/java/src/common/util/DC32.java similarity index 99% rename from java/src/game/util/DC32.java rename to java/src/common/util/DC32.java index 2a22138..1e40cc4 100644 --- a/java/src/game/util/DC32.java +++ b/java/src/common/util/DC32.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public class DC32 { public static final byte[] ASCII = { // 0x1f -> AUX1 diff --git a/java/src/game/util/Displayable.java b/java/src/common/util/Displayable.java similarity index 75% rename from java/src/game/util/Displayable.java rename to java/src/common/util/Displayable.java index 376ddff..90f83e5 100644 --- a/java/src/game/util/Displayable.java +++ b/java/src/common/util/Displayable.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public interface Displayable { public String getDisplay(); diff --git a/java/src/game/util/ExtMath.java b/java/src/common/util/ExtMath.java similarity index 99% rename from java/src/game/util/ExtMath.java rename to java/src/common/util/ExtMath.java index be7b98b..2554a03 100755 --- a/java/src/game/util/ExtMath.java +++ b/java/src/common/util/ExtMath.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public abstract class ExtMath { private static final float[] SIN_TABLE = new float[65536]; diff --git a/java/src/game/util/FileUtils.java b/java/src/common/util/FileUtils.java similarity index 97% rename from java/src/game/util/FileUtils.java rename to java/src/common/util/FileUtils.java index b2b86d2..5c01c4b 100644 --- a/java/src/game/util/FileUtils.java +++ b/java/src/common/util/FileUtils.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; import java.io.ByteArrayOutputStream; import java.io.File; @@ -8,7 +8,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import game.log.Log; +import common.log.Log; import io.netty.util.CharsetUtil; public class FileUtils { diff --git a/java/src/game/util/Identifyable.java b/java/src/common/util/Identifyable.java similarity index 73% rename from java/src/game/util/Identifyable.java rename to java/src/common/util/Identifyable.java index 03fa092..11dee69 100755 --- a/java/src/game/util/Identifyable.java +++ b/java/src/common/util/Identifyable.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public interface Identifyable { diff --git a/java/src/game/util/LazyLoadBase.java b/java/src/common/util/LazyLoadBase.java similarity index 93% rename from java/src/game/util/LazyLoadBase.java rename to java/src/common/util/LazyLoadBase.java index d40c4e7..11e3858 100755 --- a/java/src/game/util/LazyLoadBase.java +++ b/java/src/common/util/LazyLoadBase.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public abstract class LazyLoadBase { diff --git a/java/src/game/util/Matrix4f.java b/java/src/common/util/Matrix4f.java similarity index 99% rename from java/src/game/util/Matrix4f.java rename to java/src/common/util/Matrix4f.java index 813d579..8e61925 100644 --- a/java/src/game/util/Matrix4f.java +++ b/java/src/common/util/Matrix4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package game.util; +package common.util; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/java/src/game/util/Predicates.java b/java/src/common/util/Predicates.java similarity index 99% rename from java/src/game/util/Predicates.java rename to java/src/common/util/Predicates.java index 6bdfe63..4570723 100644 --- a/java/src/game/util/Predicates.java +++ b/java/src/common/util/Predicates.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package game.util; +package common.util; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/src/game/util/Tuple.java b/java/src/common/util/Tuple.java similarity index 88% rename from java/src/game/util/Tuple.java rename to java/src/common/util/Tuple.java index f41da46..20a5a73 100644 --- a/java/src/game/util/Tuple.java +++ b/java/src/common/util/Tuple.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; public class Tuple { public final S first; diff --git a/java/src/game/util/Util.java b/java/src/common/util/Util.java similarity index 99% rename from java/src/game/util/Util.java rename to java/src/common/util/Util.java index 92704a1..e66fb25 100644 --- a/java/src/game/util/Util.java +++ b/java/src/common/util/Util.java @@ -1,4 +1,4 @@ -package game.util; +package common.util; import java.awt.GraphicsEnvironment; import java.util.List; @@ -7,9 +7,9 @@ import java.util.function.Function; import javax.swing.JOptionPane; -import game.collect.Lists; -import game.collect.Maps; -import game.log.Log; +import common.collect.Lists; +import common.collect.Maps; +import common.log.Log; public abstract class Util { private static long start = getTime(); diff --git a/java/src/game/util/Vector.java b/java/src/common/util/Vector.java similarity index 99% rename from java/src/game/util/Vector.java rename to java/src/common/util/Vector.java index 4e2385a..2388ca6 100644 --- a/java/src/game/util/Vector.java +++ b/java/src/common/util/Vector.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package game.util; +package common.util; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/java/src/game/util/Vector3f.java b/java/src/common/util/Vector3f.java similarity index 99% rename from java/src/game/util/Vector3f.java rename to java/src/common/util/Vector3f.java index e9f56db..cab132d 100644 --- a/java/src/game/util/Vector3f.java +++ b/java/src/common/util/Vector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package game.util; +package common.util; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/java/src/game/util/Vector4f.java b/java/src/common/util/Vector4f.java similarity index 99% rename from java/src/game/util/Vector4f.java rename to java/src/common/util/Vector4f.java index bfd95fc..ce15037 100644 --- a/java/src/game/util/Vector4f.java +++ b/java/src/common/util/Vector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package game.util; +package common.util; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/java/src/game/village/MerchantRecipe.java b/java/src/common/village/MerchantRecipe.java similarity index 94% rename from java/src/game/village/MerchantRecipe.java rename to java/src/common/village/MerchantRecipe.java index c17d4a6..28e4dfe 100755 --- a/java/src/game/village/MerchantRecipe.java +++ b/java/src/common/village/MerchantRecipe.java @@ -1,8 +1,8 @@ -package game.village; +package common.village; -import game.item.Item; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; +import common.item.Item; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; public class MerchantRecipe { diff --git a/java/src/game/village/MerchantRecipeList.java b/java/src/common/village/MerchantRecipeList.java similarity index 97% rename from java/src/game/village/MerchantRecipeList.java rename to java/src/common/village/MerchantRecipeList.java index abc4098..d28a1c7 100755 --- a/java/src/game/village/MerchantRecipeList.java +++ b/java/src/common/village/MerchantRecipeList.java @@ -1,11 +1,11 @@ -package game.village; +package common.village; import java.util.ArrayList; -import game.item.ItemStack; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.nbt.NBTUtil; +import common.item.ItemStack; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.nbt.NBTUtil; public class MerchantRecipeList extends ArrayList { diff --git a/java/src/game/village/Village.java b/java/src/common/village/Village.java similarity index 96% rename from java/src/game/village/Village.java rename to java/src/common/village/Village.java index 5c80e39..9185f6a 100755 --- a/java/src/game/village/Village.java +++ b/java/src/common/village/Village.java @@ -1,16 +1,16 @@ -package game.village; +package common.village; import java.util.Iterator; import java.util.List; -import game.block.Block; -import game.block.BlockDoor; -import game.collect.Lists; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.world.BlockPos; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDoor; +import common.collect.Lists; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.world.BlockPos; +import common.world.WorldServer; public class Village { diff --git a/java/src/game/village/VillageCollection.java b/java/src/common/village/VillageCollection.java similarity index 96% rename from java/src/game/village/VillageCollection.java rename to java/src/common/village/VillageCollection.java index 74b0a9e..6872619 100755 --- a/java/src/game/village/VillageCollection.java +++ b/java/src/common/village/VillageCollection.java @@ -1,17 +1,17 @@ -package game.village; +package common.village; import java.util.Iterator; import java.util.List; -import game.block.Block; -import game.block.BlockDoor; -import game.collect.Lists; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDoor; +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.world.WorldServer; public class VillageCollection { diff --git a/java/src/game/village/VillageDoorInfo.java b/java/src/common/village/VillageDoorInfo.java similarity index 97% rename from java/src/game/village/VillageDoorInfo.java rename to java/src/common/village/VillageDoorInfo.java index 4a27a2d..69b229e 100755 --- a/java/src/game/village/VillageDoorInfo.java +++ b/java/src/common/village/VillageDoorInfo.java @@ -1,7 +1,7 @@ -package game.village; +package common.village; -import game.world.BlockPos; -import game.world.Facing; +import common.world.BlockPos; +import common.world.Facing; public class VillageDoorInfo { diff --git a/java/src/game/world/BlockArray.java b/java/src/common/world/BlockArray.java similarity index 95% rename from java/src/game/world/BlockArray.java rename to java/src/common/world/BlockArray.java index e838cb8..cd89a55 100755 --- a/java/src/game/world/BlockArray.java +++ b/java/src/common/world/BlockArray.java @@ -1,8 +1,8 @@ -package game.world; +package common.world; -import game.block.Block; -import game.init.BlockRegistry; -import game.init.Blocks; +import common.block.Block; +import common.init.BlockRegistry; +import common.init.Blocks; public class BlockArray { private int yBase; diff --git a/java/src/game/world/BlockPos.java b/java/src/common/world/BlockPos.java similarity index 99% rename from java/src/game/world/BlockPos.java rename to java/src/common/world/BlockPos.java index 9a8abf2..1288f53 100755 --- a/java/src/game/world/BlockPos.java +++ b/java/src/common/world/BlockPos.java @@ -1,9 +1,9 @@ -package game.world; +package common.world; import java.util.Iterator; -import game.collect.AbstractIterator; -import game.entity.Entity; +import common.collect.AbstractIterator; +import common.entity.Entity; public class BlockPos extends Vec3i { diff --git a/java/src/game/world/BoundingBox.java b/java/src/common/world/BoundingBox.java similarity index 99% rename from java/src/game/world/BoundingBox.java rename to java/src/common/world/BoundingBox.java index 1aeb90d..c7b02c1 100755 --- a/java/src/game/world/BoundingBox.java +++ b/java/src/common/world/BoundingBox.java @@ -1,6 +1,6 @@ -package game.world; +package common.world; -import game.world.HitPosition.ObjectType; +import common.world.HitPosition.ObjectType; public class BoundingBox { diff --git a/java/src/game/world/Chunk.java b/java/src/common/world/Chunk.java similarity index 98% rename from java/src/game/world/Chunk.java rename to java/src/common/world/Chunk.java index 336e6fb..9f4be01 100755 --- a/java/src/game/world/Chunk.java +++ b/java/src/common/world/Chunk.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.util.Arrays; import java.util.List; @@ -6,20 +6,20 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Predicate; -import game.biome.Biome; -import game.block.Block; -import game.block.ITileEntityProvider; -import game.collect.Maps; -import game.entity.Entity; -import game.init.Blocks; -import game.log.Log; -import game.material.Material; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.util.ExtMath; -import game.worldgen.BiomeGenerator; -import game.worldgen.ChunkPrimer; -import game.worldgen.GeneratorDebug; +import common.biome.Biome; +import common.block.Block; +import common.block.ITileEntityProvider; +import common.collect.Maps; +import common.entity.Entity; +import common.init.Blocks; +import common.log.Log; +import common.material.Material; +import common.rng.Random; +import common.tileentity.TileEntity; +import common.util.ExtMath; +import common.worldgen.BiomeGenerator; +import common.worldgen.ChunkPrimer; +import common.worldgen.GeneratorDebug; public class Chunk { public final int xPos; diff --git a/java/src/game/world/ChunkCache.java b/java/src/common/world/ChunkCache.java similarity index 97% rename from java/src/game/world/ChunkCache.java rename to java/src/common/world/ChunkCache.java index cd79161..e213ba5 100755 --- a/java/src/game/world/ChunkCache.java +++ b/java/src/common/world/ChunkCache.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class ChunkCache { diff --git a/java/src/game/world/ChunkPos.java b/java/src/common/world/ChunkPos.java similarity index 96% rename from java/src/game/world/ChunkPos.java rename to java/src/common/world/ChunkPos.java index b97a738..0e8fc2e 100755 --- a/java/src/game/world/ChunkPos.java +++ b/java/src/common/world/ChunkPos.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class ChunkPos { public final int x; diff --git a/java/src/game/world/ClassInheritanceMultiMap.java b/java/src/common/world/ClassInheritanceMultiMap.java similarity index 97% rename from java/src/game/world/ClassInheritanceMultiMap.java rename to java/src/common/world/ClassInheritanceMultiMap.java index 5137011..c5f9e93 100755 --- a/java/src/game/world/ClassInheritanceMultiMap.java +++ b/java/src/common/world/ClassInheritanceMultiMap.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.util.AbstractSet; import java.util.Collections; @@ -8,9 +8,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import game.collect.Iterators; -import game.collect.Lists; -import game.collect.Maps; +import common.collect.Iterators; +import common.collect.Lists; +import common.collect.Maps; public class ClassInheritanceMultiMap extends AbstractSet { diff --git a/java/src/game/world/EmptyChunk.java b/java/src/common/world/EmptyChunk.java similarity index 91% rename from java/src/game/world/EmptyChunk.java rename to java/src/common/world/EmptyChunk.java index 00392cd..29bc0c0 100755 --- a/java/src/game/world/EmptyChunk.java +++ b/java/src/common/world/EmptyChunk.java @@ -1,12 +1,12 @@ -package game.world; +package common.world; import java.util.List; import java.util.function.Predicate; -import game.block.Block; -import game.entity.Entity; -import game.init.Blocks; -import game.tileentity.TileEntity; +import common.block.Block; +import common.entity.Entity; +import common.init.Blocks; +import common.tileentity.TileEntity; public class EmptyChunk extends Chunk { public EmptyChunk(WorldClient world) { diff --git a/java/src/game/world/Explosion.java b/java/src/common/world/Explosion.java similarity index 96% rename from java/src/game/world/Explosion.java rename to java/src/common/world/Explosion.java index ac9438f..04fbc1c 100755 --- a/java/src/game/world/Explosion.java +++ b/java/src/common/world/Explosion.java @@ -1,26 +1,26 @@ -package game.world; +package common.world; import java.util.List; import java.util.Map; import java.util.Set; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.enchantment.EnchantmentProtection; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.item.EntityTnt; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.material.Material; -import game.model.ParticleType; -import game.rng.Random; -import game.util.ExtMath; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.enchantment.EnchantmentProtection; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.item.EntityTnt; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.SoundEvent; +import common.material.Material; +import common.model.ParticleType; +import common.rng.Random; +import common.util.ExtMath; public class Explosion { diff --git a/java/src/game/world/Facing.java b/java/src/common/world/Facing.java similarity index 98% rename from java/src/game/world/Facing.java rename to java/src/common/world/Facing.java index c94d154..66d901a 100755 --- a/java/src/game/world/Facing.java +++ b/java/src/common/world/Facing.java @@ -1,14 +1,14 @@ -package game.world; +package common.world; import java.util.Iterator; import java.util.Map; import java.util.function.Predicate; -import game.collect.Iterators; -import game.collect.Maps; -import game.rng.Random; -import game.util.ExtMath; -import game.util.Identifyable; +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/java/src/game/world/HitPosition.java b/java/src/common/world/HitPosition.java similarity index 93% rename from java/src/game/world/HitPosition.java rename to java/src/common/world/HitPosition.java index 4271e0e..940d092 100755 --- a/java/src/game/world/HitPosition.java +++ b/java/src/common/world/HitPosition.java @@ -1,6 +1,6 @@ -package game.world; +package common.world; -import game.entity.Entity; +import common.entity.Entity; public class HitPosition { public static enum ObjectType { diff --git a/java/src/game/world/IBlockAccess.java b/java/src/common/world/IBlockAccess.java similarity index 75% rename from java/src/game/world/IBlockAccess.java rename to java/src/common/world/IBlockAccess.java index 79cb6fd..2b0fb24 100755 --- a/java/src/game/world/IBlockAccess.java +++ b/java/src/common/world/IBlockAccess.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public interface IBlockAccess { diff --git a/java/src/game/world/IWorldAccess.java b/java/src/common/world/IWorldAccess.java similarity index 70% rename from java/src/game/world/IWorldAccess.java rename to java/src/common/world/IWorldAccess.java index c829d7f..b06a2fa 100755 --- a/java/src/game/world/IWorldAccess.java +++ b/java/src/common/world/IWorldAccess.java @@ -1,7 +1,7 @@ -package game.world; +package common.world; -import game.biome.Biome; -import game.tileentity.TileEntity; +import common.biome.Biome; +import common.tileentity.TileEntity; public interface IWorldAccess extends IBlockAccess { diff --git a/java/src/game/world/IntHashMap.java b/java/src/common/world/IntHashMap.java similarity index 99% rename from java/src/game/world/IntHashMap.java rename to java/src/common/world/IntHashMap.java index 47122b4..12e3470 100755 --- a/java/src/game/world/IntHashMap.java +++ b/java/src/common/world/IntHashMap.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class IntHashMap { diff --git a/java/src/game/world/LightType.java b/java/src/common/world/LightType.java similarity index 85% rename from java/src/game/world/LightType.java rename to java/src/common/world/LightType.java index ce17dd2..e1bfdbb 100755 --- a/java/src/game/world/LightType.java +++ b/java/src/common/world/LightType.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public enum LightType { SKY(15), BLOCK(0); diff --git a/java/src/game/world/LongHashMap.java b/java/src/common/world/LongHashMap.java similarity index 99% rename from java/src/game/world/LongHashMap.java rename to java/src/common/world/LongHashMap.java index c396c47..35fad96 100755 --- a/java/src/game/world/LongHashMap.java +++ b/java/src/common/world/LongHashMap.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class LongHashMap { diff --git a/java/src/game/world/NextTickListEntry.java b/java/src/common/world/NextTickListEntry.java similarity index 96% rename from java/src/game/world/NextTickListEntry.java rename to java/src/common/world/NextTickListEntry.java index 4f15717..d208b2f 100755 --- a/java/src/game/world/NextTickListEntry.java +++ b/java/src/common/world/NextTickListEntry.java @@ -1,7 +1,7 @@ -package game.world; +package common.world; -import game.block.Block; -import game.init.BlockRegistry; +import common.block.Block; +import common.init.BlockRegistry; public class NextTickListEntry implements Comparable { diff --git a/java/src/game/world/NibbleArray.java b/java/src/common/world/NibbleArray.java similarity index 97% rename from java/src/game/world/NibbleArray.java rename to java/src/common/world/NibbleArray.java index c5801a2..3a53b8d 100755 --- a/java/src/game/world/NibbleArray.java +++ b/java/src/common/world/NibbleArray.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class NibbleArray { private final byte[] data; diff --git a/java/src/game/world/PortalType.java b/java/src/common/world/PortalType.java similarity index 86% rename from java/src/game/world/PortalType.java rename to java/src/common/world/PortalType.java index 37ca835..06e214f 100755 --- a/java/src/game/world/PortalType.java +++ b/java/src/common/world/PortalType.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public enum PortalType { STAND_BLACK, STAND_RED, STAND_YELLOW, STAND_GREEN, STAND_CYAN, STAND_BLUE, STAND_MAGENTA, STAND_WHITE, FLOOR, VOID; diff --git a/java/src/game/world/Position.java b/java/src/common/world/Position.java similarity index 94% rename from java/src/game/world/Position.java rename to java/src/common/world/Position.java index 3453499..59eaf24 100755 --- a/java/src/game/world/Position.java +++ b/java/src/common/world/Position.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class Position { public final double x; diff --git a/java/src/game/world/Region.java b/java/src/common/world/Region.java similarity index 98% rename from java/src/game/world/Region.java rename to java/src/common/world/Region.java index a3df508..6990839 100755 --- a/java/src/game/world/Region.java +++ b/java/src/common/world/Region.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -17,19 +17,19 @@ import java.util.Map; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; -import game.block.Block; -import game.collect.Lists; -import game.collect.Maps; -import game.entity.Entity; -import game.init.BlockRegistry; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.UniverseRegistry; -import game.log.Log; -import game.nbt.NBTLoader; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.tileentity.TileEntity; +import common.block.Block; +import common.collect.Lists; +import common.collect.Maps; +import common.entity.Entity; +import common.init.BlockRegistry; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.UniverseRegistry; +import common.log.Log; +import common.nbt.NBTLoader; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.tileentity.TileEntity; public class Region { public static enum SaveVersion { diff --git a/java/src/game/world/Spawner.java b/java/src/common/world/Spawner.java similarity index 94% rename from java/src/game/world/Spawner.java rename to java/src/common/world/Spawner.java index 05a830c..b9e323a 100755 --- a/java/src/game/world/Spawner.java +++ b/java/src/common/world/Spawner.java @@ -1,19 +1,19 @@ -package game.world; +package common.world; import java.util.Set; -import game.biome.Biome; -import game.biome.RngSpawn; -import game.block.Block; -import game.collect.Sets; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.entity.types.EntityWaterMob; -import game.init.Blocks; -import game.init.Config; -import game.rng.Random; -import game.rng.WeightedList; -import game.util.ExtMath; +import common.biome.Biome; +import common.biome.RngSpawn; +import common.block.Block; +import common.collect.Sets; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.entity.types.EntityWaterMob; +import common.init.Blocks; +import common.init.Config; +import common.rng.Random; +import common.rng.WeightedList; +import common.util.ExtMath; public abstract class Spawner { private static final int MOB_COUNT_DIV = (int)Math.pow(17.0D, 2.0D); diff --git a/java/src/game/world/State.java b/java/src/common/world/State.java similarity index 92% rename from java/src/game/world/State.java rename to java/src/common/world/State.java index 8e05fc8..c4ab565 100755 --- a/java/src/game/world/State.java +++ b/java/src/common/world/State.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.util.Collection; import java.util.Collections; @@ -7,15 +7,15 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Function; -import game.block.Block; -import game.collect.ImmutableMap; -import game.collect.ImmutableTable; -import game.collect.Iterables; -import game.collect.Maps; -import game.collect.StandardTable; -import game.collect.Table; -import game.init.BlockRegistry; -import game.properties.IProperty; +import common.block.Block; +import common.collect.ImmutableMap; +import common.collect.ImmutableTable; +import common.collect.Iterables; +import common.collect.Maps; +import common.collect.StandardTable; +import common.collect.Table; +import common.init.BlockRegistry; +import common.properties.IProperty; public class State { // private static final Joiner COMMA_JOINER = Joiner.on(','); diff --git a/java/src/game/world/Vec3.java b/java/src/common/world/Vec3.java similarity index 99% rename from java/src/game/world/Vec3.java rename to java/src/common/world/Vec3.java index 460787f..88b95ed 100755 --- a/java/src/game/world/Vec3.java +++ b/java/src/common/world/Vec3.java @@ -1,6 +1,6 @@ -package game.world; +package common.world; -import game.util.ExtMath; +import common.util.ExtMath; public class Vec3 { diff --git a/java/src/game/world/Vec3i.java b/java/src/common/world/Vec3i.java similarity index 98% rename from java/src/game/world/Vec3i.java rename to java/src/common/world/Vec3i.java index 6c03512..fa1cd58 100755 --- a/java/src/game/world/Vec3i.java +++ b/java/src/common/world/Vec3i.java @@ -1,6 +1,6 @@ -package game.world; +package common.world; -import game.util.ExtMath; +import common.util.ExtMath; public class Vec3i implements Comparable { diff --git a/java/src/game/world/Weather.java b/java/src/common/world/Weather.java similarity index 96% rename from java/src/game/world/Weather.java rename to java/src/common/world/Weather.java index d5b52f3..89a99c7 100755 --- a/java/src/game/world/Weather.java +++ b/java/src/common/world/Weather.java @@ -1,11 +1,11 @@ -package game.world; +package common.world; import java.util.Map; -import game.collect.Maps; -import game.rng.Random; -import game.rng.RngItem; -import game.rng.WeightedList; +import common.collect.Maps; +import common.rng.Random; +import common.rng.RngItem; +import common.rng.WeightedList; public enum Weather { CLEAR("clear", "Schön", 0.0f, 0.0f, 12, 30, 9, 7), diff --git a/java/src/game/world/World.java b/java/src/common/world/World.java similarity index 98% rename from java/src/game/world/World.java rename to java/src/common/world/World.java index 76ad069..d651ac2 100755 --- a/java/src/game/world/World.java +++ b/java/src/common/world/World.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.util.Collection; import java.util.Iterator; @@ -6,30 +6,30 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; -import game.biome.Biome; -import game.block.Block; -import game.block.BlockHopper; -import game.block.BlockLiquid; -import game.block.BlockSlab; -import game.block.BlockSnow; -import game.block.BlockStairs; -import game.block.LeavesType; -import game.collect.Lists; -import game.collect.Sets; -import game.dimension.Dimension; -import game.entity.Entity; -import game.entity.item.EntityExplosion; -import game.entity.npc.EntityNPC; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.SoundEvent; -import game.item.ItemStack; -import game.material.Material; -import game.model.ParticleType; -import game.rng.Random; -import game.tileentity.ITickable; -import game.tileentity.TileEntity; -import game.util.ExtMath; +import common.biome.Biome; +import common.block.Block; +import common.block.BlockHopper; +import common.block.BlockLiquid; +import common.block.BlockSlab; +import common.block.BlockSnow; +import common.block.BlockStairs; +import common.block.LeavesType; +import common.collect.Lists; +import common.collect.Sets; +import common.dimension.Dimension; +import common.entity.Entity; +import common.entity.item.EntityExplosion; +import common.entity.npc.EntityNPC; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.init.SoundEvent; +import common.item.ItemStack; +import common.material.Material; +import common.model.ParticleType; +import common.rng.Random; +import common.tileentity.ITickable; +import common.tileentity.TileEntity; +import common.util.ExtMath; public abstract class World implements IWorldAccess { public static final float[][] BRIGHTNESS = new float[16][16]; diff --git a/java/src/game/world/WorldClient.java b/java/src/common/world/WorldClient.java similarity index 97% rename from java/src/game/world/WorldClient.java rename to java/src/common/world/WorldClient.java index e03a9cd..0365190 100755 --- a/java/src/game/world/WorldClient.java +++ b/java/src/common/world/WorldClient.java @@ -1,33 +1,33 @@ -package game.world; +package common.world; import java.util.List; import java.util.Set; -import game.IClient; -import game.biome.Biome; -import game.block.Block; -import game.collect.Lists; -import game.collect.Sets; -import game.dimension.Dimension; -import game.entity.Entity; -import game.entity.item.EntityCart; -import game.entity.npc.EntityNPC; -import game.entity.types.IEntityFX; -import game.init.BlockRegistry; -import game.init.ItemRegistry; -import game.init.Items; -import game.init.SoundEvent; -import game.item.ItemDye; -import game.log.Log; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.sound.MovingSoundMinecart; -import game.sound.PositionedSound; -import game.tileentity.TileEntity; -import game.util.ExtMath; -import game.world.BlockPos.MutableBlockPos; +import common.IClient; +import common.biome.Biome; +import common.block.Block; +import common.collect.Lists; +import common.collect.Sets; +import common.dimension.Dimension; +import common.entity.Entity; +import common.entity.item.EntityCart; +import common.entity.npc.EntityNPC; +import common.entity.types.IEntityFX; +import common.init.BlockRegistry; +import common.init.ItemRegistry; +import common.init.Items; +import common.init.SoundEvent; +import common.item.ItemDye; +import common.log.Log; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.sound.MovingSoundMinecart; +import common.sound.PositionedSound; +import common.tileentity.TileEntity; +import common.util.ExtMath; +import common.world.BlockPos.MutableBlockPos; public class WorldClient extends World { diff --git a/java/src/game/world/WorldPos.java b/java/src/common/world/WorldPos.java similarity index 97% rename from java/src/game/world/WorldPos.java rename to java/src/common/world/WorldPos.java index bf49eac..8c5608b 100755 --- a/java/src/game/world/WorldPos.java +++ b/java/src/common/world/WorldPos.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; public class WorldPos extends BlockPos { private final int dim; diff --git a/java/src/game/world/WorldServer.java b/java/src/common/world/WorldServer.java similarity index 97% rename from java/src/game/world/WorldServer.java rename to java/src/common/world/WorldServer.java index 69fa871..9b8d8dc 100755 --- a/java/src/game/world/WorldServer.java +++ b/java/src/common/world/WorldServer.java @@ -1,4 +1,4 @@ -package game.world; +package common.world; import java.io.File; import java.io.FileFilter; @@ -13,80 +13,80 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import game.IServer; -import game.biome.Biome; -import game.biome.RngSpawn; -import game.block.Block; -import game.block.BlockDoor; -import game.block.BlockEventData; -import game.block.BlockFalling; -import game.block.BlockLiquid; -import game.block.BlockSnow; -import game.clipboard.ClipboardBlock; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.dimension.Dimension; -import game.entity.DamageSource; -import game.entity.Entity; -import game.entity.EntityTrackerEntry; -import game.entity.effect.EntityLightning; -import game.entity.npc.EntityNPC; -import game.entity.types.EntityLiving; -import game.init.Blocks; -import game.init.Config; -import game.init.SoundEvent; -import game.init.UniverseRegistry; -import game.item.ItemDoor; -import game.log.Log; -import game.material.Material; -import game.model.ParticleType; -import game.nbt.NBTLoader; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagInt; -import game.nbt.NBTTagList; -import game.network.IPlayer; -import game.network.Packet; -import game.packet.S1APacketEntityStatus; -import game.packet.S27PacketExplosion; -import game.packet.S28PacketEffect; -import game.packet.S29PacketSoundEffect; -import game.packet.S2APacketParticles; -import game.packet.S2BPacketChangeGameState; -import game.packet.S2CPacketSpawnGlobalEntity; -import game.packet.SPacketBiomes; -import game.packet.SPacketBlockAction; -import game.packet.SPacketBlockBreakAnim; -import game.packet.SPacketBlockChange; -import game.packet.SPacketChunkData; -import game.packet.SPacketMultiBlockChange; -import game.rng.Random; -import game.rng.WeightedList; -import game.tileentity.TileEntity; -import game.util.ExtMath; -import game.util.FileUtils; -import game.village.Village; -import game.village.VillageCollection; -import game.worldgen.BiomeGenSingle; -import game.worldgen.BiomeGenerator; -import game.worldgen.BlockReplacer; -import game.worldgen.ChunkGenerator; -import game.worldgen.ChunkPrimer; -import game.worldgen.FeatureDungeons; -import game.worldgen.FeatureLakes; -import game.worldgen.FeatureLiquids; -import game.worldgen.FeatureOres; -import game.worldgen.GeneratorDebug; -import game.worldgen.GeneratorDestroyed; -import game.worldgen.LootConstants; -import game.worldgen.caves.MapGenBigCaves; -import game.worldgen.caves.MapGenCaves; -import game.worldgen.caves.MapGenRavine; -import game.worldgen.structure.MapGenBridge; -import game.worldgen.structure.MapGenMineshaft; -import game.worldgen.structure.MapGenScatteredFeature; -import game.worldgen.structure.MapGenStronghold; -import game.worldgen.structure.MapGenVillage; +import common.IServer; +import common.biome.Biome; +import common.biome.RngSpawn; +import common.block.Block; +import common.block.BlockDoor; +import common.block.BlockEventData; +import common.block.BlockFalling; +import common.block.BlockLiquid; +import common.block.BlockSnow; +import common.clipboard.ClipboardBlock; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.dimension.Dimension; +import common.entity.DamageSource; +import common.entity.Entity; +import common.entity.EntityTrackerEntry; +import common.entity.effect.EntityLightning; +import common.entity.npc.EntityNPC; +import common.entity.types.EntityLiving; +import common.init.Blocks; +import common.init.Config; +import common.init.SoundEvent; +import common.init.UniverseRegistry; +import common.item.ItemDoor; +import common.log.Log; +import common.material.Material; +import common.model.ParticleType; +import common.nbt.NBTLoader; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagInt; +import common.nbt.NBTTagList; +import common.network.IPlayer; +import common.network.Packet; +import common.packet.S1APacketEntityStatus; +import common.packet.S27PacketExplosion; +import common.packet.S28PacketEffect; +import common.packet.S29PacketSoundEffect; +import common.packet.S2APacketParticles; +import common.packet.S2BPacketChangeGameState; +import common.packet.S2CPacketSpawnGlobalEntity; +import common.packet.SPacketBiomes; +import common.packet.SPacketBlockAction; +import common.packet.SPacketBlockBreakAnim; +import common.packet.SPacketBlockChange; +import common.packet.SPacketChunkData; +import common.packet.SPacketMultiBlockChange; +import common.rng.Random; +import common.rng.WeightedList; +import common.tileentity.TileEntity; +import common.util.ExtMath; +import common.util.FileUtils; +import common.village.Village; +import common.village.VillageCollection; +import common.worldgen.BiomeGenSingle; +import common.worldgen.BiomeGenerator; +import common.worldgen.BlockReplacer; +import common.worldgen.ChunkGenerator; +import common.worldgen.ChunkPrimer; +import common.worldgen.FeatureDungeons; +import common.worldgen.FeatureLakes; +import common.worldgen.FeatureLiquids; +import common.worldgen.FeatureOres; +import common.worldgen.GeneratorDebug; +import common.worldgen.GeneratorDestroyed; +import common.worldgen.LootConstants; +import common.worldgen.caves.MapGenBigCaves; +import common.worldgen.caves.MapGenCaves; +import common.worldgen.caves.MapGenRavine; +import common.worldgen.structure.MapGenBridge; +import common.worldgen.structure.MapGenMineshaft; +import common.worldgen.structure.MapGenScatteredFeature; +import common.worldgen.structure.MapGenStronghold; +import common.worldgen.structure.MapGenVillage; public final class WorldServer extends World { private static final int[][] XZ_DIRS = new int[][] {{1, 0}, {0, 1}, {-1, 0}, {0, -1}}; diff --git a/java/src/game/worldgen/BiomeGenLayered.java b/java/src/common/worldgen/BiomeGenLayered.java similarity index 89% rename from java/src/game/worldgen/BiomeGenLayered.java rename to java/src/common/worldgen/BiomeGenLayered.java index f78abbc..d5e0230 100755 --- a/java/src/game/worldgen/BiomeGenLayered.java +++ b/java/src/common/worldgen/BiomeGenLayered.java @@ -1,32 +1,32 @@ -package game.worldgen; +package common.worldgen; import java.util.List; import java.util.Set; -import game.biome.Biome; -import game.collect.Lists; -import game.world.BlockPos; -import game.world.LongHashMap; -import game.worldgen.layer.GenLayer; -import game.worldgen.layer.GenLayerAddAreas; -import game.worldgen.layer.GenLayerAddExtra; -import game.worldgen.layer.GenLayerAddSea; -import game.worldgen.layer.GenLayerAddSnow; -import game.worldgen.layer.GenLayerBase; -import game.worldgen.layer.GenLayerBiome; -import game.worldgen.layer.GenLayerBiomeEdge; -import game.worldgen.layer.GenLayerEdge; -import game.worldgen.layer.GenLayerFuzzyZoom; -import game.worldgen.layer.GenLayerHills; -import game.worldgen.layer.GenLayerRemoveEmpty; -import game.worldgen.layer.GenLayerRiver; -import game.worldgen.layer.GenLayerRiverInit; -import game.worldgen.layer.GenLayerRiverMix; -import game.worldgen.layer.GenLayerShore; -import game.worldgen.layer.GenLayerSmooth; -import game.worldgen.layer.GenLayerVoronoiZoom; -import game.worldgen.layer.GenLayerZoom; -import game.worldgen.layer.IntCache; +import common.biome.Biome; +import common.collect.Lists; +import common.world.BlockPos; +import common.world.LongHashMap; +import common.worldgen.layer.GenLayer; +import common.worldgen.layer.GenLayerAddAreas; +import common.worldgen.layer.GenLayerAddExtra; +import common.worldgen.layer.GenLayerAddSea; +import common.worldgen.layer.GenLayerAddSnow; +import common.worldgen.layer.GenLayerBase; +import common.worldgen.layer.GenLayerBiome; +import common.worldgen.layer.GenLayerBiomeEdge; +import common.worldgen.layer.GenLayerEdge; +import common.worldgen.layer.GenLayerFuzzyZoom; +import common.worldgen.layer.GenLayerHills; +import common.worldgen.layer.GenLayerRemoveEmpty; +import common.worldgen.layer.GenLayerRiver; +import common.worldgen.layer.GenLayerRiverInit; +import common.worldgen.layer.GenLayerRiverMix; +import common.worldgen.layer.GenLayerShore; +import common.worldgen.layer.GenLayerSmooth; +import common.worldgen.layer.GenLayerVoronoiZoom; +import common.worldgen.layer.GenLayerZoom; +import common.worldgen.layer.IntCache; public class BiomeGenLayered implements BiomeGenerator { private class CacheBlock diff --git a/java/src/game/worldgen/BiomeGenPerlin.java b/java/src/common/worldgen/BiomeGenPerlin.java similarity index 93% rename from java/src/game/worldgen/BiomeGenPerlin.java rename to java/src/common/worldgen/BiomeGenPerlin.java index 4ff7756..ae0e0df 100755 --- a/java/src/game/worldgen/BiomeGenPerlin.java +++ b/java/src/common/worldgen/BiomeGenPerlin.java @@ -1,7 +1,7 @@ -package game.worldgen; +package common.worldgen; -import game.rng.PerlinGenOld; -import game.rng.Random; +import common.rng.PerlinGenOld; +import common.rng.Random; public class BiomeGenPerlin { private final PerlinGenOld tempNoiseGen; diff --git a/java/src/game/worldgen/BiomeGenSingle.java b/java/src/common/worldgen/BiomeGenSingle.java similarity index 94% rename from java/src/game/worldgen/BiomeGenSingle.java rename to java/src/common/worldgen/BiomeGenSingle.java index 15462fc..aad396d 100755 --- a/java/src/game/worldgen/BiomeGenSingle.java +++ b/java/src/common/worldgen/BiomeGenSingle.java @@ -1,10 +1,10 @@ -package game.worldgen; +package common.worldgen; import java.util.Arrays; import java.util.Set; -import game.biome.Biome; -import game.world.BlockPos; +import common.biome.Biome; +import common.world.BlockPos; public class BiomeGenSingle implements BiomeGenerator { private final Biome biome; diff --git a/java/src/game/worldgen/BiomeGenerator.java b/java/src/common/worldgen/BiomeGenerator.java similarity index 87% rename from java/src/game/worldgen/BiomeGenerator.java rename to java/src/common/worldgen/BiomeGenerator.java index 80f8d11..d975d42 100755 --- a/java/src/game/worldgen/BiomeGenerator.java +++ b/java/src/common/worldgen/BiomeGenerator.java @@ -1,9 +1,9 @@ -package game.worldgen; +package common.worldgen; import java.util.Set; -import game.biome.Biome; -import game.world.BlockPos; +import common.biome.Biome; +import common.world.BlockPos; public interface BiomeGenerator { public void genFactors(double[] factors, int xPos, int zPos, int sizeX, int sizeZ); diff --git a/java/src/game/worldgen/BlockReplacer.java b/java/src/common/worldgen/BlockReplacer.java similarity index 55% rename from java/src/game/worldgen/BlockReplacer.java rename to java/src/common/worldgen/BlockReplacer.java index 3ccc8f5..e45c63b 100755 --- a/java/src/game/worldgen/BlockReplacer.java +++ b/java/src/common/worldgen/BlockReplacer.java @@ -1,8 +1,8 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.rng.Random; -import game.world.WorldServer; +import common.biome.Biome; +import common.rng.Random; +import common.world.WorldServer; public interface BlockReplacer { public void replaceBlocks(WorldServer world, int x, int z, ChunkPrimer primer, Random rand, Biome[] biomes); diff --git a/java/src/game/worldgen/ChunkGenerator.java b/java/src/common/worldgen/ChunkGenerator.java similarity index 69% rename from java/src/game/worldgen/ChunkGenerator.java rename to java/src/common/worldgen/ChunkGenerator.java index d7d14ac..df3ae2d 100755 --- a/java/src/game/worldgen/ChunkGenerator.java +++ b/java/src/common/worldgen/ChunkGenerator.java @@ -1,6 +1,6 @@ -package game.worldgen; +package common.worldgen; -import game.world.WorldServer; +import common.world.WorldServer; public interface ChunkGenerator { public void generateChunk(WorldServer world, int x, int z, ChunkPrimer primer); diff --git a/java/src/game/worldgen/ChunkPrimer.java b/java/src/common/worldgen/ChunkPrimer.java similarity index 82% rename from java/src/game/worldgen/ChunkPrimer.java rename to java/src/common/worldgen/ChunkPrimer.java index 2053420..d0c6f0e 100755 --- a/java/src/game/worldgen/ChunkPrimer.java +++ b/java/src/common/worldgen/ChunkPrimer.java @@ -1,8 +1,8 @@ -package game.worldgen; +package common.worldgen; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.world.State; +import common.init.BlockRegistry; +import common.init.Blocks; +import common.world.State; public class ChunkPrimer { public final int height; diff --git a/java/src/game/worldgen/FeatureDungeons.java b/java/src/common/worldgen/FeatureDungeons.java similarity index 93% rename from java/src/game/worldgen/FeatureDungeons.java rename to java/src/common/worldgen/FeatureDungeons.java index c63e856..3f22b7a 100755 --- a/java/src/game/worldgen/FeatureDungeons.java +++ b/java/src/common/worldgen/FeatureDungeons.java @@ -1,18 +1,18 @@ -package game.worldgen; +package common.worldgen; -import game.init.Blocks; -import game.init.Items; -import game.item.RngLoot; -import game.log.Log; -import game.material.Material; -import game.rng.Random; -import game.rng.WeightedList; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntityMobSpawner; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; +import common.init.Blocks; +import common.init.Items; +import common.item.RngLoot; +import common.log.Log; +import common.material.Material; +import common.rng.Random; +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.world.WorldServer; public class FeatureDungeons { diff --git a/java/src/game/worldgen/FeatureGenerator.java b/java/src/common/worldgen/FeatureGenerator.java similarity index 81% rename from java/src/game/worldgen/FeatureGenerator.java rename to java/src/common/worldgen/FeatureGenerator.java index 252d686..d93b260 100755 --- a/java/src/game/worldgen/FeatureGenerator.java +++ b/java/src/common/worldgen/FeatureGenerator.java @@ -1,9 +1,9 @@ -package game.worldgen; +package common.worldgen; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public abstract class FeatureGenerator { diff --git a/java/src/game/worldgen/FeatureLakes.java b/java/src/common/worldgen/FeatureLakes.java similarity index 96% rename from java/src/game/worldgen/FeatureLakes.java rename to java/src/common/worldgen/FeatureLakes.java index dd1c3e5..3bb47d4 100755 --- a/java/src/game/worldgen/FeatureLakes.java +++ b/java/src/common/worldgen/FeatureLakes.java @@ -1,14 +1,14 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.block.Block; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.LightType; -import game.world.State; -import game.world.WorldServer; +import common.biome.Biome; +import common.block.Block; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.LightType; +import common.world.State; +import common.world.WorldServer; public class FeatureLakes { diff --git a/java/src/game/worldgen/FeatureLiquids.java b/java/src/common/worldgen/FeatureLiquids.java similarity index 94% rename from java/src/game/worldgen/FeatureLiquids.java rename to java/src/common/worldgen/FeatureLiquids.java index 27c9abc..bd050b8 100755 --- a/java/src/game/worldgen/FeatureLiquids.java +++ b/java/src/common/worldgen/FeatureLiquids.java @@ -1,11 +1,11 @@ -package game.worldgen; +package common.worldgen; -import game.block.Block; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class FeatureLiquids { diff --git a/java/src/game/worldgen/FeatureOres.java b/java/src/common/worldgen/FeatureOres.java similarity index 97% rename from java/src/game/worldgen/FeatureOres.java rename to java/src/common/worldgen/FeatureOres.java index 3383655..bb30028 100755 --- a/java/src/game/worldgen/FeatureOres.java +++ b/java/src/common/worldgen/FeatureOres.java @@ -1,11 +1,11 @@ -package game.worldgen; +package common.worldgen; -import game.block.Block; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class FeatureOres { diff --git a/java/src/game/worldgen/GeneratorCavern.java b/java/src/common/worldgen/GeneratorCavern.java similarity index 97% rename from java/src/game/worldgen/GeneratorCavern.java rename to java/src/common/worldgen/GeneratorCavern.java index adec0aa..0aed076 100755 --- a/java/src/game/worldgen/GeneratorCavern.java +++ b/java/src/common/worldgen/GeneratorCavern.java @@ -1,10 +1,10 @@ -package game.worldgen; +package common.worldgen; -import game.rng.OctaveGen; -import game.rng.Random; -import game.util.ExtMath; -import game.world.State; -import game.world.WorldServer; +import common.rng.OctaveGen; +import common.rng.Random; +import common.util.ExtMath; +import common.world.State; +import common.world.WorldServer; public class GeneratorCavern implements ChunkGenerator { diff --git a/java/src/game/worldgen/GeneratorDebug.java b/java/src/common/worldgen/GeneratorDebug.java similarity index 82% rename from java/src/game/worldgen/GeneratorDebug.java rename to java/src/common/worldgen/GeneratorDebug.java index b945e86..58ca6c1 100755 --- a/java/src/game/worldgen/GeneratorDebug.java +++ b/java/src/common/worldgen/GeneratorDebug.java @@ -1,13 +1,13 @@ -package game.worldgen; +package common.worldgen; import java.util.List; -import game.block.Block; -import game.collect.Lists; -import game.init.BlockRegistry; -import game.util.ExtMath; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.collect.Lists; +import common.init.BlockRegistry; +import common.util.ExtMath; +import common.world.State; +import common.world.WorldServer; public class GeneratorDebug implements ChunkGenerator { diff --git a/java/src/game/worldgen/GeneratorDestroyed.java b/java/src/common/worldgen/GeneratorDestroyed.java similarity index 86% rename from java/src/game/worldgen/GeneratorDestroyed.java rename to java/src/common/worldgen/GeneratorDestroyed.java index 03ae28b..5eea1c5 100755 --- a/java/src/game/worldgen/GeneratorDestroyed.java +++ b/java/src/common/worldgen/GeneratorDestroyed.java @@ -1,9 +1,9 @@ -package game.worldgen; +package common.worldgen; -import game.init.Blocks; -import game.rng.Random; -import game.world.State; -import game.world.WorldServer; +import common.init.Blocks; +import common.rng.Random; +import common.world.State; +import common.world.WorldServer; public class GeneratorDestroyed implements ChunkGenerator { diff --git a/java/src/game/worldgen/GeneratorFlat.java b/java/src/common/worldgen/GeneratorFlat.java similarity index 90% rename from java/src/game/worldgen/GeneratorFlat.java rename to java/src/common/worldgen/GeneratorFlat.java index 464e66a..2c0071b 100755 --- a/java/src/game/worldgen/GeneratorFlat.java +++ b/java/src/common/worldgen/GeneratorFlat.java @@ -1,9 +1,9 @@ -package game.worldgen; +package common.worldgen; import java.util.Arrays; -import game.world.State; -import game.world.WorldServer; +import common.world.State; +import common.world.WorldServer; public class GeneratorFlat implements ChunkGenerator { private final State[] layers; diff --git a/java/src/game/worldgen/GeneratorIsland.java b/java/src/common/worldgen/GeneratorIsland.java similarity index 97% rename from java/src/game/worldgen/GeneratorIsland.java rename to java/src/common/worldgen/GeneratorIsland.java index f202525..14c3b81 100755 --- a/java/src/game/worldgen/GeneratorIsland.java +++ b/java/src/common/worldgen/GeneratorIsland.java @@ -1,10 +1,10 @@ -package game.worldgen; +package common.worldgen; -import game.rng.OctaveGen; -import game.rng.Random; -import game.util.ExtMath; -import game.world.State; -import game.world.WorldServer; +import common.rng.OctaveGen; +import common.rng.Random; +import common.util.ExtMath; +import common.world.State; +import common.world.WorldServer; public class GeneratorIsland implements ChunkGenerator { diff --git a/java/src/game/worldgen/GeneratorPerlin.java b/java/src/common/worldgen/GeneratorPerlin.java similarity index 97% rename from java/src/game/worldgen/GeneratorPerlin.java rename to java/src/common/worldgen/GeneratorPerlin.java index 2b4ff2d..f9156a9 100755 --- a/java/src/game/worldgen/GeneratorPerlin.java +++ b/java/src/common/worldgen/GeneratorPerlin.java @@ -1,13 +1,13 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.dimension.Dimension; -import game.rng.NoiseGen; -import game.rng.OctaveGen; -import game.rng.Random; -import game.util.ExtMath; -import game.world.State; -import game.world.WorldServer; +import common.biome.Biome; +import common.dimension.Dimension; +import common.rng.NoiseGen; +import common.rng.OctaveGen; +import common.rng.Random; +import common.util.ExtMath; +import common.world.State; +import common.world.WorldServer; public class GeneratorPerlin implements ChunkGenerator { diff --git a/java/src/game/worldgen/GeneratorSimple.java b/java/src/common/worldgen/GeneratorSimple.java similarity index 95% rename from java/src/game/worldgen/GeneratorSimple.java rename to java/src/common/worldgen/GeneratorSimple.java index deec5a5..3ba0303 100755 --- a/java/src/game/worldgen/GeneratorSimple.java +++ b/java/src/common/worldgen/GeneratorSimple.java @@ -1,10 +1,10 @@ -package game.worldgen; +package common.worldgen; -import game.rng.NoiseGen; -import game.rng.OctaveGen; -import game.rng.Random; -import game.world.State; -import game.world.WorldServer; +import common.rng.NoiseGen; +import common.rng.OctaveGen; +import common.rng.Random; +import common.world.State; +import common.world.WorldServer; public class GeneratorSimple implements ChunkGenerator { diff --git a/java/src/game/worldgen/LootConstants.java b/java/src/common/worldgen/LootConstants.java similarity index 94% rename from java/src/game/worldgen/LootConstants.java rename to java/src/common/worldgen/LootConstants.java index 5eb0b1e..9e52c59 100755 --- a/java/src/game/worldgen/LootConstants.java +++ b/java/src/common/worldgen/LootConstants.java @@ -1,20 +1,20 @@ -package game.worldgen; +package common.worldgen; -import game.biome.RngSpawn; -import game.color.DyeColor; -import game.entity.npc.EntityDarkMage; -import game.entity.npc.EntityMage; -import game.entity.npc.EntityMagma; -import game.entity.npc.EntityTiefling; -import game.entity.npc.EntityUndead; -import game.entity.projectile.RngFishable; -import game.init.Blocks; -import game.init.ItemRegistry; -import game.init.Items; -import game.item.ItemFishFood; -import game.item.ItemStack; -import game.item.RngLoot; -import game.rng.WeightedList; +import common.biome.RngSpawn; +import common.color.DyeColor; +import common.entity.npc.EntityDarkMage; +import common.entity.npc.EntityMage; +import common.entity.npc.EntityMagma; +import common.entity.npc.EntityTiefling; +import common.entity.npc.EntityUndead; +import common.entity.projectile.RngFishable; +import common.init.Blocks; +import common.init.ItemRegistry; +import common.init.Items; +import common.item.ItemFishFood; +import common.item.ItemStack; +import common.item.RngLoot; +import common.rng.WeightedList; public abstract class LootConstants { public static final WeightedList FISHING_JUNK = new WeightedList( diff --git a/java/src/game/worldgen/ReplacerAltBiome.java b/java/src/common/worldgen/ReplacerAltBiome.java similarity index 93% rename from java/src/game/worldgen/ReplacerAltBiome.java rename to java/src/common/worldgen/ReplacerAltBiome.java index 45aa85a..549d8c9 100755 --- a/java/src/game/worldgen/ReplacerAltBiome.java +++ b/java/src/common/worldgen/ReplacerAltBiome.java @@ -1,13 +1,13 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.block.Block; -import game.init.Blocks; -import game.rng.NoiseGen; -import game.rng.OctaveGen; -import game.rng.Random; -import game.world.State; -import game.world.WorldServer; +import common.biome.Biome; +import common.block.Block; +import common.init.Blocks; +import common.rng.NoiseGen; +import common.rng.OctaveGen; +import common.rng.Random; +import common.world.State; +import common.world.WorldServer; public class ReplacerAltBiome implements BlockReplacer { diff --git a/java/src/game/worldgen/ReplacerAltSurface.java b/java/src/common/worldgen/ReplacerAltSurface.java similarity index 95% rename from java/src/game/worldgen/ReplacerAltSurface.java rename to java/src/common/worldgen/ReplacerAltSurface.java index 26f76b3..3dc3c58 100755 --- a/java/src/game/worldgen/ReplacerAltSurface.java +++ b/java/src/common/worldgen/ReplacerAltSurface.java @@ -1,12 +1,12 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.block.Block; -import game.material.Material; -import game.rng.OctaveGen; -import game.rng.Random; -import game.world.State; -import game.world.WorldServer; +import common.biome.Biome; +import common.block.Block; +import common.material.Material; +import common.rng.OctaveGen; +import common.rng.Random; +import common.world.State; +import common.world.WorldServer; public class ReplacerAltSurface implements BlockReplacer { diff --git a/java/src/game/worldgen/ReplacerBiome.java b/java/src/common/worldgen/ReplacerBiome.java similarity index 84% rename from java/src/game/worldgen/ReplacerBiome.java rename to java/src/common/worldgen/ReplacerBiome.java index 74a8acb..aa3d70a 100755 --- a/java/src/game/worldgen/ReplacerBiome.java +++ b/java/src/common/worldgen/ReplacerBiome.java @@ -1,9 +1,9 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.rng.PerlinGen; -import game.rng.Random; -import game.world.WorldServer; +import common.biome.Biome; +import common.rng.PerlinGen; +import common.rng.Random; +import common.world.WorldServer; public class ReplacerBiome implements BlockReplacer { diff --git a/java/src/game/worldgen/ReplacerTopLayer.java b/java/src/common/worldgen/ReplacerTopLayer.java similarity index 90% rename from java/src/game/worldgen/ReplacerTopLayer.java rename to java/src/common/worldgen/ReplacerTopLayer.java index ab62aa1..d27dc7e 100755 --- a/java/src/game/worldgen/ReplacerTopLayer.java +++ b/java/src/common/worldgen/ReplacerTopLayer.java @@ -1,12 +1,12 @@ -package game.worldgen; +package common.worldgen; -import game.biome.Biome; -import game.block.Block; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.State; -import game.world.WorldServer; +import common.biome.Biome; +import common.block.Block; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.State; +import common.world.WorldServer; public class ReplacerTopLayer implements BlockReplacer { diff --git a/java/src/game/worldgen/caves/MapGenBase.java b/java/src/common/worldgen/caves/MapGenBase.java similarity index 90% rename from java/src/game/worldgen/caves/MapGenBase.java rename to java/src/common/worldgen/caves/MapGenBase.java index ecb6bec..82fb296 100755 --- a/java/src/game/worldgen/caves/MapGenBase.java +++ b/java/src/common/worldgen/caves/MapGenBase.java @@ -1,8 +1,8 @@ -package game.worldgen.caves; +package common.worldgen.caves; -import game.rng.Random; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; +import common.rng.Random; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; public class MapGenBase { diff --git a/java/src/game/worldgen/caves/MapGenBigCaves.java b/java/src/common/worldgen/caves/MapGenBigCaves.java similarity index 97% rename from java/src/game/worldgen/caves/MapGenBigCaves.java rename to java/src/common/worldgen/caves/MapGenBigCaves.java index a24947e..c04c80b 100755 --- a/java/src/game/worldgen/caves/MapGenBigCaves.java +++ b/java/src/common/worldgen/caves/MapGenBigCaves.java @@ -1,12 +1,12 @@ -package game.worldgen.caves; +package common.worldgen.caves; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.util.ExtMath; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.util.ExtMath; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; public class MapGenBigCaves extends MapGenBase { diff --git a/java/src/game/worldgen/caves/MapGenCaves.java b/java/src/common/worldgen/caves/MapGenCaves.java similarity index 97% rename from java/src/game/worldgen/caves/MapGenCaves.java rename to java/src/common/worldgen/caves/MapGenCaves.java index c7fb66c..6f2a15e 100755 --- a/java/src/game/worldgen/caves/MapGenCaves.java +++ b/java/src/common/worldgen/caves/MapGenCaves.java @@ -1,16 +1,16 @@ -package game.worldgen.caves; +package common.worldgen.caves; -import game.block.Block; -import game.block.BlockColored; -import game.block.BlockSand; -import game.color.DyeColor; -import game.init.Blocks; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; +import common.block.Block; +import common.block.BlockColored; +import common.block.BlockSand; +import common.color.DyeColor; +import common.init.Blocks; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; public class MapGenCaves extends MapGenBase { diff --git a/java/src/game/worldgen/caves/MapGenRavine.java b/java/src/common/worldgen/caves/MapGenRavine.java similarity index 97% rename from java/src/game/worldgen/caves/MapGenRavine.java rename to java/src/common/worldgen/caves/MapGenRavine.java index a9e8958..13d30c0 100755 --- a/java/src/game/worldgen/caves/MapGenRavine.java +++ b/java/src/common/worldgen/caves/MapGenRavine.java @@ -1,13 +1,13 @@ -package game.worldgen.caves; +package common.worldgen.caves; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.ChunkPrimer; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.ChunkPrimer; public class MapGenRavine extends MapGenBase { diff --git a/java/src/game/worldgen/feature/WorldGenAbandonedChest.java b/java/src/common/worldgen/feature/WorldGenAbandonedChest.java similarity index 79% rename from java/src/game/worldgen/feature/WorldGenAbandonedChest.java rename to java/src/common/worldgen/feature/WorldGenAbandonedChest.java index 72bd27a..79206eb 100755 --- a/java/src/game/worldgen/feature/WorldGenAbandonedChest.java +++ b/java/src/common/worldgen/feature/WorldGenAbandonedChest.java @@ -1,17 +1,17 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.item.RngLoot; -import game.material.Material; -import game.rng.Random; -import game.rng.WeightedList; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; -import game.worldgen.LootConstants; +import common.block.Block; +import common.init.Blocks; +import common.item.RngLoot; +import common.material.Material; +import common.rng.Random; +import common.rng.WeightedList; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityChest; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; +import common.worldgen.LootConstants; public class WorldGenAbandonedChest extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenAsteroid.java b/java/src/common/worldgen/feature/WorldGenAsteroid.java similarity index 91% rename from java/src/game/worldgen/feature/WorldGenAsteroid.java rename to java/src/common/worldgen/feature/WorldGenAsteroid.java index bf8d2fc..35c2fea 100755 --- a/java/src/game/worldgen/feature/WorldGenAsteroid.java +++ b/java/src/common/worldgen/feature/WorldGenAsteroid.java @@ -1,10 +1,10 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenAsteroid extends FeatureGenerator { private final State[] blocks; diff --git a/java/src/game/worldgen/feature/WorldGenBlockBlob.java b/java/src/common/worldgen/feature/WorldGenBlockBlob.java similarity index 90% rename from java/src/game/worldgen/feature/WorldGenBlockBlob.java rename to java/src/common/worldgen/feature/WorldGenBlockBlob.java index c6eda23..98e6f18 100755 --- a/java/src/game/worldgen/feature/WorldGenBlockBlob.java +++ b/java/src/common/worldgen/feature/WorldGenBlockBlob.java @@ -1,11 +1,11 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenBlockBlob extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenClay.java b/java/src/common/worldgen/feature/WorldGenClay.java similarity index 87% rename from java/src/game/worldgen/feature/WorldGenClay.java rename to java/src/common/worldgen/feature/WorldGenClay.java index 7f7fdce..1be9142 100755 --- a/java/src/game/worldgen/feature/WorldGenClay.java +++ b/java/src/common/worldgen/feature/WorldGenClay.java @@ -1,11 +1,11 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenClay extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenClayExt.java b/java/src/common/worldgen/feature/WorldGenClayExt.java similarity index 90% rename from java/src/game/worldgen/feature/WorldGenClayExt.java rename to java/src/common/worldgen/feature/WorldGenClayExt.java index 93b99bd..9f9499e 100755 --- a/java/src/game/worldgen/feature/WorldGenClayExt.java +++ b/java/src/common/worldgen/feature/WorldGenClayExt.java @@ -1,11 +1,11 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.WorldServer; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.WorldServer; public class WorldGenClayExt extends WorldGenClay { public WorldGenClayExt(int blocks) { diff --git a/java/src/game/worldgen/feature/WorldGenDesertWells.java b/java/src/common/worldgen/feature/WorldGenDesertWells.java similarity index 89% rename from java/src/game/worldgen/feature/WorldGenDesertWells.java rename to java/src/common/worldgen/feature/WorldGenDesertWells.java index b0e233d..3412134 100755 --- a/java/src/game/worldgen/feature/WorldGenDesertWells.java +++ b/java/src/common/worldgen/feature/WorldGenDesertWells.java @@ -1,16 +1,16 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.BlockSand; -import game.block.BlockSlab; -import game.init.Blocks; -import game.pattern.BlockStateHelper; -import game.rng.Random; -import game.util.Predicates; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockSand; +import common.block.BlockSlab; +import common.init.Blocks; +import common.pattern.BlockStateHelper; +import common.rng.Random; +import common.util.Predicates; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenDesertWells extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenFire.java b/java/src/common/worldgen/feature/WorldGenFire.java similarity index 75% rename from java/src/game/worldgen/feature/WorldGenFire.java rename to java/src/common/worldgen/feature/WorldGenFire.java index f878e76..09e1665 100755 --- a/java/src/game/worldgen/feature/WorldGenFire.java +++ b/java/src/common/worldgen/feature/WorldGenFire.java @@ -1,10 +1,10 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenFire extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenGlowStone.java b/java/src/common/worldgen/feature/WorldGenGlowStone.java similarity index 85% rename from java/src/game/worldgen/feature/WorldGenGlowStone.java rename to java/src/common/worldgen/feature/WorldGenGlowStone.java index 9ec482f..3dd6047 100755 --- a/java/src/game/worldgen/feature/WorldGenGlowStone.java +++ b/java/src/common/worldgen/feature/WorldGenGlowStone.java @@ -1,12 +1,12 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.Facing; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenGlowStone extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenHellLava.java b/java/src/common/worldgen/feature/WorldGenHellLava.java similarity index 90% rename from java/src/game/worldgen/feature/WorldGenHellLava.java rename to java/src/common/worldgen/feature/WorldGenHellLava.java index 762423d..a878c5c 100755 --- a/java/src/game/worldgen/feature/WorldGenHellLava.java +++ b/java/src/common/worldgen/feature/WorldGenHellLava.java @@ -1,12 +1,12 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenHellLava extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenIcePath.java b/java/src/common/worldgen/feature/WorldGenIcePath.java similarity index 88% rename from java/src/game/worldgen/feature/WorldGenIcePath.java rename to java/src/common/worldgen/feature/WorldGenIcePath.java index 7012684..f0b26ba 100755 --- a/java/src/game/worldgen/feature/WorldGenIcePath.java +++ b/java/src/common/worldgen/feature/WorldGenIcePath.java @@ -1,11 +1,11 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenIcePath extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenIceSpike.java b/java/src/common/worldgen/feature/WorldGenIceSpike.java similarity index 93% rename from java/src/game/worldgen/feature/WorldGenIceSpike.java rename to java/src/common/worldgen/feature/WorldGenIceSpike.java index 6e916f7..3f78db2 100755 --- a/java/src/game/worldgen/feature/WorldGenIceSpike.java +++ b/java/src/common/worldgen/feature/WorldGenIceSpike.java @@ -1,13 +1,13 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenIceSpike extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenSand.java b/java/src/common/worldgen/feature/WorldGenSand.java similarity index 88% rename from java/src/game/worldgen/feature/WorldGenSand.java rename to java/src/common/worldgen/feature/WorldGenSand.java index d1bed59..178abdd 100755 --- a/java/src/game/worldgen/feature/WorldGenSand.java +++ b/java/src/common/worldgen/feature/WorldGenSand.java @@ -1,11 +1,11 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenSand extends FeatureGenerator { diff --git a/java/src/game/worldgen/feature/WorldGenSpikes.java b/java/src/common/worldgen/feature/WorldGenSpikes.java similarity index 90% rename from java/src/game/worldgen/feature/WorldGenSpikes.java rename to java/src/common/worldgen/feature/WorldGenSpikes.java index ea88f57..c22daf1 100755 --- a/java/src/game/worldgen/feature/WorldGenSpikes.java +++ b/java/src/common/worldgen/feature/WorldGenSpikes.java @@ -1,13 +1,13 @@ -package game.worldgen.feature; +package common.worldgen.feature; -import game.block.Block; -import game.entity.Entity; -import game.entity.item.EntityCrystal; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.entity.Entity; +import common.entity.item.EntityCrystal; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenSpikes extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/FeatureDoublePlant.java b/java/src/common/worldgen/foliage/FeatureDoublePlant.java similarity index 81% rename from java/src/game/worldgen/foliage/FeatureDoublePlant.java rename to java/src/common/worldgen/foliage/FeatureDoublePlant.java index a276dc2..9d61b5b 100755 --- a/java/src/game/worldgen/foliage/FeatureDoublePlant.java +++ b/java/src/common/worldgen/foliage/FeatureDoublePlant.java @@ -1,10 +1,10 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockDoublePlant; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; +import common.block.BlockDoublePlant; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; public class FeatureDoublePlant { diff --git a/java/src/game/worldgen/foliage/WorldGenBigMushroom.java b/java/src/common/worldgen/foliage/WorldGenBigMushroom.java similarity index 96% rename from java/src/game/worldgen/foliage/WorldGenBigMushroom.java rename to java/src/common/worldgen/foliage/WorldGenBigMushroom.java index 11523ae..09b707e 100755 --- a/java/src/game/worldgen/foliage/WorldGenBigMushroom.java +++ b/java/src/common/worldgen/foliage/WorldGenBigMushroom.java @@ -1,13 +1,13 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.Block; -import game.block.BlockHugeMushroom; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.block.BlockHugeMushroom; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenBigMushroom extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenCactus.java b/java/src/common/worldgen/foliage/WorldGenCactus.java similarity index 80% rename from java/src/game/worldgen/foliage/WorldGenCactus.java rename to java/src/common/worldgen/foliage/WorldGenCactus.java index 195223b..a148c2e 100755 --- a/java/src/game/worldgen/foliage/WorldGenCactus.java +++ b/java/src/common/worldgen/foliage/WorldGenCactus.java @@ -1,10 +1,10 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenCactus extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenDeadBush.java b/java/src/common/worldgen/foliage/WorldGenDeadBush.java similarity index 77% rename from java/src/game/worldgen/foliage/WorldGenDeadBush.java rename to java/src/common/worldgen/foliage/WorldGenDeadBush.java index 32d52b3..4bff100 100755 --- a/java/src/game/worldgen/foliage/WorldGenDeadBush.java +++ b/java/src/common/worldgen/foliage/WorldGenDeadBush.java @@ -1,12 +1,12 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.Block; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenDeadBush extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenFlowers.java b/java/src/common/worldgen/foliage/WorldGenFlowers.java similarity index 83% rename from java/src/game/worldgen/foliage/WorldGenFlowers.java rename to java/src/common/worldgen/foliage/WorldGenFlowers.java index 452e279..b8ab2da 100755 --- a/java/src/game/worldgen/foliage/WorldGenFlowers.java +++ b/java/src/common/worldgen/foliage/WorldGenFlowers.java @@ -1,11 +1,11 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockFlower; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockFlower; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenFlowers extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenMelon.java b/java/src/common/worldgen/foliage/WorldGenMelon.java similarity index 76% rename from java/src/game/worldgen/foliage/WorldGenMelon.java rename to java/src/common/worldgen/foliage/WorldGenMelon.java index 50f3029..b48dedf 100755 --- a/java/src/game/worldgen/foliage/WorldGenMelon.java +++ b/java/src/common/worldgen/foliage/WorldGenMelon.java @@ -1,10 +1,10 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenMelon extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenMushroom.java b/java/src/common/worldgen/foliage/WorldGenMushroom.java similarity index 80% rename from java/src/game/worldgen/foliage/WorldGenMushroom.java rename to java/src/common/worldgen/foliage/WorldGenMushroom.java index 113a43d..a23509c 100755 --- a/java/src/game/worldgen/foliage/WorldGenMushroom.java +++ b/java/src/common/worldgen/foliage/WorldGenMushroom.java @@ -1,10 +1,10 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockBush; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockBush; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenMushroom extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenPumpkin.java b/java/src/common/worldgen/foliage/WorldGenPumpkin.java similarity index 73% rename from java/src/game/worldgen/foliage/WorldGenPumpkin.java rename to java/src/common/worldgen/foliage/WorldGenPumpkin.java index e93d8c0..e15fec5 100755 --- a/java/src/game/worldgen/foliage/WorldGenPumpkin.java +++ b/java/src/common/worldgen/foliage/WorldGenPumpkin.java @@ -1,12 +1,12 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockPumpkin; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockPumpkin; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.Facing; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenPumpkin extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenReed.java b/java/src/common/worldgen/foliage/WorldGenReed.java similarity index 84% rename from java/src/game/worldgen/foliage/WorldGenReed.java rename to java/src/common/worldgen/foliage/WorldGenReed.java index d540343..5162668 100755 --- a/java/src/game/worldgen/foliage/WorldGenReed.java +++ b/java/src/common/worldgen/foliage/WorldGenReed.java @@ -1,11 +1,11 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenReed extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenShrub.java b/java/src/common/worldgen/foliage/WorldGenShrub.java similarity index 86% rename from java/src/game/worldgen/foliage/WorldGenShrub.java rename to java/src/common/worldgen/foliage/WorldGenShrub.java index 01f342e..1ae5474 100755 --- a/java/src/game/worldgen/foliage/WorldGenShrub.java +++ b/java/src/common/worldgen/foliage/WorldGenShrub.java @@ -1,14 +1,14 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.tree.WorldGenBaseTree; +import common.block.Block; +import common.block.BlockLeaves; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.tree.WorldGenBaseTree; public class WorldGenShrub extends WorldGenBaseTree { diff --git a/java/src/game/worldgen/foliage/WorldGenTallGrass.java b/java/src/common/worldgen/foliage/WorldGenTallGrass.java similarity index 77% rename from java/src/game/worldgen/foliage/WorldGenTallGrass.java rename to java/src/common/worldgen/foliage/WorldGenTallGrass.java index d841f23..2bfeb28 100755 --- a/java/src/game/worldgen/foliage/WorldGenTallGrass.java +++ b/java/src/common/worldgen/foliage/WorldGenTallGrass.java @@ -1,14 +1,14 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.Block; -import game.block.BlockTallGrass; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.block.BlockTallGrass; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenTallGrass extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenVines.java b/java/src/common/worldgen/foliage/WorldGenVines.java similarity index 81% rename from java/src/game/worldgen/foliage/WorldGenVines.java rename to java/src/common/worldgen/foliage/WorldGenVines.java index fb2333b..7b42cf0 100755 --- a/java/src/game/worldgen/foliage/WorldGenVines.java +++ b/java/src/common/worldgen/foliage/WorldGenVines.java @@ -1,13 +1,13 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockVine; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockVine; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.Facing; +import common.world.State; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenVines extends FeatureGenerator { diff --git a/java/src/game/worldgen/foliage/WorldGenWaterlily.java b/java/src/common/worldgen/foliage/WorldGenWaterlily.java similarity index 74% rename from java/src/game/worldgen/foliage/WorldGenWaterlily.java rename to java/src/common/worldgen/foliage/WorldGenWaterlily.java index 02d2df0..333505f 100755 --- a/java/src/game/worldgen/foliage/WorldGenWaterlily.java +++ b/java/src/common/worldgen/foliage/WorldGenWaterlily.java @@ -1,12 +1,12 @@ -package game.worldgen.foliage; +package common.worldgen.foliage; -import game.block.BlockDirectional; -import game.init.Blocks; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.BlockDirectional; +import common.init.Blocks; +import common.rng.Random; +import common.world.BlockPos; +import common.world.Facing; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public class WorldGenWaterlily extends FeatureGenerator { diff --git a/java/src/game/worldgen/layer/GenLayer.java b/java/src/common/worldgen/layer/GenLayer.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayer.java rename to java/src/common/worldgen/layer/GenLayer.java index 321cb6f..82c3c5b 100755 --- a/java/src/game/worldgen/layer/GenLayer.java +++ b/java/src/common/worldgen/layer/GenLayer.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public abstract class GenLayer { private long worldGenSeed; diff --git a/java/src/game/worldgen/layer/GenLayerAddAreas.java b/java/src/common/worldgen/layer/GenLayerAddAreas.java similarity index 99% rename from java/src/game/worldgen/layer/GenLayerAddAreas.java rename to java/src/common/worldgen/layer/GenLayerAddAreas.java index fa9a323..f5913b0 100755 --- a/java/src/game/worldgen/layer/GenLayerAddAreas.java +++ b/java/src/common/worldgen/layer/GenLayerAddAreas.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerAddAreas extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerAddExtra.java b/java/src/common/worldgen/layer/GenLayerAddExtra.java similarity index 96% rename from java/src/game/worldgen/layer/GenLayerAddExtra.java rename to java/src/common/worldgen/layer/GenLayerAddExtra.java index f18e670..e9a2cc0 100755 --- a/java/src/game/worldgen/layer/GenLayerAddExtra.java +++ b/java/src/common/worldgen/layer/GenLayerAddExtra.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public class GenLayerAddExtra extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerAddSea.java b/java/src/common/worldgen/layer/GenLayerAddSea.java similarity index 97% rename from java/src/game/worldgen/layer/GenLayerAddSea.java rename to java/src/common/worldgen/layer/GenLayerAddSea.java index e573bec..4e21a0c 100755 --- a/java/src/game/worldgen/layer/GenLayerAddSea.java +++ b/java/src/common/worldgen/layer/GenLayerAddSea.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public class GenLayerAddSea extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerAddSnow.java b/java/src/common/worldgen/layer/GenLayerAddSnow.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerAddSnow.java rename to java/src/common/worldgen/layer/GenLayerAddSnow.java index 4e8cfe2..de257dc 100755 --- a/java/src/game/worldgen/layer/GenLayerAddSnow.java +++ b/java/src/common/worldgen/layer/GenLayerAddSnow.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerAddSnow extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerBase.java b/java/src/common/worldgen/layer/GenLayerBase.java similarity index 95% rename from java/src/game/worldgen/layer/GenLayerBase.java rename to java/src/common/worldgen/layer/GenLayerBase.java index d82ae3e..bd1403d 100755 --- a/java/src/game/worldgen/layer/GenLayerBase.java +++ b/java/src/common/worldgen/layer/GenLayerBase.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerBase extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerBiome.java b/java/src/common/worldgen/layer/GenLayerBiome.java similarity index 97% rename from java/src/game/worldgen/layer/GenLayerBiome.java rename to java/src/common/worldgen/layer/GenLayerBiome.java index d20fd9f..e4a58e6 100755 --- a/java/src/game/worldgen/layer/GenLayerBiome.java +++ b/java/src/common/worldgen/layer/GenLayerBiome.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public class GenLayerBiome extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerBiomeEdge.java b/java/src/common/worldgen/layer/GenLayerBiomeEdge.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerBiomeEdge.java rename to java/src/common/worldgen/layer/GenLayerBiomeEdge.java index 9fd5068..f3653f7 100755 --- a/java/src/game/worldgen/layer/GenLayerBiomeEdge.java +++ b/java/src/common/worldgen/layer/GenLayerBiomeEdge.java @@ -1,7 +1,7 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; -import game.biome.Temperature; +import common.biome.Biome; +import common.biome.Temperature; public class GenLayerBiomeEdge extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerEdge.java b/java/src/common/worldgen/layer/GenLayerEdge.java similarity index 99% rename from java/src/game/worldgen/layer/GenLayerEdge.java rename to java/src/common/worldgen/layer/GenLayerEdge.java index 243506e..dda413d 100755 --- a/java/src/game/worldgen/layer/GenLayerEdge.java +++ b/java/src/common/worldgen/layer/GenLayerEdge.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerEdge extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerFuzzyZoom.java b/java/src/common/worldgen/layer/GenLayerFuzzyZoom.java similarity index 94% rename from java/src/game/worldgen/layer/GenLayerFuzzyZoom.java rename to java/src/common/worldgen/layer/GenLayerFuzzyZoom.java index b4c4fc7..d38e3de 100755 --- a/java/src/game/worldgen/layer/GenLayerFuzzyZoom.java +++ b/java/src/common/worldgen/layer/GenLayerFuzzyZoom.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerFuzzyZoom extends GenLayerZoom { diff --git a/java/src/game/worldgen/layer/GenLayerHills.java b/java/src/common/worldgen/layer/GenLayerHills.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerHills.java rename to java/src/common/worldgen/layer/GenLayerHills.java index 284261a..e8c4318 100755 --- a/java/src/game/worldgen/layer/GenLayerHills.java +++ b/java/src/common/worldgen/layer/GenLayerHills.java @@ -1,7 +1,7 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; -import game.log.Log; +import common.biome.Biome; +import common.log.Log; public class GenLayerHills extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerRemoveEmpty.java b/java/src/common/worldgen/layer/GenLayerRemoveEmpty.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerRemoveEmpty.java rename to java/src/common/worldgen/layer/GenLayerRemoveEmpty.java index e35145c..ef77ef2 100755 --- a/java/src/game/worldgen/layer/GenLayerRemoveEmpty.java +++ b/java/src/common/worldgen/layer/GenLayerRemoveEmpty.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerRemoveEmpty extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerRiver.java b/java/src/common/worldgen/layer/GenLayerRiver.java similarity index 96% rename from java/src/game/worldgen/layer/GenLayerRiver.java rename to java/src/common/worldgen/layer/GenLayerRiver.java index cced208..1bf51e0 100755 --- a/java/src/game/worldgen/layer/GenLayerRiver.java +++ b/java/src/common/worldgen/layer/GenLayerRiver.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public class GenLayerRiver extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerRiverInit.java b/java/src/common/worldgen/layer/GenLayerRiverInit.java similarity index 96% rename from java/src/game/worldgen/layer/GenLayerRiverInit.java rename to java/src/common/worldgen/layer/GenLayerRiverInit.java index 80a65a2..04bd0e8 100755 --- a/java/src/game/worldgen/layer/GenLayerRiverInit.java +++ b/java/src/common/worldgen/layer/GenLayerRiverInit.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerRiverInit extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerRiverMix.java b/java/src/common/worldgen/layer/GenLayerRiverMix.java similarity index 97% rename from java/src/game/worldgen/layer/GenLayerRiverMix.java rename to java/src/common/worldgen/layer/GenLayerRiverMix.java index a98d6d8..0796530 100755 --- a/java/src/game/worldgen/layer/GenLayerRiverMix.java +++ b/java/src/common/worldgen/layer/GenLayerRiverMix.java @@ -1,6 +1,6 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; +import common.biome.Biome; public class GenLayerRiverMix extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerShore.java b/java/src/common/worldgen/layer/GenLayerShore.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerShore.java rename to java/src/common/worldgen/layer/GenLayerShore.java index 4e94d33..c3936aa 100755 --- a/java/src/game/worldgen/layer/GenLayerShore.java +++ b/java/src/common/worldgen/layer/GenLayerShore.java @@ -1,7 +1,7 @@ -package game.worldgen.layer; +package common.worldgen.layer; -import game.biome.Biome; -import game.biome.BiomeJungle; +import common.biome.Biome; +import common.biome.BiomeJungle; public class GenLayerShore extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerSmooth.java b/java/src/common/worldgen/layer/GenLayerSmooth.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerSmooth.java rename to java/src/common/worldgen/layer/GenLayerSmooth.java index 1893663..d67a516 100755 --- a/java/src/game/worldgen/layer/GenLayerSmooth.java +++ b/java/src/common/worldgen/layer/GenLayerSmooth.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerSmooth extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerVoronoiZoom.java b/java/src/common/worldgen/layer/GenLayerVoronoiZoom.java similarity index 99% rename from java/src/game/worldgen/layer/GenLayerVoronoiZoom.java rename to java/src/common/worldgen/layer/GenLayerVoronoiZoom.java index e8c76ac..c53921c 100755 --- a/java/src/game/worldgen/layer/GenLayerVoronoiZoom.java +++ b/java/src/common/worldgen/layer/GenLayerVoronoiZoom.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerVoronoiZoom extends GenLayer { diff --git a/java/src/game/worldgen/layer/GenLayerZoom.java b/java/src/common/worldgen/layer/GenLayerZoom.java similarity index 98% rename from java/src/game/worldgen/layer/GenLayerZoom.java rename to java/src/common/worldgen/layer/GenLayerZoom.java index 8dd4565..72ef702 100755 --- a/java/src/game/worldgen/layer/GenLayerZoom.java +++ b/java/src/common/worldgen/layer/GenLayerZoom.java @@ -1,4 +1,4 @@ -package game.worldgen.layer; +package common.worldgen.layer; public class GenLayerZoom extends GenLayer { diff --git a/java/src/game/worldgen/layer/IntCache.java b/java/src/common/worldgen/layer/IntCache.java similarity index 97% rename from java/src/game/worldgen/layer/IntCache.java rename to java/src/common/worldgen/layer/IntCache.java index 38a4766..e275dc7 100755 --- a/java/src/game/worldgen/layer/IntCache.java +++ b/java/src/common/worldgen/layer/IntCache.java @@ -1,8 +1,8 @@ -package game.worldgen.layer; +package common.worldgen.layer; import java.util.List; -import game.collect.Lists; +import common.collect.Lists; public class IntCache { diff --git a/java/src/game/worldgen/structure/MapGenBridge.java b/java/src/common/worldgen/structure/MapGenBridge.java similarity index 94% rename from java/src/game/worldgen/structure/MapGenBridge.java rename to java/src/common/worldgen/structure/MapGenBridge.java index 2fa6862..3a428b4 100755 --- a/java/src/game/worldgen/structure/MapGenBridge.java +++ b/java/src/common/worldgen/structure/MapGenBridge.java @@ -1,9 +1,9 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; -import game.rng.Random; -import game.world.WorldServer; +import common.rng.Random; +import common.world.WorldServer; public class MapGenBridge extends MapGenStructure { diff --git a/java/src/game/worldgen/structure/MapGenMineshaft.java b/java/src/common/worldgen/structure/MapGenMineshaft.java similarity index 96% rename from java/src/game/worldgen/structure/MapGenMineshaft.java rename to java/src/common/worldgen/structure/MapGenMineshaft.java index 6a5ca50..e464c18 100755 --- a/java/src/game/worldgen/structure/MapGenMineshaft.java +++ b/java/src/common/worldgen/structure/MapGenMineshaft.java @@ -1,4 +1,4 @@ -package game.worldgen.structure; +package common.worldgen.structure; public class MapGenMineshaft extends MapGenStructure { diff --git a/java/src/game/worldgen/structure/MapGenScatteredFeature.java b/java/src/common/worldgen/structure/MapGenScatteredFeature.java similarity index 96% rename from java/src/game/worldgen/structure/MapGenScatteredFeature.java rename to java/src/common/worldgen/structure/MapGenScatteredFeature.java index 0228027..16c54e2 100755 --- a/java/src/game/worldgen/structure/MapGenScatteredFeature.java +++ b/java/src/common/worldgen/structure/MapGenScatteredFeature.java @@ -1,12 +1,12 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.Arrays; import java.util.List; -import game.biome.Biome; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; +import common.biome.Biome; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; public class MapGenScatteredFeature extends MapGenStructure { diff --git a/java/src/game/worldgen/structure/MapGenStronghold.java b/java/src/common/worldgen/structure/MapGenStronghold.java similarity index 98% rename from java/src/game/worldgen/structure/MapGenStronghold.java rename to java/src/common/worldgen/structure/MapGenStronghold.java index 760a240..10d7f64 100755 --- a/java/src/game/worldgen/structure/MapGenStronghold.java +++ b/java/src/common/worldgen/structure/MapGenStronghold.java @@ -1,9 +1,9 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; -import game.rng.Random; -import game.world.WorldServer; +import common.rng.Random; +import common.world.WorldServer; public class MapGenStronghold extends MapGenStructure { diff --git a/java/src/game/worldgen/structure/MapGenStructure.java b/java/src/common/worldgen/structure/MapGenStructure.java similarity index 94% rename from java/src/game/worldgen/structure/MapGenStructure.java rename to java/src/common/worldgen/structure/MapGenStructure.java index 360f058..5cd21bf 100755 --- a/java/src/game/worldgen/structure/MapGenStructure.java +++ b/java/src/common/worldgen/structure/MapGenStructure.java @@ -1,20 +1,20 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.Iterator; import java.util.Map; -import game.collect.Maps; -import game.nbt.NBTBase; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.BlockPos; -import game.world.ChunkPos; -import game.world.LongHashMap; -import game.world.World; -import game.world.WorldServer; -import game.world.WorldServer.WorldSavedData; -import game.worldgen.ChunkPrimer; -import game.worldgen.caves.MapGenBase; +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.world.World; +import common.world.WorldServer; +import common.world.WorldServer.WorldSavedData; +import common.worldgen.ChunkPrimer; +import common.worldgen.caves.MapGenBase; public abstract class MapGenStructure extends MapGenBase { diff --git a/java/src/game/worldgen/structure/MapGenStructureIO.java b/java/src/common/worldgen/structure/MapGenStructureIO.java similarity index 96% rename from java/src/game/worldgen/structure/MapGenStructureIO.java rename to java/src/common/worldgen/structure/MapGenStructureIO.java index 94c185c..2556af7 100755 --- a/java/src/game/worldgen/structure/MapGenStructureIO.java +++ b/java/src/common/worldgen/structure/MapGenStructureIO.java @@ -1,11 +1,11 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.Map; -import game.collect.Maps; -import game.log.Log; -import game.nbt.NBTTagCompound; -import game.world.WorldServer; +import common.collect.Maps; +import common.log.Log; +import common.nbt.NBTTagCompound; +import common.world.WorldServer; public class MapGenStructureIO { diff --git a/java/src/game/worldgen/structure/MapGenVillage.java b/java/src/common/worldgen/structure/MapGenVillage.java similarity index 96% rename from java/src/game/worldgen/structure/MapGenVillage.java rename to java/src/common/worldgen/structure/MapGenVillage.java index 9a81a77..b907379 100755 --- a/java/src/game/worldgen/structure/MapGenVillage.java +++ b/java/src/common/worldgen/structure/MapGenVillage.java @@ -1,13 +1,13 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; import java.util.Set; -import game.biome.Biome; -import game.collect.Sets; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.WorldServer; +import common.biome.Biome; +import common.collect.Sets; +import common.nbt.NBTTagCompound; +import common.rng.Random; +import common.world.WorldServer; public class MapGenVillage extends MapGenStructure { diff --git a/java/src/game/worldgen/structure/StructureBoundingBox.java b/java/src/common/worldgen/structure/StructureBoundingBox.java similarity index 98% rename from java/src/game/worldgen/structure/StructureBoundingBox.java rename to java/src/common/worldgen/structure/StructureBoundingBox.java index 43bf49f..418f011 100755 --- a/java/src/game/worldgen/structure/StructureBoundingBox.java +++ b/java/src/common/worldgen/structure/StructureBoundingBox.java @@ -1,9 +1,9 @@ -package game.worldgen.structure; +package common.worldgen.structure; -import game.nbt.NBTTagIntArray; -import game.world.BlockPos; -import game.world.Facing; -import game.world.Vec3i; +import common.nbt.NBTTagIntArray; +import common.world.BlockPos; +import common.world.Facing; +import common.world.Vec3i; public class StructureBoundingBox { diff --git a/java/src/game/worldgen/structure/StructureBridge.java b/java/src/common/worldgen/structure/StructureBridge.java similarity index 99% rename from java/src/game/worldgen/structure/StructureBridge.java rename to java/src/common/worldgen/structure/StructureBridge.java index a04e30a..ab35d0e 100755 --- a/java/src/game/worldgen/structure/StructureBridge.java +++ b/java/src/common/worldgen/structure/StructureBridge.java @@ -1,17 +1,17 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; -import game.collect.Lists; -import game.init.Blocks; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMobSpawner; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.LootConstants; +import common.collect.Lists; +import common.init.Blocks; +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.world.WorldServer; +import common.worldgen.LootConstants; public class StructureBridge diff --git a/java/src/game/worldgen/structure/StructureComponent.java b/java/src/common/worldgen/structure/StructureComponent.java similarity index 97% rename from java/src/game/worldgen/structure/StructureComponent.java rename to java/src/common/worldgen/structure/StructureComponent.java index 4a3fb47..b01bff9 100755 --- a/java/src/game/worldgen/structure/StructureComponent.java +++ b/java/src/common/worldgen/structure/StructureComponent.java @@ -1,24 +1,24 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; -import game.block.Block; -import game.block.BlockDirectional; -import game.block.BlockDoor; -import game.init.Blocks; -import game.item.ItemDoor; -import game.item.RngLoot; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.rng.WeightedList; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityChest; -import game.tileentity.TileEntityDispenser; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDirectional; +import common.block.BlockDoor; +import common.init.Blocks; +import common.item.ItemDoor; +import common.item.RngLoot; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.rng.Random; +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.world.State; +import common.world.WorldServer; public abstract class StructureComponent { diff --git a/java/src/game/worldgen/structure/StructureMineshaft.java b/java/src/common/worldgen/structure/StructureMineshaft.java similarity index 98% rename from java/src/game/worldgen/structure/StructureMineshaft.java rename to java/src/common/worldgen/structure/StructureMineshaft.java index c73f00f..cadc388 100755 --- a/java/src/game/worldgen/structure/StructureMineshaft.java +++ b/java/src/common/worldgen/structure/StructureMineshaft.java @@ -1,24 +1,24 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.LinkedList; import java.util.List; -import game.entity.item.EntityChestCart; -import game.init.Blocks; -import game.init.Items; -import game.item.RngLoot; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.rng.WeightedList; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMobSpawner; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.LootConstants; +import common.entity.item.EntityChestCart; +import common.init.Blocks; +import common.init.Items; +import common.item.RngLoot; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +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.world.State; +import common.world.WorldServer; +import common.worldgen.LootConstants; public class StructureMineshaft diff --git a/java/src/game/worldgen/structure/StructureMineshaftStart.java b/java/src/common/worldgen/structure/StructureMineshaftStart.java similarity index 87% rename from java/src/game/worldgen/structure/StructureMineshaftStart.java rename to java/src/common/worldgen/structure/StructureMineshaftStart.java index bd1763b..72dc9b0 100755 --- a/java/src/game/worldgen/structure/StructureMineshaftStart.java +++ b/java/src/common/worldgen/structure/StructureMineshaftStart.java @@ -1,7 +1,7 @@ -package game.worldgen.structure; +package common.worldgen.structure; -import game.rng.Random; -import game.world.WorldServer; +import common.rng.Random; +import common.world.WorldServer; public class StructureMineshaftStart extends StructureStart { diff --git a/java/src/game/worldgen/structure/StructureScattered.java b/java/src/common/worldgen/structure/StructureScattered.java similarity index 98% rename from java/src/game/worldgen/structure/StructureScattered.java rename to java/src/common/worldgen/structure/StructureScattered.java index fe095d1..b031a72 100755 --- a/java/src/game/worldgen/structure/StructureScattered.java +++ b/java/src/common/worldgen/structure/StructureScattered.java @@ -1,24 +1,24 @@ -package game.worldgen.structure; +package common.worldgen.structure; -import game.block.BlockFlower; -import game.block.BlockFlowerPot; -import game.block.BlockLever; -import game.block.BlockSandStone; -import game.block.BlockStoneBrick; -import game.block.BlockTripWire; -import game.block.BlockTripWireHook; -import game.color.DyeColor; -import game.entity.npc.EntityMage; -import game.init.Blocks; -import game.init.Config; -import game.init.Items; -import game.item.RngLoot; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.LootConstants; +import common.block.BlockFlower; +import common.block.BlockFlowerPot; +import common.block.BlockLever; +import common.block.BlockSandStone; +import common.block.BlockStoneBrick; +import common.block.BlockTripWire; +import common.block.BlockTripWireHook; +import common.color.DyeColor; +import common.entity.npc.EntityMage; +import common.init.Blocks; +import common.init.Config; +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.world.WorldServer; +import common.worldgen.LootConstants; public class StructureScattered { diff --git a/java/src/game/worldgen/structure/StructureStart.java b/java/src/common/worldgen/structure/StructureStart.java similarity index 96% rename from java/src/game/worldgen/structure/StructureStart.java rename to java/src/common/worldgen/structure/StructureStart.java index 0f200c3..5cee450 100755 --- a/java/src/game/worldgen/structure/StructureStart.java +++ b/java/src/common/worldgen/structure/StructureStart.java @@ -1,13 +1,13 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.Iterator; import java.util.LinkedList; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.rng.Random; -import game.world.ChunkPos; -import game.world.WorldServer; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.rng.Random; +import common.world.ChunkPos; +import common.world.WorldServer; public abstract class StructureStart { diff --git a/java/src/game/worldgen/structure/StructureStronghold.java b/java/src/common/worldgen/structure/StructureStronghold.java similarity index 99% rename from java/src/game/worldgen/structure/StructureStronghold.java rename to java/src/common/worldgen/structure/StructureStronghold.java index 6d4f792..3d10553 100755 --- a/java/src/game/worldgen/structure/StructureStronghold.java +++ b/java/src/common/worldgen/structure/StructureStronghold.java @@ -1,23 +1,23 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.List; import java.util.Map; -import game.block.BlockSlab; -import game.block.BlockStoneBrick; -import game.collect.Lists; -import game.collect.Maps; -import game.init.Blocks; -import game.init.Items; -import game.item.RngLoot; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMobSpawner; -import game.world.BlockPos; -import game.world.Facing; -import game.world.WorldServer; -import game.worldgen.LootConstants; +import common.block.BlockSlab; +import common.block.BlockStoneBrick; +import common.collect.Lists; +import common.collect.Maps; +import common.init.Blocks; +import common.init.Items; +import common.item.RngLoot; +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.world.WorldServer; +import common.worldgen.LootConstants; public class StructureStronghold diff --git a/java/src/game/worldgen/structure/StructureVillage.java b/java/src/common/worldgen/structure/StructureVillage.java similarity index 99% rename from java/src/game/worldgen/structure/StructureVillage.java rename to java/src/common/worldgen/structure/StructureVillage.java index 79b793d..aa850da 100755 --- a/java/src/game/worldgen/structure/StructureVillage.java +++ b/java/src/common/worldgen/structure/StructureVillage.java @@ -1,30 +1,30 @@ -package game.worldgen.structure; +package common.worldgen.structure; import java.util.Iterator; import java.util.List; -import game.biome.Biome; -import game.block.Block; -import game.block.BlockLog; -import game.block.BlockSandStone; -import game.block.BlockSlab; -import game.block.BlockStairs; -import game.block.BlockTorch; -import game.collect.Lists; -import game.color.DyeColor; -import game.entity.npc.EntityHuman; -import game.init.BlockRegistry; -import game.init.Blocks; -import game.init.Config; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; -import game.worldgen.BiomeGenerator; -import game.worldgen.LootConstants; +import common.biome.Biome; +import common.block.Block; +import common.block.BlockLog; +import common.block.BlockSandStone; +import common.block.BlockSlab; +import common.block.BlockStairs; +import common.block.BlockTorch; +import common.collect.Lists; +import common.color.DyeColor; +import common.entity.npc.EntityHuman; +import common.init.BlockRegistry; +import common.init.Blocks; +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.world.State; +import common.world.WorldServer; +import common.worldgen.BiomeGenerator; +import common.worldgen.LootConstants; public class StructureVillage diff --git a/java/src/game/worldgen/tree/WorldGenBaseTree.java b/java/src/common/worldgen/tree/WorldGenBaseTree.java similarity index 96% rename from java/src/game/worldgen/tree/WorldGenBaseTree.java rename to java/src/common/worldgen/tree/WorldGenBaseTree.java index 464f038..c1e3017 100755 --- a/java/src/game/worldgen/tree/WorldGenBaseTree.java +++ b/java/src/common/worldgen/tree/WorldGenBaseTree.java @@ -1,17 +1,17 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockCocoa; -import game.block.BlockLeaves; -import game.block.BlockVine; -import game.init.Blocks; -import game.material.Material; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockCocoa; +import common.block.BlockLeaves; +import common.block.BlockVine; +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.world.State; +import common.world.WorldServer; public class WorldGenBaseTree extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenBigTree.java b/java/src/common/worldgen/tree/WorldGenBigTree.java similarity index 97% rename from java/src/game/worldgen/tree/WorldGenBigTree.java rename to java/src/common/worldgen/tree/WorldGenBigTree.java index 9655450..8a5580c 100755 --- a/java/src/game/worldgen/tree/WorldGenBigTree.java +++ b/java/src/common/worldgen/tree/WorldGenBigTree.java @@ -1,18 +1,18 @@ -package game.worldgen.tree; +package common.worldgen.tree; import java.util.List; -import game.block.Block; -import game.block.BlockLeaves; -import game.block.BlockLog; -import game.collect.Lists; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.block.BlockLog; +import common.collect.Lists; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenBigTree extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenBirch.java b/java/src/common/worldgen/tree/WorldGenBirch.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenBirch.java rename to java/src/common/worldgen/tree/WorldGenBirch.java index bde4f4e..d0c4af8 100755 --- a/java/src/game/worldgen/tree/WorldGenBirch.java +++ b/java/src/common/worldgen/tree/WorldGenBirch.java @@ -1,13 +1,13 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenBirch extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenDarkOak.java b/java/src/common/worldgen/tree/WorldGenDarkOak.java similarity index 96% rename from java/src/game/worldgen/tree/WorldGenDarkOak.java rename to java/src/common/worldgen/tree/WorldGenDarkOak.java index 6c7379a..43cf4bc 100755 --- a/java/src/game/worldgen/tree/WorldGenDarkOak.java +++ b/java/src/common/worldgen/tree/WorldGenDarkOak.java @@ -1,14 +1,14 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +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.world.State; +import common.world.WorldServer; public class WorldGenDarkOak extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenHugeTree.java b/java/src/common/worldgen/tree/WorldGenHugeTree.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenHugeTree.java rename to java/src/common/worldgen/tree/WorldGenHugeTree.java index 145f879..bd57382 100755 --- a/java/src/game/worldgen/tree/WorldGenHugeTree.java +++ b/java/src/common/worldgen/tree/WorldGenHugeTree.java @@ -1,13 +1,13 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public abstract class WorldGenHugeTree extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenJungle.java b/java/src/common/worldgen/tree/WorldGenJungle.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenJungle.java rename to java/src/common/worldgen/tree/WorldGenJungle.java index 92e7057..d9fef45 100755 --- a/java/src/game/worldgen/tree/WorldGenJungle.java +++ b/java/src/common/worldgen/tree/WorldGenJungle.java @@ -1,13 +1,13 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.BlockVine; -import game.init.Blocks; -import game.properties.PropertyBool; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.BlockVine; +import common.init.Blocks; +import common.properties.PropertyBool; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenJungle extends WorldGenHugeTree { diff --git a/java/src/game/worldgen/tree/WorldGenPine.java b/java/src/common/worldgen/tree/WorldGenPine.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenPine.java rename to java/src/common/worldgen/tree/WorldGenPine.java index 8351b5b..c7000ed 100755 --- a/java/src/game/worldgen/tree/WorldGenPine.java +++ b/java/src/common/worldgen/tree/WorldGenPine.java @@ -1,14 +1,14 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockDirt; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.util.ExtMath; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockDirt; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.util.ExtMath; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenPine extends WorldGenHugeTree { diff --git a/java/src/game/worldgen/tree/WorldGenSavanna.java b/java/src/common/worldgen/tree/WorldGenSavanna.java similarity index 96% rename from java/src/game/worldgen/tree/WorldGenSavanna.java rename to java/src/common/worldgen/tree/WorldGenSavanna.java index 7ad81aa..f4b98d2 100755 --- a/java/src/game/worldgen/tree/WorldGenSavanna.java +++ b/java/src/common/worldgen/tree/WorldGenSavanna.java @@ -1,14 +1,14 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.Facing; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +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.world.State; +import common.world.WorldServer; public class WorldGenSavanna extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenSwamp.java b/java/src/common/worldgen/tree/WorldGenSwamp.java similarity index 95% rename from java/src/game/worldgen/tree/WorldGenSwamp.java rename to java/src/common/worldgen/tree/WorldGenSwamp.java index 9f440a2..264c763 100755 --- a/java/src/game/worldgen/tree/WorldGenSwamp.java +++ b/java/src/common/worldgen/tree/WorldGenSwamp.java @@ -1,15 +1,15 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.block.BlockVine; -import game.init.Blocks; -import game.material.Material; -import game.properties.PropertyBool; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.block.BlockVine; +import common.init.Blocks; +import common.material.Material; +import common.properties.PropertyBool; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenSwamp extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenTaiga1.java b/java/src/common/worldgen/tree/WorldGenTaiga1.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenTaiga1.java rename to java/src/common/worldgen/tree/WorldGenTaiga1.java index 8427191..f5f6b85 100755 --- a/java/src/game/worldgen/tree/WorldGenTaiga1.java +++ b/java/src/common/worldgen/tree/WorldGenTaiga1.java @@ -1,13 +1,13 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenTaiga1 extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenTaiga2.java b/java/src/common/worldgen/tree/WorldGenTaiga2.java similarity index 94% rename from java/src/game/worldgen/tree/WorldGenTaiga2.java rename to java/src/common/worldgen/tree/WorldGenTaiga2.java index 0adba2a..f085cdb 100755 --- a/java/src/game/worldgen/tree/WorldGenTaiga2.java +++ b/java/src/common/worldgen/tree/WorldGenTaiga2.java @@ -1,13 +1,13 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLeaves; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.State; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockLeaves; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.State; +import common.world.WorldServer; public class WorldGenTaiga2 extends WorldGenTree { diff --git a/java/src/game/worldgen/tree/WorldGenTree.java b/java/src/common/worldgen/tree/WorldGenTree.java similarity index 73% rename from java/src/game/worldgen/tree/WorldGenTree.java rename to java/src/common/worldgen/tree/WorldGenTree.java index 260c603..1ea362b 100755 --- a/java/src/game/worldgen/tree/WorldGenTree.java +++ b/java/src/common/worldgen/tree/WorldGenTree.java @@ -1,14 +1,14 @@ -package game.worldgen.tree; +package common.worldgen.tree; -import game.block.Block; -import game.block.BlockLog; -import game.block.BlockSapling; -import game.init.Blocks; -import game.material.Material; -import game.rng.Random; -import game.world.BlockPos; -import game.world.WorldServer; -import game.worldgen.FeatureGenerator; +import common.block.Block; +import common.block.BlockLog; +import common.block.BlockSapling; +import common.init.Blocks; +import common.material.Material; +import common.rng.Random; +import common.world.BlockPos; +import common.world.WorldServer; +import common.worldgen.FeatureGenerator; public abstract class WorldGenTree extends FeatureGenerator { diff --git a/server/src/server/Server.java b/server/src/server/Server.java index 1419a7d..7781080 100755 --- a/server/src/server/Server.java +++ b/server/src/server/Server.java @@ -18,63 +18,63 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.FutureTask; -import game.IServer; -import game.collect.Lists; -import game.collect.Maps; -import game.color.TextColor; -import game.dimension.Dimension; -import game.dimension.Space; -import game.entity.Entity; -import game.entity.npc.EntityHuman; -import game.entity.npc.EntityNPC; -import game.future.Futures; -import game.future.ListenableFuture; -import game.future.ListenableFutureTask; -import game.future.ThreadFactoryBuilder; -import game.init.Config; -import game.init.EntityRegistry; -import game.init.Registry; -import game.init.UniverseRegistry; -import game.log.Log; -import game.nbt.NBTLoader; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.network.IPlayer; -import game.network.IThreadListener; -import game.network.NetConnection; -import game.network.NetHandler.ThreadQuickExitException; -import game.network.Packet; -import game.network.PacketDecoder; -import game.network.PacketEncoder; -import game.network.PacketPrepender; -import game.network.PacketSplitter; -import game.packet.RPacketEnableCompression; -import game.packet.RPacketLoginSuccess; -import game.packet.S1DPacketEntityEffect; -import game.packet.S2BPacketChangeGameState; -import game.packet.S38PacketPlayerListItem; -import game.packet.S39PacketPlayerAbilities; -import game.packet.SPacketDisconnect; -import game.packet.SPacketHeldItemChange; -import game.packet.SPacketJoinGame; -import game.packet.SPacketRespawn; -import game.packet.SPacketSetExperience; -import game.packet.SPacketSkin; -import game.packet.SPacketTimeUpdate; -import game.packet.SPacketWorld; -import game.potion.PotionEffect; -import game.util.ExtMath; -import game.util.LazyLoadBase; -import game.util.Tuple; -import game.util.Util; -import game.world.BlockPos; -import game.world.PortalType; -import game.world.Position; -import game.world.Region; -import game.world.Region.FolderInfo; -import game.world.World; -import game.world.WorldPos; -import game.world.WorldServer; +import common.IServer; +import common.collect.Lists; +import common.collect.Maps; +import common.color.TextColor; +import common.dimension.Dimension; +import common.dimension.Space; +import common.entity.Entity; +import common.entity.npc.EntityHuman; +import common.entity.npc.EntityNPC; +import common.future.Futures; +import common.future.ListenableFuture; +import common.future.ListenableFutureTask; +import common.future.ThreadFactoryBuilder; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.Registry; +import common.init.UniverseRegistry; +import common.log.Log; +import common.nbt.NBTLoader; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.network.IPlayer; +import common.network.IThreadListener; +import common.network.NetConnection; +import common.network.Packet; +import common.network.PacketDecoder; +import common.network.PacketEncoder; +import common.network.PacketPrepender; +import common.network.PacketSplitter; +import common.network.NetHandler.ThreadQuickExitException; +import common.packet.RPacketEnableCompression; +import common.packet.RPacketLoginSuccess; +import common.packet.S1DPacketEntityEffect; +import common.packet.S2BPacketChangeGameState; +import common.packet.S38PacketPlayerListItem; +import common.packet.S39PacketPlayerAbilities; +import common.packet.SPacketDisconnect; +import common.packet.SPacketHeldItemChange; +import common.packet.SPacketJoinGame; +import common.packet.SPacketRespawn; +import common.packet.SPacketSetExperience; +import common.packet.SPacketSkin; +import common.packet.SPacketTimeUpdate; +import common.packet.SPacketWorld; +import common.potion.PotionEffect; +import common.util.ExtMath; +import common.util.LazyLoadBase; +import common.util.Tuple; +import common.util.Util; +import common.world.BlockPos; +import common.world.PortalType; +import common.world.Position; +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; import io.netty.channel.Channel; import io.netty.channel.ChannelException; diff --git a/server/src/server/command/ArgumentParser.java b/server/src/server/command/ArgumentParser.java index e6a90d7..4d55712 100644 --- a/server/src/server/command/ArgumentParser.java +++ b/server/src/server/command/ArgumentParser.java @@ -3,7 +3,7 @@ package server.command; import java.util.Collection; import java.util.List; -import game.collect.Lists; +import common.collect.Lists; public abstract class ArgumentParser { public static String[][] splitString(String str) { diff --git a/server/src/server/command/ArgumentSplitter.java b/server/src/server/command/ArgumentSplitter.java index 6e746a9..58ba45a 100644 --- a/server/src/server/command/ArgumentSplitter.java +++ b/server/src/server/command/ArgumentSplitter.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; public class ArgumentSplitter { private final String command; diff --git a/server/src/server/command/CachedExecutable.java b/server/src/server/command/CachedExecutable.java index d3e97c4..55e64bb 100644 --- a/server/src/server/command/CachedExecutable.java +++ b/server/src/server/command/CachedExecutable.java @@ -4,8 +4,8 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; +import common.collect.Lists; +import common.collect.Maps; public class CachedExecutable { private final Executable executable; diff --git a/server/src/server/command/ColorParser.java b/server/src/server/command/ColorParser.java index 191568b..0a3e49c 100644 --- a/server/src/server/command/ColorParser.java +++ b/server/src/server/command/ColorParser.java @@ -1,6 +1,6 @@ package server.command; -import game.color.DyeColor; +import common.color.DyeColor; public class ColorParser extends IntParser { public ColorParser(String name, Integer def, Object ... completions) { diff --git a/server/src/server/command/Command.java b/server/src/server/command/Command.java index 1a7074f..2598c0f 100644 --- a/server/src/server/command/Command.java +++ b/server/src/server/command/Command.java @@ -5,10 +5,10 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import game.collect.Lists; -import game.collect.Maps; -import game.world.Vec3; -import game.world.World; +import common.collect.Lists; +import common.collect.Maps; +import common.world.Vec3; +import common.world.World; import server.command.DoubleParser.DefType; public abstract class Command implements Executable { diff --git a/server/src/server/command/CommandEnvironment.java b/server/src/server/command/CommandEnvironment.java index d416d93..34d7fbf 100644 --- a/server/src/server/command/CommandEnvironment.java +++ b/server/src/server/command/CommandEnvironment.java @@ -7,11 +7,11 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import game.collect.Lists; -import game.collect.Maps; -import game.collect.Sets; -import game.color.TextColor; -import game.log.Log; +import common.collect.Lists; +import common.collect.Maps; +import common.collect.Sets; +import common.color.TextColor; +import common.log.Log; import server.Server; import server.command.commands.CommandAdmin; import server.command.commands.CommandHelp; diff --git a/server/src/server/command/DimensionParser.java b/server/src/server/command/DimensionParser.java index 268702f..523f4b9 100644 --- a/server/src/server/command/DimensionParser.java +++ b/server/src/server/command/DimensionParser.java @@ -2,9 +2,9 @@ package server.command; import java.util.Collection; -import game.dimension.Dimension; -import game.init.UniverseRegistry; -import game.world.Position; +import common.dimension.Dimension; +import common.init.UniverseRegistry; +import common.world.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 9401ae5..cb071b4 100644 --- a/server/src/server/command/DoubleParser.java +++ b/server/src/server/command/DoubleParser.java @@ -2,9 +2,9 @@ package server.command; import java.util.Collection; -import game.collect.Lists; -import game.world.BlockPos; -import game.world.Position; +import common.collect.Lists; +import common.world.BlockPos; +import common.world.Position; public class DoubleParser extends DefaultingParser { public static enum DefType { diff --git a/server/src/server/command/EntityListParser.java b/server/src/server/command/EntityListParser.java index c221a28..c62aeaf 100644 --- a/server/src/server/command/EntityListParser.java +++ b/server/src/server/command/EntityListParser.java @@ -5,13 +5,13 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; -import game.entity.Entity; -import game.entity.EntityType; -import game.entity.types.EntityLiving; -import game.init.EntityRegistry; -import game.world.WorldServer; +import common.collect.Lists; +import common.collect.Sets; +import common.entity.Entity; +import common.entity.EntityType; +import common.entity.types.EntityLiving; +import common.init.EntityRegistry; +import common.world.WorldServer; import server.network.Player; public class EntityListParser extends EntityParser { diff --git a/server/src/server/command/EntityParser.java b/server/src/server/command/EntityParser.java index 93a1934..3b5ff7a 100644 --- a/server/src/server/command/EntityParser.java +++ b/server/src/server/command/EntityParser.java @@ -3,10 +3,10 @@ package server.command; import java.util.Collection; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.world.WorldServer; +import common.collect.Lists; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.world.WorldServer; public class EntityParser extends PlayerEntityParser { protected final boolean livingOnly; diff --git a/server/src/server/command/EnumParser.java b/server/src/server/command/EnumParser.java index b39653b..a8b7a78 100644 --- a/server/src/server/command/EnumParser.java +++ b/server/src/server/command/EnumParser.java @@ -2,7 +2,7 @@ package server.command; import java.util.Map; -import game.collect.Maps; +import common.collect.Maps; public class EnumParser extends DefaultingParser { private final Class clazz; diff --git a/server/src/server/command/Executor.java b/server/src/server/command/Executor.java index cde825c..02207b4 100644 --- a/server/src/server/command/Executor.java +++ b/server/src/server/command/Executor.java @@ -1,8 +1,8 @@ package server.command; -import game.entity.Entity; -import game.world.BlockPos; -import game.world.Position; +import common.entity.Entity; +import common.world.BlockPos; +import common.world.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 c609f8c..df9e3fb 100644 --- a/server/src/server/command/FixedExecutor.java +++ b/server/src/server/command/FixedExecutor.java @@ -1,8 +1,8 @@ package server.command; -import game.entity.Entity; -import game.world.BlockPos; -import game.world.Position; +import common.entity.Entity; +import common.world.BlockPos; +import common.world.Position; import server.Server; public class FixedExecutor implements Executor { diff --git a/server/src/server/command/PlayerEntityListParser.java b/server/src/server/command/PlayerEntityListParser.java index 45adab1..d97c1e6 100644 --- a/server/src/server/command/PlayerEntityListParser.java +++ b/server/src/server/command/PlayerEntityListParser.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; -import game.entity.Entity; -import game.entity.npc.EntityNPC; +import common.collect.Lists; +import common.collect.Sets; +import common.entity.Entity; +import common.entity.npc.EntityNPC; import server.network.Player; public class PlayerEntityListParser extends PlayerEntityParser { diff --git a/server/src/server/command/PlayerEntityParser.java b/server/src/server/command/PlayerEntityParser.java index f202478..ff9eeb7 100644 --- a/server/src/server/command/PlayerEntityParser.java +++ b/server/src/server/command/PlayerEntityParser.java @@ -1,6 +1,6 @@ package server.command; -import game.entity.npc.EntityNPC; +import common.entity.npc.EntityNPC; import server.network.Player; public class PlayerEntityParser extends PlayerParser { diff --git a/server/src/server/command/PlayerListParser.java b/server/src/server/command/PlayerListParser.java index 3bc9d57..aed9691 100644 --- a/server/src/server/command/PlayerListParser.java +++ b/server/src/server/command/PlayerListParser.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; +import common.collect.Lists; +import common.collect.Sets; import server.network.Player; public class PlayerListParser extends PlayerParser { diff --git a/server/src/server/command/StringParser.java b/server/src/server/command/StringParser.java index b676e21..b4ce0e8 100644 --- a/server/src/server/command/StringParser.java +++ b/server/src/server/command/StringParser.java @@ -2,7 +2,7 @@ package server.command; import java.util.Collection; -import game.util.CharValidator; +import common.util.CharValidator; public class StringParser extends DefaultingParser { private final boolean allowEmpty; diff --git a/server/src/server/command/TagParser.java b/server/src/server/command/TagParser.java index ffef156..848f6d8 100644 --- a/server/src/server/command/TagParser.java +++ b/server/src/server/command/TagParser.java @@ -1,8 +1,8 @@ package server.command; -import game.nbt.NBTException; -import game.nbt.NBTParser; -import game.nbt.NBTTagCompound; +import common.nbt.NBTException; +import common.nbt.NBTParser; +import common.nbt.NBTTagCompound; public class TagParser extends DefaultingParser { public TagParser(String name, NBTTagCompound def, Object ... completions) { diff --git a/server/src/server/command/WorldParser.java b/server/src/server/command/WorldParser.java index 8659362..87c9d43 100644 --- a/server/src/server/command/WorldParser.java +++ b/server/src/server/command/WorldParser.java @@ -3,9 +3,9 @@ package server.command; import java.util.Collection; import java.util.List; -import game.collect.Lists; -import game.dimension.Dimension; -import game.world.WorldServer; +import common.collect.Lists; +import common.dimension.Dimension; +import common.world.WorldServer; public class WorldParser extends DimensionParser { private final boolean loadedOnly; diff --git a/server/src/server/command/commands/CommandHelp.java b/server/src/server/command/commands/CommandHelp.java index 2ec6e9d..f5df1b8 100644 --- a/server/src/server/command/commands/CommandHelp.java +++ b/server/src/server/command/commands/CommandHelp.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map.Entry; import java.util.function.Function; -import game.collect.Lists; -import game.util.Util; +import common.collect.Lists; +import common.util.Util; import server.command.ArgumentParser; import server.command.CachedExecutable; import server.command.Command; diff --git a/server/src/server/command/commands/CommandMessage.java b/server/src/server/command/commands/CommandMessage.java index ba0fd94..177ba6c 100644 --- a/server/src/server/command/commands/CommandMessage.java +++ b/server/src/server/command/commands/CommandMessage.java @@ -1,6 +1,6 @@ package server.command.commands; -import game.packet.SPacketMessage; +import common.packet.SPacketMessage; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandMilk.java b/server/src/server/command/commands/CommandMilk.java index c858882..9ebb7f3 100644 --- a/server/src/server/command/commands/CommandMilk.java +++ b/server/src/server/command/commands/CommandMilk.java @@ -2,9 +2,9 @@ package server.command.commands; import java.util.List; -import game.collect.Lists; -import game.entity.types.EntityLiving; -import game.potion.Potion; +import common.collect.Lists; +import common.entity.types.EntityLiving; +import common.potion.Potion; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandOfflinetp.java b/server/src/server/command/commands/CommandOfflinetp.java index 892bbb9..6966524 100644 --- a/server/src/server/command/commands/CommandOfflinetp.java +++ b/server/src/server/command/commands/CommandOfflinetp.java @@ -3,10 +3,10 @@ package server.command.commands; import java.util.Collection; import java.util.List; -import game.collect.Lists; -import game.entity.Entity; -import game.init.UniverseRegistry; -import game.world.Position; +import common.collect.Lists; +import common.entity.Entity; +import common.init.UniverseRegistry; +import common.world.Position; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandPotion.java b/server/src/server/command/commands/CommandPotion.java index d3262ec..b814346 100644 --- a/server/src/server/command/commands/CommandPotion.java +++ b/server/src/server/command/commands/CommandPotion.java @@ -2,9 +2,9 @@ package server.command.commands; import java.util.List; -import game.entity.types.EntityLiving; -import game.potion.Potion; -import game.potion.PotionEffect; +import common.entity.types.EntityLiving; +import common.potion.Potion; +import common.potion.PotionEffect; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandRemove.java b/server/src/server/command/commands/CommandRemove.java index e3265f4..2ecf0b6 100644 --- a/server/src/server/command/commands/CommandRemove.java +++ b/server/src/server/command/commands/CommandRemove.java @@ -2,7 +2,7 @@ package server.command.commands; import java.util.List; -import game.entity.Entity; +import common.entity.Entity; 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 74f3ffb..93e522e 100644 --- a/server/src/server/command/commands/CommandSpawn.java +++ b/server/src/server/command/commands/CommandSpawn.java @@ -3,15 +3,15 @@ package server.command.commands; import java.util.List; import java.util.Set; -import game.collect.Lists; -import game.collect.Sets; -import game.entity.Entity; -import game.entity.types.EntityLiving; -import game.init.EntityRegistry; -import game.nbt.NBTTagCompound; -import game.util.Util; -import game.world.Vec3; -import game.world.WorldServer; +import common.collect.Lists; +import common.collect.Sets; +import common.entity.Entity; +import common.entity.types.EntityLiving; +import common.init.EntityRegistry; +import common.nbt.NBTTagCompound; +import common.util.Util; +import common.world.Vec3; +import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandTele.java b/server/src/server/command/commands/CommandTele.java index 427111f..19766bf 100644 --- a/server/src/server/command/commands/CommandTele.java +++ b/server/src/server/command/commands/CommandTele.java @@ -2,9 +2,9 @@ package server.command.commands; import java.util.List; -import game.dimension.Dimension; -import game.entity.Entity; -import game.world.Vec3; +import common.dimension.Dimension; +import common.entity.Entity; +import common.world.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 2cedd0a..1a4676e 100644 --- a/server/src/server/command/commands/CommandTime.java +++ b/server/src/server/command/commands/CommandTime.java @@ -1,9 +1,9 @@ package server.command.commands; -import game.dimension.Dimension; -import game.item.ItemSpaceNavigator; -import game.world.Position; -import game.world.WorldServer; +import common.dimension.Dimension; +import common.item.ItemSpaceNavigator; +import common.world.Position; +import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandTp.java b/server/src/server/command/commands/CommandTp.java index 9011787..e300ae7 100644 --- a/server/src/server/command/commands/CommandTp.java +++ b/server/src/server/command/commands/CommandTp.java @@ -2,9 +2,9 @@ package server.command.commands; import java.util.List; -import game.entity.Entity; -import game.init.UniverseRegistry; -import game.world.Position; +import common.entity.Entity; +import common.init.UniverseRegistry; +import common.world.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 0e4802e..987e9de 100644 --- a/server/src/server/command/commands/CommandWarp.java +++ b/server/src/server/command/commands/CommandWarp.java @@ -3,9 +3,9 @@ package server.command.commands; import java.util.Collection; import java.util.List; -import game.entity.Entity; -import game.init.UniverseRegistry; -import game.world.Position; +import common.entity.Entity; +import common.init.UniverseRegistry; +import common.world.Position; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/command/commands/CommandWeather.java b/server/src/server/command/commands/CommandWeather.java index 2e8b8bd..ea62180 100644 --- a/server/src/server/command/commands/CommandWeather.java +++ b/server/src/server/command/commands/CommandWeather.java @@ -1,7 +1,7 @@ package server.command.commands; -import game.world.Weather; -import game.world.WorldServer; +import common.world.Weather; +import common.world.WorldServer; 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 0fba0c4..3b02edb 100644 --- a/server/src/server/command/commands/CommandWorld.java +++ b/server/src/server/command/commands/CommandWorld.java @@ -2,9 +2,9 @@ package server.command.commands; import java.util.List; -import game.entity.Entity; -import game.world.BlockPos; -import game.world.WorldServer; +import common.entity.Entity; +import common.world.BlockPos; +import common.world.WorldServer; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/server/network/HandshakeHandler.java b/server/src/server/network/HandshakeHandler.java index 4d79d09..a3fc59e 100755 --- a/server/src/server/network/HandshakeHandler.java +++ b/server/src/server/network/HandshakeHandler.java @@ -1,12 +1,12 @@ package server.network; -import game.init.Config; -import game.network.IHandshakeHandler; -import game.network.NetConnection; -import game.network.NetHandler; -import game.network.PacketRegistry; -import game.packet.HPacketHandshake; -import game.packet.RPacketDisconnect; +import common.init.Config; +import common.network.IHandshakeHandler; +import common.network.NetConnection; +import common.network.NetHandler; +import common.network.PacketRegistry; +import common.packet.HPacketHandshake; +import common.packet.RPacketDisconnect; import server.Server; public class HandshakeHandler extends NetHandler implements IHandshakeHandler diff --git a/server/src/server/network/LoginHandler.java b/server/src/server/network/LoginHandler.java index 51d9e22..a215180 100755 --- a/server/src/server/network/LoginHandler.java +++ b/server/src/server/network/LoginHandler.java @@ -1,14 +1,14 @@ package server.network; -import game.color.TextColor; -import game.init.Config; -import game.log.Log; -import game.network.ILoginHandler; -import game.network.IPlayer; -import game.network.NetConnection; -import game.network.NetHandler; -import game.packet.LPacketPasswordResponse; -import game.packet.RPacketDisconnect; +import common.color.TextColor; +import common.init.Config; +import common.log.Log; +import common.network.ILoginHandler; +import common.network.IPlayer; +import common.network.NetConnection; +import common.network.NetHandler; +import common.packet.LPacketPasswordResponse; +import common.packet.RPacketDisconnect; import server.Server; public class LoginHandler extends NetHandler implements ILoginHandler diff --git a/server/src/server/network/Player.java b/server/src/server/network/Player.java index 97fab53..544e4ef 100755 --- a/server/src/server/network/Player.java +++ b/server/src/server/network/Player.java @@ -8,128 +8,128 @@ import java.util.Map.Entry; import java.util.Set; import java.util.function.Predicate; -import game.block.Block; -import game.block.BlockFence; -import game.block.BlockFenceGate; -import game.block.BlockWall; -import game.clipboard.BlockTransform; -import game.clipboard.ClipboardBlock; -import game.clipboard.ClipboardPlacer; -import game.clipboard.Rotation; -import game.clipboard.RotationValue; -import game.clipboard.Vector; -import game.collect.Lists; -import game.color.TextColor; -import game.dimension.Dimension; -import game.entity.Entity; -import game.entity.animal.EntityHorse; -import game.entity.item.EntityItem; -import game.entity.item.EntityXp; -import game.entity.npc.Alignment; -import game.entity.npc.EntityHuman; -import game.entity.npc.EntityNPC; -import game.entity.npc.PlayerCharacter; -import game.entity.projectile.EntityArrow; -import game.entity.types.EntityLiving; -import game.future.Futures; -import game.init.BlockRegistry; -import game.init.Config; -import game.init.Config.ValueType; -import game.init.EntityRegistry; -import game.init.Items; -import game.init.RotationRegistry; -import game.init.SoundEvent; -import game.init.UniverseRegistry; -import game.inventory.Container; -import game.inventory.ContainerChest; -import game.inventory.ContainerHorseInventory; -import game.inventory.ContainerMerchant; -import game.inventory.ICrafting; -import game.inventory.IInventory; -import game.inventory.InventoryPlayer; -import game.inventory.Slot; -import game.inventory.SlotCrafting; -import game.item.ItemArmor; -import game.item.ItemControl; -import game.item.ItemStack; -import game.log.Log; -import game.material.Material; -import game.nbt.NBTTagCompound; -import game.nbt.NBTTagList; -import game.nbt.NBTTagString; -import game.network.IPlayer; -import game.network.NetConnection; -import game.network.NetHandler; -import game.network.Packet; -import game.packet.CPacketAction; -import game.packet.CPacketAction.Action; -import game.packet.CPacketBook; -import game.packet.CPacketBreak; -import game.packet.CPacketCheat; -import game.packet.CPacketClick; -import game.packet.CPacketComplete; -import game.packet.CPacketInput; -import game.packet.CPacketKeepAlive; -import game.packet.CPacketMessage; -import game.packet.CPacketPlace; -import game.packet.CPacketPlayer; -import game.packet.CPacketSign; -import game.packet.CPacketSkin; -import game.packet.S18PacketEntityTeleport; -import game.packet.S1APacketEntityStatus; -import game.packet.S1BPacketEntityAttach; -import game.packet.S1DPacketEntityEffect; -import game.packet.S1EPacketRemoveEntityEffect; -import game.packet.S29PacketSoundEffect; -import game.packet.S2DPacketOpenWindow; -import game.packet.S2EPacketCloseWindow; -import game.packet.S2FPacketSetSlot; -import game.packet.S30PacketWindowItems; -import game.packet.S31PacketWindowProperty; -import game.packet.S32PacketConfirmTransaction; -import game.packet.S36PacketSignEditorOpen; -import game.packet.S39PacketPlayerAbilities; -import game.packet.S3APacketTabComplete; -import game.packet.SPacketAnimation; -import game.packet.SPacketBlockChange; -import game.packet.SPacketCharacterList; -import game.packet.SPacketChunkData; -import game.packet.SPacketDestroyEntities; -import game.packet.SPacketDisconnect; -import game.packet.SPacketKeepAlive; -import game.packet.SPacketLoading; -import game.packet.SPacketMapChunkBulk; -import game.packet.SPacketMessage; -import game.packet.SPacketMessage.Type; -import game.packet.SPacketPlayerPosLook; -import game.packet.SPacketServerTick; -import game.packet.SPacketSetExperience; -import game.packet.SPacketSkin; -import game.packet.SPacketTrades; -import game.packet.SPacketUpdateHealth; -import game.potion.Potion; -import game.potion.PotionEffect; -import game.tileentity.IInteractionObject; -import game.tileentity.ILockableContainer; -import game.tileentity.TileEntity; -import game.tileentity.TileEntityMachine; -import game.tileentity.TileEntitySign; -import game.util.ExtMath; -import game.village.MerchantRecipeList; -import game.world.BlockPos; -import game.world.BoundingBox; -import game.world.Chunk; -import game.world.ChunkPos; -import game.world.Facing; -import game.world.IntHashMap; -import game.world.PortalType; -import game.world.Position; -import game.world.Region; -import game.world.State; -import game.world.Vec3i; -import game.world.World; -import game.world.WorldPos; -import game.world.WorldServer; +import common.block.Block; +import common.block.BlockFence; +import common.block.BlockFenceGate; +import common.block.BlockWall; +import common.clipboard.BlockTransform; +import common.clipboard.ClipboardBlock; +import common.clipboard.ClipboardPlacer; +import common.clipboard.Rotation; +import common.clipboard.RotationValue; +import common.clipboard.Vector; +import common.collect.Lists; +import common.color.TextColor; +import common.dimension.Dimension; +import common.entity.Entity; +import common.entity.animal.EntityHorse; +import common.entity.item.EntityItem; +import common.entity.item.EntityXp; +import common.entity.npc.Alignment; +import common.entity.npc.EntityHuman; +import common.entity.npc.EntityNPC; +import common.entity.npc.PlayerCharacter; +import common.entity.projectile.EntityArrow; +import common.entity.types.EntityLiving; +import common.future.Futures; +import common.init.BlockRegistry; +import common.init.Config; +import common.init.EntityRegistry; +import common.init.Items; +import common.init.RotationRegistry; +import common.init.SoundEvent; +import common.init.UniverseRegistry; +import common.init.Config.ValueType; +import common.inventory.Container; +import common.inventory.ContainerChest; +import common.inventory.ContainerHorseInventory; +import common.inventory.ContainerMerchant; +import common.inventory.ICrafting; +import common.inventory.IInventory; +import common.inventory.InventoryPlayer; +import common.inventory.Slot; +import common.inventory.SlotCrafting; +import common.item.ItemArmor; +import common.item.ItemControl; +import common.item.ItemStack; +import common.log.Log; +import common.material.Material; +import common.nbt.NBTTagCompound; +import common.nbt.NBTTagList; +import common.nbt.NBTTagString; +import common.network.IPlayer; +import common.network.NetConnection; +import common.network.NetHandler; +import common.network.Packet; +import common.packet.CPacketAction; +import common.packet.CPacketBook; +import common.packet.CPacketBreak; +import common.packet.CPacketCheat; +import common.packet.CPacketClick; +import common.packet.CPacketComplete; +import common.packet.CPacketInput; +import common.packet.CPacketKeepAlive; +import common.packet.CPacketMessage; +import common.packet.CPacketPlace; +import common.packet.CPacketPlayer; +import common.packet.CPacketSign; +import common.packet.CPacketSkin; +import common.packet.S18PacketEntityTeleport; +import common.packet.S1APacketEntityStatus; +import common.packet.S1BPacketEntityAttach; +import common.packet.S1DPacketEntityEffect; +import common.packet.S1EPacketRemoveEntityEffect; +import common.packet.S29PacketSoundEffect; +import common.packet.S2DPacketOpenWindow; +import common.packet.S2EPacketCloseWindow; +import common.packet.S2FPacketSetSlot; +import common.packet.S30PacketWindowItems; +import common.packet.S31PacketWindowProperty; +import common.packet.S32PacketConfirmTransaction; +import common.packet.S36PacketSignEditorOpen; +import common.packet.S39PacketPlayerAbilities; +import common.packet.S3APacketTabComplete; +import common.packet.SPacketAnimation; +import common.packet.SPacketBlockChange; +import common.packet.SPacketCharacterList; +import common.packet.SPacketChunkData; +import common.packet.SPacketDestroyEntities; +import common.packet.SPacketDisconnect; +import common.packet.SPacketKeepAlive; +import common.packet.SPacketLoading; +import common.packet.SPacketMapChunkBulk; +import common.packet.SPacketMessage; +import common.packet.SPacketPlayerPosLook; +import common.packet.SPacketServerTick; +import common.packet.SPacketSetExperience; +import common.packet.SPacketSkin; +import common.packet.SPacketTrades; +import common.packet.SPacketUpdateHealth; +import common.packet.CPacketAction.Action; +import common.packet.SPacketMessage.Type; +import common.potion.Potion; +import common.potion.PotionEffect; +import common.tileentity.IInteractionObject; +import common.tileentity.ILockableContainer; +import common.tileentity.TileEntity; +import common.tileentity.TileEntityMachine; +import common.tileentity.TileEntitySign; +import common.util.ExtMath; +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; import server.Server;