From a6b0f110b1fdce5142257ffa773b83b86772a9b4 Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 6 May 2025 13:32:30 +0200 Subject: [PATCH] split client and server 5 --- {java => client}/src/client/Game.java | 0 {java => client}/src/client/PerfSection.java | 0 .../src/client/PlayerController.java | 0 {java => client}/src/client/SkinConverter.java | 0 {java => client}/src/client/Timing.java | 0 .../src/client/audio/AudioInterface.java | 0 .../src/client/audio/CodecJOrbis.java | 0 .../src/client/audio/SoundManager.java | 0 {java => client}/src/client/audio/Volume.java | 0 .../src/client/audio/jogg/Buffer.java | 0 .../src/client/audio/jogg/Packet.java | 0 .../src/client/audio/jogg/Page.java | 0 .../src/client/audio/jogg/StreamState.java | 0 .../src/client/audio/jogg/SyncState.java | 0 .../src/client/audio/jorbis/Block.java | 0 .../client/audio/jorbis/ChainingExample.java | 0 .../src/client/audio/jorbis/CodeBook.java | 0 .../src/client/audio/jorbis/Comment.java | 0 .../src/client/audio/jorbis/DecodeExample.java | 0 .../src/client/audio/jorbis/Drft.java | 0 .../src/client/audio/jorbis/DspState.java | 0 .../src/client/audio/jorbis/Floor0.java | 0 .../src/client/audio/jorbis/Floor1.java | 0 .../src/client/audio/jorbis/FuncFloor.java | 0 .../src/client/audio/jorbis/FuncMapping.java | 0 .../src/client/audio/jorbis/FuncResidue.java | 0 .../src/client/audio/jorbis/FuncTime.java | 0 .../src/client/audio/jorbis/Info.java | 0 .../src/client/audio/jorbis/InfoMode.java | 0 .../client/audio/jorbis/JOrbisException.java | 0 .../src/client/audio/jorbis/Lookup.java | 0 .../src/client/audio/jorbis/Lpc.java | 0 .../src/client/audio/jorbis/Lsp.java | 0 .../src/client/audio/jorbis/Mapping0.java | 0 .../src/client/audio/jorbis/Mdct.java | 0 .../src/client/audio/jorbis/PsyInfo.java | 0 .../src/client/audio/jorbis/PsyLook.java | 0 .../src/client/audio/jorbis/Residue0.java | 0 .../src/client/audio/jorbis/Residue1.java | 0 .../src/client/audio/jorbis/Residue2.java | 0 .../client/audio/jorbis/StaticCodeBook.java | 0 .../src/client/audio/jorbis/Time0.java | 0 .../src/client/audio/jorbis/Util.java | 0 .../src/client/audio/jorbis/VorbisFile.java | 0 .../src/client/gui/FileCallback.java | 0 {java => client}/src/client/gui/Font.java | 0 {java => client}/src/client/gui/FontChar.java | 0 {java => client}/src/client/gui/Formatter.java | 0 {java => client}/src/client/gui/Gui.java | 0 .../src/client/gui/GuiConfirm.java | 0 .../src/client/gui/GuiConnect.java | 0 .../src/client/gui/GuiConsole.java | 0 .../src/client/gui/GuiConvert.java | 0 {java => client}/src/client/gui/GuiInfo.java | 0 .../src/client/gui/GuiLoading.java | 0 {java => client}/src/client/gui/GuiMenu.java | 0 {java => client}/src/client/gui/GuiServer.java | 0 {java => client}/src/client/gui/Splashes.java | 0 {java => client}/src/client/gui/Style.java | 0 .../src/client/gui/character/GuiChar.java | 0 .../client/gui/character/GuiCharacters.java | 0 .../src/client/gui/character/GuiClass.java | 0 .../src/client/gui/character/GuiSpecies.java | 0 .../src/client/gui/container/GuiBrewing.java | 0 .../src/client/gui/container/GuiChest.java | 0 .../src/client/gui/container/GuiContainer.java | 0 .../src/client/gui/container/GuiCrafting.java | 0 .../src/client/gui/container/GuiDispenser.java | 0 .../src/client/gui/container/GuiEnchant.java | 0 .../src/client/gui/container/GuiFurnace.java | 0 .../src/client/gui/container/GuiHopper.java | 0 .../src/client/gui/container/GuiHorse.java | 0 .../src/client/gui/container/GuiInventory.java | 0 .../src/client/gui/container/GuiMachine.java | 0 .../src/client/gui/container/GuiMerchant.java | 0 .../src/client/gui/container/GuiRepair.java | 0 .../src/client/gui/element/ActButton.java | 0 .../src/client/gui/element/Bar.java | 0 .../src/client/gui/element/Dropdown.java | 0 .../src/client/gui/element/Element.java | 0 .../src/client/gui/element/Fill.java | 0 .../src/client/gui/element/GuiList.java | 0 .../client/gui/element/InventoryButton.java | 0 .../src/client/gui/element/Label.java | 0 .../src/client/gui/element/ListEntry.java | 0 .../src/client/gui/element/NavButton.java | 0 .../client/gui/element/SelectableButton.java | 0 .../src/client/gui/element/Slider.java | 0 .../src/client/gui/element/Switch.java | 0 .../src/client/gui/element/Textbox.java | 0 .../src/client/gui/element/Toggle.java | 0 .../src/client/gui/element/TransparentBox.java | 0 .../src/client/gui/ingame/GuiGameOver.java | 0 .../src/client/gui/ingame/GuiSign.java | 0 .../src/client/gui/options/GuiBinds.java | 0 .../src/client/gui/options/GuiDisplay.java | 0 .../src/client/gui/options/GuiOptions.java | 0 .../src/client/gui/options/GuiSound.java | 0 .../src/client/gui/options/GuiStyle.java | 0 .../src/client/init/EntityRenderRegistry.java | 0 .../src/client/network/ClientLoginHandler.java | 0 .../src/client/network/ClientPlayer.java | 0 .../src/client/renderer/ActiveRenderInfo.java | 0 .../src/client/renderer/BlockRenderer.java | 0 .../client/renderer/DefaultVertexFormats.java | 0 .../src/client/renderer/Drawing.java | 0 .../src/client/renderer/EntityRenderer.java | 0 .../src/client/renderer/Frustum.java | 0 .../src/client/renderer/GlState.java | 0 .../src/client/renderer/ItemModelMesher.java | 0 .../src/client/renderer/ItemRenderer.java | 0 .../src/client/renderer/Project.java | 0 .../src/client/renderer/RegionRenderCache.java | 0 .../renderer/RegionRenderCacheBuilder.java | 0 .../src/client/renderer/RenderBuffer.java | 0 .../src/client/renderer/RenderGlobal.java | 0 .../src/client/renderer/Tessellator.java | 0 .../src/client/renderer/VertexBuffer.java | 0 .../src/client/renderer/VertexFormat.java | 0 .../client/renderer/VertexFormatElement.java | 0 .../src/client/renderer/ViewFrustum.java | 0 .../client/renderer/blockmodel/BakedModel.java | 0 .../client/renderer/blockmodel/BakedQuad.java | 0 .../renderer/blockmodel/BlockFaceUV.java | 0 .../client/renderer/blockmodel/BlockPart.java | 0 .../renderer/blockmodel/BlockPartFace.java | 0 .../renderer/blockmodel/BlockPartRotation.java | 0 .../renderer/blockmodel/BreakingFour.java | 0 .../renderer/blockmodel/BuiltInModel.java | 0 .../client/renderer/blockmodel/FaceBakery.java | 0 .../renderer/blockmodel/IBakedModel.java | 0 .../renderer/blockmodel/ModelBakery.java | 0 .../client/renderer/blockmodel/ModelBlock.java | 0 .../renderer/blockmodel/ModelGenerator.java | 0 .../renderer/blockmodel/ModelManager.java | 0 .../renderer/blockmodel/MultiStateMap.java | 0 .../renderer/blockmodel/SingleStateMap.java | 0 .../client/renderer/blockmodel/StateMap.java | 0 .../chunk/ChunkCompileTaskGenerator.java | 0 .../renderer/chunk/ChunkRenderDispatcher.java | 0 .../renderer/chunk/ChunkRenderWorker.java | 0 .../client/renderer/chunk/CompiledChunk.java | 0 .../src/client/renderer/chunk/RenderChunk.java | 0 .../client/renderer/chunk/SetVisibility.java | 0 .../src/client/renderer/chunk/VisGraph.java | 0 .../src/client/renderer/entity/Render.java | 0 .../renderer/entity/RenderArachnoid.java | 0 .../client/renderer/entity/RenderArrow.java | 0 .../src/client/renderer/entity/RenderBat.java | 0 .../renderer/entity/RenderBlockEntity.java | 0 .../src/client/renderer/entity/RenderBoat.java | 0 .../client/renderer/entity/RenderBullet.java | 0 .../client/renderer/entity/RenderChicken.java | 0 .../src/client/renderer/entity/RenderCow.java | 0 .../client/renderer/entity/RenderCrystal.java | 0 .../src/client/renderer/entity/RenderDie.java | 0 .../client/renderer/entity/RenderDragon.java | 0 .../client/renderer/entity/RenderDynamite.java | 0 .../client/renderer/entity/RenderEntity.java | 0 .../renderer/entity/RenderEntityItem.java | 0 .../renderer/entity/RenderFallingBlock.java | 0 .../client/renderer/entity/RenderFireball.java | 0 .../src/client/renderer/entity/RenderFish.java | 0 .../renderer/entity/RenderFlyingBox.java | 0 .../client/renderer/entity/RenderHorse.java | 0 .../client/renderer/entity/RenderHumanoid.java | 0 .../src/client/renderer/entity/RenderItem.java | 0 .../renderer/entity/RenderItemEntity.java | 0 .../renderer/entity/RenderLeashKnot.java | 0 .../renderer/entity/RenderLightning.java | 0 .../client/renderer/entity/RenderLiving.java | 0 .../client/renderer/entity/RenderManager.java | 0 .../client/renderer/entity/RenderMinecart.java | 0 .../renderer/entity/RenderMooshroom.java | 0 .../client/renderer/entity/RenderMouse.java | 0 .../src/client/renderer/entity/RenderNpc.java | 0 .../client/renderer/entity/RenderOcelot.java | 0 .../src/client/renderer/entity/RenderPig.java | 0 .../client/renderer/entity/RenderPotion.java | 0 .../client/renderer/entity/RenderRabbit.java | 0 .../client/renderer/entity/RenderSheep.java | 0 .../client/renderer/entity/RenderSlime.java | 0 .../renderer/entity/RenderSpaceMarine.java | 0 .../client/renderer/entity/RenderSquid.java | 0 .../renderer/entity/RenderTntMinecart.java | 0 .../renderer/entity/RenderTntPrimed.java | 0 .../src/client/renderer/entity/RenderWolf.java | 0 .../client/renderer/entity/RenderXpOrb.java | 0 .../renderer/entity/RendererLivingEntity.java | 0 .../renderer/layers/LayerArachnoidArmor.java | 0 .../src/client/renderer/layers/LayerArmor.java | 0 .../src/client/renderer/layers/LayerArrow.java | 0 .../src/client/renderer/layers/LayerCape.java | 0 .../client/renderer/layers/LayerCharge.java | 0 .../renderer/layers/LayerEnderDragonEyes.java | 0 .../renderer/layers/LayerEntityBreak.java | 0 .../src/client/renderer/layers/LayerExtra.java | 0 .../client/renderer/layers/LayerHeldItem.java | 0 .../layers/LayerMooshroomMushroom.java | 0 .../client/renderer/layers/LayerPowerRods.java | 0 .../client/renderer/layers/LayerRenderer.java | 0 .../client/renderer/layers/LayerSaddle.java | 0 .../client/renderer/layers/LayerSheepWool.java | 0 .../client/renderer/layers/LayerSlimeGel.java | 0 .../renderer/layers/LayerWolfCollar.java | 0 .../client/renderer/model/ModelArachnoid.java | 0 .../src/client/renderer/model/ModelArmor.java | 0 .../src/client/renderer/model/ModelBanner.java | 0 .../src/client/renderer/model/ModelBase.java | 0 .../src/client/renderer/model/ModelBat.java | 0 .../src/client/renderer/model/ModelBiped.java | 0 .../src/client/renderer/model/ModelBoat.java | 0 .../src/client/renderer/model/ModelBox.java | 0 .../src/client/renderer/model/ModelCharge.java | 0 .../src/client/renderer/model/ModelChest.java | 0 .../client/renderer/model/ModelChicken.java | 0 .../src/client/renderer/model/ModelCow.java | 0 .../client/renderer/model/ModelCrystal.java | 0 .../src/client/renderer/model/ModelDie.java | 0 .../src/client/renderer/model/ModelDragon.java | 0 .../src/client/renderer/model/ModelHead.java | 0 .../src/client/renderer/model/ModelHorse.java | 0 .../client/renderer/model/ModelHumanoid.java | 0 .../renderer/model/ModelHumanoidHead.java | 0 .../client/renderer/model/ModelLargeChest.java | 0 .../client/renderer/model/ModelLeashKnot.java | 0 .../client/renderer/model/ModelMinecart.java | 0 .../src/client/renderer/model/ModelMouse.java | 0 .../src/client/renderer/model/ModelOcelot.java | 0 .../src/client/renderer/model/ModelPig.java | 0 .../client/renderer/model/ModelQuadruped.java | 0 .../src/client/renderer/model/ModelRabbit.java | 0 .../client/renderer/model/ModelRenderer.java | 0 .../src/client/renderer/model/ModelSheep1.java | 0 .../src/client/renderer/model/ModelSheep2.java | 0 .../src/client/renderer/model/ModelSign.java | 0 .../src/client/renderer/model/ModelSlime.java | 0 .../renderer/model/ModelSpaceMarine.java | 0 .../src/client/renderer/model/ModelSquid.java | 0 .../src/client/renderer/model/ModelWolf.java | 0 .../renderer/model/PositionTextureVertex.java | 0 .../client/renderer/model/TextureOffset.java | 0 .../client/renderer/model/TexturedQuad.java | 0 .../renderer/particle/EffectRenderer.java | 0 .../client/renderer/particle/EntityAuraFX.java | 0 .../renderer/particle/EntityBlockDustFX.java | 0 .../renderer/particle/EntityBreakingFX.java | 0 .../renderer/particle/EntityBubbleFX.java | 0 .../renderer/particle/EntityCloudFX.java | 0 .../renderer/particle/EntityCrit2FX.java | 0 .../client/renderer/particle/EntityCritFX.java | 0 .../renderer/particle/EntityDiggingFX.java | 0 .../renderer/particle/EntityDownfallFX.java | 0 .../particle/EntityDropParticleFX.java | 0 .../EntityEnchantmentTableParticleFX.java | 0 .../renderer/particle/EntityExplodeFX.java | 0 .../src/client/renderer/particle/EntityFX.java | 0 .../renderer/particle/EntityFirework.java | 0 .../renderer/particle/EntityFishWakeFX.java | 0 .../renderer/particle/EntityFlameFX.java | 0 .../renderer/particle/EntityFootStepFX.java | 0 .../renderer/particle/EntityHeartFX.java | 0 .../renderer/particle/EntityHugeExplodeFX.java | 0 .../particle/EntityLargeExplodeFX.java | 0 .../client/renderer/particle/EntityLavaFX.java | 0 .../client/renderer/particle/EntityNoteFX.java | 0 .../particle/EntityParticleEmitter.java | 0 .../renderer/particle/EntityPickupFX.java | 0 .../renderer/particle/EntityPortalFX.java | 0 .../renderer/particle/EntityReddustFX.java | 0 .../renderer/particle/EntitySmokeFX.java | 0 .../renderer/particle/EntitySnowShovelFX.java | 0 .../particle/EntitySpellParticleFX.java | 0 .../renderer/particle/EntitySplashFX.java | 0 .../renderer/particle/EntitySuspendFX.java | 0 .../renderer/particle/IParticleFactory.java | 0 .../renderer/texture/DynamicTexture.java | 0 .../renderer/texture/EntityTexManager.java | 0 .../client/renderer/texture/IIconCreator.java | 0 .../texture/LayeredColorMaskTexture.java | 0 .../renderer/texture/LayeredTexture.java | 0 .../client/renderer/texture/SimpleTexture.java | 0 .../src/client/renderer/texture/Stitcher.java | 0 .../src/client/renderer/texture/Texture.java | 0 .../renderer/texture/TextureAtlasSprite.java | 0 .../renderer/texture/TextureManager.java | 0 .../client/renderer/texture/TextureMap.java | 0 .../client/renderer/texture/TextureTicked.java | 0 .../client/renderer/texture/TextureUtil.java | 0 .../renderer/ticked/TextureFlamesFX1.java | 0 .../renderer/ticked/TextureFlamesFX2.java | 0 .../client/renderer/ticked/TextureLavaFX.java | 0 .../renderer/ticked/TextureLavaFlowFX.java | 0 .../client/renderer/ticked/TextureWaterFX.java | 0 .../renderer/ticked/TextureWaterFlowFX.java | 0 .../tileentity/TileEntityBannerRenderer.java | 0 .../tileentity/TileEntityChestRenderer.java | 0 .../TileEntityItemStackRenderer.java | 0 .../TileEntityMobSpawnerRenderer.java | 0 .../tileentity/TileEntityPistonRenderer.java | 0 .../TileEntityRendererDispatcher.java | 0 .../tileentity/TileEntitySignRenderer.java | 0 .../tileentity/TileEntitySkullRenderer.java | 0 .../tileentity/TileEntitySpecialRenderer.java | 0 {java => client}/src/client/window/Bind.java | 0 {java => client}/src/client/window/Button.java | 0 .../src/client/window/DisplayMode.java | 0 {java => client}/src/client/window/Input.java | 0 .../src/client/window/KeyEvent.java | 0 {java => client}/src/client/window/Keysym.java | 0 {java => client}/src/client/window/Wheel.java | 0 {java => client}/src/client/window/Window.java | 0 .../src/client/window/WindowAction.java | 0 .../src/client/window/WindowEvent.java | 0 {java => client}/src/game/vars/BaseVar.java | 0 {java => client}/src/game/vars/BoolVar.java | 0 {java => client}/src/game/vars/CVar.java | 0 .../src/game/vars/CVarCategory.java | 0 {java => client}/src/game/vars/ColorVar.java | 0 {java => client}/src/game/vars/EnumVar.java | 0 {java => client}/src/game/vars/FloatVar.java | 0 {java => client}/src/game/vars/IntVar.java | 0 {java => client}/src/game/vars/StringVar.java | 0 {java => client}/src/game/vars/Variable.java | 0 {java => client}/src/game/world/Converter.java | 18 +----------------- java/src/game/init/Config.java | 10 +++++----- java/src/game/world/Region.java | 18 +++++++++++++++++- {java => server}/src/server/Server.java | 0 .../src/server/command/ArgCombiner.java | 0 .../src/server/command/Argument.java | 0 .../src/server/command/ArgumentParser.java | 0 .../src/server/command/ArgumentSplitter.java | 0 .../src/server/command/BooleanParser.java | 0 .../src/server/command/CachedExecutable.java | 0 .../src/server/command/ColorParser.java | 0 .../src/server/command/Command.java | 0 .../src/server/command/CommandEnvironment.java | 0 .../src/server/command/Completer.java | 0 .../src/server/command/CompletingParser.java | 0 .../src/server/command/DefaultingParser.java | 0 .../src/server/command/DimensionParser.java | 0 .../src/server/command/DoubleParser.java | 0 .../src/server/command/EntityListParser.java | 0 .../src/server/command/EntityParser.java | 0 .../src/server/command/EnumParser.java | 0 .../src/server/command/Executable.java | 0 .../src/server/command/Executor.java | 0 .../src/server/command/FixedExecutor.java | 0 .../src/server/command/IntParser.java | 0 .../src/server/command/LongParser.java | 0 .../server/command/NonDefaultingParser.java | 0 .../src/server/command/Parameter.java | 0 .../src/server/command/PatternReplacer.java | 0 .../server/command/PlayerEntityListParser.java | 0 .../src/server/command/PlayerEntityParser.java | 0 .../src/server/command/PlayerListParser.java | 0 .../src/server/command/PlayerParser.java | 0 .../src/server/command/RunException.java | 0 .../src/server/command/StringCompleter.java | 0 .../src/server/command/StringParser.java | 0 .../src/server/command/TagParser.java | 0 .../src/server/command/Variable.java | 0 .../src/server/command/WorldParser.java | 0 .../server/command/commands/CommandAdmin.java | 0 .../server/command/commands/CommandHelp.java | 0 .../server/command/commands/CommandKick.java | 0 .../command/commands/CommandMessage.java | 0 .../server/command/commands/CommandMilk.java | 0 .../command/commands/CommandOfflinetp.java | 0 .../server/command/commands/CommandPotion.java | 0 .../server/command/commands/CommandRemove.java | 0 .../server/command/commands/CommandRevoke.java | 0 .../server/command/commands/CommandSpawn.java | 0 .../server/command/commands/CommandTele.java | 0 .../server/command/commands/CommandTime.java | 0 .../src/server/command/commands/CommandTp.java | 0 .../server/command/commands/CommandWarp.java | 0 .../command/commands/CommandWeather.java | 0 .../server/command/commands/CommandWorld.java | 0 .../src/server/network/HandshakeHandler.java | 0 .../src/server/network/LoginHandler.java | 0 .../src/server/network/Player.java | 0 382 files changed, 23 insertions(+), 23 deletions(-) rename {java => client}/src/client/Game.java (100%) rename {java => client}/src/client/PerfSection.java (100%) rename {java => client}/src/client/PlayerController.java (100%) rename {java => client}/src/client/SkinConverter.java (100%) rename {java => client}/src/client/Timing.java (100%) rename {java => client}/src/client/audio/AudioInterface.java (100%) rename {java => client}/src/client/audio/CodecJOrbis.java (100%) rename {java => client}/src/client/audio/SoundManager.java (100%) rename {java => client}/src/client/audio/Volume.java (100%) rename {java => client}/src/client/audio/jogg/Buffer.java (100%) rename {java => client}/src/client/audio/jogg/Packet.java (100%) rename {java => client}/src/client/audio/jogg/Page.java (100%) rename {java => client}/src/client/audio/jogg/StreamState.java (100%) rename {java => client}/src/client/audio/jogg/SyncState.java (100%) rename {java => client}/src/client/audio/jorbis/Block.java (100%) rename {java => client}/src/client/audio/jorbis/ChainingExample.java (100%) rename {java => client}/src/client/audio/jorbis/CodeBook.java (100%) rename {java => client}/src/client/audio/jorbis/Comment.java (100%) rename {java => client}/src/client/audio/jorbis/DecodeExample.java (100%) rename {java => client}/src/client/audio/jorbis/Drft.java (100%) rename {java => client}/src/client/audio/jorbis/DspState.java (100%) rename {java => client}/src/client/audio/jorbis/Floor0.java (100%) rename {java => client}/src/client/audio/jorbis/Floor1.java (100%) rename {java => client}/src/client/audio/jorbis/FuncFloor.java (100%) rename {java => client}/src/client/audio/jorbis/FuncMapping.java (100%) rename {java => client}/src/client/audio/jorbis/FuncResidue.java (100%) rename {java => client}/src/client/audio/jorbis/FuncTime.java (100%) rename {java => client}/src/client/audio/jorbis/Info.java (100%) rename {java => client}/src/client/audio/jorbis/InfoMode.java (100%) rename {java => client}/src/client/audio/jorbis/JOrbisException.java (100%) rename {java => client}/src/client/audio/jorbis/Lookup.java (100%) rename {java => client}/src/client/audio/jorbis/Lpc.java (100%) rename {java => client}/src/client/audio/jorbis/Lsp.java (100%) rename {java => client}/src/client/audio/jorbis/Mapping0.java (100%) rename {java => client}/src/client/audio/jorbis/Mdct.java (100%) rename {java => client}/src/client/audio/jorbis/PsyInfo.java (100%) rename {java => client}/src/client/audio/jorbis/PsyLook.java (100%) rename {java => client}/src/client/audio/jorbis/Residue0.java (100%) rename {java => client}/src/client/audio/jorbis/Residue1.java (100%) rename {java => client}/src/client/audio/jorbis/Residue2.java (100%) rename {java => client}/src/client/audio/jorbis/StaticCodeBook.java (100%) rename {java => client}/src/client/audio/jorbis/Time0.java (100%) rename {java => client}/src/client/audio/jorbis/Util.java (100%) rename {java => client}/src/client/audio/jorbis/VorbisFile.java (100%) rename {java => client}/src/client/gui/FileCallback.java (100%) rename {java => client}/src/client/gui/Font.java (100%) rename {java => client}/src/client/gui/FontChar.java (100%) rename {java => client}/src/client/gui/Formatter.java (100%) rename {java => client}/src/client/gui/Gui.java (100%) rename {java => client}/src/client/gui/GuiConfirm.java (100%) rename {java => client}/src/client/gui/GuiConnect.java (100%) rename {java => client}/src/client/gui/GuiConsole.java (100%) rename {java => client}/src/client/gui/GuiConvert.java (100%) rename {java => client}/src/client/gui/GuiInfo.java (100%) rename {java => client}/src/client/gui/GuiLoading.java (100%) rename {java => client}/src/client/gui/GuiMenu.java (100%) rename {java => client}/src/client/gui/GuiServer.java (100%) rename {java => client}/src/client/gui/Splashes.java (100%) rename {java => client}/src/client/gui/Style.java (100%) rename {java => client}/src/client/gui/character/GuiChar.java (100%) rename {java => client}/src/client/gui/character/GuiCharacters.java (100%) rename {java => client}/src/client/gui/character/GuiClass.java (100%) rename {java => client}/src/client/gui/character/GuiSpecies.java (100%) rename {java => client}/src/client/gui/container/GuiBrewing.java (100%) rename {java => client}/src/client/gui/container/GuiChest.java (100%) rename {java => client}/src/client/gui/container/GuiContainer.java (100%) rename {java => client}/src/client/gui/container/GuiCrafting.java (100%) rename {java => client}/src/client/gui/container/GuiDispenser.java (100%) rename {java => client}/src/client/gui/container/GuiEnchant.java (100%) rename {java => client}/src/client/gui/container/GuiFurnace.java (100%) rename {java => client}/src/client/gui/container/GuiHopper.java (100%) rename {java => client}/src/client/gui/container/GuiHorse.java (100%) rename {java => client}/src/client/gui/container/GuiInventory.java (100%) rename {java => client}/src/client/gui/container/GuiMachine.java (100%) rename {java => client}/src/client/gui/container/GuiMerchant.java (100%) rename {java => client}/src/client/gui/container/GuiRepair.java (100%) rename {java => client}/src/client/gui/element/ActButton.java (100%) rename {java => client}/src/client/gui/element/Bar.java (100%) rename {java => client}/src/client/gui/element/Dropdown.java (100%) rename {java => client}/src/client/gui/element/Element.java (100%) rename {java => client}/src/client/gui/element/Fill.java (100%) rename {java => client}/src/client/gui/element/GuiList.java (100%) rename {java => client}/src/client/gui/element/InventoryButton.java (100%) rename {java => client}/src/client/gui/element/Label.java (100%) rename {java => client}/src/client/gui/element/ListEntry.java (100%) rename {java => client}/src/client/gui/element/NavButton.java (100%) rename {java => client}/src/client/gui/element/SelectableButton.java (100%) rename {java => client}/src/client/gui/element/Slider.java (100%) rename {java => client}/src/client/gui/element/Switch.java (100%) rename {java => client}/src/client/gui/element/Textbox.java (100%) rename {java => client}/src/client/gui/element/Toggle.java (100%) rename {java => client}/src/client/gui/element/TransparentBox.java (100%) rename {java => client}/src/client/gui/ingame/GuiGameOver.java (100%) rename {java => client}/src/client/gui/ingame/GuiSign.java (100%) rename {java => client}/src/client/gui/options/GuiBinds.java (100%) rename {java => client}/src/client/gui/options/GuiDisplay.java (100%) rename {java => client}/src/client/gui/options/GuiOptions.java (100%) rename {java => client}/src/client/gui/options/GuiSound.java (100%) rename {java => client}/src/client/gui/options/GuiStyle.java (100%) rename {java => client}/src/client/init/EntityRenderRegistry.java (100%) rename {java => client}/src/client/network/ClientLoginHandler.java (100%) rename {java => client}/src/client/network/ClientPlayer.java (100%) rename {java => client}/src/client/renderer/ActiveRenderInfo.java (100%) rename {java => client}/src/client/renderer/BlockRenderer.java (100%) rename {java => client}/src/client/renderer/DefaultVertexFormats.java (100%) rename {java => client}/src/client/renderer/Drawing.java (100%) rename {java => client}/src/client/renderer/EntityRenderer.java (100%) rename {java => client}/src/client/renderer/Frustum.java (100%) rename {java => client}/src/client/renderer/GlState.java (100%) rename {java => client}/src/client/renderer/ItemModelMesher.java (100%) rename {java => client}/src/client/renderer/ItemRenderer.java (100%) rename {java => client}/src/client/renderer/Project.java (100%) rename {java => client}/src/client/renderer/RegionRenderCache.java (100%) rename {java => client}/src/client/renderer/RegionRenderCacheBuilder.java (100%) rename {java => client}/src/client/renderer/RenderBuffer.java (100%) rename {java => client}/src/client/renderer/RenderGlobal.java (100%) rename {java => client}/src/client/renderer/Tessellator.java (100%) rename {java => client}/src/client/renderer/VertexBuffer.java (100%) rename {java => client}/src/client/renderer/VertexFormat.java (100%) rename {java => client}/src/client/renderer/VertexFormatElement.java (100%) rename {java => client}/src/client/renderer/ViewFrustum.java (100%) rename {java => client}/src/client/renderer/blockmodel/BakedModel.java (100%) rename {java => client}/src/client/renderer/blockmodel/BakedQuad.java (100%) rename {java => client}/src/client/renderer/blockmodel/BlockFaceUV.java (100%) rename {java => client}/src/client/renderer/blockmodel/BlockPart.java (100%) rename {java => client}/src/client/renderer/blockmodel/BlockPartFace.java (100%) rename {java => client}/src/client/renderer/blockmodel/BlockPartRotation.java (100%) rename {java => client}/src/client/renderer/blockmodel/BreakingFour.java (100%) rename {java => client}/src/client/renderer/blockmodel/BuiltInModel.java (100%) rename {java => client}/src/client/renderer/blockmodel/FaceBakery.java (100%) rename {java => client}/src/client/renderer/blockmodel/IBakedModel.java (100%) rename {java => client}/src/client/renderer/blockmodel/ModelBakery.java (100%) rename {java => client}/src/client/renderer/blockmodel/ModelBlock.java (100%) rename {java => client}/src/client/renderer/blockmodel/ModelGenerator.java (100%) rename {java => client}/src/client/renderer/blockmodel/ModelManager.java (100%) rename {java => client}/src/client/renderer/blockmodel/MultiStateMap.java (100%) rename {java => client}/src/client/renderer/blockmodel/SingleStateMap.java (100%) rename {java => client}/src/client/renderer/blockmodel/StateMap.java (100%) rename {java => client}/src/client/renderer/chunk/ChunkCompileTaskGenerator.java (100%) rename {java => client}/src/client/renderer/chunk/ChunkRenderDispatcher.java (100%) rename {java => client}/src/client/renderer/chunk/ChunkRenderWorker.java (100%) rename {java => client}/src/client/renderer/chunk/CompiledChunk.java (100%) rename {java => client}/src/client/renderer/chunk/RenderChunk.java (100%) rename {java => client}/src/client/renderer/chunk/SetVisibility.java (100%) rename {java => client}/src/client/renderer/chunk/VisGraph.java (100%) rename {java => client}/src/client/renderer/entity/Render.java (100%) rename {java => client}/src/client/renderer/entity/RenderArachnoid.java (100%) rename {java => client}/src/client/renderer/entity/RenderArrow.java (100%) rename {java => client}/src/client/renderer/entity/RenderBat.java (100%) rename {java => client}/src/client/renderer/entity/RenderBlockEntity.java (100%) rename {java => client}/src/client/renderer/entity/RenderBoat.java (100%) rename {java => client}/src/client/renderer/entity/RenderBullet.java (100%) rename {java => client}/src/client/renderer/entity/RenderChicken.java (100%) rename {java => client}/src/client/renderer/entity/RenderCow.java (100%) rename {java => client}/src/client/renderer/entity/RenderCrystal.java (100%) rename {java => client}/src/client/renderer/entity/RenderDie.java (100%) rename {java => client}/src/client/renderer/entity/RenderDragon.java (100%) rename {java => client}/src/client/renderer/entity/RenderDynamite.java (100%) rename {java => client}/src/client/renderer/entity/RenderEntity.java (100%) rename {java => client}/src/client/renderer/entity/RenderEntityItem.java (100%) rename {java => client}/src/client/renderer/entity/RenderFallingBlock.java (100%) rename {java => client}/src/client/renderer/entity/RenderFireball.java (100%) rename {java => client}/src/client/renderer/entity/RenderFish.java (100%) rename {java => client}/src/client/renderer/entity/RenderFlyingBox.java (100%) rename {java => client}/src/client/renderer/entity/RenderHorse.java (100%) rename {java => client}/src/client/renderer/entity/RenderHumanoid.java (100%) rename {java => client}/src/client/renderer/entity/RenderItem.java (100%) rename {java => client}/src/client/renderer/entity/RenderItemEntity.java (100%) rename {java => client}/src/client/renderer/entity/RenderLeashKnot.java (100%) rename {java => client}/src/client/renderer/entity/RenderLightning.java (100%) rename {java => client}/src/client/renderer/entity/RenderLiving.java (100%) rename {java => client}/src/client/renderer/entity/RenderManager.java (100%) rename {java => client}/src/client/renderer/entity/RenderMinecart.java (100%) rename {java => client}/src/client/renderer/entity/RenderMooshroom.java (100%) rename {java => client}/src/client/renderer/entity/RenderMouse.java (100%) rename {java => client}/src/client/renderer/entity/RenderNpc.java (100%) rename {java => client}/src/client/renderer/entity/RenderOcelot.java (100%) rename {java => client}/src/client/renderer/entity/RenderPig.java (100%) rename {java => client}/src/client/renderer/entity/RenderPotion.java (100%) rename {java => client}/src/client/renderer/entity/RenderRabbit.java (100%) rename {java => client}/src/client/renderer/entity/RenderSheep.java (100%) rename {java => client}/src/client/renderer/entity/RenderSlime.java (100%) rename {java => client}/src/client/renderer/entity/RenderSpaceMarine.java (100%) rename {java => client}/src/client/renderer/entity/RenderSquid.java (100%) rename {java => client}/src/client/renderer/entity/RenderTntMinecart.java (100%) rename {java => client}/src/client/renderer/entity/RenderTntPrimed.java (100%) rename {java => client}/src/client/renderer/entity/RenderWolf.java (100%) rename {java => client}/src/client/renderer/entity/RenderXpOrb.java (100%) rename {java => client}/src/client/renderer/entity/RendererLivingEntity.java (100%) rename {java => client}/src/client/renderer/layers/LayerArachnoidArmor.java (100%) rename {java => client}/src/client/renderer/layers/LayerArmor.java (100%) rename {java => client}/src/client/renderer/layers/LayerArrow.java (100%) rename {java => client}/src/client/renderer/layers/LayerCape.java (100%) rename {java => client}/src/client/renderer/layers/LayerCharge.java (100%) rename {java => client}/src/client/renderer/layers/LayerEnderDragonEyes.java (100%) rename {java => client}/src/client/renderer/layers/LayerEntityBreak.java (100%) rename {java => client}/src/client/renderer/layers/LayerExtra.java (100%) rename {java => client}/src/client/renderer/layers/LayerHeldItem.java (100%) rename {java => client}/src/client/renderer/layers/LayerMooshroomMushroom.java (100%) rename {java => client}/src/client/renderer/layers/LayerPowerRods.java (100%) rename {java => client}/src/client/renderer/layers/LayerRenderer.java (100%) rename {java => client}/src/client/renderer/layers/LayerSaddle.java (100%) rename {java => client}/src/client/renderer/layers/LayerSheepWool.java (100%) rename {java => client}/src/client/renderer/layers/LayerSlimeGel.java (100%) rename {java => client}/src/client/renderer/layers/LayerWolfCollar.java (100%) rename {java => client}/src/client/renderer/model/ModelArachnoid.java (100%) rename {java => client}/src/client/renderer/model/ModelArmor.java (100%) rename {java => client}/src/client/renderer/model/ModelBanner.java (100%) rename {java => client}/src/client/renderer/model/ModelBase.java (100%) rename {java => client}/src/client/renderer/model/ModelBat.java (100%) rename {java => client}/src/client/renderer/model/ModelBiped.java (100%) rename {java => client}/src/client/renderer/model/ModelBoat.java (100%) rename {java => client}/src/client/renderer/model/ModelBox.java (100%) rename {java => client}/src/client/renderer/model/ModelCharge.java (100%) rename {java => client}/src/client/renderer/model/ModelChest.java (100%) rename {java => client}/src/client/renderer/model/ModelChicken.java (100%) rename {java => client}/src/client/renderer/model/ModelCow.java (100%) rename {java => client}/src/client/renderer/model/ModelCrystal.java (100%) rename {java => client}/src/client/renderer/model/ModelDie.java (100%) rename {java => client}/src/client/renderer/model/ModelDragon.java (100%) rename {java => client}/src/client/renderer/model/ModelHead.java (100%) rename {java => client}/src/client/renderer/model/ModelHorse.java (100%) rename {java => client}/src/client/renderer/model/ModelHumanoid.java (100%) rename {java => client}/src/client/renderer/model/ModelHumanoidHead.java (100%) rename {java => client}/src/client/renderer/model/ModelLargeChest.java (100%) rename {java => client}/src/client/renderer/model/ModelLeashKnot.java (100%) rename {java => client}/src/client/renderer/model/ModelMinecart.java (100%) rename {java => client}/src/client/renderer/model/ModelMouse.java (100%) rename {java => client}/src/client/renderer/model/ModelOcelot.java (100%) rename {java => client}/src/client/renderer/model/ModelPig.java (100%) rename {java => client}/src/client/renderer/model/ModelQuadruped.java (100%) rename {java => client}/src/client/renderer/model/ModelRabbit.java (100%) rename {java => client}/src/client/renderer/model/ModelRenderer.java (100%) rename {java => client}/src/client/renderer/model/ModelSheep1.java (100%) rename {java => client}/src/client/renderer/model/ModelSheep2.java (100%) rename {java => client}/src/client/renderer/model/ModelSign.java (100%) rename {java => client}/src/client/renderer/model/ModelSlime.java (100%) rename {java => client}/src/client/renderer/model/ModelSpaceMarine.java (100%) rename {java => client}/src/client/renderer/model/ModelSquid.java (100%) rename {java => client}/src/client/renderer/model/ModelWolf.java (100%) rename {java => client}/src/client/renderer/model/PositionTextureVertex.java (100%) rename {java => client}/src/client/renderer/model/TextureOffset.java (100%) rename {java => client}/src/client/renderer/model/TexturedQuad.java (100%) rename {java => client}/src/client/renderer/particle/EffectRenderer.java (100%) rename {java => client}/src/client/renderer/particle/EntityAuraFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityBlockDustFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityBreakingFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityBubbleFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityCloudFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityCrit2FX.java (100%) rename {java => client}/src/client/renderer/particle/EntityCritFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityDiggingFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityDownfallFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityDropParticleFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityExplodeFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityFirework.java (100%) rename {java => client}/src/client/renderer/particle/EntityFishWakeFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityFlameFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityFootStepFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityHeartFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityHugeExplodeFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityLargeExplodeFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityLavaFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityNoteFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityParticleEmitter.java (100%) rename {java => client}/src/client/renderer/particle/EntityPickupFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityPortalFX.java (100%) rename {java => client}/src/client/renderer/particle/EntityReddustFX.java (100%) rename {java => client}/src/client/renderer/particle/EntitySmokeFX.java (100%) rename {java => client}/src/client/renderer/particle/EntitySnowShovelFX.java (100%) rename {java => client}/src/client/renderer/particle/EntitySpellParticleFX.java (100%) rename {java => client}/src/client/renderer/particle/EntitySplashFX.java (100%) rename {java => client}/src/client/renderer/particle/EntitySuspendFX.java (100%) rename {java => client}/src/client/renderer/particle/IParticleFactory.java (100%) rename {java => client}/src/client/renderer/texture/DynamicTexture.java (100%) rename {java => client}/src/client/renderer/texture/EntityTexManager.java (100%) rename {java => client}/src/client/renderer/texture/IIconCreator.java (100%) rename {java => client}/src/client/renderer/texture/LayeredColorMaskTexture.java (100%) rename {java => client}/src/client/renderer/texture/LayeredTexture.java (100%) rename {java => client}/src/client/renderer/texture/SimpleTexture.java (100%) rename {java => client}/src/client/renderer/texture/Stitcher.java (100%) rename {java => client}/src/client/renderer/texture/Texture.java (100%) rename {java => client}/src/client/renderer/texture/TextureAtlasSprite.java (100%) rename {java => client}/src/client/renderer/texture/TextureManager.java (100%) rename {java => client}/src/client/renderer/texture/TextureMap.java (100%) rename {java => client}/src/client/renderer/texture/TextureTicked.java (100%) rename {java => client}/src/client/renderer/texture/TextureUtil.java (100%) rename {java => client}/src/client/renderer/ticked/TextureFlamesFX1.java (100%) rename {java => client}/src/client/renderer/ticked/TextureFlamesFX2.java (100%) rename {java => client}/src/client/renderer/ticked/TextureLavaFX.java (100%) rename {java => client}/src/client/renderer/ticked/TextureLavaFlowFX.java (100%) rename {java => client}/src/client/renderer/ticked/TextureWaterFX.java (100%) rename {java => client}/src/client/renderer/ticked/TextureWaterFlowFX.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityBannerRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityChestRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityItemStackRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityPistonRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntityRendererDispatcher.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntitySignRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntitySkullRenderer.java (100%) rename {java => client}/src/client/renderer/tileentity/TileEntitySpecialRenderer.java (100%) rename {java => client}/src/client/window/Bind.java (100%) rename {java => client}/src/client/window/Button.java (100%) rename {java => client}/src/client/window/DisplayMode.java (100%) rename {java => client}/src/client/window/Input.java (100%) rename {java => client}/src/client/window/KeyEvent.java (100%) rename {java => client}/src/client/window/Keysym.java (100%) rename {java => client}/src/client/window/Wheel.java (100%) rename {java => client}/src/client/window/Window.java (100%) rename {java => client}/src/client/window/WindowAction.java (100%) rename {java => client}/src/client/window/WindowEvent.java (100%) rename {java => client}/src/game/vars/BaseVar.java (100%) rename {java => client}/src/game/vars/BoolVar.java (100%) rename {java => client}/src/game/vars/CVar.java (100%) rename {java => client}/src/game/vars/CVarCategory.java (100%) rename {java => client}/src/game/vars/ColorVar.java (100%) rename {java => client}/src/game/vars/EnumVar.java (100%) rename {java => client}/src/game/vars/FloatVar.java (100%) rename {java => client}/src/game/vars/IntVar.java (100%) rename {java => client}/src/game/vars/StringVar.java (100%) rename {java => client}/src/game/vars/Variable.java (100%) rename {java => client}/src/game/world/Converter.java (99%) rename {java => server}/src/server/Server.java (100%) rename {java => server}/src/server/command/ArgCombiner.java (100%) rename {java => server}/src/server/command/Argument.java (100%) rename {java => server}/src/server/command/ArgumentParser.java (100%) rename {java => server}/src/server/command/ArgumentSplitter.java (100%) rename {java => server}/src/server/command/BooleanParser.java (100%) rename {java => server}/src/server/command/CachedExecutable.java (100%) rename {java => server}/src/server/command/ColorParser.java (100%) rename {java => server}/src/server/command/Command.java (100%) rename {java => server}/src/server/command/CommandEnvironment.java (100%) rename {java => server}/src/server/command/Completer.java (100%) rename {java => server}/src/server/command/CompletingParser.java (100%) rename {java => server}/src/server/command/DefaultingParser.java (100%) rename {java => server}/src/server/command/DimensionParser.java (100%) rename {java => server}/src/server/command/DoubleParser.java (100%) rename {java => server}/src/server/command/EntityListParser.java (100%) rename {java => server}/src/server/command/EntityParser.java (100%) rename {java => server}/src/server/command/EnumParser.java (100%) rename {java => server}/src/server/command/Executable.java (100%) rename {java => server}/src/server/command/Executor.java (100%) rename {java => server}/src/server/command/FixedExecutor.java (100%) rename {java => server}/src/server/command/IntParser.java (100%) rename {java => server}/src/server/command/LongParser.java (100%) rename {java => server}/src/server/command/NonDefaultingParser.java (100%) rename {java => server}/src/server/command/Parameter.java (100%) rename {java => server}/src/server/command/PatternReplacer.java (100%) rename {java => server}/src/server/command/PlayerEntityListParser.java (100%) rename {java => server}/src/server/command/PlayerEntityParser.java (100%) rename {java => server}/src/server/command/PlayerListParser.java (100%) rename {java => server}/src/server/command/PlayerParser.java (100%) rename {java => server}/src/server/command/RunException.java (100%) rename {java => server}/src/server/command/StringCompleter.java (100%) rename {java => server}/src/server/command/StringParser.java (100%) rename {java => server}/src/server/command/TagParser.java (100%) rename {java => server}/src/server/command/Variable.java (100%) rename {java => server}/src/server/command/WorldParser.java (100%) rename {java => server}/src/server/command/commands/CommandAdmin.java (100%) rename {java => server}/src/server/command/commands/CommandHelp.java (100%) rename {java => server}/src/server/command/commands/CommandKick.java (100%) rename {java => server}/src/server/command/commands/CommandMessage.java (100%) rename {java => server}/src/server/command/commands/CommandMilk.java (100%) rename {java => server}/src/server/command/commands/CommandOfflinetp.java (100%) rename {java => server}/src/server/command/commands/CommandPotion.java (100%) rename {java => server}/src/server/command/commands/CommandRemove.java (100%) rename {java => server}/src/server/command/commands/CommandRevoke.java (100%) rename {java => server}/src/server/command/commands/CommandSpawn.java (100%) rename {java => server}/src/server/command/commands/CommandTele.java (100%) rename {java => server}/src/server/command/commands/CommandTime.java (100%) rename {java => server}/src/server/command/commands/CommandTp.java (100%) rename {java => server}/src/server/command/commands/CommandWarp.java (100%) rename {java => server}/src/server/command/commands/CommandWeather.java (100%) rename {java => server}/src/server/command/commands/CommandWorld.java (100%) rename {java => server}/src/server/network/HandshakeHandler.java (100%) rename {java => server}/src/server/network/LoginHandler.java (100%) rename {java => server}/src/server/network/Player.java (100%) diff --git a/java/src/client/Game.java b/client/src/client/Game.java similarity index 100% rename from java/src/client/Game.java rename to client/src/client/Game.java diff --git a/java/src/client/PerfSection.java b/client/src/client/PerfSection.java similarity index 100% rename from java/src/client/PerfSection.java rename to client/src/client/PerfSection.java diff --git a/java/src/client/PlayerController.java b/client/src/client/PlayerController.java similarity index 100% rename from java/src/client/PlayerController.java rename to client/src/client/PlayerController.java diff --git a/java/src/client/SkinConverter.java b/client/src/client/SkinConverter.java similarity index 100% rename from java/src/client/SkinConverter.java rename to client/src/client/SkinConverter.java diff --git a/java/src/client/Timing.java b/client/src/client/Timing.java similarity index 100% rename from java/src/client/Timing.java rename to client/src/client/Timing.java diff --git a/java/src/client/audio/AudioInterface.java b/client/src/client/audio/AudioInterface.java similarity index 100% rename from java/src/client/audio/AudioInterface.java rename to client/src/client/audio/AudioInterface.java diff --git a/java/src/client/audio/CodecJOrbis.java b/client/src/client/audio/CodecJOrbis.java similarity index 100% rename from java/src/client/audio/CodecJOrbis.java rename to client/src/client/audio/CodecJOrbis.java diff --git a/java/src/client/audio/SoundManager.java b/client/src/client/audio/SoundManager.java similarity index 100% rename from java/src/client/audio/SoundManager.java rename to client/src/client/audio/SoundManager.java diff --git a/java/src/client/audio/Volume.java b/client/src/client/audio/Volume.java similarity index 100% rename from java/src/client/audio/Volume.java rename to client/src/client/audio/Volume.java diff --git a/java/src/client/audio/jogg/Buffer.java b/client/src/client/audio/jogg/Buffer.java similarity index 100% rename from java/src/client/audio/jogg/Buffer.java rename to client/src/client/audio/jogg/Buffer.java diff --git a/java/src/client/audio/jogg/Packet.java b/client/src/client/audio/jogg/Packet.java similarity index 100% rename from java/src/client/audio/jogg/Packet.java rename to client/src/client/audio/jogg/Packet.java diff --git a/java/src/client/audio/jogg/Page.java b/client/src/client/audio/jogg/Page.java similarity index 100% rename from java/src/client/audio/jogg/Page.java rename to client/src/client/audio/jogg/Page.java diff --git a/java/src/client/audio/jogg/StreamState.java b/client/src/client/audio/jogg/StreamState.java similarity index 100% rename from java/src/client/audio/jogg/StreamState.java rename to client/src/client/audio/jogg/StreamState.java diff --git a/java/src/client/audio/jogg/SyncState.java b/client/src/client/audio/jogg/SyncState.java similarity index 100% rename from java/src/client/audio/jogg/SyncState.java rename to client/src/client/audio/jogg/SyncState.java diff --git a/java/src/client/audio/jorbis/Block.java b/client/src/client/audio/jorbis/Block.java similarity index 100% rename from java/src/client/audio/jorbis/Block.java rename to client/src/client/audio/jorbis/Block.java diff --git a/java/src/client/audio/jorbis/ChainingExample.java b/client/src/client/audio/jorbis/ChainingExample.java similarity index 100% rename from java/src/client/audio/jorbis/ChainingExample.java rename to client/src/client/audio/jorbis/ChainingExample.java diff --git a/java/src/client/audio/jorbis/CodeBook.java b/client/src/client/audio/jorbis/CodeBook.java similarity index 100% rename from java/src/client/audio/jorbis/CodeBook.java rename to client/src/client/audio/jorbis/CodeBook.java diff --git a/java/src/client/audio/jorbis/Comment.java b/client/src/client/audio/jorbis/Comment.java similarity index 100% rename from java/src/client/audio/jorbis/Comment.java rename to client/src/client/audio/jorbis/Comment.java diff --git a/java/src/client/audio/jorbis/DecodeExample.java b/client/src/client/audio/jorbis/DecodeExample.java similarity index 100% rename from java/src/client/audio/jorbis/DecodeExample.java rename to client/src/client/audio/jorbis/DecodeExample.java diff --git a/java/src/client/audio/jorbis/Drft.java b/client/src/client/audio/jorbis/Drft.java similarity index 100% rename from java/src/client/audio/jorbis/Drft.java rename to client/src/client/audio/jorbis/Drft.java diff --git a/java/src/client/audio/jorbis/DspState.java b/client/src/client/audio/jorbis/DspState.java similarity index 100% rename from java/src/client/audio/jorbis/DspState.java rename to client/src/client/audio/jorbis/DspState.java diff --git a/java/src/client/audio/jorbis/Floor0.java b/client/src/client/audio/jorbis/Floor0.java similarity index 100% rename from java/src/client/audio/jorbis/Floor0.java rename to client/src/client/audio/jorbis/Floor0.java diff --git a/java/src/client/audio/jorbis/Floor1.java b/client/src/client/audio/jorbis/Floor1.java similarity index 100% rename from java/src/client/audio/jorbis/Floor1.java rename to client/src/client/audio/jorbis/Floor1.java diff --git a/java/src/client/audio/jorbis/FuncFloor.java b/client/src/client/audio/jorbis/FuncFloor.java similarity index 100% rename from java/src/client/audio/jorbis/FuncFloor.java rename to client/src/client/audio/jorbis/FuncFloor.java diff --git a/java/src/client/audio/jorbis/FuncMapping.java b/client/src/client/audio/jorbis/FuncMapping.java similarity index 100% rename from java/src/client/audio/jorbis/FuncMapping.java rename to client/src/client/audio/jorbis/FuncMapping.java diff --git a/java/src/client/audio/jorbis/FuncResidue.java b/client/src/client/audio/jorbis/FuncResidue.java similarity index 100% rename from java/src/client/audio/jorbis/FuncResidue.java rename to client/src/client/audio/jorbis/FuncResidue.java diff --git a/java/src/client/audio/jorbis/FuncTime.java b/client/src/client/audio/jorbis/FuncTime.java similarity index 100% rename from java/src/client/audio/jorbis/FuncTime.java rename to client/src/client/audio/jorbis/FuncTime.java diff --git a/java/src/client/audio/jorbis/Info.java b/client/src/client/audio/jorbis/Info.java similarity index 100% rename from java/src/client/audio/jorbis/Info.java rename to client/src/client/audio/jorbis/Info.java diff --git a/java/src/client/audio/jorbis/InfoMode.java b/client/src/client/audio/jorbis/InfoMode.java similarity index 100% rename from java/src/client/audio/jorbis/InfoMode.java rename to client/src/client/audio/jorbis/InfoMode.java diff --git a/java/src/client/audio/jorbis/JOrbisException.java b/client/src/client/audio/jorbis/JOrbisException.java similarity index 100% rename from java/src/client/audio/jorbis/JOrbisException.java rename to client/src/client/audio/jorbis/JOrbisException.java diff --git a/java/src/client/audio/jorbis/Lookup.java b/client/src/client/audio/jorbis/Lookup.java similarity index 100% rename from java/src/client/audio/jorbis/Lookup.java rename to client/src/client/audio/jorbis/Lookup.java diff --git a/java/src/client/audio/jorbis/Lpc.java b/client/src/client/audio/jorbis/Lpc.java similarity index 100% rename from java/src/client/audio/jorbis/Lpc.java rename to client/src/client/audio/jorbis/Lpc.java diff --git a/java/src/client/audio/jorbis/Lsp.java b/client/src/client/audio/jorbis/Lsp.java similarity index 100% rename from java/src/client/audio/jorbis/Lsp.java rename to client/src/client/audio/jorbis/Lsp.java diff --git a/java/src/client/audio/jorbis/Mapping0.java b/client/src/client/audio/jorbis/Mapping0.java similarity index 100% rename from java/src/client/audio/jorbis/Mapping0.java rename to client/src/client/audio/jorbis/Mapping0.java diff --git a/java/src/client/audio/jorbis/Mdct.java b/client/src/client/audio/jorbis/Mdct.java similarity index 100% rename from java/src/client/audio/jorbis/Mdct.java rename to client/src/client/audio/jorbis/Mdct.java diff --git a/java/src/client/audio/jorbis/PsyInfo.java b/client/src/client/audio/jorbis/PsyInfo.java similarity index 100% rename from java/src/client/audio/jorbis/PsyInfo.java rename to client/src/client/audio/jorbis/PsyInfo.java diff --git a/java/src/client/audio/jorbis/PsyLook.java b/client/src/client/audio/jorbis/PsyLook.java similarity index 100% rename from java/src/client/audio/jorbis/PsyLook.java rename to client/src/client/audio/jorbis/PsyLook.java diff --git a/java/src/client/audio/jorbis/Residue0.java b/client/src/client/audio/jorbis/Residue0.java similarity index 100% rename from java/src/client/audio/jorbis/Residue0.java rename to client/src/client/audio/jorbis/Residue0.java diff --git a/java/src/client/audio/jorbis/Residue1.java b/client/src/client/audio/jorbis/Residue1.java similarity index 100% rename from java/src/client/audio/jorbis/Residue1.java rename to client/src/client/audio/jorbis/Residue1.java diff --git a/java/src/client/audio/jorbis/Residue2.java b/client/src/client/audio/jorbis/Residue2.java similarity index 100% rename from java/src/client/audio/jorbis/Residue2.java rename to client/src/client/audio/jorbis/Residue2.java diff --git a/java/src/client/audio/jorbis/StaticCodeBook.java b/client/src/client/audio/jorbis/StaticCodeBook.java similarity index 100% rename from java/src/client/audio/jorbis/StaticCodeBook.java rename to client/src/client/audio/jorbis/StaticCodeBook.java diff --git a/java/src/client/audio/jorbis/Time0.java b/client/src/client/audio/jorbis/Time0.java similarity index 100% rename from java/src/client/audio/jorbis/Time0.java rename to client/src/client/audio/jorbis/Time0.java diff --git a/java/src/client/audio/jorbis/Util.java b/client/src/client/audio/jorbis/Util.java similarity index 100% rename from java/src/client/audio/jorbis/Util.java rename to client/src/client/audio/jorbis/Util.java diff --git a/java/src/client/audio/jorbis/VorbisFile.java b/client/src/client/audio/jorbis/VorbisFile.java similarity index 100% rename from java/src/client/audio/jorbis/VorbisFile.java rename to client/src/client/audio/jorbis/VorbisFile.java diff --git a/java/src/client/gui/FileCallback.java b/client/src/client/gui/FileCallback.java similarity index 100% rename from java/src/client/gui/FileCallback.java rename to client/src/client/gui/FileCallback.java diff --git a/java/src/client/gui/Font.java b/client/src/client/gui/Font.java similarity index 100% rename from java/src/client/gui/Font.java rename to client/src/client/gui/Font.java diff --git a/java/src/client/gui/FontChar.java b/client/src/client/gui/FontChar.java similarity index 100% rename from java/src/client/gui/FontChar.java rename to client/src/client/gui/FontChar.java diff --git a/java/src/client/gui/Formatter.java b/client/src/client/gui/Formatter.java similarity index 100% rename from java/src/client/gui/Formatter.java rename to client/src/client/gui/Formatter.java diff --git a/java/src/client/gui/Gui.java b/client/src/client/gui/Gui.java similarity index 100% rename from java/src/client/gui/Gui.java rename to client/src/client/gui/Gui.java diff --git a/java/src/client/gui/GuiConfirm.java b/client/src/client/gui/GuiConfirm.java similarity index 100% rename from java/src/client/gui/GuiConfirm.java rename to client/src/client/gui/GuiConfirm.java diff --git a/java/src/client/gui/GuiConnect.java b/client/src/client/gui/GuiConnect.java similarity index 100% rename from java/src/client/gui/GuiConnect.java rename to client/src/client/gui/GuiConnect.java diff --git a/java/src/client/gui/GuiConsole.java b/client/src/client/gui/GuiConsole.java similarity index 100% rename from java/src/client/gui/GuiConsole.java rename to client/src/client/gui/GuiConsole.java diff --git a/java/src/client/gui/GuiConvert.java b/client/src/client/gui/GuiConvert.java similarity index 100% rename from java/src/client/gui/GuiConvert.java rename to client/src/client/gui/GuiConvert.java diff --git a/java/src/client/gui/GuiInfo.java b/client/src/client/gui/GuiInfo.java similarity index 100% rename from java/src/client/gui/GuiInfo.java rename to client/src/client/gui/GuiInfo.java diff --git a/java/src/client/gui/GuiLoading.java b/client/src/client/gui/GuiLoading.java similarity index 100% rename from java/src/client/gui/GuiLoading.java rename to client/src/client/gui/GuiLoading.java diff --git a/java/src/client/gui/GuiMenu.java b/client/src/client/gui/GuiMenu.java similarity index 100% rename from java/src/client/gui/GuiMenu.java rename to client/src/client/gui/GuiMenu.java diff --git a/java/src/client/gui/GuiServer.java b/client/src/client/gui/GuiServer.java similarity index 100% rename from java/src/client/gui/GuiServer.java rename to client/src/client/gui/GuiServer.java diff --git a/java/src/client/gui/Splashes.java b/client/src/client/gui/Splashes.java similarity index 100% rename from java/src/client/gui/Splashes.java rename to client/src/client/gui/Splashes.java diff --git a/java/src/client/gui/Style.java b/client/src/client/gui/Style.java similarity index 100% rename from java/src/client/gui/Style.java rename to client/src/client/gui/Style.java diff --git a/java/src/client/gui/character/GuiChar.java b/client/src/client/gui/character/GuiChar.java similarity index 100% rename from java/src/client/gui/character/GuiChar.java rename to client/src/client/gui/character/GuiChar.java diff --git a/java/src/client/gui/character/GuiCharacters.java b/client/src/client/gui/character/GuiCharacters.java similarity index 100% rename from java/src/client/gui/character/GuiCharacters.java rename to client/src/client/gui/character/GuiCharacters.java diff --git a/java/src/client/gui/character/GuiClass.java b/client/src/client/gui/character/GuiClass.java similarity index 100% rename from java/src/client/gui/character/GuiClass.java rename to client/src/client/gui/character/GuiClass.java diff --git a/java/src/client/gui/character/GuiSpecies.java b/client/src/client/gui/character/GuiSpecies.java similarity index 100% rename from java/src/client/gui/character/GuiSpecies.java rename to client/src/client/gui/character/GuiSpecies.java diff --git a/java/src/client/gui/container/GuiBrewing.java b/client/src/client/gui/container/GuiBrewing.java similarity index 100% rename from java/src/client/gui/container/GuiBrewing.java rename to client/src/client/gui/container/GuiBrewing.java diff --git a/java/src/client/gui/container/GuiChest.java b/client/src/client/gui/container/GuiChest.java similarity index 100% rename from java/src/client/gui/container/GuiChest.java rename to client/src/client/gui/container/GuiChest.java diff --git a/java/src/client/gui/container/GuiContainer.java b/client/src/client/gui/container/GuiContainer.java similarity index 100% rename from java/src/client/gui/container/GuiContainer.java rename to client/src/client/gui/container/GuiContainer.java diff --git a/java/src/client/gui/container/GuiCrafting.java b/client/src/client/gui/container/GuiCrafting.java similarity index 100% rename from java/src/client/gui/container/GuiCrafting.java rename to client/src/client/gui/container/GuiCrafting.java diff --git a/java/src/client/gui/container/GuiDispenser.java b/client/src/client/gui/container/GuiDispenser.java similarity index 100% rename from java/src/client/gui/container/GuiDispenser.java rename to client/src/client/gui/container/GuiDispenser.java diff --git a/java/src/client/gui/container/GuiEnchant.java b/client/src/client/gui/container/GuiEnchant.java similarity index 100% rename from java/src/client/gui/container/GuiEnchant.java rename to client/src/client/gui/container/GuiEnchant.java diff --git a/java/src/client/gui/container/GuiFurnace.java b/client/src/client/gui/container/GuiFurnace.java similarity index 100% rename from java/src/client/gui/container/GuiFurnace.java rename to client/src/client/gui/container/GuiFurnace.java diff --git a/java/src/client/gui/container/GuiHopper.java b/client/src/client/gui/container/GuiHopper.java similarity index 100% rename from java/src/client/gui/container/GuiHopper.java rename to client/src/client/gui/container/GuiHopper.java diff --git a/java/src/client/gui/container/GuiHorse.java b/client/src/client/gui/container/GuiHorse.java similarity index 100% rename from java/src/client/gui/container/GuiHorse.java rename to client/src/client/gui/container/GuiHorse.java diff --git a/java/src/client/gui/container/GuiInventory.java b/client/src/client/gui/container/GuiInventory.java similarity index 100% rename from java/src/client/gui/container/GuiInventory.java rename to client/src/client/gui/container/GuiInventory.java diff --git a/java/src/client/gui/container/GuiMachine.java b/client/src/client/gui/container/GuiMachine.java similarity index 100% rename from java/src/client/gui/container/GuiMachine.java rename to client/src/client/gui/container/GuiMachine.java diff --git a/java/src/client/gui/container/GuiMerchant.java b/client/src/client/gui/container/GuiMerchant.java similarity index 100% rename from java/src/client/gui/container/GuiMerchant.java rename to client/src/client/gui/container/GuiMerchant.java diff --git a/java/src/client/gui/container/GuiRepair.java b/client/src/client/gui/container/GuiRepair.java similarity index 100% rename from java/src/client/gui/container/GuiRepair.java rename to client/src/client/gui/container/GuiRepair.java diff --git a/java/src/client/gui/element/ActButton.java b/client/src/client/gui/element/ActButton.java similarity index 100% rename from java/src/client/gui/element/ActButton.java rename to client/src/client/gui/element/ActButton.java diff --git a/java/src/client/gui/element/Bar.java b/client/src/client/gui/element/Bar.java similarity index 100% rename from java/src/client/gui/element/Bar.java rename to client/src/client/gui/element/Bar.java diff --git a/java/src/client/gui/element/Dropdown.java b/client/src/client/gui/element/Dropdown.java similarity index 100% rename from java/src/client/gui/element/Dropdown.java rename to client/src/client/gui/element/Dropdown.java diff --git a/java/src/client/gui/element/Element.java b/client/src/client/gui/element/Element.java similarity index 100% rename from java/src/client/gui/element/Element.java rename to client/src/client/gui/element/Element.java diff --git a/java/src/client/gui/element/Fill.java b/client/src/client/gui/element/Fill.java similarity index 100% rename from java/src/client/gui/element/Fill.java rename to client/src/client/gui/element/Fill.java diff --git a/java/src/client/gui/element/GuiList.java b/client/src/client/gui/element/GuiList.java similarity index 100% rename from java/src/client/gui/element/GuiList.java rename to client/src/client/gui/element/GuiList.java diff --git a/java/src/client/gui/element/InventoryButton.java b/client/src/client/gui/element/InventoryButton.java similarity index 100% rename from java/src/client/gui/element/InventoryButton.java rename to client/src/client/gui/element/InventoryButton.java diff --git a/java/src/client/gui/element/Label.java b/client/src/client/gui/element/Label.java similarity index 100% rename from java/src/client/gui/element/Label.java rename to client/src/client/gui/element/Label.java diff --git a/java/src/client/gui/element/ListEntry.java b/client/src/client/gui/element/ListEntry.java similarity index 100% rename from java/src/client/gui/element/ListEntry.java rename to client/src/client/gui/element/ListEntry.java diff --git a/java/src/client/gui/element/NavButton.java b/client/src/client/gui/element/NavButton.java similarity index 100% rename from java/src/client/gui/element/NavButton.java rename to client/src/client/gui/element/NavButton.java diff --git a/java/src/client/gui/element/SelectableButton.java b/client/src/client/gui/element/SelectableButton.java similarity index 100% rename from java/src/client/gui/element/SelectableButton.java rename to client/src/client/gui/element/SelectableButton.java diff --git a/java/src/client/gui/element/Slider.java b/client/src/client/gui/element/Slider.java similarity index 100% rename from java/src/client/gui/element/Slider.java rename to client/src/client/gui/element/Slider.java diff --git a/java/src/client/gui/element/Switch.java b/client/src/client/gui/element/Switch.java similarity index 100% rename from java/src/client/gui/element/Switch.java rename to client/src/client/gui/element/Switch.java diff --git a/java/src/client/gui/element/Textbox.java b/client/src/client/gui/element/Textbox.java similarity index 100% rename from java/src/client/gui/element/Textbox.java rename to client/src/client/gui/element/Textbox.java diff --git a/java/src/client/gui/element/Toggle.java b/client/src/client/gui/element/Toggle.java similarity index 100% rename from java/src/client/gui/element/Toggle.java rename to client/src/client/gui/element/Toggle.java diff --git a/java/src/client/gui/element/TransparentBox.java b/client/src/client/gui/element/TransparentBox.java similarity index 100% rename from java/src/client/gui/element/TransparentBox.java rename to client/src/client/gui/element/TransparentBox.java diff --git a/java/src/client/gui/ingame/GuiGameOver.java b/client/src/client/gui/ingame/GuiGameOver.java similarity index 100% rename from java/src/client/gui/ingame/GuiGameOver.java rename to client/src/client/gui/ingame/GuiGameOver.java diff --git a/java/src/client/gui/ingame/GuiSign.java b/client/src/client/gui/ingame/GuiSign.java similarity index 100% rename from java/src/client/gui/ingame/GuiSign.java rename to client/src/client/gui/ingame/GuiSign.java diff --git a/java/src/client/gui/options/GuiBinds.java b/client/src/client/gui/options/GuiBinds.java similarity index 100% rename from java/src/client/gui/options/GuiBinds.java rename to client/src/client/gui/options/GuiBinds.java diff --git a/java/src/client/gui/options/GuiDisplay.java b/client/src/client/gui/options/GuiDisplay.java similarity index 100% rename from java/src/client/gui/options/GuiDisplay.java rename to client/src/client/gui/options/GuiDisplay.java diff --git a/java/src/client/gui/options/GuiOptions.java b/client/src/client/gui/options/GuiOptions.java similarity index 100% rename from java/src/client/gui/options/GuiOptions.java rename to client/src/client/gui/options/GuiOptions.java diff --git a/java/src/client/gui/options/GuiSound.java b/client/src/client/gui/options/GuiSound.java similarity index 100% rename from java/src/client/gui/options/GuiSound.java rename to client/src/client/gui/options/GuiSound.java diff --git a/java/src/client/gui/options/GuiStyle.java b/client/src/client/gui/options/GuiStyle.java similarity index 100% rename from java/src/client/gui/options/GuiStyle.java rename to client/src/client/gui/options/GuiStyle.java diff --git a/java/src/client/init/EntityRenderRegistry.java b/client/src/client/init/EntityRenderRegistry.java similarity index 100% rename from java/src/client/init/EntityRenderRegistry.java rename to client/src/client/init/EntityRenderRegistry.java diff --git a/java/src/client/network/ClientLoginHandler.java b/client/src/client/network/ClientLoginHandler.java similarity index 100% rename from java/src/client/network/ClientLoginHandler.java rename to client/src/client/network/ClientLoginHandler.java diff --git a/java/src/client/network/ClientPlayer.java b/client/src/client/network/ClientPlayer.java similarity index 100% rename from java/src/client/network/ClientPlayer.java rename to client/src/client/network/ClientPlayer.java diff --git a/java/src/client/renderer/ActiveRenderInfo.java b/client/src/client/renderer/ActiveRenderInfo.java similarity index 100% rename from java/src/client/renderer/ActiveRenderInfo.java rename to client/src/client/renderer/ActiveRenderInfo.java diff --git a/java/src/client/renderer/BlockRenderer.java b/client/src/client/renderer/BlockRenderer.java similarity index 100% rename from java/src/client/renderer/BlockRenderer.java rename to client/src/client/renderer/BlockRenderer.java diff --git a/java/src/client/renderer/DefaultVertexFormats.java b/client/src/client/renderer/DefaultVertexFormats.java similarity index 100% rename from java/src/client/renderer/DefaultVertexFormats.java rename to client/src/client/renderer/DefaultVertexFormats.java diff --git a/java/src/client/renderer/Drawing.java b/client/src/client/renderer/Drawing.java similarity index 100% rename from java/src/client/renderer/Drawing.java rename to client/src/client/renderer/Drawing.java diff --git a/java/src/client/renderer/EntityRenderer.java b/client/src/client/renderer/EntityRenderer.java similarity index 100% rename from java/src/client/renderer/EntityRenderer.java rename to client/src/client/renderer/EntityRenderer.java diff --git a/java/src/client/renderer/Frustum.java b/client/src/client/renderer/Frustum.java similarity index 100% rename from java/src/client/renderer/Frustum.java rename to client/src/client/renderer/Frustum.java diff --git a/java/src/client/renderer/GlState.java b/client/src/client/renderer/GlState.java similarity index 100% rename from java/src/client/renderer/GlState.java rename to client/src/client/renderer/GlState.java diff --git a/java/src/client/renderer/ItemModelMesher.java b/client/src/client/renderer/ItemModelMesher.java similarity index 100% rename from java/src/client/renderer/ItemModelMesher.java rename to client/src/client/renderer/ItemModelMesher.java diff --git a/java/src/client/renderer/ItemRenderer.java b/client/src/client/renderer/ItemRenderer.java similarity index 100% rename from java/src/client/renderer/ItemRenderer.java rename to client/src/client/renderer/ItemRenderer.java diff --git a/java/src/client/renderer/Project.java b/client/src/client/renderer/Project.java similarity index 100% rename from java/src/client/renderer/Project.java rename to client/src/client/renderer/Project.java diff --git a/java/src/client/renderer/RegionRenderCache.java b/client/src/client/renderer/RegionRenderCache.java similarity index 100% rename from java/src/client/renderer/RegionRenderCache.java rename to client/src/client/renderer/RegionRenderCache.java diff --git a/java/src/client/renderer/RegionRenderCacheBuilder.java b/client/src/client/renderer/RegionRenderCacheBuilder.java similarity index 100% rename from java/src/client/renderer/RegionRenderCacheBuilder.java rename to client/src/client/renderer/RegionRenderCacheBuilder.java diff --git a/java/src/client/renderer/RenderBuffer.java b/client/src/client/renderer/RenderBuffer.java similarity index 100% rename from java/src/client/renderer/RenderBuffer.java rename to client/src/client/renderer/RenderBuffer.java diff --git a/java/src/client/renderer/RenderGlobal.java b/client/src/client/renderer/RenderGlobal.java similarity index 100% rename from java/src/client/renderer/RenderGlobal.java rename to client/src/client/renderer/RenderGlobal.java diff --git a/java/src/client/renderer/Tessellator.java b/client/src/client/renderer/Tessellator.java similarity index 100% rename from java/src/client/renderer/Tessellator.java rename to client/src/client/renderer/Tessellator.java diff --git a/java/src/client/renderer/VertexBuffer.java b/client/src/client/renderer/VertexBuffer.java similarity index 100% rename from java/src/client/renderer/VertexBuffer.java rename to client/src/client/renderer/VertexBuffer.java diff --git a/java/src/client/renderer/VertexFormat.java b/client/src/client/renderer/VertexFormat.java similarity index 100% rename from java/src/client/renderer/VertexFormat.java rename to client/src/client/renderer/VertexFormat.java diff --git a/java/src/client/renderer/VertexFormatElement.java b/client/src/client/renderer/VertexFormatElement.java similarity index 100% rename from java/src/client/renderer/VertexFormatElement.java rename to client/src/client/renderer/VertexFormatElement.java diff --git a/java/src/client/renderer/ViewFrustum.java b/client/src/client/renderer/ViewFrustum.java similarity index 100% rename from java/src/client/renderer/ViewFrustum.java rename to client/src/client/renderer/ViewFrustum.java diff --git a/java/src/client/renderer/blockmodel/BakedModel.java b/client/src/client/renderer/blockmodel/BakedModel.java similarity index 100% rename from java/src/client/renderer/blockmodel/BakedModel.java rename to client/src/client/renderer/blockmodel/BakedModel.java diff --git a/java/src/client/renderer/blockmodel/BakedQuad.java b/client/src/client/renderer/blockmodel/BakedQuad.java similarity index 100% rename from java/src/client/renderer/blockmodel/BakedQuad.java rename to client/src/client/renderer/blockmodel/BakedQuad.java diff --git a/java/src/client/renderer/blockmodel/BlockFaceUV.java b/client/src/client/renderer/blockmodel/BlockFaceUV.java similarity index 100% rename from java/src/client/renderer/blockmodel/BlockFaceUV.java rename to client/src/client/renderer/blockmodel/BlockFaceUV.java diff --git a/java/src/client/renderer/blockmodel/BlockPart.java b/client/src/client/renderer/blockmodel/BlockPart.java similarity index 100% rename from java/src/client/renderer/blockmodel/BlockPart.java rename to client/src/client/renderer/blockmodel/BlockPart.java diff --git a/java/src/client/renderer/blockmodel/BlockPartFace.java b/client/src/client/renderer/blockmodel/BlockPartFace.java similarity index 100% rename from java/src/client/renderer/blockmodel/BlockPartFace.java rename to client/src/client/renderer/blockmodel/BlockPartFace.java diff --git a/java/src/client/renderer/blockmodel/BlockPartRotation.java b/client/src/client/renderer/blockmodel/BlockPartRotation.java similarity index 100% rename from java/src/client/renderer/blockmodel/BlockPartRotation.java rename to client/src/client/renderer/blockmodel/BlockPartRotation.java diff --git a/java/src/client/renderer/blockmodel/BreakingFour.java b/client/src/client/renderer/blockmodel/BreakingFour.java similarity index 100% rename from java/src/client/renderer/blockmodel/BreakingFour.java rename to client/src/client/renderer/blockmodel/BreakingFour.java diff --git a/java/src/client/renderer/blockmodel/BuiltInModel.java b/client/src/client/renderer/blockmodel/BuiltInModel.java similarity index 100% rename from java/src/client/renderer/blockmodel/BuiltInModel.java rename to client/src/client/renderer/blockmodel/BuiltInModel.java diff --git a/java/src/client/renderer/blockmodel/FaceBakery.java b/client/src/client/renderer/blockmodel/FaceBakery.java similarity index 100% rename from java/src/client/renderer/blockmodel/FaceBakery.java rename to client/src/client/renderer/blockmodel/FaceBakery.java diff --git a/java/src/client/renderer/blockmodel/IBakedModel.java b/client/src/client/renderer/blockmodel/IBakedModel.java similarity index 100% rename from java/src/client/renderer/blockmodel/IBakedModel.java rename to client/src/client/renderer/blockmodel/IBakedModel.java diff --git a/java/src/client/renderer/blockmodel/ModelBakery.java b/client/src/client/renderer/blockmodel/ModelBakery.java similarity index 100% rename from java/src/client/renderer/blockmodel/ModelBakery.java rename to client/src/client/renderer/blockmodel/ModelBakery.java diff --git a/java/src/client/renderer/blockmodel/ModelBlock.java b/client/src/client/renderer/blockmodel/ModelBlock.java similarity index 100% rename from java/src/client/renderer/blockmodel/ModelBlock.java rename to client/src/client/renderer/blockmodel/ModelBlock.java diff --git a/java/src/client/renderer/blockmodel/ModelGenerator.java b/client/src/client/renderer/blockmodel/ModelGenerator.java similarity index 100% rename from java/src/client/renderer/blockmodel/ModelGenerator.java rename to client/src/client/renderer/blockmodel/ModelGenerator.java diff --git a/java/src/client/renderer/blockmodel/ModelManager.java b/client/src/client/renderer/blockmodel/ModelManager.java similarity index 100% rename from java/src/client/renderer/blockmodel/ModelManager.java rename to client/src/client/renderer/blockmodel/ModelManager.java diff --git a/java/src/client/renderer/blockmodel/MultiStateMap.java b/client/src/client/renderer/blockmodel/MultiStateMap.java similarity index 100% rename from java/src/client/renderer/blockmodel/MultiStateMap.java rename to client/src/client/renderer/blockmodel/MultiStateMap.java diff --git a/java/src/client/renderer/blockmodel/SingleStateMap.java b/client/src/client/renderer/blockmodel/SingleStateMap.java similarity index 100% rename from java/src/client/renderer/blockmodel/SingleStateMap.java rename to client/src/client/renderer/blockmodel/SingleStateMap.java diff --git a/java/src/client/renderer/blockmodel/StateMap.java b/client/src/client/renderer/blockmodel/StateMap.java similarity index 100% rename from java/src/client/renderer/blockmodel/StateMap.java rename to client/src/client/renderer/blockmodel/StateMap.java diff --git a/java/src/client/renderer/chunk/ChunkCompileTaskGenerator.java b/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java similarity index 100% rename from java/src/client/renderer/chunk/ChunkCompileTaskGenerator.java rename to client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java diff --git a/java/src/client/renderer/chunk/ChunkRenderDispatcher.java b/client/src/client/renderer/chunk/ChunkRenderDispatcher.java similarity index 100% rename from java/src/client/renderer/chunk/ChunkRenderDispatcher.java rename to client/src/client/renderer/chunk/ChunkRenderDispatcher.java diff --git a/java/src/client/renderer/chunk/ChunkRenderWorker.java b/client/src/client/renderer/chunk/ChunkRenderWorker.java similarity index 100% rename from java/src/client/renderer/chunk/ChunkRenderWorker.java rename to client/src/client/renderer/chunk/ChunkRenderWorker.java diff --git a/java/src/client/renderer/chunk/CompiledChunk.java b/client/src/client/renderer/chunk/CompiledChunk.java similarity index 100% rename from java/src/client/renderer/chunk/CompiledChunk.java rename to client/src/client/renderer/chunk/CompiledChunk.java diff --git a/java/src/client/renderer/chunk/RenderChunk.java b/client/src/client/renderer/chunk/RenderChunk.java similarity index 100% rename from java/src/client/renderer/chunk/RenderChunk.java rename to client/src/client/renderer/chunk/RenderChunk.java diff --git a/java/src/client/renderer/chunk/SetVisibility.java b/client/src/client/renderer/chunk/SetVisibility.java similarity index 100% rename from java/src/client/renderer/chunk/SetVisibility.java rename to client/src/client/renderer/chunk/SetVisibility.java diff --git a/java/src/client/renderer/chunk/VisGraph.java b/client/src/client/renderer/chunk/VisGraph.java similarity index 100% rename from java/src/client/renderer/chunk/VisGraph.java rename to client/src/client/renderer/chunk/VisGraph.java diff --git a/java/src/client/renderer/entity/Render.java b/client/src/client/renderer/entity/Render.java similarity index 100% rename from java/src/client/renderer/entity/Render.java rename to client/src/client/renderer/entity/Render.java diff --git a/java/src/client/renderer/entity/RenderArachnoid.java b/client/src/client/renderer/entity/RenderArachnoid.java similarity index 100% rename from java/src/client/renderer/entity/RenderArachnoid.java rename to client/src/client/renderer/entity/RenderArachnoid.java diff --git a/java/src/client/renderer/entity/RenderArrow.java b/client/src/client/renderer/entity/RenderArrow.java similarity index 100% rename from java/src/client/renderer/entity/RenderArrow.java rename to client/src/client/renderer/entity/RenderArrow.java diff --git a/java/src/client/renderer/entity/RenderBat.java b/client/src/client/renderer/entity/RenderBat.java similarity index 100% rename from java/src/client/renderer/entity/RenderBat.java rename to client/src/client/renderer/entity/RenderBat.java diff --git a/java/src/client/renderer/entity/RenderBlockEntity.java b/client/src/client/renderer/entity/RenderBlockEntity.java similarity index 100% rename from java/src/client/renderer/entity/RenderBlockEntity.java rename to client/src/client/renderer/entity/RenderBlockEntity.java diff --git a/java/src/client/renderer/entity/RenderBoat.java b/client/src/client/renderer/entity/RenderBoat.java similarity index 100% rename from java/src/client/renderer/entity/RenderBoat.java rename to client/src/client/renderer/entity/RenderBoat.java diff --git a/java/src/client/renderer/entity/RenderBullet.java b/client/src/client/renderer/entity/RenderBullet.java similarity index 100% rename from java/src/client/renderer/entity/RenderBullet.java rename to client/src/client/renderer/entity/RenderBullet.java diff --git a/java/src/client/renderer/entity/RenderChicken.java b/client/src/client/renderer/entity/RenderChicken.java similarity index 100% rename from java/src/client/renderer/entity/RenderChicken.java rename to client/src/client/renderer/entity/RenderChicken.java diff --git a/java/src/client/renderer/entity/RenderCow.java b/client/src/client/renderer/entity/RenderCow.java similarity index 100% rename from java/src/client/renderer/entity/RenderCow.java rename to client/src/client/renderer/entity/RenderCow.java diff --git a/java/src/client/renderer/entity/RenderCrystal.java b/client/src/client/renderer/entity/RenderCrystal.java similarity index 100% rename from java/src/client/renderer/entity/RenderCrystal.java rename to client/src/client/renderer/entity/RenderCrystal.java diff --git a/java/src/client/renderer/entity/RenderDie.java b/client/src/client/renderer/entity/RenderDie.java similarity index 100% rename from java/src/client/renderer/entity/RenderDie.java rename to client/src/client/renderer/entity/RenderDie.java diff --git a/java/src/client/renderer/entity/RenderDragon.java b/client/src/client/renderer/entity/RenderDragon.java similarity index 100% rename from java/src/client/renderer/entity/RenderDragon.java rename to client/src/client/renderer/entity/RenderDragon.java diff --git a/java/src/client/renderer/entity/RenderDynamite.java b/client/src/client/renderer/entity/RenderDynamite.java similarity index 100% rename from java/src/client/renderer/entity/RenderDynamite.java rename to client/src/client/renderer/entity/RenderDynamite.java diff --git a/java/src/client/renderer/entity/RenderEntity.java b/client/src/client/renderer/entity/RenderEntity.java similarity index 100% rename from java/src/client/renderer/entity/RenderEntity.java rename to client/src/client/renderer/entity/RenderEntity.java diff --git a/java/src/client/renderer/entity/RenderEntityItem.java b/client/src/client/renderer/entity/RenderEntityItem.java similarity index 100% rename from java/src/client/renderer/entity/RenderEntityItem.java rename to client/src/client/renderer/entity/RenderEntityItem.java diff --git a/java/src/client/renderer/entity/RenderFallingBlock.java b/client/src/client/renderer/entity/RenderFallingBlock.java similarity index 100% rename from java/src/client/renderer/entity/RenderFallingBlock.java rename to client/src/client/renderer/entity/RenderFallingBlock.java diff --git a/java/src/client/renderer/entity/RenderFireball.java b/client/src/client/renderer/entity/RenderFireball.java similarity index 100% rename from java/src/client/renderer/entity/RenderFireball.java rename to client/src/client/renderer/entity/RenderFireball.java diff --git a/java/src/client/renderer/entity/RenderFish.java b/client/src/client/renderer/entity/RenderFish.java similarity index 100% rename from java/src/client/renderer/entity/RenderFish.java rename to client/src/client/renderer/entity/RenderFish.java diff --git a/java/src/client/renderer/entity/RenderFlyingBox.java b/client/src/client/renderer/entity/RenderFlyingBox.java similarity index 100% rename from java/src/client/renderer/entity/RenderFlyingBox.java rename to client/src/client/renderer/entity/RenderFlyingBox.java diff --git a/java/src/client/renderer/entity/RenderHorse.java b/client/src/client/renderer/entity/RenderHorse.java similarity index 100% rename from java/src/client/renderer/entity/RenderHorse.java rename to client/src/client/renderer/entity/RenderHorse.java diff --git a/java/src/client/renderer/entity/RenderHumanoid.java b/client/src/client/renderer/entity/RenderHumanoid.java similarity index 100% rename from java/src/client/renderer/entity/RenderHumanoid.java rename to client/src/client/renderer/entity/RenderHumanoid.java diff --git a/java/src/client/renderer/entity/RenderItem.java b/client/src/client/renderer/entity/RenderItem.java similarity index 100% rename from java/src/client/renderer/entity/RenderItem.java rename to client/src/client/renderer/entity/RenderItem.java diff --git a/java/src/client/renderer/entity/RenderItemEntity.java b/client/src/client/renderer/entity/RenderItemEntity.java similarity index 100% rename from java/src/client/renderer/entity/RenderItemEntity.java rename to client/src/client/renderer/entity/RenderItemEntity.java diff --git a/java/src/client/renderer/entity/RenderLeashKnot.java b/client/src/client/renderer/entity/RenderLeashKnot.java similarity index 100% rename from java/src/client/renderer/entity/RenderLeashKnot.java rename to client/src/client/renderer/entity/RenderLeashKnot.java diff --git a/java/src/client/renderer/entity/RenderLightning.java b/client/src/client/renderer/entity/RenderLightning.java similarity index 100% rename from java/src/client/renderer/entity/RenderLightning.java rename to client/src/client/renderer/entity/RenderLightning.java diff --git a/java/src/client/renderer/entity/RenderLiving.java b/client/src/client/renderer/entity/RenderLiving.java similarity index 100% rename from java/src/client/renderer/entity/RenderLiving.java rename to client/src/client/renderer/entity/RenderLiving.java diff --git a/java/src/client/renderer/entity/RenderManager.java b/client/src/client/renderer/entity/RenderManager.java similarity index 100% rename from java/src/client/renderer/entity/RenderManager.java rename to client/src/client/renderer/entity/RenderManager.java diff --git a/java/src/client/renderer/entity/RenderMinecart.java b/client/src/client/renderer/entity/RenderMinecart.java similarity index 100% rename from java/src/client/renderer/entity/RenderMinecart.java rename to client/src/client/renderer/entity/RenderMinecart.java diff --git a/java/src/client/renderer/entity/RenderMooshroom.java b/client/src/client/renderer/entity/RenderMooshroom.java similarity index 100% rename from java/src/client/renderer/entity/RenderMooshroom.java rename to client/src/client/renderer/entity/RenderMooshroom.java diff --git a/java/src/client/renderer/entity/RenderMouse.java b/client/src/client/renderer/entity/RenderMouse.java similarity index 100% rename from java/src/client/renderer/entity/RenderMouse.java rename to client/src/client/renderer/entity/RenderMouse.java diff --git a/java/src/client/renderer/entity/RenderNpc.java b/client/src/client/renderer/entity/RenderNpc.java similarity index 100% rename from java/src/client/renderer/entity/RenderNpc.java rename to client/src/client/renderer/entity/RenderNpc.java diff --git a/java/src/client/renderer/entity/RenderOcelot.java b/client/src/client/renderer/entity/RenderOcelot.java similarity index 100% rename from java/src/client/renderer/entity/RenderOcelot.java rename to client/src/client/renderer/entity/RenderOcelot.java diff --git a/java/src/client/renderer/entity/RenderPig.java b/client/src/client/renderer/entity/RenderPig.java similarity index 100% rename from java/src/client/renderer/entity/RenderPig.java rename to client/src/client/renderer/entity/RenderPig.java diff --git a/java/src/client/renderer/entity/RenderPotion.java b/client/src/client/renderer/entity/RenderPotion.java similarity index 100% rename from java/src/client/renderer/entity/RenderPotion.java rename to client/src/client/renderer/entity/RenderPotion.java diff --git a/java/src/client/renderer/entity/RenderRabbit.java b/client/src/client/renderer/entity/RenderRabbit.java similarity index 100% rename from java/src/client/renderer/entity/RenderRabbit.java rename to client/src/client/renderer/entity/RenderRabbit.java diff --git a/java/src/client/renderer/entity/RenderSheep.java b/client/src/client/renderer/entity/RenderSheep.java similarity index 100% rename from java/src/client/renderer/entity/RenderSheep.java rename to client/src/client/renderer/entity/RenderSheep.java diff --git a/java/src/client/renderer/entity/RenderSlime.java b/client/src/client/renderer/entity/RenderSlime.java similarity index 100% rename from java/src/client/renderer/entity/RenderSlime.java rename to client/src/client/renderer/entity/RenderSlime.java diff --git a/java/src/client/renderer/entity/RenderSpaceMarine.java b/client/src/client/renderer/entity/RenderSpaceMarine.java similarity index 100% rename from java/src/client/renderer/entity/RenderSpaceMarine.java rename to client/src/client/renderer/entity/RenderSpaceMarine.java diff --git a/java/src/client/renderer/entity/RenderSquid.java b/client/src/client/renderer/entity/RenderSquid.java similarity index 100% rename from java/src/client/renderer/entity/RenderSquid.java rename to client/src/client/renderer/entity/RenderSquid.java diff --git a/java/src/client/renderer/entity/RenderTntMinecart.java b/client/src/client/renderer/entity/RenderTntMinecart.java similarity index 100% rename from java/src/client/renderer/entity/RenderTntMinecart.java rename to client/src/client/renderer/entity/RenderTntMinecart.java diff --git a/java/src/client/renderer/entity/RenderTntPrimed.java b/client/src/client/renderer/entity/RenderTntPrimed.java similarity index 100% rename from java/src/client/renderer/entity/RenderTntPrimed.java rename to client/src/client/renderer/entity/RenderTntPrimed.java diff --git a/java/src/client/renderer/entity/RenderWolf.java b/client/src/client/renderer/entity/RenderWolf.java similarity index 100% rename from java/src/client/renderer/entity/RenderWolf.java rename to client/src/client/renderer/entity/RenderWolf.java diff --git a/java/src/client/renderer/entity/RenderXpOrb.java b/client/src/client/renderer/entity/RenderXpOrb.java similarity index 100% rename from java/src/client/renderer/entity/RenderXpOrb.java rename to client/src/client/renderer/entity/RenderXpOrb.java diff --git a/java/src/client/renderer/entity/RendererLivingEntity.java b/client/src/client/renderer/entity/RendererLivingEntity.java similarity index 100% rename from java/src/client/renderer/entity/RendererLivingEntity.java rename to client/src/client/renderer/entity/RendererLivingEntity.java diff --git a/java/src/client/renderer/layers/LayerArachnoidArmor.java b/client/src/client/renderer/layers/LayerArachnoidArmor.java similarity index 100% rename from java/src/client/renderer/layers/LayerArachnoidArmor.java rename to client/src/client/renderer/layers/LayerArachnoidArmor.java diff --git a/java/src/client/renderer/layers/LayerArmor.java b/client/src/client/renderer/layers/LayerArmor.java similarity index 100% rename from java/src/client/renderer/layers/LayerArmor.java rename to client/src/client/renderer/layers/LayerArmor.java diff --git a/java/src/client/renderer/layers/LayerArrow.java b/client/src/client/renderer/layers/LayerArrow.java similarity index 100% rename from java/src/client/renderer/layers/LayerArrow.java rename to client/src/client/renderer/layers/LayerArrow.java diff --git a/java/src/client/renderer/layers/LayerCape.java b/client/src/client/renderer/layers/LayerCape.java similarity index 100% rename from java/src/client/renderer/layers/LayerCape.java rename to client/src/client/renderer/layers/LayerCape.java diff --git a/java/src/client/renderer/layers/LayerCharge.java b/client/src/client/renderer/layers/LayerCharge.java similarity index 100% rename from java/src/client/renderer/layers/LayerCharge.java rename to client/src/client/renderer/layers/LayerCharge.java diff --git a/java/src/client/renderer/layers/LayerEnderDragonEyes.java b/client/src/client/renderer/layers/LayerEnderDragonEyes.java similarity index 100% rename from java/src/client/renderer/layers/LayerEnderDragonEyes.java rename to client/src/client/renderer/layers/LayerEnderDragonEyes.java diff --git a/java/src/client/renderer/layers/LayerEntityBreak.java b/client/src/client/renderer/layers/LayerEntityBreak.java similarity index 100% rename from java/src/client/renderer/layers/LayerEntityBreak.java rename to client/src/client/renderer/layers/LayerEntityBreak.java diff --git a/java/src/client/renderer/layers/LayerExtra.java b/client/src/client/renderer/layers/LayerExtra.java similarity index 100% rename from java/src/client/renderer/layers/LayerExtra.java rename to client/src/client/renderer/layers/LayerExtra.java diff --git a/java/src/client/renderer/layers/LayerHeldItem.java b/client/src/client/renderer/layers/LayerHeldItem.java similarity index 100% rename from java/src/client/renderer/layers/LayerHeldItem.java rename to client/src/client/renderer/layers/LayerHeldItem.java diff --git a/java/src/client/renderer/layers/LayerMooshroomMushroom.java b/client/src/client/renderer/layers/LayerMooshroomMushroom.java similarity index 100% rename from java/src/client/renderer/layers/LayerMooshroomMushroom.java rename to client/src/client/renderer/layers/LayerMooshroomMushroom.java diff --git a/java/src/client/renderer/layers/LayerPowerRods.java b/client/src/client/renderer/layers/LayerPowerRods.java similarity index 100% rename from java/src/client/renderer/layers/LayerPowerRods.java rename to client/src/client/renderer/layers/LayerPowerRods.java diff --git a/java/src/client/renderer/layers/LayerRenderer.java b/client/src/client/renderer/layers/LayerRenderer.java similarity index 100% rename from java/src/client/renderer/layers/LayerRenderer.java rename to client/src/client/renderer/layers/LayerRenderer.java diff --git a/java/src/client/renderer/layers/LayerSaddle.java b/client/src/client/renderer/layers/LayerSaddle.java similarity index 100% rename from java/src/client/renderer/layers/LayerSaddle.java rename to client/src/client/renderer/layers/LayerSaddle.java diff --git a/java/src/client/renderer/layers/LayerSheepWool.java b/client/src/client/renderer/layers/LayerSheepWool.java similarity index 100% rename from java/src/client/renderer/layers/LayerSheepWool.java rename to client/src/client/renderer/layers/LayerSheepWool.java diff --git a/java/src/client/renderer/layers/LayerSlimeGel.java b/client/src/client/renderer/layers/LayerSlimeGel.java similarity index 100% rename from java/src/client/renderer/layers/LayerSlimeGel.java rename to client/src/client/renderer/layers/LayerSlimeGel.java diff --git a/java/src/client/renderer/layers/LayerWolfCollar.java b/client/src/client/renderer/layers/LayerWolfCollar.java similarity index 100% rename from java/src/client/renderer/layers/LayerWolfCollar.java rename to client/src/client/renderer/layers/LayerWolfCollar.java diff --git a/java/src/client/renderer/model/ModelArachnoid.java b/client/src/client/renderer/model/ModelArachnoid.java similarity index 100% rename from java/src/client/renderer/model/ModelArachnoid.java rename to client/src/client/renderer/model/ModelArachnoid.java diff --git a/java/src/client/renderer/model/ModelArmor.java b/client/src/client/renderer/model/ModelArmor.java similarity index 100% rename from java/src/client/renderer/model/ModelArmor.java rename to client/src/client/renderer/model/ModelArmor.java diff --git a/java/src/client/renderer/model/ModelBanner.java b/client/src/client/renderer/model/ModelBanner.java similarity index 100% rename from java/src/client/renderer/model/ModelBanner.java rename to client/src/client/renderer/model/ModelBanner.java diff --git a/java/src/client/renderer/model/ModelBase.java b/client/src/client/renderer/model/ModelBase.java similarity index 100% rename from java/src/client/renderer/model/ModelBase.java rename to client/src/client/renderer/model/ModelBase.java diff --git a/java/src/client/renderer/model/ModelBat.java b/client/src/client/renderer/model/ModelBat.java similarity index 100% rename from java/src/client/renderer/model/ModelBat.java rename to client/src/client/renderer/model/ModelBat.java diff --git a/java/src/client/renderer/model/ModelBiped.java b/client/src/client/renderer/model/ModelBiped.java similarity index 100% rename from java/src/client/renderer/model/ModelBiped.java rename to client/src/client/renderer/model/ModelBiped.java diff --git a/java/src/client/renderer/model/ModelBoat.java b/client/src/client/renderer/model/ModelBoat.java similarity index 100% rename from java/src/client/renderer/model/ModelBoat.java rename to client/src/client/renderer/model/ModelBoat.java diff --git a/java/src/client/renderer/model/ModelBox.java b/client/src/client/renderer/model/ModelBox.java similarity index 100% rename from java/src/client/renderer/model/ModelBox.java rename to client/src/client/renderer/model/ModelBox.java diff --git a/java/src/client/renderer/model/ModelCharge.java b/client/src/client/renderer/model/ModelCharge.java similarity index 100% rename from java/src/client/renderer/model/ModelCharge.java rename to client/src/client/renderer/model/ModelCharge.java diff --git a/java/src/client/renderer/model/ModelChest.java b/client/src/client/renderer/model/ModelChest.java similarity index 100% rename from java/src/client/renderer/model/ModelChest.java rename to client/src/client/renderer/model/ModelChest.java diff --git a/java/src/client/renderer/model/ModelChicken.java b/client/src/client/renderer/model/ModelChicken.java similarity index 100% rename from java/src/client/renderer/model/ModelChicken.java rename to client/src/client/renderer/model/ModelChicken.java diff --git a/java/src/client/renderer/model/ModelCow.java b/client/src/client/renderer/model/ModelCow.java similarity index 100% rename from java/src/client/renderer/model/ModelCow.java rename to client/src/client/renderer/model/ModelCow.java diff --git a/java/src/client/renderer/model/ModelCrystal.java b/client/src/client/renderer/model/ModelCrystal.java similarity index 100% rename from java/src/client/renderer/model/ModelCrystal.java rename to client/src/client/renderer/model/ModelCrystal.java diff --git a/java/src/client/renderer/model/ModelDie.java b/client/src/client/renderer/model/ModelDie.java similarity index 100% rename from java/src/client/renderer/model/ModelDie.java rename to client/src/client/renderer/model/ModelDie.java diff --git a/java/src/client/renderer/model/ModelDragon.java b/client/src/client/renderer/model/ModelDragon.java similarity index 100% rename from java/src/client/renderer/model/ModelDragon.java rename to client/src/client/renderer/model/ModelDragon.java diff --git a/java/src/client/renderer/model/ModelHead.java b/client/src/client/renderer/model/ModelHead.java similarity index 100% rename from java/src/client/renderer/model/ModelHead.java rename to client/src/client/renderer/model/ModelHead.java diff --git a/java/src/client/renderer/model/ModelHorse.java b/client/src/client/renderer/model/ModelHorse.java similarity index 100% rename from java/src/client/renderer/model/ModelHorse.java rename to client/src/client/renderer/model/ModelHorse.java diff --git a/java/src/client/renderer/model/ModelHumanoid.java b/client/src/client/renderer/model/ModelHumanoid.java similarity index 100% rename from java/src/client/renderer/model/ModelHumanoid.java rename to client/src/client/renderer/model/ModelHumanoid.java diff --git a/java/src/client/renderer/model/ModelHumanoidHead.java b/client/src/client/renderer/model/ModelHumanoidHead.java similarity index 100% rename from java/src/client/renderer/model/ModelHumanoidHead.java rename to client/src/client/renderer/model/ModelHumanoidHead.java diff --git a/java/src/client/renderer/model/ModelLargeChest.java b/client/src/client/renderer/model/ModelLargeChest.java similarity index 100% rename from java/src/client/renderer/model/ModelLargeChest.java rename to client/src/client/renderer/model/ModelLargeChest.java diff --git a/java/src/client/renderer/model/ModelLeashKnot.java b/client/src/client/renderer/model/ModelLeashKnot.java similarity index 100% rename from java/src/client/renderer/model/ModelLeashKnot.java rename to client/src/client/renderer/model/ModelLeashKnot.java diff --git a/java/src/client/renderer/model/ModelMinecart.java b/client/src/client/renderer/model/ModelMinecart.java similarity index 100% rename from java/src/client/renderer/model/ModelMinecart.java rename to client/src/client/renderer/model/ModelMinecart.java diff --git a/java/src/client/renderer/model/ModelMouse.java b/client/src/client/renderer/model/ModelMouse.java similarity index 100% rename from java/src/client/renderer/model/ModelMouse.java rename to client/src/client/renderer/model/ModelMouse.java diff --git a/java/src/client/renderer/model/ModelOcelot.java b/client/src/client/renderer/model/ModelOcelot.java similarity index 100% rename from java/src/client/renderer/model/ModelOcelot.java rename to client/src/client/renderer/model/ModelOcelot.java diff --git a/java/src/client/renderer/model/ModelPig.java b/client/src/client/renderer/model/ModelPig.java similarity index 100% rename from java/src/client/renderer/model/ModelPig.java rename to client/src/client/renderer/model/ModelPig.java diff --git a/java/src/client/renderer/model/ModelQuadruped.java b/client/src/client/renderer/model/ModelQuadruped.java similarity index 100% rename from java/src/client/renderer/model/ModelQuadruped.java rename to client/src/client/renderer/model/ModelQuadruped.java diff --git a/java/src/client/renderer/model/ModelRabbit.java b/client/src/client/renderer/model/ModelRabbit.java similarity index 100% rename from java/src/client/renderer/model/ModelRabbit.java rename to client/src/client/renderer/model/ModelRabbit.java diff --git a/java/src/client/renderer/model/ModelRenderer.java b/client/src/client/renderer/model/ModelRenderer.java similarity index 100% rename from java/src/client/renderer/model/ModelRenderer.java rename to client/src/client/renderer/model/ModelRenderer.java diff --git a/java/src/client/renderer/model/ModelSheep1.java b/client/src/client/renderer/model/ModelSheep1.java similarity index 100% rename from java/src/client/renderer/model/ModelSheep1.java rename to client/src/client/renderer/model/ModelSheep1.java diff --git a/java/src/client/renderer/model/ModelSheep2.java b/client/src/client/renderer/model/ModelSheep2.java similarity index 100% rename from java/src/client/renderer/model/ModelSheep2.java rename to client/src/client/renderer/model/ModelSheep2.java diff --git a/java/src/client/renderer/model/ModelSign.java b/client/src/client/renderer/model/ModelSign.java similarity index 100% rename from java/src/client/renderer/model/ModelSign.java rename to client/src/client/renderer/model/ModelSign.java diff --git a/java/src/client/renderer/model/ModelSlime.java b/client/src/client/renderer/model/ModelSlime.java similarity index 100% rename from java/src/client/renderer/model/ModelSlime.java rename to client/src/client/renderer/model/ModelSlime.java diff --git a/java/src/client/renderer/model/ModelSpaceMarine.java b/client/src/client/renderer/model/ModelSpaceMarine.java similarity index 100% rename from java/src/client/renderer/model/ModelSpaceMarine.java rename to client/src/client/renderer/model/ModelSpaceMarine.java diff --git a/java/src/client/renderer/model/ModelSquid.java b/client/src/client/renderer/model/ModelSquid.java similarity index 100% rename from java/src/client/renderer/model/ModelSquid.java rename to client/src/client/renderer/model/ModelSquid.java diff --git a/java/src/client/renderer/model/ModelWolf.java b/client/src/client/renderer/model/ModelWolf.java similarity index 100% rename from java/src/client/renderer/model/ModelWolf.java rename to client/src/client/renderer/model/ModelWolf.java diff --git a/java/src/client/renderer/model/PositionTextureVertex.java b/client/src/client/renderer/model/PositionTextureVertex.java similarity index 100% rename from java/src/client/renderer/model/PositionTextureVertex.java rename to client/src/client/renderer/model/PositionTextureVertex.java diff --git a/java/src/client/renderer/model/TextureOffset.java b/client/src/client/renderer/model/TextureOffset.java similarity index 100% rename from java/src/client/renderer/model/TextureOffset.java rename to client/src/client/renderer/model/TextureOffset.java diff --git a/java/src/client/renderer/model/TexturedQuad.java b/client/src/client/renderer/model/TexturedQuad.java similarity index 100% rename from java/src/client/renderer/model/TexturedQuad.java rename to client/src/client/renderer/model/TexturedQuad.java diff --git a/java/src/client/renderer/particle/EffectRenderer.java b/client/src/client/renderer/particle/EffectRenderer.java similarity index 100% rename from java/src/client/renderer/particle/EffectRenderer.java rename to client/src/client/renderer/particle/EffectRenderer.java diff --git a/java/src/client/renderer/particle/EntityAuraFX.java b/client/src/client/renderer/particle/EntityAuraFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityAuraFX.java rename to client/src/client/renderer/particle/EntityAuraFX.java diff --git a/java/src/client/renderer/particle/EntityBlockDustFX.java b/client/src/client/renderer/particle/EntityBlockDustFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityBlockDustFX.java rename to client/src/client/renderer/particle/EntityBlockDustFX.java diff --git a/java/src/client/renderer/particle/EntityBreakingFX.java b/client/src/client/renderer/particle/EntityBreakingFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityBreakingFX.java rename to client/src/client/renderer/particle/EntityBreakingFX.java diff --git a/java/src/client/renderer/particle/EntityBubbleFX.java b/client/src/client/renderer/particle/EntityBubbleFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityBubbleFX.java rename to client/src/client/renderer/particle/EntityBubbleFX.java diff --git a/java/src/client/renderer/particle/EntityCloudFX.java b/client/src/client/renderer/particle/EntityCloudFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityCloudFX.java rename to client/src/client/renderer/particle/EntityCloudFX.java diff --git a/java/src/client/renderer/particle/EntityCrit2FX.java b/client/src/client/renderer/particle/EntityCrit2FX.java similarity index 100% rename from java/src/client/renderer/particle/EntityCrit2FX.java rename to client/src/client/renderer/particle/EntityCrit2FX.java diff --git a/java/src/client/renderer/particle/EntityCritFX.java b/client/src/client/renderer/particle/EntityCritFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityCritFX.java rename to client/src/client/renderer/particle/EntityCritFX.java diff --git a/java/src/client/renderer/particle/EntityDiggingFX.java b/client/src/client/renderer/particle/EntityDiggingFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityDiggingFX.java rename to client/src/client/renderer/particle/EntityDiggingFX.java diff --git a/java/src/client/renderer/particle/EntityDownfallFX.java b/client/src/client/renderer/particle/EntityDownfallFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityDownfallFX.java rename to client/src/client/renderer/particle/EntityDownfallFX.java diff --git a/java/src/client/renderer/particle/EntityDropParticleFX.java b/client/src/client/renderer/particle/EntityDropParticleFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityDropParticleFX.java rename to client/src/client/renderer/particle/EntityDropParticleFX.java diff --git a/java/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java b/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java rename to client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java diff --git a/java/src/client/renderer/particle/EntityExplodeFX.java b/client/src/client/renderer/particle/EntityExplodeFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityExplodeFX.java rename to client/src/client/renderer/particle/EntityExplodeFX.java diff --git a/java/src/client/renderer/particle/EntityFX.java b/client/src/client/renderer/particle/EntityFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityFX.java rename to client/src/client/renderer/particle/EntityFX.java diff --git a/java/src/client/renderer/particle/EntityFirework.java b/client/src/client/renderer/particle/EntityFirework.java similarity index 100% rename from java/src/client/renderer/particle/EntityFirework.java rename to client/src/client/renderer/particle/EntityFirework.java diff --git a/java/src/client/renderer/particle/EntityFishWakeFX.java b/client/src/client/renderer/particle/EntityFishWakeFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityFishWakeFX.java rename to client/src/client/renderer/particle/EntityFishWakeFX.java diff --git a/java/src/client/renderer/particle/EntityFlameFX.java b/client/src/client/renderer/particle/EntityFlameFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityFlameFX.java rename to client/src/client/renderer/particle/EntityFlameFX.java diff --git a/java/src/client/renderer/particle/EntityFootStepFX.java b/client/src/client/renderer/particle/EntityFootStepFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityFootStepFX.java rename to client/src/client/renderer/particle/EntityFootStepFX.java diff --git a/java/src/client/renderer/particle/EntityHeartFX.java b/client/src/client/renderer/particle/EntityHeartFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityHeartFX.java rename to client/src/client/renderer/particle/EntityHeartFX.java diff --git a/java/src/client/renderer/particle/EntityHugeExplodeFX.java b/client/src/client/renderer/particle/EntityHugeExplodeFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityHugeExplodeFX.java rename to client/src/client/renderer/particle/EntityHugeExplodeFX.java diff --git a/java/src/client/renderer/particle/EntityLargeExplodeFX.java b/client/src/client/renderer/particle/EntityLargeExplodeFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityLargeExplodeFX.java rename to client/src/client/renderer/particle/EntityLargeExplodeFX.java diff --git a/java/src/client/renderer/particle/EntityLavaFX.java b/client/src/client/renderer/particle/EntityLavaFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityLavaFX.java rename to client/src/client/renderer/particle/EntityLavaFX.java diff --git a/java/src/client/renderer/particle/EntityNoteFX.java b/client/src/client/renderer/particle/EntityNoteFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityNoteFX.java rename to client/src/client/renderer/particle/EntityNoteFX.java diff --git a/java/src/client/renderer/particle/EntityParticleEmitter.java b/client/src/client/renderer/particle/EntityParticleEmitter.java similarity index 100% rename from java/src/client/renderer/particle/EntityParticleEmitter.java rename to client/src/client/renderer/particle/EntityParticleEmitter.java diff --git a/java/src/client/renderer/particle/EntityPickupFX.java b/client/src/client/renderer/particle/EntityPickupFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityPickupFX.java rename to client/src/client/renderer/particle/EntityPickupFX.java diff --git a/java/src/client/renderer/particle/EntityPortalFX.java b/client/src/client/renderer/particle/EntityPortalFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityPortalFX.java rename to client/src/client/renderer/particle/EntityPortalFX.java diff --git a/java/src/client/renderer/particle/EntityReddustFX.java b/client/src/client/renderer/particle/EntityReddustFX.java similarity index 100% rename from java/src/client/renderer/particle/EntityReddustFX.java rename to client/src/client/renderer/particle/EntityReddustFX.java diff --git a/java/src/client/renderer/particle/EntitySmokeFX.java b/client/src/client/renderer/particle/EntitySmokeFX.java similarity index 100% rename from java/src/client/renderer/particle/EntitySmokeFX.java rename to client/src/client/renderer/particle/EntitySmokeFX.java diff --git a/java/src/client/renderer/particle/EntitySnowShovelFX.java b/client/src/client/renderer/particle/EntitySnowShovelFX.java similarity index 100% rename from java/src/client/renderer/particle/EntitySnowShovelFX.java rename to client/src/client/renderer/particle/EntitySnowShovelFX.java diff --git a/java/src/client/renderer/particle/EntitySpellParticleFX.java b/client/src/client/renderer/particle/EntitySpellParticleFX.java similarity index 100% rename from java/src/client/renderer/particle/EntitySpellParticleFX.java rename to client/src/client/renderer/particle/EntitySpellParticleFX.java diff --git a/java/src/client/renderer/particle/EntitySplashFX.java b/client/src/client/renderer/particle/EntitySplashFX.java similarity index 100% rename from java/src/client/renderer/particle/EntitySplashFX.java rename to client/src/client/renderer/particle/EntitySplashFX.java diff --git a/java/src/client/renderer/particle/EntitySuspendFX.java b/client/src/client/renderer/particle/EntitySuspendFX.java similarity index 100% rename from java/src/client/renderer/particle/EntitySuspendFX.java rename to client/src/client/renderer/particle/EntitySuspendFX.java diff --git a/java/src/client/renderer/particle/IParticleFactory.java b/client/src/client/renderer/particle/IParticleFactory.java similarity index 100% rename from java/src/client/renderer/particle/IParticleFactory.java rename to client/src/client/renderer/particle/IParticleFactory.java diff --git a/java/src/client/renderer/texture/DynamicTexture.java b/client/src/client/renderer/texture/DynamicTexture.java similarity index 100% rename from java/src/client/renderer/texture/DynamicTexture.java rename to client/src/client/renderer/texture/DynamicTexture.java diff --git a/java/src/client/renderer/texture/EntityTexManager.java b/client/src/client/renderer/texture/EntityTexManager.java similarity index 100% rename from java/src/client/renderer/texture/EntityTexManager.java rename to client/src/client/renderer/texture/EntityTexManager.java diff --git a/java/src/client/renderer/texture/IIconCreator.java b/client/src/client/renderer/texture/IIconCreator.java similarity index 100% rename from java/src/client/renderer/texture/IIconCreator.java rename to client/src/client/renderer/texture/IIconCreator.java diff --git a/java/src/client/renderer/texture/LayeredColorMaskTexture.java b/client/src/client/renderer/texture/LayeredColorMaskTexture.java similarity index 100% rename from java/src/client/renderer/texture/LayeredColorMaskTexture.java rename to client/src/client/renderer/texture/LayeredColorMaskTexture.java diff --git a/java/src/client/renderer/texture/LayeredTexture.java b/client/src/client/renderer/texture/LayeredTexture.java similarity index 100% rename from java/src/client/renderer/texture/LayeredTexture.java rename to client/src/client/renderer/texture/LayeredTexture.java diff --git a/java/src/client/renderer/texture/SimpleTexture.java b/client/src/client/renderer/texture/SimpleTexture.java similarity index 100% rename from java/src/client/renderer/texture/SimpleTexture.java rename to client/src/client/renderer/texture/SimpleTexture.java diff --git a/java/src/client/renderer/texture/Stitcher.java b/client/src/client/renderer/texture/Stitcher.java similarity index 100% rename from java/src/client/renderer/texture/Stitcher.java rename to client/src/client/renderer/texture/Stitcher.java diff --git a/java/src/client/renderer/texture/Texture.java b/client/src/client/renderer/texture/Texture.java similarity index 100% rename from java/src/client/renderer/texture/Texture.java rename to client/src/client/renderer/texture/Texture.java diff --git a/java/src/client/renderer/texture/TextureAtlasSprite.java b/client/src/client/renderer/texture/TextureAtlasSprite.java similarity index 100% rename from java/src/client/renderer/texture/TextureAtlasSprite.java rename to client/src/client/renderer/texture/TextureAtlasSprite.java diff --git a/java/src/client/renderer/texture/TextureManager.java b/client/src/client/renderer/texture/TextureManager.java similarity index 100% rename from java/src/client/renderer/texture/TextureManager.java rename to client/src/client/renderer/texture/TextureManager.java diff --git a/java/src/client/renderer/texture/TextureMap.java b/client/src/client/renderer/texture/TextureMap.java similarity index 100% rename from java/src/client/renderer/texture/TextureMap.java rename to client/src/client/renderer/texture/TextureMap.java diff --git a/java/src/client/renderer/texture/TextureTicked.java b/client/src/client/renderer/texture/TextureTicked.java similarity index 100% rename from java/src/client/renderer/texture/TextureTicked.java rename to client/src/client/renderer/texture/TextureTicked.java diff --git a/java/src/client/renderer/texture/TextureUtil.java b/client/src/client/renderer/texture/TextureUtil.java similarity index 100% rename from java/src/client/renderer/texture/TextureUtil.java rename to client/src/client/renderer/texture/TextureUtil.java diff --git a/java/src/client/renderer/ticked/TextureFlamesFX1.java b/client/src/client/renderer/ticked/TextureFlamesFX1.java similarity index 100% rename from java/src/client/renderer/ticked/TextureFlamesFX1.java rename to client/src/client/renderer/ticked/TextureFlamesFX1.java diff --git a/java/src/client/renderer/ticked/TextureFlamesFX2.java b/client/src/client/renderer/ticked/TextureFlamesFX2.java similarity index 100% rename from java/src/client/renderer/ticked/TextureFlamesFX2.java rename to client/src/client/renderer/ticked/TextureFlamesFX2.java diff --git a/java/src/client/renderer/ticked/TextureLavaFX.java b/client/src/client/renderer/ticked/TextureLavaFX.java similarity index 100% rename from java/src/client/renderer/ticked/TextureLavaFX.java rename to client/src/client/renderer/ticked/TextureLavaFX.java diff --git a/java/src/client/renderer/ticked/TextureLavaFlowFX.java b/client/src/client/renderer/ticked/TextureLavaFlowFX.java similarity index 100% rename from java/src/client/renderer/ticked/TextureLavaFlowFX.java rename to client/src/client/renderer/ticked/TextureLavaFlowFX.java diff --git a/java/src/client/renderer/ticked/TextureWaterFX.java b/client/src/client/renderer/ticked/TextureWaterFX.java similarity index 100% rename from java/src/client/renderer/ticked/TextureWaterFX.java rename to client/src/client/renderer/ticked/TextureWaterFX.java diff --git a/java/src/client/renderer/ticked/TextureWaterFlowFX.java b/client/src/client/renderer/ticked/TextureWaterFlowFX.java similarity index 100% rename from java/src/client/renderer/ticked/TextureWaterFlowFX.java rename to client/src/client/renderer/ticked/TextureWaterFlowFX.java diff --git a/java/src/client/renderer/tileentity/TileEntityBannerRenderer.java b/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityBannerRenderer.java rename to client/src/client/renderer/tileentity/TileEntityBannerRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntityChestRenderer.java b/client/src/client/renderer/tileentity/TileEntityChestRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityChestRenderer.java rename to client/src/client/renderer/tileentity/TileEntityChestRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityItemStackRenderer.java rename to client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java rename to client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntityPistonRenderer.java b/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityPistonRenderer.java rename to client/src/client/renderer/tileentity/TileEntityPistonRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntityRendererDispatcher.java b/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntityRendererDispatcher.java rename to client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java diff --git a/java/src/client/renderer/tileentity/TileEntitySignRenderer.java b/client/src/client/renderer/tileentity/TileEntitySignRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntitySignRenderer.java rename to client/src/client/renderer/tileentity/TileEntitySignRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntitySkullRenderer.java b/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntitySkullRenderer.java rename to client/src/client/renderer/tileentity/TileEntitySkullRenderer.java diff --git a/java/src/client/renderer/tileentity/TileEntitySpecialRenderer.java b/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java similarity index 100% rename from java/src/client/renderer/tileentity/TileEntitySpecialRenderer.java rename to client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java diff --git a/java/src/client/window/Bind.java b/client/src/client/window/Bind.java similarity index 100% rename from java/src/client/window/Bind.java rename to client/src/client/window/Bind.java diff --git a/java/src/client/window/Button.java b/client/src/client/window/Button.java similarity index 100% rename from java/src/client/window/Button.java rename to client/src/client/window/Button.java diff --git a/java/src/client/window/DisplayMode.java b/client/src/client/window/DisplayMode.java similarity index 100% rename from java/src/client/window/DisplayMode.java rename to client/src/client/window/DisplayMode.java diff --git a/java/src/client/window/Input.java b/client/src/client/window/Input.java similarity index 100% rename from java/src/client/window/Input.java rename to client/src/client/window/Input.java diff --git a/java/src/client/window/KeyEvent.java b/client/src/client/window/KeyEvent.java similarity index 100% rename from java/src/client/window/KeyEvent.java rename to client/src/client/window/KeyEvent.java diff --git a/java/src/client/window/Keysym.java b/client/src/client/window/Keysym.java similarity index 100% rename from java/src/client/window/Keysym.java rename to client/src/client/window/Keysym.java diff --git a/java/src/client/window/Wheel.java b/client/src/client/window/Wheel.java similarity index 100% rename from java/src/client/window/Wheel.java rename to client/src/client/window/Wheel.java diff --git a/java/src/client/window/Window.java b/client/src/client/window/Window.java similarity index 100% rename from java/src/client/window/Window.java rename to client/src/client/window/Window.java diff --git a/java/src/client/window/WindowAction.java b/client/src/client/window/WindowAction.java similarity index 100% rename from java/src/client/window/WindowAction.java rename to client/src/client/window/WindowAction.java diff --git a/java/src/client/window/WindowEvent.java b/client/src/client/window/WindowEvent.java similarity index 100% rename from java/src/client/window/WindowEvent.java rename to client/src/client/window/WindowEvent.java diff --git a/java/src/game/vars/BaseVar.java b/client/src/game/vars/BaseVar.java similarity index 100% rename from java/src/game/vars/BaseVar.java rename to client/src/game/vars/BaseVar.java diff --git a/java/src/game/vars/BoolVar.java b/client/src/game/vars/BoolVar.java similarity index 100% rename from java/src/game/vars/BoolVar.java rename to client/src/game/vars/BoolVar.java diff --git a/java/src/game/vars/CVar.java b/client/src/game/vars/CVar.java similarity index 100% rename from java/src/game/vars/CVar.java rename to client/src/game/vars/CVar.java diff --git a/java/src/game/vars/CVarCategory.java b/client/src/game/vars/CVarCategory.java similarity index 100% rename from java/src/game/vars/CVarCategory.java rename to client/src/game/vars/CVarCategory.java diff --git a/java/src/game/vars/ColorVar.java b/client/src/game/vars/ColorVar.java similarity index 100% rename from java/src/game/vars/ColorVar.java rename to client/src/game/vars/ColorVar.java diff --git a/java/src/game/vars/EnumVar.java b/client/src/game/vars/EnumVar.java similarity index 100% rename from java/src/game/vars/EnumVar.java rename to client/src/game/vars/EnumVar.java diff --git a/java/src/game/vars/FloatVar.java b/client/src/game/vars/FloatVar.java similarity index 100% rename from java/src/game/vars/FloatVar.java rename to client/src/game/vars/FloatVar.java diff --git a/java/src/game/vars/IntVar.java b/client/src/game/vars/IntVar.java similarity index 100% rename from java/src/game/vars/IntVar.java rename to client/src/game/vars/IntVar.java diff --git a/java/src/game/vars/StringVar.java b/client/src/game/vars/StringVar.java similarity index 100% rename from java/src/game/vars/StringVar.java rename to client/src/game/vars/StringVar.java diff --git a/java/src/game/vars/Variable.java b/client/src/game/vars/Variable.java similarity index 100% rename from java/src/game/vars/Variable.java rename to client/src/game/vars/Variable.java diff --git a/java/src/game/world/Converter.java b/client/src/game/world/Converter.java similarity index 99% rename from java/src/game/world/Converter.java rename to client/src/game/world/Converter.java index 279412e..c50ebe0 100644 --- a/java/src/game/world/Converter.java +++ b/client/src/game/world/Converter.java @@ -87,25 +87,9 @@ import game.tileentity.TileEntityPiston; import game.tileentity.TileEntitySign; import game.tileentity.TileEntitySkull; import game.world.Region.FolderInfo; +import game.world.Region.SaveVersion; public final class Converter { - public static enum SaveVersion { - ALPHA_1_0("Alpha 1.0 - Beta 1.2"), - BETA_1_3("Beta 1.3 - Release 1.8.9"), - RELEASE_1_9("Release 1.9 - Release 1.12.2"), - RELEASE_1_13("Release 1.13 +"); - - private final String name; - - private SaveVersion(String name) { - this.name = name; - } - - public String toString() { - return this.name; - } - } - // public static interface Callback { // void postMessage(String msg); // void postProgress(int progress); diff --git a/java/src/game/init/Config.java b/java/src/game/init/Config.java index 3210f9f..e59968e 100755 --- a/java/src/game/init/Config.java +++ b/java/src/game/init/Config.java @@ -14,7 +14,7 @@ import java.util.TreeMap; import game.packet.SPacketWorld; import game.util.ExtMath; import game.world.WorldServer; -import server.Server; +import game.IServer; public abstract class Config { public static enum ValueType { @@ -22,7 +22,7 @@ public abstract class Config { } private static interface Callback { - void run(Server server); + void run(IServer server); } @Target(FIELD) @@ -504,7 +504,7 @@ public abstract class Config { } } - public static void set(String key, String value, Server server) { + public static void set(String key, String value, IServer server) { Config.Value vl = VARS.get(key); if(vl != null) { vl.setValue(value); @@ -514,7 +514,7 @@ public abstract class Config { } public static class WorldCallback implements Callback { - public void run(Server server) { + public void run(IServer server) { for(WorldServer world : server.getWorlds()) { world.updatePhysics(); } @@ -522,7 +522,7 @@ public abstract class Config { } } public static class DistanceCallback implements Callback { - public void run(Server server) { + public void run(IServer server) { for(WorldServer world : server.getWorlds()) { world.updateViewRadius(); } diff --git a/java/src/game/world/Region.java b/java/src/game/world/Region.java index a3a5a28..a3df508 100755 --- a/java/src/game/world/Region.java +++ b/java/src/game/world/Region.java @@ -30,9 +30,25 @@ import game.nbt.NBTLoader; import game.nbt.NBTTagCompound; import game.nbt.NBTTagList; import game.tileentity.TileEntity; -import game.world.Converter.SaveVersion; public class Region { + public static enum SaveVersion { + ALPHA_1_0("Alpha 1.0 - Beta 1.2"), + BETA_1_3("Beta 1.3 - Release 1.8.9"), + RELEASE_1_9("Release 1.9 - Release 1.12.2"), + RELEASE_1_13("Release 1.13 +"); + + private final String name; + + private SaveVersion(String name) { + this.name = name; + } + + public String toString() { + return this.name; + } + } + public static class FolderInfo { public final long time; public final long lastPlayed; diff --git a/java/src/server/Server.java b/server/src/server/Server.java similarity index 100% rename from java/src/server/Server.java rename to server/src/server/Server.java diff --git a/java/src/server/command/ArgCombiner.java b/server/src/server/command/ArgCombiner.java similarity index 100% rename from java/src/server/command/ArgCombiner.java rename to server/src/server/command/ArgCombiner.java diff --git a/java/src/server/command/Argument.java b/server/src/server/command/Argument.java similarity index 100% rename from java/src/server/command/Argument.java rename to server/src/server/command/Argument.java diff --git a/java/src/server/command/ArgumentParser.java b/server/src/server/command/ArgumentParser.java similarity index 100% rename from java/src/server/command/ArgumentParser.java rename to server/src/server/command/ArgumentParser.java diff --git a/java/src/server/command/ArgumentSplitter.java b/server/src/server/command/ArgumentSplitter.java similarity index 100% rename from java/src/server/command/ArgumentSplitter.java rename to server/src/server/command/ArgumentSplitter.java diff --git a/java/src/server/command/BooleanParser.java b/server/src/server/command/BooleanParser.java similarity index 100% rename from java/src/server/command/BooleanParser.java rename to server/src/server/command/BooleanParser.java diff --git a/java/src/server/command/CachedExecutable.java b/server/src/server/command/CachedExecutable.java similarity index 100% rename from java/src/server/command/CachedExecutable.java rename to server/src/server/command/CachedExecutable.java diff --git a/java/src/server/command/ColorParser.java b/server/src/server/command/ColorParser.java similarity index 100% rename from java/src/server/command/ColorParser.java rename to server/src/server/command/ColorParser.java diff --git a/java/src/server/command/Command.java b/server/src/server/command/Command.java similarity index 100% rename from java/src/server/command/Command.java rename to server/src/server/command/Command.java diff --git a/java/src/server/command/CommandEnvironment.java b/server/src/server/command/CommandEnvironment.java similarity index 100% rename from java/src/server/command/CommandEnvironment.java rename to server/src/server/command/CommandEnvironment.java diff --git a/java/src/server/command/Completer.java b/server/src/server/command/Completer.java similarity index 100% rename from java/src/server/command/Completer.java rename to server/src/server/command/Completer.java diff --git a/java/src/server/command/CompletingParser.java b/server/src/server/command/CompletingParser.java similarity index 100% rename from java/src/server/command/CompletingParser.java rename to server/src/server/command/CompletingParser.java diff --git a/java/src/server/command/DefaultingParser.java b/server/src/server/command/DefaultingParser.java similarity index 100% rename from java/src/server/command/DefaultingParser.java rename to server/src/server/command/DefaultingParser.java diff --git a/java/src/server/command/DimensionParser.java b/server/src/server/command/DimensionParser.java similarity index 100% rename from java/src/server/command/DimensionParser.java rename to server/src/server/command/DimensionParser.java diff --git a/java/src/server/command/DoubleParser.java b/server/src/server/command/DoubleParser.java similarity index 100% rename from java/src/server/command/DoubleParser.java rename to server/src/server/command/DoubleParser.java diff --git a/java/src/server/command/EntityListParser.java b/server/src/server/command/EntityListParser.java similarity index 100% rename from java/src/server/command/EntityListParser.java rename to server/src/server/command/EntityListParser.java diff --git a/java/src/server/command/EntityParser.java b/server/src/server/command/EntityParser.java similarity index 100% rename from java/src/server/command/EntityParser.java rename to server/src/server/command/EntityParser.java diff --git a/java/src/server/command/EnumParser.java b/server/src/server/command/EnumParser.java similarity index 100% rename from java/src/server/command/EnumParser.java rename to server/src/server/command/EnumParser.java diff --git a/java/src/server/command/Executable.java b/server/src/server/command/Executable.java similarity index 100% rename from java/src/server/command/Executable.java rename to server/src/server/command/Executable.java diff --git a/java/src/server/command/Executor.java b/server/src/server/command/Executor.java similarity index 100% rename from java/src/server/command/Executor.java rename to server/src/server/command/Executor.java diff --git a/java/src/server/command/FixedExecutor.java b/server/src/server/command/FixedExecutor.java similarity index 100% rename from java/src/server/command/FixedExecutor.java rename to server/src/server/command/FixedExecutor.java diff --git a/java/src/server/command/IntParser.java b/server/src/server/command/IntParser.java similarity index 100% rename from java/src/server/command/IntParser.java rename to server/src/server/command/IntParser.java diff --git a/java/src/server/command/LongParser.java b/server/src/server/command/LongParser.java similarity index 100% rename from java/src/server/command/LongParser.java rename to server/src/server/command/LongParser.java diff --git a/java/src/server/command/NonDefaultingParser.java b/server/src/server/command/NonDefaultingParser.java similarity index 100% rename from java/src/server/command/NonDefaultingParser.java rename to server/src/server/command/NonDefaultingParser.java diff --git a/java/src/server/command/Parameter.java b/server/src/server/command/Parameter.java similarity index 100% rename from java/src/server/command/Parameter.java rename to server/src/server/command/Parameter.java diff --git a/java/src/server/command/PatternReplacer.java b/server/src/server/command/PatternReplacer.java similarity index 100% rename from java/src/server/command/PatternReplacer.java rename to server/src/server/command/PatternReplacer.java diff --git a/java/src/server/command/PlayerEntityListParser.java b/server/src/server/command/PlayerEntityListParser.java similarity index 100% rename from java/src/server/command/PlayerEntityListParser.java rename to server/src/server/command/PlayerEntityListParser.java diff --git a/java/src/server/command/PlayerEntityParser.java b/server/src/server/command/PlayerEntityParser.java similarity index 100% rename from java/src/server/command/PlayerEntityParser.java rename to server/src/server/command/PlayerEntityParser.java diff --git a/java/src/server/command/PlayerListParser.java b/server/src/server/command/PlayerListParser.java similarity index 100% rename from java/src/server/command/PlayerListParser.java rename to server/src/server/command/PlayerListParser.java diff --git a/java/src/server/command/PlayerParser.java b/server/src/server/command/PlayerParser.java similarity index 100% rename from java/src/server/command/PlayerParser.java rename to server/src/server/command/PlayerParser.java diff --git a/java/src/server/command/RunException.java b/server/src/server/command/RunException.java similarity index 100% rename from java/src/server/command/RunException.java rename to server/src/server/command/RunException.java diff --git a/java/src/server/command/StringCompleter.java b/server/src/server/command/StringCompleter.java similarity index 100% rename from java/src/server/command/StringCompleter.java rename to server/src/server/command/StringCompleter.java diff --git a/java/src/server/command/StringParser.java b/server/src/server/command/StringParser.java similarity index 100% rename from java/src/server/command/StringParser.java rename to server/src/server/command/StringParser.java diff --git a/java/src/server/command/TagParser.java b/server/src/server/command/TagParser.java similarity index 100% rename from java/src/server/command/TagParser.java rename to server/src/server/command/TagParser.java diff --git a/java/src/server/command/Variable.java b/server/src/server/command/Variable.java similarity index 100% rename from java/src/server/command/Variable.java rename to server/src/server/command/Variable.java diff --git a/java/src/server/command/WorldParser.java b/server/src/server/command/WorldParser.java similarity index 100% rename from java/src/server/command/WorldParser.java rename to server/src/server/command/WorldParser.java diff --git a/java/src/server/command/commands/CommandAdmin.java b/server/src/server/command/commands/CommandAdmin.java similarity index 100% rename from java/src/server/command/commands/CommandAdmin.java rename to server/src/server/command/commands/CommandAdmin.java diff --git a/java/src/server/command/commands/CommandHelp.java b/server/src/server/command/commands/CommandHelp.java similarity index 100% rename from java/src/server/command/commands/CommandHelp.java rename to server/src/server/command/commands/CommandHelp.java diff --git a/java/src/server/command/commands/CommandKick.java b/server/src/server/command/commands/CommandKick.java similarity index 100% rename from java/src/server/command/commands/CommandKick.java rename to server/src/server/command/commands/CommandKick.java diff --git a/java/src/server/command/commands/CommandMessage.java b/server/src/server/command/commands/CommandMessage.java similarity index 100% rename from java/src/server/command/commands/CommandMessage.java rename to server/src/server/command/commands/CommandMessage.java diff --git a/java/src/server/command/commands/CommandMilk.java b/server/src/server/command/commands/CommandMilk.java similarity index 100% rename from java/src/server/command/commands/CommandMilk.java rename to server/src/server/command/commands/CommandMilk.java diff --git a/java/src/server/command/commands/CommandOfflinetp.java b/server/src/server/command/commands/CommandOfflinetp.java similarity index 100% rename from java/src/server/command/commands/CommandOfflinetp.java rename to server/src/server/command/commands/CommandOfflinetp.java diff --git a/java/src/server/command/commands/CommandPotion.java b/server/src/server/command/commands/CommandPotion.java similarity index 100% rename from java/src/server/command/commands/CommandPotion.java rename to server/src/server/command/commands/CommandPotion.java diff --git a/java/src/server/command/commands/CommandRemove.java b/server/src/server/command/commands/CommandRemove.java similarity index 100% rename from java/src/server/command/commands/CommandRemove.java rename to server/src/server/command/commands/CommandRemove.java diff --git a/java/src/server/command/commands/CommandRevoke.java b/server/src/server/command/commands/CommandRevoke.java similarity index 100% rename from java/src/server/command/commands/CommandRevoke.java rename to server/src/server/command/commands/CommandRevoke.java diff --git a/java/src/server/command/commands/CommandSpawn.java b/server/src/server/command/commands/CommandSpawn.java similarity index 100% rename from java/src/server/command/commands/CommandSpawn.java rename to server/src/server/command/commands/CommandSpawn.java diff --git a/java/src/server/command/commands/CommandTele.java b/server/src/server/command/commands/CommandTele.java similarity index 100% rename from java/src/server/command/commands/CommandTele.java rename to server/src/server/command/commands/CommandTele.java diff --git a/java/src/server/command/commands/CommandTime.java b/server/src/server/command/commands/CommandTime.java similarity index 100% rename from java/src/server/command/commands/CommandTime.java rename to server/src/server/command/commands/CommandTime.java diff --git a/java/src/server/command/commands/CommandTp.java b/server/src/server/command/commands/CommandTp.java similarity index 100% rename from java/src/server/command/commands/CommandTp.java rename to server/src/server/command/commands/CommandTp.java diff --git a/java/src/server/command/commands/CommandWarp.java b/server/src/server/command/commands/CommandWarp.java similarity index 100% rename from java/src/server/command/commands/CommandWarp.java rename to server/src/server/command/commands/CommandWarp.java diff --git a/java/src/server/command/commands/CommandWeather.java b/server/src/server/command/commands/CommandWeather.java similarity index 100% rename from java/src/server/command/commands/CommandWeather.java rename to server/src/server/command/commands/CommandWeather.java diff --git a/java/src/server/command/commands/CommandWorld.java b/server/src/server/command/commands/CommandWorld.java similarity index 100% rename from java/src/server/command/commands/CommandWorld.java rename to server/src/server/command/commands/CommandWorld.java diff --git a/java/src/server/network/HandshakeHandler.java b/server/src/server/network/HandshakeHandler.java similarity index 100% rename from java/src/server/network/HandshakeHandler.java rename to server/src/server/network/HandshakeHandler.java diff --git a/java/src/server/network/LoginHandler.java b/server/src/server/network/LoginHandler.java similarity index 100% rename from java/src/server/network/LoginHandler.java rename to server/src/server/network/LoginHandler.java diff --git a/java/src/server/network/Player.java b/server/src/server/network/Player.java similarity index 100% rename from java/src/server/network/Player.java rename to server/src/server/network/Player.java