From 5c1fed0613391bfeda0b7556b9e361564965e4bb Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:26:14 -0500 Subject: [PATCH] refactor: merge Minecraft.Client/net into minecraft --- .../Minecraft.Client/Common/Consoles_App.cpp | 40 ++++----- .../Common/src/Audio/SoundEngine.cpp | 6 +- .../Common/src/DLC/DLCColourTableFile.cpp | 6 +- .../Common/src/DLC/DLCManager.cpp | 4 +- .../Common/src/DLC/DLCSkinFile.h | 2 +- .../Common/src/Network/GameNetworkManager.cpp | 28 +++--- .../Common/src/Network/Socket.cpp | 2 +- .../Tutorial/Constraints/AreaConstraint.cpp | 4 +- .../Constraints/ChangeStateConstraint.cpp | 6 +- .../Common/src/Tutorial/FullTutorialMode.cpp | 2 +- .../Common/src/Tutorial/Hints/AreaHint.cpp | 4 +- .../src/Tutorial/Hints/TutorialHint.cpp | 4 +- .../Common/src/Tutorial/Tasks/ChoiceTask.cpp | 4 +- .../src/Tutorial/Tasks/ControllerTask.cpp | 4 +- .../Common/src/Tutorial/Tasks/InfoTask.cpp | 4 +- .../Common/src/Tutorial/Tasks/StatTask.cpp | 4 +- .../Common/src/Tutorial/Tutorial.cpp | 12 +-- .../Common/src/Tutorial/TutorialMode.cpp | 8 +- .../Common/src/Tutorial/TutorialMode.h | 2 +- .../IUIScene_AbstractContainerMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 6 +- .../IUIScene_CommandBlockMenu.cpp | 6 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 4 +- .../UI/All Platforms/IUIScene_CraftingMenu.h | 2 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 6 +- .../All Platforms/IUIScene_EnchantingMenu.cpp | 6 +- .../src/UI/All Platforms/IUIScene_HUD.cpp | 6 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 14 +-- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 8 +- .../src/UI/Components/UIComponent_Chat.cpp | 4 +- .../UI/Components/UIComponent_Panorama.cpp | 4 +- .../Components/UIComponent_TutorialPopup.cpp | 4 +- .../Common/src/UI/Components/UIScene_HUD.cpp | 10 +-- .../UI/Controls/UIControl_EnchantmentBook.cpp | 12 +-- .../Controls/UIControl_EnchantmentButton.cpp | 6 +- .../UI/Controls/UIControl_MinecraftHorse.cpp | 10 +-- .../UI/Controls/UIControl_MinecraftPlayer.cpp | 12 +-- .../Controls/UIControl_PlayerSkinPreview.cpp | 18 ++-- .../UI/Controls/UIControl_PlayerSkinPreview.h | 2 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 12 +-- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 4 +- .../IUIScene_StartGame.cpp | 6 +- .../UIScene_CreateWorldMenu.cpp | 12 +-- .../UIScene_JoinMenu.cpp | 8 +- .../UIScene_LoadMenu.cpp | 10 +-- .../UIScene_LoadOrJoinMenu.cpp | 8 +- .../UIScene_LoadOrJoinMenu.h | 2 +- .../UIScene_MainMenu.cpp | 10 +-- .../Help & Options/UIScene_ControlsMenu.cpp | 4 +- .../UIScene_HelpAndOptionsMenu.cpp | 2 +- .../UIScene_SettingsControlMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsMenu.cpp | 2 +- .../UIScene_AbstractContainerMenu.cpp | 2 +- .../Containers/UIScene_AnvilMenu.cpp | 4 +- .../Containers/UIScene_BeaconMenu.cpp | 2 +- .../Containers/UIScene_BrewingStandMenu.cpp | 2 +- .../Containers/UIScene_ContainerMenu.cpp | 2 +- .../Containers/UIScene_CreativeMenu.cpp | 4 +- .../Containers/UIScene_DispenserMenu.cpp | 2 +- .../Containers/UIScene_EnchantingMenu.cpp | 2 +- .../Containers/UIScene_FireworksMenu.cpp | 4 +- .../Containers/UIScene_FurnaceMenu.cpp | 2 +- .../Containers/UIScene_HopperMenu.cpp | 2 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 2 +- .../Containers/UIScene_InventoryMenu.cpp | 10 +-- .../Containers/UIScene_TradingMenu.cpp | 4 +- .../UIScene_CraftingMenu.cpp | 4 +- .../UIScene_DeathMenu.cpp | 4 +- .../In-Game Menu Screens/UIScene_EndPoem.cpp | 6 +- .../UIScene_InGameHostOptionsMenu.cpp | 6 +- .../UIScene_InGameInfoMenu.cpp | 8 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 6 +- .../UIScene_PauseMenu.cpp | 10 +-- .../UIScene_SignEntryMenu.cpp | 8 +- .../UIScene_TeleportMenu.cpp | 8 +- .../UI/Scenes/UIScene_ConnectingProgress.cpp | 2 +- .../UI/Scenes/UIScene_FullscreenProgress.cpp | 4 +- .../src/UI/Scenes/UIScene_QuadrantSignin.cpp | 2 +- .../Common/src/UI/UIController.cpp | 14 +-- .../Common/src/UI/UIGroup.cpp | 4 +- .../Common/src/UI/UIScene.cpp | 6 +- .../Minecraft.Client/Linux/Linux_App.cpp | 6 +- .../Linux/Linux_Minecraft.cpp | 20 ++--- .../Source Files/Windows64_Minecraft.cpp | 18 ++-- .../Windows64/Windows64_App.cpp | 10 +-- .../Windows64/Windows64_UIController.cpp | 4 +- minecraft/minecraft/StaticConstructors.cpp | 2 +- .../net => }/minecraft/client/Camera.cpp | 0 .../net => }/minecraft/client/Camera.h | 0 .../minecraft/client/ClientConstants.cpp | 2 +- .../minecraft/client/ClientConstants.h | 0 .../net => }/minecraft/client/DemoUser.cpp | 2 +- .../net => }/minecraft/client/DemoUser.h | 0 .../net => }/minecraft/client/GuiMessage.cpp | 2 +- .../net => }/minecraft/client/GuiMessage.h | 0 .../net => }/minecraft/client/KeyMapping.cpp | 0 .../net => }/minecraft/client/KeyMapping.h | 0 .../net => }/minecraft/client/Lighting.cpp | 0 .../net => }/minecraft/client/Lighting.h | 0 .../minecraft/client/MemoryTracker.cpp | 2 +- .../net => }/minecraft/client/MemoryTracker.h | 0 .../net => }/minecraft/client/Minecraft.cpp | 74 +++++++-------- .../net => }/minecraft/client/Minecraft.h | 2 +- .../net => }/minecraft/client/Options.cpp | 6 +- .../net => }/minecraft/client/Options.h | 0 .../minecraft/client/ProgressRenderer.cpp | 2 +- .../minecraft/client/ProgressRenderer.h | 0 .../net => }/minecraft/client/Timer.cpp | 0 .../net => }/minecraft/client/Timer.h | 0 .../net => }/minecraft/client/User.cpp | 0 .../net => }/minecraft/client/User.h | 0 .../net => }/minecraft/client/gui/Button.cpp | 0 .../net => }/minecraft/client/gui/Button.h | 0 .../minecraft/client/gui/ChatScreen.cpp | 8 +- .../minecraft/client/gui/ChatScreen.h | 0 .../minecraft/client/gui/ConfirmScreen.cpp | 4 +- .../minecraft/client/gui/ConfirmScreen.h | 0 .../minecraft/client/gui/ControlsScreen.cpp | 8 +- .../minecraft/client/gui/ControlsScreen.h | 0 .../client/gui/CreateWorldScreen.cpp | 8 +- .../minecraft/client/gui/CreateWorldScreen.h | 0 .../minecraft/client/gui/DeathScreen.cpp | 6 +- .../minecraft/client/gui/DeathScreen.h | 0 .../net => }/minecraft/client/gui/EditBox.cpp | 2 +- .../net => }/minecraft/client/gui/EditBox.h | 0 .../client/gui/EnchantmentScreen.cpp | 10 +-- .../minecraft/client/gui/EnchantmentScreen.h | 2 +- .../minecraft/client/gui/ErrorScreen.cpp | 2 +- .../minecraft/client/gui/ErrorScreen.h | 0 .../net => }/minecraft/client/gui/Font.cpp | 10 +-- .../net => }/minecraft/client/gui/Font.h | 0 .../net => }/minecraft/client/gui/Gui.cpp | 32 +++---- .../net => }/minecraft/client/gui/Gui.h | 4 +- .../minecraft/client/gui/GuiComponent.cpp | 8 +- .../minecraft/client/gui/GuiComponent.h | 0 .../minecraft/client/gui/HopperScreen.cpp | 2 +- .../minecraft/client/gui/HopperScreen.h | 2 +- .../minecraft/client/gui/InBedChatScreen.cpp | 6 +- .../minecraft/client/gui/InBedChatScreen.h | 0 .../client/gui/JoinMultiplayerScreen.cpp | 6 +- .../client/gui/JoinMultiplayerScreen.h | 0 .../minecraft/client/gui/MerchantScreen.cpp | 10 +-- .../minecraft/client/gui/MerchantScreen.h | 2 +- .../minecraft/client/gui/MessageScreen.cpp | 2 +- .../minecraft/client/gui/MessageScreen.h | 0 .../net => }/minecraft/client/gui/Minimap.cpp | 6 +- .../net => }/minecraft/client/gui/Minimap.h | 0 .../minecraft/client/gui/NameEntryScreen.cpp | 4 +- .../minecraft/client/gui/NameEntryScreen.h | 0 .../minecraft/client/gui/OptionsScreen.cpp | 8 +- .../minecraft/client/gui/OptionsScreen.h | 0 .../minecraft/client/gui/PauseScreen.cpp | 8 +- .../minecraft/client/gui/PauseScreen.h | 0 .../client/gui/RenameWorldScreen.cpp | 4 +- .../minecraft/client/gui/RenameWorldScreen.h | 0 .../minecraft/client/gui/RepairScreen.cpp | 10 +-- .../minecraft/client/gui/RepairScreen.h | 2 +- .../net => }/minecraft/client/gui/Screen.cpp | 6 +- .../net => }/minecraft/client/gui/Screen.h | 0 .../client/gui/ScreenSizeCalculator.cpp | 4 +- .../client/gui/ScreenSizeCalculator.h | 0 .../client/gui/ScrolledSelectionList.cpp | 0 .../client/gui/ScrolledSelectionList.h | 0 .../client/gui/SelectWorldScreen.cpp | 6 +- .../minecraft/client/gui/SelectWorldScreen.h | 0 .../minecraft/client/gui/SlideButton.cpp | 6 +- .../minecraft/client/gui/SlideButton.h | 2 +- .../minecraft/client/gui/SmallButton.cpp | 4 +- .../minecraft/client/gui/SmallButton.h | 2 +- .../client/gui/TradeSwitchButton.cpp | 2 +- .../minecraft/client/gui/TradeSwitchButton.h | 0 .../client/gui/VideoSettingsScreen.cpp | 8 +- .../client/gui/VideoSettingsScreen.h | 0 .../gui/achievement/AchievementPopup.cpp | 6 +- .../client/gui/achievement/AchievementPopup.h | 2 +- .../gui/achievement/AchievementScreen.cpp | 14 +-- .../gui/achievement/AchievementScreen.h | 2 +- .../client/gui/achievement/StatsScreen.cpp | 14 +-- .../client/gui/achievement/StatsScreen.h | 4 +- .../gui/inventory/AbstractBeaconButton.cpp | 2 +- .../gui/inventory/AbstractBeaconButton.h | 2 +- .../gui/inventory/AbstractContainerScreen.cpp | 16 ++-- .../gui/inventory/AbstractContainerScreen.h | 2 +- .../gui/inventory/BeaconCancelButton.cpp | 2 +- .../client/gui/inventory/BeaconCancelButton.h | 0 .../gui/inventory/BeaconConfirmButton.cpp | 2 +- .../gui/inventory/BeaconConfirmButton.h | 0 .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../client/gui/inventory/BeaconPowerButton.h | 0 .../client/gui/inventory/BeaconScreen.cpp | 14 +-- .../client/gui/inventory/BeaconScreen.h | 0 .../gui/inventory/BrewingStandScreen.cpp | 4 +- .../client/gui/inventory/BrewingStandScreen.h | 0 .../client/gui/inventory/ContainerScreen.cpp | 2 +- .../client/gui/inventory/ContainerScreen.h | 0 .../client/gui/inventory/CraftingScreen.cpp | 8 +- .../client/gui/inventory/CraftingScreen.h | 0 .../gui/inventory/CreativeInventoryScreen.cpp | 12 +-- .../gui/inventory/CreativeInventoryScreen.h | 2 +- .../client/gui/inventory/FurnaceScreen.cpp | 4 +- .../client/gui/inventory/FurnaceScreen.h | 0 .../gui/inventory/HorseInventoryScreen.cpp | 4 +- .../gui/inventory/HorseInventoryScreen.h | 0 .../client/gui/inventory/InventoryScreen.cpp | 14 +-- .../client/gui/inventory/InventoryScreen.h | 0 .../client/gui/inventory/TextEditScreen.cpp | 12 +-- .../client/gui/inventory/TextEditScreen.h | 2 +- .../client/gui/inventory/TrapScreen.cpp | 4 +- .../client/gui/inventory/TrapScreen.h | 0 .../client/gui/particle/GuiParticle.cpp | 0 .../client/gui/particle/GuiParticle.h | 0 .../client/gui/particle/GuiParticles.cpp | 0 .../client/gui/particle/GuiParticles.h | 2 +- .../minecraft/client/level/DemoLevel.cpp | 0 .../minecraft/client/level/DemoLevel.h | 0 .../minecraft/client/model/BatModel.cpp | 4 +- .../minecraft/client/model/BatModel.h | 2 +- .../minecraft/client/model/BlazeModel.cpp | 4 +- .../minecraft/client/model/BlazeModel.h | 2 +- .../minecraft/client/model/BoatModel.cpp | 4 +- .../minecraft/client/model/BoatModel.h | 4 +- .../minecraft/client/model/BookModel.cpp | 2 +- .../minecraft/client/model/BookModel.h | 2 +- .../minecraft/client/model/ChestModel.cpp | 2 +- .../minecraft/client/model/ChestModel.h | 2 +- .../minecraft/client/model/ChickenModel.cpp | 4 +- .../minecraft/client/model/ChickenModel.h | 2 +- .../minecraft/client/model/CowModel.cpp | 4 +- .../minecraft/client/model/CowModel.h | 0 .../minecraft/client/model/CreeperModel.cpp | 4 +- .../minecraft/client/model/CreeperModel.h | 2 +- .../minecraft/client/model/EndermanModel.cpp | 4 +- .../minecraft/client/model/EndermanModel.h | 0 .../minecraft/client/model/GhastModel.cpp | 4 +- .../minecraft/client/model/GhastModel.h | 2 +- .../minecraft/client/model/HumanoidModel.cpp | 6 +- .../minecraft/client/model/HumanoidModel.h | 2 +- .../client/model/LargeChestModel.cpp | 2 +- .../minecraft/client/model/LargeChestModel.h | 0 .../minecraft/client/model/LavaSlimeModel.cpp | 2 +- .../minecraft/client/model/LavaSlimeModel.h | 2 +- .../minecraft/client/model/LeashKnotModel.cpp | 4 +- .../minecraft/client/model/LeashKnotModel.h | 2 +- .../minecraft/client/model/MinecartModel.cpp | 4 +- .../minecraft/client/model/MinecartModel.h | 2 +- .../minecraft/client/model/ModelHorse.cpp | 4 +- .../minecraft/client/model/ModelHorse.h | 2 +- .../minecraft/client/model/OcelotModel.cpp | 2 +- .../minecraft/client/model/OcelotModel.h | 2 +- .../minecraft/client/model/PigModel.cpp | 4 +- .../minecraft/client/model/PigModel.h | 0 .../minecraft/client/model/Polygon.cpp | 2 +- .../net => }/minecraft/client/model/Polygon.h | 2 +- .../minecraft/client/model/QuadrupedModel.cpp | 4 +- .../minecraft/client/model/QuadrupedModel.h | 2 +- .../minecraft/client/model/SheepFurModel.cpp | 4 +- .../minecraft/client/model/SheepFurModel.h | 0 .../minecraft/client/model/SheepModel.cpp | 4 +- .../minecraft/client/model/SheepModel.h | 0 .../minecraft/client/model/SignModel.cpp | 2 +- .../minecraft/client/model/SignModel.h | 2 +- .../client/model/SilverfishModel.cpp | 2 +- .../minecraft/client/model/SilverfishModel.h | 2 +- .../client/model/SkeletonHeadModel.cpp | 4 +- .../client/model/SkeletonHeadModel.h | 2 +- .../minecraft/client/model/SkeletonModel.cpp | 4 +- .../minecraft/client/model/SkeletonModel.h | 0 .../minecraft/client/model/SkiModel.cpp | 2 +- .../minecraft/client/model/SkiModel.h | 4 +- .../minecraft/client/model/SlimeModel.cpp | 2 +- .../minecraft/client/model/SlimeModel.h | 2 +- .../minecraft/client/model/SnowManModel.cpp | 4 +- .../minecraft/client/model/SnowManModel.h | 2 +- .../minecraft/client/model/SpiderModel.cpp | 4 +- .../minecraft/client/model/SpiderModel.h | 2 +- .../minecraft/client/model/SquidModel.cpp | 4 +- .../minecraft/client/model/SquidModel.h | 2 +- .../minecraft/client/model/Vertex.cpp | 0 .../net => }/minecraft/client/model/Vertex.h | 0 .../client/model/VillagerGolemModel.cpp | 2 +- .../client/model/VillagerGolemModel.h | 2 +- .../minecraft/client/model/VillagerModel.cpp | 4 +- .../minecraft/client/model/VillagerModel.h | 2 +- .../client/model/VillagerZombieModel.cpp | 4 +- .../client/model/VillagerZombieModel.h | 0 .../minecraft/client/model/WitchModel.cpp | 2 +- .../minecraft/client/model/WitchModel.h | 0 .../client/model/WitherBossModel.cpp | 2 +- .../minecraft/client/model/WitherBossModel.h | 4 +- .../minecraft/client/model/WolfModel.cpp | 4 +- .../minecraft/client/model/WolfModel.h | 2 +- .../minecraft/client/model/ZombieModel.cpp | 4 +- .../minecraft/client/model/ZombieModel.h | 0 .../client/model/dragon/DragonModel.cpp | 0 .../client/model/dragon/DragonModel.h | 4 +- .../client/model/dragon/EnderCrystalModel.cpp | 2 +- .../client/model/dragon/EnderCrystalModel.h | 4 +- .../minecraft/client/model/geom/Cube.cpp | 4 +- .../minecraft/client/model/geom/Cube.h | 4 +- .../minecraft/client/model/geom/Model.cpp | 2 +- .../minecraft/client/model/geom/Model.h | 0 .../minecraft/client/model/geom/ModelPart.cpp | 6 +- .../minecraft/client/model/geom/ModelPart.h | 4 +- .../minecraft/client/model/geom/TexOffs.cpp | 0 .../minecraft/client/model/geom/TexOffs.h | 0 .../client/multiplayer/ClientConnection.cpp | 30 +++---- .../client/multiplayer/ClientConnection.h | 0 .../client/multiplayer/ConnectScreen.cpp | 10 +-- .../client/multiplayer/ConnectScreen.h | 2 +- .../client/multiplayer/DisconnectedScreen.cpp | 8 +- .../client/multiplayer/DisconnectedScreen.h | 2 +- .../multiplayer/MultiPlayerChunkCache.cpp | 6 +- .../multiplayer/MultiPlayerChunkCache.h | 0 .../multiplayer/MultiPlayerGameMode.cpp | 4 +- .../client/multiplayer/MultiPlayerGameMode.h | 4 +- .../client/multiplayer/MultiPlayerLevel.cpp | 6 +- .../client/multiplayer/MultiPlayerLevel.h | 0 .../multiplayer/MultiPlayerLocalPlayer.cpp | 8 +- .../multiplayer/MultiPlayerLocalPlayer.h | 2 +- .../minecraft/client/multiplayer/PlayerInfo.h | 0 .../multiplayer/ReceivingLevelScreen.cpp | 2 +- .../client/multiplayer/ReceivingLevelScreen.h | 2 +- .../client/particle/BreakingItemParticle.cpp | 6 +- .../client/particle/BreakingItemParticle.h | 0 .../client/particle/BubbleParticle.cpp | 2 +- .../client/particle/BubbleParticle.h | 0 .../client/particle/CritParticle.cpp | 4 +- .../minecraft/client/particle/CritParticle.h | 0 .../client/particle/CritParticle2.cpp | 2 +- .../minecraft/client/particle/CritParticle2.h | 0 .../client/particle/DragonBreathParticle.cpp | 6 +- .../client/particle/DragonBreathParticle.h | 0 .../client/particle/DripParticle.cpp | 4 +- .../minecraft/client/particle/DripParticle.h | 0 .../particle/EnchantmentTableParticle.cpp | 4 +- .../particle/EnchantmentTableParticle.h | 0 .../client/particle/EnderParticle.cpp | 4 +- .../minecraft/client/particle/EnderParticle.h | 0 .../client/particle/ExplodeParticle.cpp | 4 +- .../client/particle/ExplodeParticle.h | 0 .../client/particle/FireworksParticles.cpp | 8 +- .../client/particle/FireworksParticles.h | 0 .../client/particle/FlameParticle.cpp | 2 +- .../minecraft/client/particle/FlameParticle.h | 0 .../client/particle/FootstepParticle.cpp | 10 +-- .../client/particle/FootstepParticle.h | 0 .../client/particle/HeartParticle.cpp | 2 +- .../minecraft/client/particle/HeartParticle.h | 0 .../client/particle/HugeExplosionParticle.cpp | 14 +-- .../client/particle/HugeExplosionParticle.h | 0 .../particle/HugeExplosionSeedParticle.cpp | 6 +- .../particle/HugeExplosionSeedParticle.h | 0 .../client/particle/LavaParticle.cpp | 2 +- .../minecraft/client/particle/LavaParticle.h | 0 .../client/particle/NetherPortalParticle.cpp | 4 +- .../client/particle/NetherPortalParticle.h | 0 .../client/particle/NoteParticle.cpp | 4 +- .../minecraft/client/particle/NoteParticle.h | 0 .../minecraft/client/particle/Particle.cpp | 6 +- .../minecraft/client/particle/Particle.h | 0 .../client/particle/ParticleEngine.cpp | 10 +-- .../client/particle/ParticleEngine.h | 0 .../client/particle/PlayerCloudParticle.cpp | 2 +- .../client/particle/PlayerCloudParticle.h | 0 .../client/particle/RedDustParticle.cpp | 2 +- .../client/particle/RedDustParticle.h | 0 .../client/particle/SmokeParticle.cpp | 4 +- .../minecraft/client/particle/SmokeParticle.h | 0 .../client/particle/SnowShovelParticle.cpp | 2 +- .../client/particle/SnowShovelParticle.h | 0 .../client/particle/SpellParticle.cpp | 2 +- .../minecraft/client/particle/SpellParticle.h | 0 .../client/particle/SplashParticle.cpp | 2 +- .../client/particle/SplashParticle.h | 0 .../client/particle/SuspendedParticle.cpp | 4 +- .../client/particle/SuspendedParticle.h | 0 .../client/particle/SuspendedTownParticle.cpp | 2 +- .../client/particle/SuspendedTownParticle.h | 0 .../client/particle/TakeAnimationParticle.cpp | 6 +- .../client/particle/TakeAnimationParticle.h | 0 .../client/particle/TerrainParticle.cpp | 6 +- .../client/particle/TerrainParticle.h | 0 .../client/particle/WaterDropParticle.cpp | 2 +- .../client/particle/WaterDropParticle.h | 0 .../minecraft/client/player/Input.cpp | 4 +- .../net => }/minecraft/client/player/Input.h | 0 .../minecraft/client/player/LocalPlayer.cpp | 24 ++--- .../minecraft/client/player/LocalPlayer.h | 0 .../minecraft/client/player/RemotePlayer.cpp | 0 .../minecraft/client/player/RemotePlayer.h | 0 .../client/renderer/BossMobGuiInfo.cpp | 0 .../client/renderer/BossMobGuiInfo.h | 0 .../minecraft/client/renderer/Chunk.cpp | 6 +- .../minecraft/client/renderer/Chunk.h | 2 +- .../client/renderer/DirtyChunkSorter.cpp | 0 .../client/renderer/DirtyChunkSorter.h | 0 .../client/renderer/DistanceChunkSorter.cpp | 0 .../client/renderer/DistanceChunkSorter.h | 0 .../client/renderer/EntityTileRenderer.cpp | 2 +- .../client/renderer/EntityTileRenderer.h | 0 .../client/renderer/GameRenderer.cpp | 48 +++++----- .../minecraft/client/renderer/GameRenderer.h | 2 +- .../minecraft/client/renderer/HttpTexture.cpp | 0 .../minecraft/client/renderer/HttpTexture.h | 0 .../client/renderer/HttpTextureProcessor.h | 0 .../client/renderer/ItemInHandRenderer.cpp | 24 ++--- .../client/renderer/ItemInHandRenderer.h | 0 .../client/renderer/LevelRenderer.cpp | 90 +++++++++---------- .../minecraft/client/renderer/LevelRenderer.h | 0 .../minecraft/client/renderer/MemTexture.cpp | 0 .../renderer/MobSkinMemTextureProcessor.cpp | 0 .../renderer/MobSkinTextureProcessor.cpp | 0 .../client/renderer/MobSkinTextureProcessor.h | 0 .../client/renderer/OffsettedRenderList.cpp | 2 +- .../client/renderer/OffsettedRenderList.h | 0 .../minecraft/client/renderer/Rect2i.cpp | 0 .../minecraft/client/renderer/Rect2i.h | 0 .../minecraft/client/renderer/Tesselator.cpp | 4 +- .../minecraft/client/renderer/Tesselator.h | 0 .../minecraft/client/renderer/Textures.cpp | 18 ++-- .../minecraft/client/renderer/Textures.h | 0 .../client/renderer/TileRenderer.cpp | 4 +- .../minecraft/client/renderer/TileRenderer.h | 0 .../renderer/culling/AllowAllCuller.cpp | 0 .../client/renderer/culling/AllowAllCuller.h | 0 .../client/renderer/culling/Culler.h | 0 .../client/renderer/culling/Frustum.cpp | 2 +- .../client/renderer/culling/Frustum.h | 0 .../client/renderer/culling/FrustumCuller.cpp | 4 +- .../client/renderer/culling/FrustumCuller.h | 0 .../client/renderer/culling/FrustumData.cpp | 0 .../client/renderer/culling/FrustumData.h | 0 .../renderer/culling/ViewportCuller.cpp | 0 .../client/renderer/culling/ViewportCuller.h | 0 .../client/renderer/entity/ArrowRenderer.cpp | 6 +- .../client/renderer/entity/ArrowRenderer.h | 0 .../client/renderer/entity/BatRenderer.cpp | 10 +-- .../client/renderer/entity/BatRenderer.h | 0 .../client/renderer/entity/BlazeRenderer.cpp | 8 +- .../client/renderer/entity/BlazeRenderer.h | 0 .../client/renderer/entity/BoatRenderer.cpp | 10 +-- .../client/renderer/entity/BoatRenderer.h | 0 .../renderer/entity/CaveSpiderRenderer.cpp | 6 +- .../renderer/entity/CaveSpiderRenderer.h | 0 .../renderer/entity/ChickenRenderer.cpp | 6 +- .../client/renderer/entity/ChickenRenderer.h | 0 .../client/renderer/entity/CowRenderer.cpp | 6 +- .../client/renderer/entity/CowRenderer.h | 0 .../renderer/entity/CreeperRenderer.cpp | 8 +- .../client/renderer/entity/CreeperRenderer.h | 0 .../renderer/entity/DefaultRenderer.cpp | 0 .../client/renderer/entity/DefaultRenderer.h | 0 .../renderer/entity/EnderCrystalRenderer.cpp | 2 +- .../renderer/entity/EnderCrystalRenderer.h | 0 .../renderer/entity/EnderDragonRenderer.cpp | 8 +- .../renderer/entity/EnderDragonRenderer.h | 0 .../renderer/entity/EndermanRenderer.cpp | 12 +-- .../client/renderer/entity/EndermanRenderer.h | 0 .../entity/EntityRenderDispatcher.cpp | 36 ++++---- .../renderer/entity/EntityRenderDispatcher.h | 0 .../client/renderer/entity/EntityRenderer.cpp | 12 +-- .../client/renderer/entity/EntityRenderer.h | 12 +-- .../renderer/entity/ExperienceOrbRenderer.cpp | 6 +- .../renderer/entity/ExperienceOrbRenderer.h | 0 .../renderer/entity/FallingTileRenderer.cpp | 8 +- .../renderer/entity/FallingTileRenderer.h | 0 .../renderer/entity/FireballRenderer.cpp | 4 +- .../client/renderer/entity/FireballRenderer.h | 0 .../renderer/entity/FishingHookRenderer.cpp | 10 +-- .../renderer/entity/FishingHookRenderer.h | 0 .../client/renderer/entity/GhastRenderer.cpp | 8 +- .../client/renderer/entity/GhastRenderer.h | 0 .../renderer/entity/GiantMobRenderer.cpp | 6 +- .../client/renderer/entity/GiantMobRenderer.h | 0 .../client/renderer/entity/HorseRenderer.cpp | 8 +- .../client/renderer/entity/HorseRenderer.h | 2 +- .../renderer/entity/HumanoidMobRenderer.cpp | 16 ++-- .../renderer/entity/HumanoidMobRenderer.h | 0 .../renderer/entity/ItemFrameRenderer.cpp | 18 ++-- .../renderer/entity/ItemFrameRenderer.h | 0 .../client/renderer/entity/ItemRenderer.cpp | 22 ++--- .../client/renderer/entity/ItemRenderer.h | 0 .../renderer/entity/ItemSpriteRenderer.cpp | 6 +- .../renderer/entity/ItemSpriteRenderer.h | 0 .../renderer/entity/LavaSlimeRenderer.cpp | 8 +- .../renderer/entity/LavaSlimeRenderer.h | 0 .../renderer/entity/LeashKnotRenderer.cpp | 8 +- .../renderer/entity/LeashKnotRenderer.h | 0 .../renderer/entity/LightningBoltRenderer.cpp | 2 +- .../renderer/entity/LightningBoltRenderer.h | 0 .../renderer/entity/LivingEntityRenderer.cpp | 20 ++--- .../renderer/entity/LivingEntityRenderer.h | 2 +- .../renderer/entity/MinecartRenderer.cpp | 12 +-- .../client/renderer/entity/MinecartRenderer.h | 0 .../entity/MinecartSpawnerRenderer.cpp | 4 +- .../renderer/entity/MinecartSpawnerRenderer.h | 0 .../client/renderer/entity/MobRenderer.cpp | 4 +- .../client/renderer/entity/MobRenderer.h | 0 .../renderer/entity/MushroomCowRenderer.cpp | 14 +-- .../renderer/entity/MushroomCowRenderer.h | 0 .../client/renderer/entity/OcelotRenderer.cpp | 6 +- .../client/renderer/entity/OcelotRenderer.h | 0 .../renderer/entity/PaintingRenderer.cpp | 6 +- .../client/renderer/entity/PaintingRenderer.h | 0 .../client/renderer/entity/PigRenderer.cpp | 6 +- .../client/renderer/entity/PigRenderer.h | 0 .../client/renderer/entity/PlayerRenderer.cpp | 22 ++--- .../client/renderer/entity/PlayerRenderer.h | 2 +- .../client/renderer/entity/SheepRenderer.cpp | 10 +-- .../client/renderer/entity/SheepRenderer.h | 0 .../renderer/entity/SilverfishRenderer.cpp | 8 +- .../renderer/entity/SilverfishRenderer.h | 0 .../renderer/entity/SkeletonRenderer.cpp | 8 +- .../client/renderer/entity/SkeletonRenderer.h | 0 .../client/renderer/entity/SlimeRenderer.cpp | 6 +- .../client/renderer/entity/SlimeRenderer.h | 0 .../renderer/entity/SnowManRenderer.cpp | 14 +-- .../client/renderer/entity/SnowManRenderer.h | 0 .../client/renderer/entity/SpiderRenderer.cpp | 8 +- .../client/renderer/entity/SpiderRenderer.h | 0 .../client/renderer/entity/SquidRenderer.cpp | 6 +- .../client/renderer/entity/SquidRenderer.h | 0 .../renderer/entity/TntMinecartRenderer.cpp | 4 +- .../renderer/entity/TntMinecartRenderer.h | 0 .../client/renderer/entity/TntRenderer.cpp | 4 +- .../client/renderer/entity/TntRenderer.h | 0 .../renderer/entity/VillagerGolemRenderer.cpp | 14 +-- .../renderer/entity/VillagerGolemRenderer.h | 0 .../renderer/entity/VillagerRenderer.cpp | 8 +- .../client/renderer/entity/VillagerRenderer.h | 0 .../client/renderer/entity/WitchRenderer.cpp | 16 ++-- .../client/renderer/entity/WitchRenderer.h | 0 .../renderer/entity/WitherBossRenderer.cpp | 4 +- .../renderer/entity/WitherBossRenderer.h | 0 .../renderer/entity/WitherSkullRenderer.cpp | 6 +- .../renderer/entity/WitherSkullRenderer.h | 0 .../client/renderer/entity/WolfRenderer.cpp | 10 +-- .../client/renderer/entity/WolfRenderer.h | 0 .../client/renderer/entity/ZombieRenderer.cpp | 12 +-- .../client/renderer/entity/ZombieRenderer.h | 0 .../texture/PreStitchedTextureMap.cpp | 14 +-- .../renderer/texture/PreStitchedTextureMap.h | 0 .../client/renderer/texture/SimpleIcon.cpp | 2 +- .../client/renderer/texture/SimpleIcon.h | 0 .../client/renderer/texture/StitchSlot.cpp | 0 .../client/renderer/texture/StitchSlot.h | 0 .../renderer/texture/StitchedTexture.cpp | 6 +- .../client/renderer/texture/StitchedTexture.h | 0 .../client/renderer/texture/Stitcher.cpp | 0 .../client/renderer/texture/Stitcher.h | 0 .../client/renderer/texture/Texture.cpp | 2 +- .../client/renderer/texture/Texture.h | 0 .../client/renderer/texture/TextureAtlas.cpp | 4 +- .../client/renderer/texture/TextureAtlas.h | 0 .../client/renderer/texture/TextureHolder.cpp | 0 .../client/renderer/texture/TextureHolder.h | 0 .../renderer/texture/TextureManager.cpp | 6 +- .../client/renderer/texture/TextureManager.h | 0 .../client/renderer/texture/TextureMap.cpp | 10 +-- .../client/renderer/texture/TextureMap.h | 0 .../renderer/texture/custom/ClockTexture.cpp | 8 +- .../renderer/texture/custom/ClockTexture.h | 2 +- .../texture/custom/CompassTexture.cpp | 8 +- .../renderer/texture/custom/CompassTexture.h | 2 +- .../renderer/tileentity/BeaconRenderer.cpp | 6 +- .../renderer/tileentity/BeaconRenderer.h | 0 .../renderer/tileentity/ChestRenderer.cpp | 12 +-- .../renderer/tileentity/ChestRenderer.h | 0 .../tileentity/EnchantTableRenderer.cpp | 6 +- .../tileentity/EnchantTableRenderer.h | 0 .../tileentity/EnderChestRenderer.cpp | 8 +- .../renderer/tileentity/EnderChestRenderer.h | 2 +- .../tileentity/MobSpawnerRenderer.cpp | 2 +- .../renderer/tileentity/MobSpawnerRenderer.h | 0 .../tileentity/PistonPieceRenderer.cpp | 12 +-- .../renderer/tileentity/PistonPieceRenderer.h | 0 .../renderer/tileentity/SignRenderer.cpp | 10 +-- .../client/renderer/tileentity/SignRenderer.h | 0 .../renderer/tileentity/SkullTileRenderer.cpp | 12 +-- .../renderer/tileentity/SkullTileRenderer.h | 0 .../tileentity/TheEndPortalRenderer.cpp | 10 +-- .../tileentity/TheEndPortalRenderer.h | 0 .../tileentity/TileEntityRenderDispatcher.cpp | 0 .../tileentity/TileEntityRenderDispatcher.h | 2 +- .../tileentity/TileEntityRenderer.cpp | 4 +- .../renderer/tileentity/TileEntityRenderer.h | 4 +- .../client/resources/ResourceLocation.h | 2 +- .../client/skins/AbstractTexturePack.cpp | 4 +- .../client/skins/AbstractTexturePack.h | 0 .../minecraft/client/skins/DLCTexturePack.cpp | 6 +- .../minecraft/client/skins/DLCTexturePack.h | 0 .../client/skins/DefaultTexturePack.cpp | 2 +- .../client/skins/DefaultTexturePack.h | 0 .../client/skins/FileTexturePack.cpp | 2 +- .../minecraft/client/skins/FileTexturePack.h | 0 .../client/skins/FolderTexturePack.cpp | 2 +- .../client/skins/FolderTexturePack.h | 0 .../minecraft/client/skins/TexturePack.cpp | 0 .../minecraft/client/skins/TexturePack.h | 0 .../client/skins/TexturePackRepository.cpp | 6 +- .../client/skins/TexturePackRepository.h | 0 .../minecraft/client/title/TitleScreen.cpp | 12 +-- .../minecraft/client/title/TitleScreen.h | 2 +- minecraft/minecraft/commands/Command.cpp | 4 +- .../commands/common/EnchantItemCommand.cpp | 2 +- .../commands/common/GiveItemCommand.cpp | 2 +- .../minecraft/commands/common/TimeCommand.cpp | 4 +- .../commands/common/ToggleDownfallCommand.cpp | 4 +- minecraft/minecraft/meson.build | 5 ++ .../network/packet/PlayerInfoPacket.cpp | 4 +- .../network/packet/TextureAndGeometryPacket.h | 2 +- .../minecraft/server/ConsoleInput.cpp | 0 .../net => }/minecraft/server/ConsoleInput.h | 0 .../minecraft/server/ConsoleInputSource.h | 0 .../minecraft/server/DispenserBootstrap.cpp | 0 .../minecraft/server/DispenserBootstrap.h | 0 .../minecraft/server/MinecraftServer.cpp | 26 +++--- .../minecraft/server/MinecraftServer.h | 0 .../net => }/minecraft/server/PlayerList.cpp | 22 ++--- .../net => }/minecraft/server/PlayerList.h | 0 .../minecraft/server/ServerInterface.h | 0 .../minecraft/server/ServerScoreboard.cpp | 0 .../minecraft/server/ServerScoreboard.h | 0 .../net => }/minecraft/server/Settings.cpp | 0 .../net => }/minecraft/server/Settings.h | 0 .../commands/ServerCommandDispatcher.cpp | 6 +- .../server/commands/ServerCommandDispatcher.h | 0 .../server/commands/TeleportCommand.cpp | 8 +- .../server/commands/TeleportCommand.h | 0 .../minecraft/server/level/CreativeMode.cpp | 4 +- .../minecraft/server/level/CreativeMode.h | 0 .../minecraft/server/level/DemoMode.cpp | 0 .../minecraft/server/level/DemoMode.h | 0 .../server/level/DerivedServerLevel.cpp | 2 +- .../server/level/DerivedServerLevel.h | 0 .../minecraft/server/level/EntityTracker.cpp | 6 +- .../minecraft/server/level/EntityTracker.h | 0 .../minecraft/server/level/GameMode.cpp | 4 +- .../minecraft/server/level/GameMode.h | 0 .../minecraft/server/level/PlayerChunkMap.cpp | 6 +- .../minecraft/server/level/PlayerChunkMap.h | 0 .../server/level/ServerChunkCache.cpp | 2 +- .../minecraft/server/level/ServerChunkCache.h | 0 .../minecraft/server/level/ServerLevel.cpp | 14 +-- .../minecraft/server/level/ServerLevel.h | 0 .../server/level/ServerLevelListener.cpp | 6 +- .../server/level/ServerLevelListener.h | 0 .../minecraft/server/level/ServerPlayer.cpp | 14 +-- .../minecraft/server/level/ServerPlayer.h | 0 .../server/level/ServerPlayerGameMode.cpp | 8 +- .../server/level/ServerPlayerGameMode.h | 0 .../minecraft/server/level/SurvivalMode.cpp | 6 +- .../minecraft/server/level/SurvivalMode.h | 0 .../minecraft/server/level/TrackedEntity.cpp | 6 +- .../minecraft/server/level/TrackedEntity.h | 0 .../server/network/PendingConnection.cpp | 6 +- .../server/network/PendingConnection.h | 0 .../server/network/PlayerConnection.cpp | 10 +-- .../server/network/PlayerConnection.h | 2 +- .../server/network/ServerConnection.cpp | 6 +- .../server/network/ServerConnection.h | 0 minecraft/minecraft/stats/Stats.cpp | 2 +- .../net => }/minecraft/stats/StatsCounter.cpp | 0 .../net => }/minecraft/stats/StatsCounter.h | 0 .../net => }/minecraft/stats/StatsSyncer.cpp | 0 .../net => }/minecraft/stats/StatsSyncer.h | 0 minecraft/minecraft/world/entity/Entity.cpp | 8 +- .../minecraft/world/entity/LivingEntity.cpp | 4 +- minecraft/minecraft/world/entity/Mob.cpp | 4 +- .../world/entity/animal/EntityHorse.cpp | 2 +- .../minecraft/world/entity/animal/Ocelot.cpp | 4 +- .../entity/boss/enderdragon/EnderDragon.cpp | 2 +- .../world/entity/global/LightningBolt.cpp | 4 +- .../minecraft/world/entity/item/Minecart.cpp | 4 +- .../world/entity/monster/Monster.cpp | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 2 +- .../minecraft/world/entity/player/Player.cpp | 4 +- .../world/entity/projectile/Arrow.cpp | 4 +- .../entity/projectile/ThrownEnderpearl.cpp | 4 +- .../world/inventory/ContainerMenu.cpp | 6 +- minecraft/minecraft/world/item/ArmorItem.cpp | 2 +- minecraft/minecraft/world/item/BucketItem.cpp | 4 +- minecraft/minecraft/world/item/ClockItem.cpp | 4 +- .../minecraft/world/item/CompassItem.cpp | 4 +- .../minecraft/world/item/SpawnEggItem.cpp | 2 +- .../world/item/alchemy/PotionBrewing.cpp | 2 +- .../minecraft/world/level/FoliageColor.cpp | 2 +- minecraft/minecraft/world/level/Level.cpp | 4 +- .../minecraft/world/level/MobSpawner.cpp | 2 +- .../minecraft/world/level/PortalForcer.cpp | 2 +- .../minecraft/world/level/biome/Biome.cpp | 2 +- .../world/level/biome/BiomeSource.cpp | 4 +- .../world/level/chunk/LevelChunk.cpp | 8 +- .../world/level/dimension/Dimension.cpp | 2 +- .../world/level/dimension/HellDimension.cpp | 2 +- .../world/level/dimension/TheEndDimension.cpp | 2 +- .../level/saveddata/MapItemSavedData.cpp | 6 +- .../ConsoleSaveFileOriginal.cpp | 6 +- .../ConsoleSaveFileSplit.cpp | 6 +- .../world/level/tile/CauldronTile.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 4 +- .../minecraft/world/level/tile/GrassTile.cpp | 2 +- .../minecraft/world/level/tile/LeafTile.cpp | 2 +- .../world/level/tile/RedStoneDustTile.cpp | 2 +- .../minecraft/world/level/tile/StemTile.cpp | 2 +- .../world/level/tile/TallGrassPlantTile.cpp | 2 +- .../world/level/tile/WaterLilyTile.cpp | 2 +- .../level/tile/entity/SignTileEntity.cpp | 4 +- .../level/tile/piston/PistonBaseTile.cpp | 4 +- 710 files changed, 1382 insertions(+), 1377 deletions(-) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Camera.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Camera.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/ClientConstants.cpp (80%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/ClientConstants.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/DemoUser.cpp (62%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/DemoUser.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/GuiMessage.cpp (66%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/GuiMessage.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/KeyMapping.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/KeyMapping.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Lighting.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Lighting.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/MemoryTracker.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/MemoryTracker.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Minecraft.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Minecraft.h (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Options.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Options.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/ProgressRenderer.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/ProgressRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Timer.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/Timer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/User.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/User.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Button.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Button.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ChatScreen.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ChatScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ConfirmScreen.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ConfirmScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ControlsScreen.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ControlsScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/CreateWorldScreen.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/CreateWorldScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/DeathScreen.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/DeathScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/EditBox.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/EditBox.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/EnchantmentScreen.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/EnchantmentScreen.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ErrorScreen.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ErrorScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Font.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Font.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Gui.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Gui.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/GuiComponent.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/GuiComponent.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/HopperScreen.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/HopperScreen.h (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/InBedChatScreen.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/InBedChatScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/JoinMultiplayerScreen.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/JoinMultiplayerScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/MerchantScreen.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/MerchantScreen.h (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/MessageScreen.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/MessageScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Minimap.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Minimap.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/NameEntryScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/NameEntryScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/OptionsScreen.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/OptionsScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/PauseScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/PauseScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/RenameWorldScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/RenameWorldScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/RepairScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/RepairScreen.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Screen.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/Screen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ScreenSizeCalculator.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ScreenSizeCalculator.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ScrolledSelectionList.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/ScrolledSelectionList.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SelectWorldScreen.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SelectWorldScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SlideButton.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SlideButton.h (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SmallButton.cpp (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/SmallButton.h (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/TradeSwitchButton.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/TradeSwitchButton.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/VideoSettingsScreen.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/VideoSettingsScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/AchievementPopup.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/AchievementPopup.h (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/AchievementScreen.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/AchievementScreen.h (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/StatsScreen.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/achievement/StatsScreen.h (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/AbstractBeaconButton.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/AbstractBeaconButton.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/AbstractContainerScreen.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/AbstractContainerScreen.h (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconCancelButton.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconCancelButton.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconConfirmButton.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconConfirmButton.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconPowerButton.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconPowerButton.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BeaconScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BrewingStandScreen.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/BrewingStandScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/ContainerScreen.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/ContainerScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/CraftingScreen.cpp (81%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/CraftingScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/CreativeInventoryScreen.h (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/FurnaceScreen.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/FurnaceScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/HorseInventoryScreen.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/HorseInventoryScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/InventoryScreen.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/InventoryScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/TextEditScreen.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/TextEditScreen.h (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/TrapScreen.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/inventory/TrapScreen.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/particle/GuiParticle.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/particle/GuiParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/particle/GuiParticles.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/gui/particle/GuiParticles.h (82%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/level/DemoLevel.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/level/DemoLevel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BatModel.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BatModel.h (87%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BlazeModel.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BlazeModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BoatModel.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BoatModel.h (68%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BookModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/BookModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ChestModel.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ChestModel.h (77%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ChickenModel.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ChickenModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/CowModel.cpp (85%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/CowModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/CreeperModel.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/CreeperModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/EndermanModel.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/EndermanModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/GhastModel.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/GhastModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/HumanoidModel.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/HumanoidModel.h (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LargeChestModel.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LargeChestModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LavaSlimeModel.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LavaSlimeModel.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LeashKnotModel.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/LeashKnotModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/MinecartModel.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/MinecartModel.h (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ModelHorse.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ModelHorse.h (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/OcelotModel.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/OcelotModel.h (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/PigModel.cpp (72%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/PigModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/Polygon.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/Polygon.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/QuadrupedModel.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/QuadrupedModel.h (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SheepFurModel.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SheepFurModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SheepModel.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SheepModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SignModel.cpp (87%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SignModel.h (75%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SilverfishModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SilverfishModel.h (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkeletonHeadModel.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkeletonHeadModel.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkeletonModel.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkeletonModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkiModel.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SkiModel.h (82%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SlimeModel.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SlimeModel.h (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SnowManModel.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SnowManModel.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SpiderModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SpiderModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SquidModel.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/SquidModel.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/Vertex.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/Vertex.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerGolemModel.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerGolemModel.h (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerModel.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerModel.h (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerZombieModel.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/VillagerZombieModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WitchModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WitchModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WitherBossModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WitherBossModel.h (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WolfModel.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/WolfModel.h (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ZombieModel.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/ZombieModel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/dragon/DragonModel.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/dragon/DragonModel.h (85%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/dragon/EnderCrystalModel.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/dragon/EnderCrystalModel.h (75%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/Cube.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/Cube.h (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/Model.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/Model.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/ModelPart.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/ModelPart.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/TexOffs.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/model/geom/TexOffs.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ClientConnection.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ClientConnection.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ConnectScreen.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ConnectScreen.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/DisconnectedScreen.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/DisconnectedScreen.h (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerChunkCache.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerGameMode.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerGameMode.h (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerLevel.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerLevel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/PlayerInfo.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ReceivingLevelScreen.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/multiplayer/ReceivingLevelScreen.h (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/BreakingItemParticle.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/BreakingItemParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/BubbleParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/BubbleParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/CritParticle.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/CritParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/CritParticle2.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/CritParticle2.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/DragonBreathParticle.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/DragonBreathParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/DripParticle.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/DripParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/EnchantmentTableParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/EnchantmentTableParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/EnderParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/EnderParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/ExplodeParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/ExplodeParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FireworksParticles.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FireworksParticles.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FlameParticle.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FlameParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FootstepParticle.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/FootstepParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HeartParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HeartParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HugeExplosionParticle.cpp (85%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HugeExplosionParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HugeExplosionSeedParticle.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/HugeExplosionSeedParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/LavaParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/LavaParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/NetherPortalParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/NetherPortalParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/NoteParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/NoteParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/Particle.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/Particle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/ParticleEngine.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/ParticleEngine.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/PlayerCloudParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/PlayerCloudParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/RedDustParticle.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/RedDustParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SmokeParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SmokeParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SnowShovelParticle.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SnowShovelParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SpellParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SpellParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SplashParticle.cpp (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SplashParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SuspendedParticle.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SuspendedParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SuspendedTownParticle.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/SuspendedTownParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/TakeAnimationParticle.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/TakeAnimationParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/TerrainParticle.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/TerrainParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/WaterDropParticle.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/particle/WaterDropParticle.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/Input.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/Input.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/LocalPlayer.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/LocalPlayer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/RemotePlayer.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/player/RemotePlayer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/BossMobGuiInfo.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/BossMobGuiInfo.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Chunk.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Chunk.h (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/DirtyChunkSorter.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/DirtyChunkSorter.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/DistanceChunkSorter.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/DistanceChunkSorter.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/EntityTileRenderer.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/EntityTileRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/GameRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/GameRenderer.h (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/HttpTexture.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/HttpTexture.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/HttpTextureProcessor.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/ItemInHandRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/ItemInHandRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/LevelRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/LevelRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/MemTexture.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/MobSkinTextureProcessor.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/MobSkinTextureProcessor.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/OffsettedRenderList.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/OffsettedRenderList.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Rect2i.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Rect2i.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Tesselator.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Tesselator.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Textures.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/Textures.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/TileRenderer.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/TileRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/AllowAllCuller.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/AllowAllCuller.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/Culler.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/Frustum.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/Frustum.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/FrustumCuller.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/FrustumCuller.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/FrustumData.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/FrustumData.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/ViewportCuller.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/culling/ViewportCuller.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ArrowRenderer.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ArrowRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BatRenderer.cpp (81%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BatRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BlazeRenderer.cpp (78%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BlazeRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BoatRenderer.cpp (79%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/BoatRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp (71%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CaveSpiderRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ChickenRenderer.cpp (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ChickenRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CowRenderer.cpp (69%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CowRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CreeperRenderer.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/CreeperRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/DefaultRenderer.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/DefaultRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EnderCrystalRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EnderDragonRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EnderDragonRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EndermanRenderer.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EndermanRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EntityRenderDispatcher.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EntityRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/EntityRenderer.h (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ExperienceOrbRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FallingTileRenderer.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FallingTileRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FireballRenderer.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FireballRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FishingHookRenderer.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/FishingHookRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/GhastRenderer.cpp (79%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/GhastRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/GiantMobRenderer.cpp (71%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/GiantMobRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/HorseRenderer.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/HorseRenderer.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/HumanoidMobRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemFrameRenderer.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemFrameRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ItemSpriteRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp (79%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LavaSlimeRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LeashKnotRenderer.cpp (75%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LeashKnotRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LightningBoltRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LightningBoltRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LivingEntityRenderer.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/LivingEntityRenderer.h (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MinecartRenderer.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MinecartRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp (74%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MobRenderer.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MobRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MushroomCowRenderer.cpp (81%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/MushroomCowRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/OcelotRenderer.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/OcelotRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PaintingRenderer.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PaintingRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PigRenderer.cpp (83%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PigRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PlayerRenderer.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/PlayerRenderer.h (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SheepRenderer.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SheepRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SilverfishRenderer.cpp (72%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SilverfishRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SkeletonRenderer.cpp (79%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SkeletonRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SlimeRenderer.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SlimeRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SnowManRenderer.cpp (78%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SnowManRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SpiderRenderer.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SpiderRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SquidRenderer.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/SquidRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/TntMinecartRenderer.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/TntMinecartRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/TntRenderer.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/TntRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/VillagerGolemRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/VillagerRenderer.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/VillagerRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitchRenderer.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitchRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitherBossRenderer.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitherBossRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitherSkullRenderer.cpp (87%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WitherSkullRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WolfRenderer.cpp (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/WolfRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ZombieRenderer.cpp (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/entity/ZombieRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/PreStitchedTextureMap.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/SimpleIcon.cpp (75%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/SimpleIcon.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/StitchSlot.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/StitchSlot.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/StitchedTexture.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/StitchedTexture.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/Stitcher.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/Stitcher.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/Texture.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/Texture.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureAtlas.cpp (55%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureAtlas.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureHolder.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureHolder.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureManager.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureManager.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureMap.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/TextureMap.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/custom/ClockTexture.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/custom/ClockTexture.h (84%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/custom/CompassTexture.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/texture/custom/CompassTexture.h (88%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/BeaconRenderer.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/BeaconRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/ChestRenderer.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/ChestRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp (90%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/EnchantTableRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp (85%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/EnderChestRenderer.h (86%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/PistonPieceRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/SignRenderer.cpp (92%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/SignRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp (89%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/SkullTileRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp (85%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/renderer/tileentity/TileEntityRenderer.h (87%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/resources/ResourceLocation.h (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/AbstractTexturePack.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/AbstractTexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/DLCTexturePack.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/DLCTexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/DefaultTexturePack.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/DefaultTexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/FileTexturePack.cpp (91%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/FileTexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/FolderTexturePack.cpp (95%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/FolderTexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/TexturePack.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/TexturePack.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/TexturePackRepository.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/skins/TexturePackRepository.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/title/TitleScreen.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/client/title/TitleScreen.h (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ConsoleInput.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ConsoleInput.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ConsoleInputSource.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/DispenserBootstrap.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/DispenserBootstrap.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/MinecraftServer.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/MinecraftServer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/PlayerList.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/PlayerList.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ServerInterface.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ServerScoreboard.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/ServerScoreboard.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/Settings.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/Settings.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/commands/ServerCommandDispatcher.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/commands/ServerCommandDispatcher.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/commands/TeleportCommand.cpp (93%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/commands/TeleportCommand.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/CreativeMode.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/CreativeMode.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/DemoMode.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/DemoMode.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/DerivedServerLevel.cpp (94%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/DerivedServerLevel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/EntityTracker.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/EntityTracker.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/GameMode.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/GameMode.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/PlayerChunkMap.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/PlayerChunkMap.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerChunkCache.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerChunkCache.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerLevel.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerLevel.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerLevelListener.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerLevelListener.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerPlayer.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerPlayer.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerPlayerGameMode.cpp (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/ServerPlayerGameMode.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/SurvivalMode.cpp (96%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/SurvivalMode.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/TrackedEntity.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/level/TrackedEntity.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/PendingConnection.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/PendingConnection.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/PlayerConnection.cpp (99%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/PlayerConnection.h (98%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/ServerConnection.cpp (97%) rename minecraft/{Minecraft.Client/net => }/minecraft/server/network/ServerConnection.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/stats/StatsCounter.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/stats/StatsCounter.h (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/stats/StatsSyncer.cpp (100%) rename minecraft/{Minecraft.Client/net => }/minecraft/stats/StatsSyncer.h (100%) diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index ef77c6f1d..4bad22c62 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -1,17 +1,17 @@ #include "minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/ProgressRenderer.h" +#include "minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/level/Level.h" @@ -21,8 +21,8 @@ #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "minecraft/world/level/tile/entity/HopperTileEntity.h" #include "console_helpers/PathHelper.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/server/level/GameMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" @@ -30,30 +30,30 @@ #endif #include "console_helpers/PlatformTime.h" #include "Minecraft_Macros.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "java/InputOutputStream/InputOutputStream.h" #include "minecraft/world/level/LevelSettings.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/User.h" #include #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "console_helpers/compression.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "console_helpers/StringHelpers.h" #include "4J_Input.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/Gui.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #if defined(__linux__) diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp index 159b0cf47..ab6992fa3 100644 --- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp @@ -12,17 +12,17 @@ #include "SoundEngine.h" #include #include "console_helpers/PathHelper.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/util/Mth.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/C4JThread.h" #include "minecraft/world/entity/Mob.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/util/Mth.h" #if defined(__linux__) diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp index 54a4a78bc..ae3c9f4af 100644 --- a/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp @@ -1,8 +1,8 @@ #include "DLCManager.h" #include "DLCColourTableFile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp index a6a8f0d1a..8574c9b35 100644 --- a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp @@ -8,8 +8,8 @@ #include "console_helpers/StringHelpers.h" #include "console_helpers/PortableFileIO.h" #include "Minecraft.Client/Common/src/UI/UIController.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePackRepository.h" #include #include #include diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h index e8e7f022f..b16b4a1b4 100644 --- a/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h @@ -5,7 +5,7 @@ #include #include "DLCFile.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/HumanoidModel.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index e5a1ffc44..52897d7a0 100644 --- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -13,24 +13,24 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/item/crafting/FireworksRecipe.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/User.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/ProgressRenderer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "console_helpers/compression.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" diff --git a/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp b/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp index cbe37774e..5dc672b67 100644 --- a/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp @@ -6,7 +6,7 @@ #include "Socket.h" // 4jcraft TODO #include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" +#include "minecraft/server/network/ServerConnection.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/include/NetTypes.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp index 12d1e0631..09db192ab 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp @@ -1,7 +1,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" #include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp index 7186c63ad..bcff79946 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -1,11 +1,11 @@ #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ChangeStateConstraint.h" #include "minecraft/world/phys/AABB.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp index da98ac6bd..d6335fb53 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp index 295a5f66b..3c451dcda 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp @@ -1,7 +1,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaHint.h" #include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp index 9db8b2b8d..3012fd3b3 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialHint.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "minecraft/world/level/material/Material.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp index e373496f2..99cb8b1c1 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "ChoiceTask.h" #include "minecraft/world/level/material/Material.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp index b949b8578..ad1892554 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ControllerTask.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp index bc9ee4fb4..1b47b94e6 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "InfoTask.h" #include "minecraft/world/level/material/Material.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp index d95dacb2c..1f2941129 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/stats/StatsCounter.h" #include "StatTask.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp index c34ec72c4..89acc28a1 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp @@ -2,18 +2,18 @@ #include "console_helpers/PlatformTime.h" #include "minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/server/level/SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp index 6815ea99c..f34fafffd 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp @@ -2,16 +2,16 @@ #include "console_helpers/PlatformTime.h" #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/entity/player/Inventory.h" #include "TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" class ClientConnection; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h index f5c38dc30..2fbddf974 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Tutorial.h" class ClientConnection; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index adfe47f74..300c213cd 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -9,9 +9,9 @@ #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp index 3c90704ac..66ea8e278 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -4,9 +4,9 @@ #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "java/InputOutputStream/InputOutputStream.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" IUIScene_AnvilMenu::IUIScene_AnvilMenu() { m_inventory = nullptr; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp index 5d8d9a90f..82966fe1f 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -5,9 +5,9 @@ #include "minecraft/network/packet/CustomPayloadPacket.h" #include "minecraft/util/HtmlString.h" #include "IUIScene_BeaconMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp index a96df4d46..904d1ff3a 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp @@ -1,13 +1,13 @@ #include #include "minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "IUIScene_CommandBlockMenu.h" #include "minecraft/world/level/tile/entity/CommandBlockEntity.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" void IUIScene_CommandBlockMenu::Initialise(CommandBlockEntity* commandBlock) { m_commandBlock = commandBlock; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 2343217c1..5cf51921d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -4,10 +4,10 @@ #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "IUIScene_CraftingMenu.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA [IUIScene_CraftingMenu::m_iMaxGroup2x2] = { diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h index dc1c91be5..83fbdafd1 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h @@ -2,7 +2,7 @@ #include "minecraft/world/item/crafting/Recipy.h" #include "minecraft/world/item/Item.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" class LocalPlayer; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index 0952fa9c8..4a2538fd6 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -4,8 +4,8 @@ #include "IUIScene_CreativeMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" @@ -13,7 +13,7 @@ #include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" #include "minecraft/world/entity/net.minecraft.world.entity.h" #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/item/alchemy/PotionMacros.h" #include "java/JavaMath.h" #include "4J.Common/4J_InputActions.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 4c8b1e707..9ba004cd0 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -1,13 +1,13 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/EnchantmentMenu.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" class Player; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp index 96d66aa66..c75af6e03 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_HUD.h" #include "4J_Profile.h" #include "4J.Render/4J_Render.h" @@ -20,7 +20,7 @@ #include "minecraft/world/food/FoodData.h" #include "minecraft/world/level/material/Material.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" IUIScene_HUD::IUIScene_HUD() { m_lastActiveSlot = -1; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 9710dca83..7137b8b8d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -4,15 +4,15 @@ #include "IUIScene_PauseMenu.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/ProgressRenderer.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "console_helpers/compression.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index d271ca159..f6cb891d7 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -4,11 +4,11 @@ #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "IUIScene_TradingMenu.h" #include "4J.Common/4J_InputActions.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp index 1d25405e1..2eb86f69f 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp @@ -1,8 +1,8 @@ #include #include "UIComponent_Chat.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Gui.h" #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp index a87bec92d..06a67d4df 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp @@ -2,8 +2,8 @@ #include #include "UIComponent_Panorama.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp index 19e6bffb1..6f7322791 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -4,8 +4,8 @@ #include "UIComponent_TutorialPopup.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp index 5aa237128..978427a0a 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp @@ -1,16 +1,16 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HUD.h" -#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/BossMobGuiInfo.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" +#include "minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/effect/net.minecraft.world.effect.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/Gui.h" UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp index 0079b1e6d..d60d0d388 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -2,11 +2,11 @@ #include #include "UIControl_EnchantmentBook.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/model/BookModel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/client/renderer/tileentity/EnchantTableRenderer.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/model/BookModel.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" @@ -15,7 +15,7 @@ #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" UIControl_EnchantmentBook::UIControl_EnchantmentBook() { UIControl::setControlType(UIControl::eEnchantmentBook); diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp index fb70c8af0..d386771f2 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -5,8 +5,8 @@ #include #include "UIControl_EnchantmentButton.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" #include "4J.Render/4J_Render.h" @@ -18,7 +18,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/inventory/EnchantmentMenu.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Font.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { m_index = 0; diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp index 5276cc3d9..bc7363c57 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -2,11 +2,11 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/Options.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 6dfcf734a..07d7e8fdc 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -2,12 +2,12 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "UIControl_MinecraftPlayer.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "4J.Render/4J_Render.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index 366b3f6d4..da8765f81 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -4,13 +4,13 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/Options.h" #include "UIControl_PlayerSkinPreview.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" @@ -18,8 +18,8 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/entity/player/Player.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" // #define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h index df84d91d6..69d6234aa 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h @@ -5,7 +5,7 @@ #include #include "UIControl.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index ae2eabd62..4fab49ab5 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -24,12 +24,12 @@ class Player; class UILayer; #ifdef _DEBUG_MENUS_ENABLED #include "UIScene_DebugOverlay.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index ef2fa12ef..21b57d641 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -14,8 +14,8 @@ class UILayer; #ifdef _DEBUG_MENUS_ENABLED #include "UIScene_DebugSetCamera.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 52a97123c..135d0380d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -1,9 +1,9 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Minecraft.h" #include "IUIScene_StartGame.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_structs.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 95d35f324..a744382ee 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -1,16 +1,16 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_CreateWorldMenu.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" #include "minecraft/world/level/LevelSettings.h" #include "console_helpers/StringHelpers.h" #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/LevelType.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #if defined(_WINDOWS64) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 5d6c091ae..1020d5c4a 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -1,10 +1,10 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_JoinMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Options.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/net.minecraft.world.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 34a6621b4..206998f9d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -1,13 +1,13 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LoadMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Options.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index c8b5071f6..002844291 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -13,10 +13,10 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #include "console_helpers/PortableFileIO.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/client/ProgressRenderer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/Common/src/Network/SessionInfo.h" #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 4c0c01051..c8da7826f 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -5,7 +5,7 @@ #include "java/File.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" #include "4J_Storage.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index d60012abf..f78694c6c 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -2,12 +2,12 @@ #include "minecraft/util/Mth.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/client/User.h" +#include "minecraft/server/MinecraftServer.h" #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_MainMenu.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 8e9fa5a41..1f548bc47 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_ControlsMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 8c1d0dfbb..83b5778fe 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HelpAndOptionsMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 2f1bf26fd..44ff3466f 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -2,7 +2,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsControlMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index cbf3f196e..138a9e892 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 2c571fb2a..2514fed67 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -4,7 +4,7 @@ #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu( diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 70ac348b9..9e36980f3 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" #include "console_helpers/StringHelpers.h" #include "UIScene_AnvilMenu.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index 92c7177c0..502d3ad90 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -3,7 +3,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_BeaconMenu.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index a02969686..b5ee49881 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_BrewingStandMenu.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" #include "4J_Profile.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index a2e6dc6f7..2940437ef 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -2,7 +2,7 @@ #include #include "UIScene_ContainerMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 8d7f76a4b..125df4618 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -2,7 +2,7 @@ #include #include "UIScene_CreativeMenu.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" @@ -17,7 +17,7 @@ #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 1a29d983b..a318cc7a0 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_DispenserMenu.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index af9b3ae8b..16ba171ee 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -2,7 +2,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_EnchantingMenu.h" UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index b5d48762d..6b8055267 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -3,8 +3,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/player/LocalPlayer.h" #include "UIScene_FireworksMenu.h" UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 12b778b76..753487516 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -2,7 +2,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_FurnaceMenu.h" #include "4J_Profile.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 26f7817f3..f7d243203 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_HopperMenu.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index b61ba875d..2deebc0e6 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_HorseInventoryMenu.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index fd05faf55..87a61e7f9 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -6,11 +6,11 @@ #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/stats/net.minecraft.stats.h" #include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Lighting.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 1eeba9cbf..0e74eb815 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -4,9 +4,9 @@ #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "UIScene_TradingMenu.h" UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 5e45160c4..74f40dc36 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 824d3f4fa..e216176d2 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_DeathMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index ad5ade4fe..42dbc95f6 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -2,10 +2,10 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_EndPoem.h" #include "Minecraft.Client/Common/src/UI/UIBitmapFont.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Font.h" UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index acb324d92..042494971 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameHostOptionsMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/network/net.minecraft.network.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 544af0c85..10e3f23fd 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -2,11 +2,11 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 2929c96d7..0b13d706d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGamePlayerOptionsMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" #define CHECKBOXES_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index ea481bc47..9fb9316ca 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -1,11 +1,11 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_PauseMenu.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 4d8fc86d2..ccb1a5f86 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -2,10 +2,10 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "console_helpers/StringHelpers.h" #include "UIScene_SignEntryMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 9c5ee8be3..532fc34f1 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -1,11 +1,11 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_TeleportMenu.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/server/commands/TeleportCommand.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index ee1731308..e16e51840 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_ConnectingProgress.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index ef909a2e4..808422693 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -1,8 +1,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_FullscreenProgress.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/ProgressRenderer.h" UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index 9b84de710..07c800fb2 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_QuadrantSignin.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "4J_Input.h" UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp index 3dabf0191..4de1e641e 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp @@ -5,14 +5,14 @@ #include "UIScene.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" +#include "minecraft/client/renderer/entity/EnderDragonRenderer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/title/TitleScreen.h" #include "console_helpers/PerformanceTimer.h" #include "UIFontData.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp index 62291fb86..022c16c35 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp @@ -6,8 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/Minecraft.h" class UIScene; diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp index f233b0ba4..360734bf1 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -4,8 +4,8 @@ #include #include "UIScene.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" @@ -25,7 +25,7 @@ #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" #include "java/System.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" class MultiplayerLocalPlayer; diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.cpp b/minecraft/Minecraft.Client/Linux/Linux_App.cpp index 8e0b56c39..cef2ffcab 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp @@ -2,9 +2,9 @@ #include #include "Minecraft.Client/Common/Consoles_App.h" -#include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/client/User.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" #include "Linux_App.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index 304292dac..11464141e 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -36,8 +36,8 @@ static void sigsegv_handler(int sig) { _exit(139); } #endif -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/MapItem.h" #include "minecraft/world/item/crafting/Recipes.h" @@ -49,21 +49,21 @@ static void sigsegv_handler(int sig) { #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/User.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "console_helpers/ThreadName.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/multiplayer/ConnectScreen.h" // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/renderer/Textures.h" #include "console_helpers/compression.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_Defines.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp index 1d6a63931..7983a0f2d 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/MapItem.h" #include "minecraft/world/item/crafting/Recipes.h" @@ -18,20 +18,20 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/User.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "console_helpers/ThreadName.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/multiplayer/ConnectScreen.h" // #include "Social/SocialManager.h" // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/Options.h" #include "Sentient/SentientManager.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "../Resource.h" #include "console_helpers/compression.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp index cbeaa919e..d28e81453 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp @@ -1,10 +1,10 @@  #include "Minecraft.Client/Common/Consoles_App.h" -#include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/client/User.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/level/ServerPlayer.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSettings.h" #include "minecraft/world/level/biome/BiomeSource.h" diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp index 84a06bded..f7aaea330 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -2,8 +2,8 @@ #include "Windows64_UIController.h" // Temp -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Textures.h" #define _ENABLEIGGY diff --git a/minecraft/minecraft/StaticConstructors.cpp b/minecraft/minecraft/StaticConstructors.cpp index a0ef294c2..e55717e95 100644 --- a/minecraft/minecraft/StaticConstructors.cpp +++ b/minecraft/minecraft/StaticConstructors.cpp @@ -1,5 +1,5 @@ #include "minecraft/StaticConstructors.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerLevel.h" #include "minecraft/stats/CommonStats.h" #include "minecraft/SharedConstants.h" #include "minecraft/network/packet/Packet.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp b/minecraft/minecraft/client/Camera.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp rename to minecraft/minecraft/client/Camera.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.h b/minecraft/minecraft/client/Camera.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Camera.h rename to minecraft/minecraft/client/Camera.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp b/minecraft/minecraft/client/ClientConstants.cpp similarity index 80% rename from minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp rename to minecraft/minecraft/client/ClientConstants.cpp index 07c347e18..71147e024 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp +++ b/minecraft/minecraft/client/ClientConstants.cpp @@ -1,5 +1,5 @@ #include "ClientConstants.h" -#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" +#include "minecraft/client/ClientConstants.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" const std::wstring ClientConstants::VERSION_STRING = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h b/minecraft/minecraft/client/ClientConstants.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h rename to minecraft/minecraft/client/ClientConstants.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp b/minecraft/minecraft/client/DemoUser.cpp similarity index 62% rename from minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp rename to minecraft/minecraft/client/DemoUser.cpp index 9f78970c5..17811194d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp +++ b/minecraft/minecraft/client/DemoUser.cpp @@ -1,6 +1,6 @@ #include #include "DemoUser.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/User.h" DemoUser::DemoUser() : User(L"DemoUser", L"n/a") {} \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.h b/minecraft/minecraft/client/DemoUser.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/DemoUser.h rename to minecraft/minecraft/client/DemoUser.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp b/minecraft/minecraft/client/GuiMessage.cpp similarity index 66% rename from minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp rename to minecraft/minecraft/client/GuiMessage.cpp index 461017efb..cd15c705c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp +++ b/minecraft/minecraft/client/GuiMessage.cpp @@ -1,5 +1,5 @@ #include "GuiMessage.h" -#include "Minecraft.Client/net/minecraft/client/GuiMessage.h" +#include "minecraft/client/GuiMessage.h" GuiMessage::GuiMessage(const std::wstring& string) { this->string = string; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h b/minecraft/minecraft/client/GuiMessage.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h rename to minecraft/minecraft/client/GuiMessage.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp b/minecraft/minecraft/client/KeyMapping.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp rename to minecraft/minecraft/client/KeyMapping.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h b/minecraft/minecraft/client/KeyMapping.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h rename to minecraft/minecraft/client/KeyMapping.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp b/minecraft/minecraft/client/Lighting.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp rename to minecraft/minecraft/client/Lighting.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.h b/minecraft/minecraft/client/Lighting.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Lighting.h rename to minecraft/minecraft/client/Lighting.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp b/minecraft/minecraft/client/MemoryTracker.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp rename to minecraft/minecraft/client/MemoryTracker.cpp index d5f5161e1..baa874fba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp +++ b/minecraft/minecraft/client/MemoryTracker.cpp @@ -3,7 +3,7 @@ #include "MemoryTracker.h" #include "java/ByteBuffer.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/MemoryTracker.h" #include "4J.Render/4J_Render.h" std::unordered_map MemoryTracker::GL_LIST_IDS; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h b/minecraft/minecraft/client/MemoryTracker.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h rename to minecraft/minecraft/client/MemoryTracker.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/minecraft/client/Minecraft.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp rename to minecraft/minecraft/client/Minecraft.cpp index e70c03ab4..e04907f46 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/minecraft/client/Minecraft.cpp @@ -5,42 +5,42 @@ #include "Minecraft.Client/include/stdafx.h" #include "Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" -#include "Minecraft.Client/net/minecraft/client/gui/PauseScreen.h" +#include "minecraft/server/level/GameMode.h" +#include "minecraft/client/gui/PauseScreen.h" #include "Timer.h" #include "ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "User.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/model/HumanoidModel.h" #include "Options.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Chunk.h" -#include "Minecraft.Client/net/minecraft/server/level/CreativeMode.h" -#include "Minecraft.Client/net/minecraft/client/level/DemoLevel.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/server/level/SurvivalMode.h" +#include "minecraft/client/renderer/Chunk.h" +#include "minecraft/server/level/CreativeMode.h" +#include "minecraft/client/level/DemoLevel.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "DemoUser.h" -#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/DeathScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h" -#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h" +#include "minecraft/client/gui/particle/GuiParticles.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/DeathScreen.h" +#include "minecraft/client/gui/ErrorScreen.h" +#include "minecraft/client/title/TitleScreen.h" +#include "minecraft/client/gui/inventory/InventoryScreen.h" #if defined(ENABLE_JAVA_GUIS) -#include "Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h" +#include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif -#include "Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h" -#include "Minecraft.Client/net/minecraft/client/player/Input.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" +#include "minecraft/client/gui/InBedChatScreen.h" +#include "minecraft/client/gui/achievement/AchievementPopup.h" +#include "minecraft/client/player/Input.h" +#include "minecraft/client/renderer/culling/FrustumCuller.h" #include "Camera.h" #include "minecraft/world/effect/MobEffect.h" @@ -61,7 +61,7 @@ #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/StaticConstructors.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/world/level/levelgen/HellRandomLevelSource.h" #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" @@ -70,18 +70,18 @@ #include "minecraft/world/level/chunk/SparseLightStorage.h" #include "minecraft/world/level/chunk/SparseDataStorage.h" #include "minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h" +#include "minecraft/client/renderer/texture/TextureManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Common/src/UI/UIFontData.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/gui/Font.h" #include "Minecraft.Client/include/stubs.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/MemoryTracker.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "console_helpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h b/minecraft/minecraft/client/Minecraft.h similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h rename to minecraft/minecraft/client/Minecraft.h index 3ec1e2d07..df67c04bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h +++ b/minecraft/minecraft/client/Minecraft.h @@ -43,7 +43,7 @@ class LivingEntity; #include "java/File.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "4J.Common/4J_Compat.h" #if defined(linux) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp b/minecraft/minecraft/client/Options.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/Options.cpp rename to minecraft/minecraft/client/Options.cpp index a52a31d0d..3a3a9a7bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp +++ b/minecraft/minecraft/client/Options.cpp @@ -1,7 +1,7 @@ #include "Options.h" #include "KeyMapping.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/renderer/Textures.h" #include "minecraft/locale/Language.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" @@ -13,7 +13,7 @@ #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/locale/I18n.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/include/stubs.h" // 4J - the Option sub-class used to be an java enumerated type, trying to diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.h b/minecraft/minecraft/client/Options.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Options.h rename to minecraft/minecraft/client/Options.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp b/minecraft/minecraft/client/ProgressRenderer.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp rename to minecraft/minecraft/client/ProgressRenderer.cpp index e65573aae..89d1d64f6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp +++ b/minecraft/minecraft/client/ProgressRenderer.cpp @@ -1,6 +1,6 @@ #include "ProgressRenderer.h" #include "java/System.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" std::recursive_mutex ProgressRenderer::s_progress; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h b/minecraft/minecraft/client/ProgressRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h rename to minecraft/minecraft/client/ProgressRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp b/minecraft/minecraft/client/Timer.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp rename to minecraft/minecraft/client/Timer.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Timer.h b/minecraft/minecraft/client/Timer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/Timer.h rename to minecraft/minecraft/client/Timer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.cpp b/minecraft/minecraft/client/User.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/User.cpp rename to minecraft/minecraft/client/User.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.h b/minecraft/minecraft/client/User.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/User.h rename to minecraft/minecraft/client/User.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp b/minecraft/minecraft/client/gui/Button.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp rename to minecraft/minecraft/client/gui/Button.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h b/minecraft/minecraft/client/gui/Button.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h rename to minecraft/minecraft/client/gui/Button.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp b/minecraft/minecraft/client/gui/ChatScreen.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp rename to minecraft/minecraft/client/gui/ChatScreen.cpp index 2f62d9741..d6a8a4d50 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp +++ b/minecraft/minecraft/client/gui/ChatScreen.cpp @@ -1,12 +1,12 @@ #include #include "ChatScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/SharedConstants.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" const std::wstring ChatScreen::allowedChars = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h b/minecraft/minecraft/client/gui/ChatScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h rename to minecraft/minecraft/client/gui/ChatScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp b/minecraft/minecraft/client/gui/ConfirmScreen.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp rename to minecraft/minecraft/client/gui/ConfirmScreen.cpp index adaea08aa..7e01e1b56 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp +++ b/minecraft/minecraft/client/gui/ConfirmScreen.cpp @@ -3,8 +3,8 @@ #include "ConfirmScreen.h" #include "SmallButton.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Screen.h" ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1, const std::wstring& title2, int id) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h b/minecraft/minecraft/client/gui/ConfirmScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h rename to minecraft/minecraft/client/gui/ConfirmScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp b/minecraft/minecraft/client/gui/ControlsScreen.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp rename to minecraft/minecraft/client/gui/ControlsScreen.cpp index 818989738..462e6a5c4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp +++ b/minecraft/minecraft/client/gui/ControlsScreen.cpp @@ -1,12 +1,12 @@ #include #include "ControlsScreen.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "SmallButton.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Screen.h" ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h b/minecraft/minecraft/client/gui/ControlsScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h rename to minecraft/minecraft/client/gui/ControlsScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/minecraft/client/gui/CreateWorldScreen.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp rename to minecraft/minecraft/client/gui/CreateWorldScreen.cpp index d4faefa92..b3c01fe0a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp +++ b/minecraft/minecraft/client/gui/CreateWorldScreen.cpp @@ -8,8 +8,8 @@ #include "Button.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/Options.h" #include "MessageScreen.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" @@ -24,8 +24,8 @@ #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h b/minecraft/minecraft/client/gui/CreateWorldScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h rename to minecraft/minecraft/client/gui/CreateWorldScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp b/minecraft/minecraft/client/gui/DeathScreen.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp rename to minecraft/minecraft/client/gui/DeathScreen.cpp index 2b9192c2d..9e61223ec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp +++ b/minecraft/minecraft/client/gui/DeathScreen.cpp @@ -5,11 +5,11 @@ #include "console_helpers/StringHelpers.h" #include "DeathScreen.h" #include "Button.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "PauseScreen.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" void DeathScreen::init() { buttons.clear(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.h b/minecraft/minecraft/client/gui/DeathScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.h rename to minecraft/minecraft/client/gui/DeathScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp b/minecraft/minecraft/client/gui/EditBox.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp rename to minecraft/minecraft/client/gui/EditBox.cpp index 7f338ed0a..0fe146deb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp +++ b/minecraft/minecraft/client/gui/EditBox.cpp @@ -1,6 +1,6 @@ #include "EditBox.h" #include "minecraft/SharedConstants.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h b/minecraft/minecraft/client/gui/EditBox.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h rename to minecraft/minecraft/client/gui/EditBox.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp b/minecraft/minecraft/client/gui/EnchantmentScreen.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp rename to minecraft/minecraft/client/gui/EnchantmentScreen.cpp index 4c5525115..47ccadc5d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp +++ b/minecraft/minecraft/client/gui/EnchantmentScreen.cpp @@ -5,17 +5,17 @@ #include #include "EnchantmentScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/EnchantmentMenu.h" #include "minecraft/world/inventory/Slot.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/locale/Language.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/ItemInstance.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h b/minecraft/minecraft/client/gui/EnchantmentScreen.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h rename to minecraft/minecraft/client/gui/EnchantmentScreen.h index 7a2cd5a84..d6a184d61 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h +++ b/minecraft/minecraft/client/gui/EnchantmentScreen.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/inventory/EnchantmentMenu.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp b/minecraft/minecraft/client/gui/ErrorScreen.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp rename to minecraft/minecraft/client/gui/ErrorScreen.cpp index 6d0b9bc56..1b40a470d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp +++ b/minecraft/minecraft/client/gui/ErrorScreen.cpp @@ -1,5 +1,5 @@ #include "ErrorScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" ErrorScreen::ErrorScreen(const std::wstring& title, const std::wstring& message) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h b/minecraft/minecraft/client/gui/ErrorScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h rename to minecraft/minecraft/client/gui/ErrorScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp b/minecraft/minecraft/client/gui/Font.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp rename to minecraft/minecraft/client/gui/Font.cpp index 58838dd25..f1abc9af2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp +++ b/minecraft/minecraft/client/gui/Font.cpp @@ -2,14 +2,14 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "Font.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Font.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/include/BufferedImage.h" #include "minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h b/minecraft/minecraft/client/gui/Font.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h rename to minecraft/minecraft/client/gui/Font.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/minecraft/client/gui/Gui.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp rename to minecraft/minecraft/client/gui/Gui.cpp index c12431173..eac17ad34 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/minecraft/client/gui/Gui.cpp @@ -1,16 +1,16 @@ #include "Minecraft.Client/include/stdafx.h" #include "Gui.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/server/level/GameMode.h" +#include "minecraft/client/Lighting.h" #include "ChatScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "java/JavaMath.h" #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/effect/net.minecraft.world.effect.h" @@ -21,21 +21,21 @@ #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "java/System.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" +#include "minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "minecraft/net.minecraft.h" #include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/ClientConstants.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/util/Mth.h" #include "console_helpers/StringHelpers.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h b/minecraft/minecraft/client/gui/Gui.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h rename to minecraft/minecraft/client/gui/Gui.h index 7520e9028..ffb01f1b6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h +++ b/minecraft/minecraft/client/gui/Gui.h @@ -1,8 +1,8 @@ #pragma once #include #include "GuiComponent.h" -#include "Minecraft.Client/net/minecraft/client/GuiMessage.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/GuiMessage.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" class Random; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp b/minecraft/minecraft/client/gui/GuiComponent.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp rename to minecraft/minecraft/client/gui/GuiComponent.cpp index 7bdd1f93c..5d90a0b2c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp +++ b/minecraft/minecraft/client/gui/GuiComponent.cpp @@ -2,11 +2,11 @@ #include #include "GuiComponent.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Gui.h" #include "Minecraft.Client/include/stubs.h" void GuiComponent::hLine(int x0, int x1, int y, int col) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h b/minecraft/minecraft/client/gui/GuiComponent.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h rename to minecraft/minecraft/client/gui/GuiComponent.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp b/minecraft/minecraft/client/gui/HopperScreen.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp rename to minecraft/minecraft/client/gui/HopperScreen.cpp index 16094c8f5..9d0c8b448 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp +++ b/minecraft/minecraft/client/gui/HopperScreen.cpp @@ -5,7 +5,7 @@ #include "minecraft/world/inventory/HopperMenu.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h b/minecraft/minecraft/client/gui/HopperScreen.h similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h rename to minecraft/minecraft/client/gui/HopperScreen.h index 39561e00a..7773ccf3b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h +++ b/minecraft/minecraft/client/gui/HopperScreen.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class HopperTileEntity; class MinecartHopper; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp b/minecraft/minecraft/client/gui/InBedChatScreen.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp rename to minecraft/minecraft/client/gui/InBedChatScreen.cpp index a47dd7754..efb838454 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp +++ b/minecraft/minecraft/client/gui/InBedChatScreen.cpp @@ -4,11 +4,11 @@ #include "InBedChatScreen.h" #include "Button.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ChatScreen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ChatScreen.h" #include "Minecraft.Client/include/stubs.h" void InBedChatScreen::init() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.h b/minecraft/minecraft/client/gui/InBedChatScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.h rename to minecraft/minecraft/client/gui/InBedChatScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp b/minecraft/minecraft/client/gui/JoinMultiplayerScreen.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp rename to minecraft/minecraft/client/gui/JoinMultiplayerScreen.cpp index 33d06d79d..859d3e9fa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/minecraft/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -3,11 +3,11 @@ #include "JoinMultiplayerScreen.h" #include "Button.h" #include "EditBox.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "console_helpers/StringHelpers.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h b/minecraft/minecraft/client/gui/JoinMultiplayerScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h rename to minecraft/minecraft/client/gui/JoinMultiplayerScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp b/minecraft/minecraft/client/gui/MerchantScreen.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp rename to minecraft/minecraft/client/gui/MerchantScreen.cpp index 6dc6a8944..62ae9df34 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp +++ b/minecraft/minecraft/client/gui/MerchantScreen.cpp @@ -4,10 +4,10 @@ #include "MerchantScreen.h" #include "TradeSwitchButton.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/CustomPayloadPacket.h" @@ -15,8 +15,8 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/trading/Merchant.h" #include "minecraft/world/item/trading/MerchantRecipeList.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h b/minecraft/minecraft/client/gui/MerchantScreen.h similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h rename to minecraft/minecraft/client/gui/MerchantScreen.h index 332aa9248..03f0f1934 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h +++ b/minecraft/minecraft/client/gui/MerchantScreen.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp b/minecraft/minecraft/client/gui/MessageScreen.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp rename to minecraft/minecraft/client/gui/MessageScreen.cpp index a428480a8..505994470 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp +++ b/minecraft/minecraft/client/gui/MessageScreen.cpp @@ -1,7 +1,7 @@ #include #include "MessageScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" MessageScreen::MessageScreen(const std::wstring& message) { this->message = message; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h b/minecraft/minecraft/client/gui/MessageScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h rename to minecraft/minecraft/client/gui/MessageScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp b/minecraft/minecraft/client/gui/Minimap.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp rename to minecraft/minecraft/client/gui/Minimap.cpp index 02df7336d..33689a3fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp +++ b/minecraft/minecraft/client/gui/Minimap.cpp @@ -3,11 +3,11 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minimap.h" #include "Font.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h b/minecraft/minecraft/client/gui/Minimap.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h rename to minecraft/minecraft/client/gui/Minimap.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp b/minecraft/minecraft/client/gui/NameEntryScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp rename to minecraft/minecraft/client/gui/NameEntryScreen.cpp index 55f721454..428106860 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp +++ b/minecraft/minecraft/client/gui/NameEntryScreen.cpp @@ -3,8 +3,8 @@ #include "NameEntryScreen.h" #include "Button.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" const std::wstring NameEntryScreen::allowedChars = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h b/minecraft/minecraft/client/gui/NameEntryScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h rename to minecraft/minecraft/client/gui/NameEntryScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp b/minecraft/minecraft/client/gui/OptionsScreen.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp rename to minecraft/minecraft/client/gui/OptionsScreen.cpp index eff4d2dee..e0e3d4926 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp +++ b/minecraft/minecraft/client/gui/OptionsScreen.cpp @@ -3,13 +3,13 @@ #include "OptionsScreen.h" #include "SmallButton.h" #include "SlideButton.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "ControlsScreen.h" #include "VideoSettingsScreen.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Screen.h" OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { title = L"Options"; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h b/minecraft/minecraft/client/gui/OptionsScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h rename to minecraft/minecraft/client/gui/OptionsScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp b/minecraft/minecraft/client/gui/PauseScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp rename to minecraft/minecraft/client/gui/PauseScreen.cpp index 58bf2666e..d68b169d8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp +++ b/minecraft/minecraft/client/gui/PauseScreen.cpp @@ -8,16 +8,16 @@ #include "Button.h" #include "MessageScreen.h" #include "OptionsScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/server/MinecraftServer.h" #include "4J_Profile.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/locale/I18n.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" PauseScreen::PauseScreen() { saveStep = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h b/minecraft/minecraft/client/gui/PauseScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h rename to minecraft/minecraft/client/gui/PauseScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp b/minecraft/minecraft/client/gui/RenameWorldScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp rename to minecraft/minecraft/client/gui/RenameWorldScreen.cpp index ba4a1f98d..01250b27d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp +++ b/minecraft/minecraft/client/gui/RenameWorldScreen.cpp @@ -6,8 +6,8 @@ #include "console_helpers/StringHelpers.h" #include "minecraft/locale/Language.h" #include "minecraft/world/level/storage/LevelStorageSource.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" RenameWorldScreen::RenameWorldScreen(Screen* lastScreen, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h b/minecraft/minecraft/client/gui/RenameWorldScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h rename to minecraft/minecraft/client/gui/RenameWorldScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp b/minecraft/minecraft/client/gui/RepairScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp rename to minecraft/minecraft/client/gui/RepairScreen.cpp index 952ccc5a4..b244b68dd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp +++ b/minecraft/minecraft/client/gui/RepairScreen.cpp @@ -4,11 +4,11 @@ #include "RepairScreen.h" #include "EditBox.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/AnvilMenu.h" #include "minecraft/world/inventory/Slot.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/Minecraft.h" #include "4J.Render/4J_Render.h" #include "minecraft/locale/Language.h" #include "minecraft/network/packet/CustomPayloadPacket.h" @@ -16,8 +16,8 @@ #include "minecraft/world/item/ItemInstance.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class Inventory; class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h b/minecraft/minecraft/client/gui/RepairScreen.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h rename to minecraft/minecraft/client/gui/RepairScreen.h index 61d99620e..00485ed4d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h +++ b/minecraft/minecraft/client/gui/RepairScreen.h @@ -3,7 +3,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/inventory/AnvilMenu.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/minecraft/client/gui/Screen.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp rename to minecraft/minecraft/client/gui/Screen.cpp index e03db7ca1..431497c40 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp +++ b/minecraft/minecraft/client/gui/Screen.cpp @@ -1,15 +1,15 @@ #include "Screen.h" #include "Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" +#include "minecraft/client/gui/particle/GuiParticles.h" #include "minecraft/sounds/SoundTypes.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" #include "4J_Profile.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/include/stubs.h" Screen::Screen() // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h b/minecraft/minecraft/client/gui/Screen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h rename to minecraft/minecraft/client/gui/Screen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp b/minecraft/minecraft/client/gui/ScreenSizeCalculator.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp rename to minecraft/minecraft/client/gui/ScreenSizeCalculator.cpp index 3ebaa95e7..03dc7d35d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp +++ b/minecraft/minecraft/client/gui/ScreenSizeCalculator.cpp @@ -1,8 +1,8 @@ #include #include "ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" // who the fuck thought this was a good idea ScreenSizeCalculator::ScreenSizeCalculator(Options* options, int width, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h b/minecraft/minecraft/client/gui/ScreenSizeCalculator.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h rename to minecraft/minecraft/client/gui/ScreenSizeCalculator.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp b/minecraft/minecraft/client/gui/ScrolledSelectionList.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp rename to minecraft/minecraft/client/gui/ScrolledSelectionList.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h b/minecraft/minecraft/client/gui/ScrolledSelectionList.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h rename to minecraft/minecraft/client/gui/ScrolledSelectionList.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp b/minecraft/minecraft/client/gui/SelectWorldScreen.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp rename to minecraft/minecraft/client/gui/SelectWorldScreen.cpp index 8c304353c..c3940c9fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp +++ b/minecraft/minecraft/client/gui/SelectWorldScreen.cpp @@ -14,9 +14,9 @@ #include "minecraft/locale/Language.h" #include "minecraft/world/level/storage/LevelStorageSource.h" #include "minecraft/world/level/storage/LevelSummary.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ScrolledSelectionList.h" SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h b/minecraft/minecraft/client/gui/SelectWorldScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h rename to minecraft/minecraft/client/gui/SelectWorldScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp b/minecraft/minecraft/client/gui/SlideButton.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp rename to minecraft/minecraft/client/gui/SlideButton.cpp index 09dbccf07..7de5084e3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp +++ b/minecraft/minecraft/client/gui/SlideButton.cpp @@ -1,8 +1,8 @@ #include "SlideButton.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/gui/Button.h" SlideButton::SlideButton(int id, int x, int y, const Options::Option* option, const std::wstring& msg, float value) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h b/minecraft/minecraft/client/gui/SlideButton.h similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h rename to minecraft/minecraft/client/gui/SlideButton.h index a7d8572a6..87c01df48 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h +++ b/minecraft/minecraft/client/gui/SlideButton.h @@ -2,7 +2,7 @@ #include #include "Button.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp b/minecraft/minecraft/client/gui/SmallButton.cpp similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp rename to minecraft/minecraft/client/gui/SmallButton.cpp index 85d369234..1a5732968 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp +++ b/minecraft/minecraft/client/gui/SmallButton.cpp @@ -1,6 +1,6 @@ #include "SmallButton.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/gui/Button.h" SmallButton::SmallButton(int id, int x, int y, const std::wstring& msg) : Button(id, x, y, 150, 20, msg) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h b/minecraft/minecraft/client/gui/SmallButton.h similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h rename to minecraft/minecraft/client/gui/SmallButton.h index 46df632d9..7d39190bf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h +++ b/minecraft/minecraft/client/gui/SmallButton.h @@ -2,7 +2,7 @@ #include #include "Button.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" class SmallButton : public Button { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp b/minecraft/minecraft/client/gui/TradeSwitchButton.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp rename to minecraft/minecraft/client/gui/TradeSwitchButton.cpp index 540e771da..a0030f349 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp +++ b/minecraft/minecraft/client/gui/TradeSwitchButton.cpp @@ -1,7 +1,7 @@ #include #include "TradeSwitchButton.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Button.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.h b/minecraft/minecraft/client/gui/TradeSwitchButton.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.h rename to minecraft/minecraft/client/gui/TradeSwitchButton.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp b/minecraft/minecraft/client/gui/VideoSettingsScreen.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp rename to minecraft/minecraft/client/gui/VideoSettingsScreen.cpp index cb609fb24..7c4021383 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/minecraft/minecraft/client/gui/VideoSettingsScreen.cpp @@ -3,11 +3,11 @@ #include "VideoSettingsScreen.h" #include "SmallButton.h" #include "SlideButton.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Screen.h" // 4jcraft #define ITEM_COUNT 10 diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h b/minecraft/minecraft/client/gui/VideoSettingsScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h rename to minecraft/minecraft/client/gui/VideoSettingsScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp b/minecraft/minecraft/client/gui/achievement/AchievementPopup.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp rename to minecraft/minecraft/client/gui/achievement/AchievementPopup.cpp index b9806240d..f1287dce0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/minecraft/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -1,13 +1,13 @@ #include #include "AchievementPopup.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "java/System.h" #include "4J.Render/4J_Render.h" #include "minecraft/locale/I18n.h" #include "minecraft/stats/Achievement.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" AchievementPopup::AchievementPopup(Minecraft* mc) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h b/minecraft/minecraft/client/gui/achievement/AchievementPopup.h similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h rename to minecraft/minecraft/client/gui/achievement/AchievementPopup.h index c310c540a..44563515f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h +++ b/minecraft/minecraft/client/gui/achievement/AchievementPopup.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/GuiComponent.h" +#include "minecraft/client/gui/GuiComponent.h" class Achievement; class ItemRenderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp b/minecraft/minecraft/client/gui/achievement/AchievementScreen.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp rename to minecraft/minecraft/client/gui/achievement/AchievementScreen.cpp index a5a88029b..c41752f32 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/minecraft/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -3,16 +3,16 @@ #include #include "AchievementScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/SmallButton.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/KeyMapping.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/gui/SmallButton.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/KeyMapping.h" +#include "minecraft/client/gui/Font.h" #include "4J.Render/4J_Render.h" #include "minecraft/locale/I18n.h" #include "minecraft/stats/Achievement.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h b/minecraft/minecraft/client/gui/achievement/AchievementScreen.h similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h rename to minecraft/minecraft/client/gui/achievement/AchievementScreen.h index 70b6f0105..348bee5c7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h +++ b/minecraft/minecraft/client/gui/achievement/AchievementScreen.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" #include "minecraft/stats/net.minecraft.stats.h" #include "minecraft/stats/Achievements.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp b/minecraft/minecraft/client/gui/achievement/StatsScreen.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp rename to minecraft/minecraft/client/gui/achievement/StatsScreen.cpp index f5addffa7..cd33cff41 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/minecraft/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,8 +1,8 @@ #include "StatsScreen.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Font.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "console_helpers/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" @@ -11,9 +11,9 @@ #include "minecraft/stats/ItemStat.h" #include "minecraft/stats/Stat.h" #include "minecraft/stats/Stats.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ScrolledSelectionList.h" #include "Minecraft.Client/include/stubs.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h b/minecraft/minecraft/client/gui/achievement/StatsScreen.h similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h rename to minecraft/minecraft/client/gui/achievement/StatsScreen.h index fed6a0d93..17dc2fe37 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h +++ b/minecraft/minecraft/client/gui/achievement/StatsScreen.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ScrolledSelectionList.h" class ItemStat; class ItemRenderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp rename to minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 8f2468711..2a0300f7e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -1,7 +1,7 @@ #include #include "AbstractBeaconButton.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Button.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h b/minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h rename to minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.h index a38f1ff82..f1111ff29 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h +++ b/minecraft/minecraft/client/gui/inventory/AbstractBeaconButton.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Button.h" class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp rename to minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index a68068a35..e79964fec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -2,19 +2,19 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/KeyMapping.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/KeyMapping.h" +#include "minecraft/client/Options.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/Rarity.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/include/stubs.h" ItemRenderer* AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h b/minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.h similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h rename to minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.h index 315c90704..4a4c4dace 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h +++ b/minecraft/minecraft/client/gui/inventory/AbstractContainerScreen.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class ItemRenderer; class AbstractContainerMenu; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/minecraft/minecraft/client/gui/inventory/BeaconCancelButton.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp rename to minecraft/minecraft/client/gui/inventory/BeaconCancelButton.cpp index 7ce9061a6..cb301071e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/minecraft/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -3,7 +3,7 @@ #include "BeaconCancelButton.h" #include "BeaconScreen.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.h b/minecraft/minecraft/client/gui/inventory/BeaconCancelButton.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.h rename to minecraft/minecraft/client/gui/inventory/BeaconCancelButton.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/minecraft/minecraft/client/gui/inventory/BeaconConfirmButton.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp rename to minecraft/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index 4c36a20ed..78d684fcf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/minecraft/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -3,7 +3,7 @@ #include "BeaconConfirmButton.h" #include "BeaconScreen.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.h b/minecraft/minecraft/client/gui/inventory/BeaconConfirmButton.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.h rename to minecraft/minecraft/client/gui/inventory/BeaconConfirmButton.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/minecraft/minecraft/client/gui/inventory/BeaconPowerButton.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp rename to minecraft/minecraft/client/gui/inventory/BeaconPowerButton.cpp index d6f91fbf8..fbc041ed5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/minecraft/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -4,7 +4,7 @@ #include "BeaconScreen.h" #include "minecraft/world/effect/MobEffect.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h b/minecraft/minecraft/client/gui/inventory/BeaconPowerButton.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h rename to minecraft/minecraft/client/gui/inventory/BeaconPowerButton.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp b/minecraft/minecraft/client/gui/inventory/BeaconScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp rename to minecraft/minecraft/client/gui/inventory/BeaconScreen.cpp index 8eb16f9fd..6fe6d0c16 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -7,9 +7,9 @@ #include "BeaconConfirmButton.h" #include "BeaconCancelButton.h" #include "BeaconPowerButton.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/ClientConnection.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "4J.Render/4J_Render.h" @@ -19,10 +19,10 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/BeaconMenu.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes (and iggy too) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h b/minecraft/minecraft/client/gui/inventory/BeaconScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h rename to minecraft/minecraft/client/gui/inventory/BeaconScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/minecraft/minecraft/client/gui/inventory/BrewingStandScreen.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp rename to minecraft/minecraft/client/gui/inventory/BrewingStandScreen.cpp index 165496590..ee5c6bbdf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -5,8 +5,8 @@ #include "minecraft/world/inventory/BrewingStandMenu.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h b/minecraft/minecraft/client/gui/inventory/BrewingStandScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h rename to minecraft/minecraft/client/gui/inventory/BrewingStandScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp b/minecraft/minecraft/client/gui/inventory/ContainerScreen.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp rename to minecraft/minecraft/client/gui/inventory/ContainerScreen.cpp index c3e68123f..ac768bd5a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -1,7 +1,7 @@ #include "ContainerScreen.h" #include "minecraft/world/Container.h" #include "minecraft/world/inventory/ContainerMenu.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" ContainerScreen::ContainerScreen(std::shared_ptr inventory, std::shared_ptr container) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h b/minecraft/minecraft/client/gui/inventory/ContainerScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h rename to minecraft/minecraft/client/gui/inventory/ContainerScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp b/minecraft/minecraft/client/gui/inventory/CraftingScreen.cpp similarity index 81% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp rename to minecraft/minecraft/client/gui/inventory/CraftingScreen.cpp index 1f42875a1..6f19da82d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/CraftingScreen.cpp @@ -1,14 +1,14 @@ #include #include "CraftingScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/locale/Language.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/CraftingMenu.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class Player; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h b/minecraft/minecraft/client/gui/inventory/CraftingScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h rename to minecraft/minecraft/client/gui/inventory/CraftingScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp rename to minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 08032c89d..082d5c622 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/SimpleContainer.h" #include "minecraft/world/inventory/Slot.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "minecraft/world/inventory/InventoryMenu.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" @@ -16,10 +16,10 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/include/stubs.h" // Static member initialization diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.h similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h rename to minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.h index d081244e6..d024a093c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/minecraft/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -5,7 +5,7 @@ #include "AbstractContainerScreen.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" class Player; class SimpleContainer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp b/minecraft/minecraft/client/gui/inventory/FurnaceScreen.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp rename to minecraft/minecraft/client/gui/inventory/FurnaceScreen.cpp index fdafac4b5..c125d8790 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/FurnaceScreen.cpp @@ -1,11 +1,11 @@ #include #include "FurnaceScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/FurnaceMenu.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h b/minecraft/minecraft/client/gui/inventory/FurnaceScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h rename to minecraft/minecraft/client/gui/inventory/FurnaceScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/minecraft/minecraft/client/gui/inventory/HorseInventoryScreen.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp rename to minecraft/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index 0463b0e82..31d68a8e8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -4,8 +4,8 @@ #include "minecraft/world/inventory/HorseInventoryMenu.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class EntityHorse; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h b/minecraft/minecraft/client/gui/inventory/HorseInventoryScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h rename to minecraft/minecraft/client/gui/inventory/HorseInventoryScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp b/minecraft/minecraft/client/gui/inventory/InventoryScreen.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp rename to minecraft/minecraft/client/gui/inventory/InventoryScreen.cpp index 8c08bd0ae..be7a1fb80 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -2,15 +2,15 @@ #include #include "InventoryScreen.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/achievement/AchievementScreen.h" +#include "minecraft/client/gui/achievement/StatsScreen.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" InventoryScreen::InventoryScreen(std::shared_ptr player) : AbstractContainerScreen(player->inventoryMenu) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h b/minecraft/minecraft/client/gui/inventory/InventoryScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h rename to minecraft/minecraft/client/gui/inventory/InventoryScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp b/minecraft/minecraft/client/gui/inventory/TextEditScreen.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp rename to minecraft/minecraft/client/gui/inventory/TextEditScreen.cpp index 93c72b442..40c682ea4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -1,17 +1,17 @@ #include #include "TextEditScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/client/multiplayer/ClientConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "minecraft/SharedConstants.h" #include "4J.Render/4J_Render.h" #include "minecraft/network/packet/SignUpdatePacket.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" const std::wstring TextEditScreen::allowedChars = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h b/minecraft/minecraft/client/gui/inventory/TextEditScreen.h similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h rename to minecraft/minecraft/client/gui/inventory/TextEditScreen.h index 8f5aabbb1..ef2d8a655 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h +++ b/minecraft/minecraft/client/gui/inventory/TextEditScreen.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class SignTileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp b/minecraft/minecraft/client/gui/inventory/TrapScreen.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp rename to minecraft/minecraft/client/gui/inventory/TrapScreen.cpp index 627f14c25..25af93f6e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/minecraft/minecraft/client/gui/inventory/TrapScreen.cpp @@ -4,8 +4,8 @@ #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/TrapMenu.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.h b/minecraft/minecraft/client/gui/inventory/TrapScreen.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.h rename to minecraft/minecraft/client/gui/inventory/TrapScreen.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp b/minecraft/minecraft/client/gui/particle/GuiParticle.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp rename to minecraft/minecraft/client/gui/particle/GuiParticle.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.h b/minecraft/minecraft/client/gui/particle/GuiParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.h rename to minecraft/minecraft/client/gui/particle/GuiParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp b/minecraft/minecraft/client/gui/particle/GuiParticles.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp rename to minecraft/minecraft/client/gui/particle/GuiParticles.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h b/minecraft/minecraft/client/gui/particle/GuiParticles.h similarity index 82% rename from minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h rename to minecraft/minecraft/client/gui/particle/GuiParticles.h index ab6dfc265..a1d96b806 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h +++ b/minecraft/minecraft/client/gui/particle/GuiParticles.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/gui/GuiComponent.h" +#include "minecraft/client/gui/GuiComponent.h" class GuiParticle; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp b/minecraft/minecraft/client/level/DemoLevel.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp rename to minecraft/minecraft/client/level/DemoLevel.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h b/minecraft/minecraft/client/level/DemoLevel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h rename to minecraft/minecraft/client/level/DemoLevel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp b/minecraft/minecraft/client/model/BatModel.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp rename to minecraft/minecraft/client/model/BatModel.cpp index 0fcc5c2bc..10cf3aadd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp +++ b/minecraft/minecraft/client/model/BatModel.cpp @@ -3,10 +3,10 @@ #include #include "BatModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ambient/Bat.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" BatModel::BatModel() : Model() { texWidth = 64; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h b/minecraft/minecraft/client/model/BatModel.h similarity index 87% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h rename to minecraft/minecraft/client/model/BatModel.h index 15e0be6f7..f726b2011 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h +++ b/minecraft/minecraft/client/model/BatModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp b/minecraft/minecraft/client/model/BlazeModel.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp rename to minecraft/minecraft/client/model/BlazeModel.cpp index bd3290038..46450a6f8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp +++ b/minecraft/minecraft/client/model/BlazeModel.cpp @@ -3,8 +3,8 @@ #include #include "BlazeModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" BlazeModel::BlazeModel() : Model() { upperBodyParts = std::vector(12); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h b/minecraft/minecraft/client/model/BlazeModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h rename to minecraft/minecraft/client/model/BlazeModel.h index f3506e3ab..38eaa3498 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h +++ b/minecraft/minecraft/client/model/BlazeModel.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp b/minecraft/minecraft/client/model/BoatModel.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp rename to minecraft/minecraft/client/model/BoatModel.cpp index c2914b36d..c95211f04 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp +++ b/minecraft/minecraft/client/model/BoatModel.cpp @@ -2,8 +2,8 @@ #include #include "BoatModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" BoatModel::BoatModel() : Model() { cubes[0] = new ModelPart(this, 0, 8); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h b/minecraft/minecraft/client/model/BoatModel.h similarity index 68% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h rename to minecraft/minecraft/client/model/BoatModel.h index dc4a80a79..6be8a6fbd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h +++ b/minecraft/minecraft/client/model/BoatModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp b/minecraft/minecraft/client/model/BookModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp rename to minecraft/minecraft/client/model/BookModel.cpp index b5a994797..655e7e5f5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp +++ b/minecraft/minecraft/client/model/BookModel.cpp @@ -3,7 +3,7 @@ #include #include "BookModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" BookModel::BookModel() { leftLid = (new ModelPart(this))->texOffs(0, 0)->addBox(-6, -5, 0, 6, 10, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h b/minecraft/minecraft/client/model/BookModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h rename to minecraft/minecraft/client/model/BookModel.h index 0d08c6241..4efb7d06e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h +++ b/minecraft/minecraft/client/model/BookModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp b/minecraft/minecraft/client/model/ChestModel.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp rename to minecraft/minecraft/client/model/ChestModel.cpp index 9f00bb80f..6be5cc22e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp +++ b/minecraft/minecraft/client/model/ChestModel.cpp @@ -1,7 +1,7 @@ #include #include "ChestModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" ChestModel::ChestModel() { lid = ((new ModelPart(this, 0, 0)))->setTexSize(64, 64); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h b/minecraft/minecraft/client/model/ChestModel.h similarity index 77% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h rename to minecraft/minecraft/client/model/ChestModel.h index f5864e7a5..9b467ed14 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h +++ b/minecraft/minecraft/client/model/ChestModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class Cube; class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp b/minecraft/minecraft/client/model/ChickenModel.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp rename to minecraft/minecraft/client/model/ChickenModel.cpp index 5d60b0a18..7eb8d0fc6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp +++ b/minecraft/minecraft/client/model/ChickenModel.cpp @@ -3,9 +3,9 @@ #include #include "ChickenModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" ChickenModel::ChickenModel() : Model() { int yo = 16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h b/minecraft/minecraft/client/model/ChickenModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h rename to minecraft/minecraft/client/model/ChickenModel.h index 34f9f5ec8..c7f5d2b22 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h +++ b/minecraft/minecraft/client/model/ChickenModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp b/minecraft/minecraft/client/model/CowModel.cpp similarity index 85% rename from minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp rename to minecraft/minecraft/client/model/CowModel.cpp index 1bec3b31b..453450636 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp +++ b/minecraft/minecraft/client/model/CowModel.cpp @@ -1,6 +1,6 @@ #include "CowModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/QuadrupedModel.h" CowModel::CowModel() : QuadrupedModel(12, 0) { head = new ModelPart(this, 0, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.h b/minecraft/minecraft/client/model/CowModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.h rename to minecraft/minecraft/client/model/CowModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp b/minecraft/minecraft/client/model/CreeperModel.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp rename to minecraft/minecraft/client/model/CreeperModel.cpp index 98a287026..f45051c6a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp +++ b/minecraft/minecraft/client/model/CreeperModel.cpp @@ -3,8 +3,8 @@ #include #include "CreeperModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" // 4J - added void CreeperModel::_init(float g) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h b/minecraft/minecraft/client/model/CreeperModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h rename to minecraft/minecraft/client/model/CreeperModel.h index 512a4d761..10fb6b717 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h +++ b/minecraft/minecraft/client/model/CreeperModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp b/minecraft/minecraft/client/model/EndermanModel.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp rename to minecraft/minecraft/client/model/EndermanModel.cpp index 5cc33731b..4f22f09f7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp +++ b/minecraft/minecraft/client/model/EndermanModel.cpp @@ -1,8 +1,8 @@ #include #include "EndermanModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" EndermanModel::EndermanModel() : HumanoidModel(0, -14, 64, 32) { carrying = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.h b/minecraft/minecraft/client/model/EndermanModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.h rename to minecraft/minecraft/client/model/EndermanModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp b/minecraft/minecraft/client/model/GhastModel.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp rename to minecraft/minecraft/client/model/GhastModel.cpp index 30d2f6630..c8f525d61 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp +++ b/minecraft/minecraft/client/model/GhastModel.cpp @@ -3,9 +3,9 @@ #include "java/Random.h" #include "GhastModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" GhastModel::GhastModel() : Model() { int yoffs = -16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h b/minecraft/minecraft/client/model/GhastModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h rename to minecraft/minecraft/client/model/GhastModel.h index 8f822a5a2..dad0e1abf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h +++ b/minecraft/minecraft/client/model/GhastModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp b/minecraft/minecraft/client/model/HumanoidModel.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp rename to minecraft/minecraft/client/model/HumanoidModel.cpp index f607d1c1c..83b811c2c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp +++ b/minecraft/minecraft/client/model/HumanoidModel.cpp @@ -5,11 +5,11 @@ #include "HumanoidModel.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h b/minecraft/minecraft/client/model/HumanoidModel.h similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h rename to minecraft/minecraft/client/model/HumanoidModel.h index d2c5c2197..9f6edbba1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h +++ b/minecraft/minecraft/client/model/HumanoidModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" #include "Minecraft.Client/include/SkinBox.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp b/minecraft/minecraft/client/model/LargeChestModel.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp rename to minecraft/minecraft/client/model/LargeChestModel.cpp index 276ec5ea2..d8eead0a5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp +++ b/minecraft/minecraft/client/model/LargeChestModel.cpp @@ -1,5 +1,5 @@ #include "LargeChestModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" LargeChestModel::LargeChestModel() { lid = ((new ModelPart(this, 0, 0)))->setTexSize(128, 64); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.h b/minecraft/minecraft/client/model/LargeChestModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.h rename to minecraft/minecraft/client/model/LargeChestModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp b/minecraft/minecraft/client/model/LavaSlimeModel.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp rename to minecraft/minecraft/client/model/LavaSlimeModel.cpp index 58c1dcc9b..92065677b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp +++ b/minecraft/minecraft/client/model/LavaSlimeModel.cpp @@ -1,7 +1,7 @@ #include #include "LavaSlimeModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/monster/LavaSlime.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h b/minecraft/minecraft/client/model/LavaSlimeModel.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h rename to minecraft/minecraft/client/model/LavaSlimeModel.h index 89af592a2..11ec322cf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h +++ b/minecraft/minecraft/client/model/LavaSlimeModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp b/minecraft/minecraft/client/model/LeashKnotModel.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp rename to minecraft/minecraft/client/model/LeashKnotModel.cpp index 83e22fdad..509461a9c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp +++ b/minecraft/minecraft/client/model/LeashKnotModel.cpp @@ -2,8 +2,8 @@ #include #include "LeashKnotModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" LeashKnotModel::LeashKnotModel() { _init(0, 0, 32, 32); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h b/minecraft/minecraft/client/model/LeashKnotModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h rename to minecraft/minecraft/client/model/LeashKnotModel.h index 42e3aded8..7cd8df59d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h +++ b/minecraft/minecraft/client/model/LeashKnotModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp b/minecraft/minecraft/client/model/MinecartModel.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp rename to minecraft/minecraft/client/model/MinecartModel.cpp index 9f0285ae5..4e538a04a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp +++ b/minecraft/minecraft/client/model/MinecartModel.cpp @@ -2,8 +2,8 @@ #include #include "MinecartModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" MinecartModel::MinecartModel() : Model() { cubes[0] = new ModelPart(this, 0, 10); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h b/minecraft/minecraft/client/model/MinecartModel.h similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h rename to minecraft/minecraft/client/model/MinecartModel.h index b023a8057..f756f9f8a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h +++ b/minecraft/minecraft/client/model/MinecartModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp b/minecraft/minecraft/client/model/ModelHorse.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp rename to minecraft/minecraft/client/model/ModelHorse.cpp index 697f14d5b..549cbd798 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp +++ b/minecraft/minecraft/client/model/ModelHorse.cpp @@ -5,12 +5,12 @@ #include "minecraft/util/Mth.h" #include "ModelHorse.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" #include "minecraft/util/Mth.h" ModelHorse::ModelHorse() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h b/minecraft/minecraft/client/model/ModelHorse.h similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h rename to minecraft/minecraft/client/model/ModelHorse.h index 956b44ef7..893d09bec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h +++ b/minecraft/minecraft/client/model/ModelHorse.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp b/minecraft/minecraft/client/model/OcelotModel.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp rename to minecraft/minecraft/client/model/OcelotModel.cpp index da5b0a323..c806fd95d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp +++ b/minecraft/minecraft/client/model/OcelotModel.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "OcelotModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h b/minecraft/minecraft/client/model/OcelotModel.h similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h rename to minecraft/minecraft/client/model/OcelotModel.h index 10efd9f11..ee5a4d96e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h +++ b/minecraft/minecraft/client/model/OcelotModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp b/minecraft/minecraft/client/model/PigModel.cpp similarity index 72% rename from minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp rename to minecraft/minecraft/client/model/PigModel.cpp index bffb5e164..512af6ece 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp +++ b/minecraft/minecraft/client/model/PigModel.cpp @@ -1,6 +1,6 @@ #include "PigModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/QuadrupedModel.h" PigModel::PigModel() : QuadrupedModel(6, 0) { head->texOffs(16, 16)->addBox(-2.0f, 0.0f, -9.0f, 4, 3, 1, 0.0f); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.h b/minecraft/minecraft/client/model/PigModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.h rename to minecraft/minecraft/client/model/PigModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp b/minecraft/minecraft/client/model/Polygon.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp rename to minecraft/minecraft/client/model/Polygon.cpp index 01e6eea53..0aeba7483 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp +++ b/minecraft/minecraft/client/model/Polygon.cpp @@ -5,7 +5,7 @@ #include "Vertex.h" #include "Polygon.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" _Polygon::_Polygon(const std::span vertices) : vertexCount(vertices.size()), diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h b/minecraft/minecraft/client/model/Polygon.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h rename to minecraft/minecraft/client/model/Polygon.h index 1c4c16209..6f0d625ec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h +++ b/minecraft/minecraft/client/model/Polygon.h @@ -4,7 +4,7 @@ #include #include "Vertex.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp b/minecraft/minecraft/client/model/QuadrupedModel.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp rename to minecraft/minecraft/client/model/QuadrupedModel.cpp index e68e3f20e..8c964e1a0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp +++ b/minecraft/minecraft/client/model/QuadrupedModel.cpp @@ -3,9 +3,9 @@ #include #include "QuadrupedModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" QuadrupedModel::QuadrupedModel(int legSize, float g) : Model() { yHeadOffs = 8; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h b/minecraft/minecraft/client/model/QuadrupedModel.h similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h rename to minecraft/minecraft/client/model/QuadrupedModel.h index 81178035a..feeb11673 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h +++ b/minecraft/minecraft/client/model/QuadrupedModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp b/minecraft/minecraft/client/model/SheepFurModel.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp rename to minecraft/minecraft/client/model/SheepFurModel.cpp index 24197f38f..4af8ae288 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp +++ b/minecraft/minecraft/client/model/SheepFurModel.cpp @@ -1,10 +1,10 @@ #include #include "SheepFurModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" -#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "minecraft/client/model/QuadrupedModel.h" SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.h b/minecraft/minecraft/client/model/SheepFurModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.h rename to minecraft/minecraft/client/model/SheepFurModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp b/minecraft/minecraft/client/model/SheepModel.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp rename to minecraft/minecraft/client/model/SheepModel.cpp index e641affa6..604c45d1b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp +++ b/minecraft/minecraft/client/model/SheepModel.cpp @@ -1,10 +1,10 @@ #include #include "SheepModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" -#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "minecraft/client/model/QuadrupedModel.h" SheepModel::SheepModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.h b/minecraft/minecraft/client/model/SheepModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.h rename to minecraft/minecraft/client/model/SheepModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp b/minecraft/minecraft/client/model/SignModel.cpp similarity index 87% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp rename to minecraft/minecraft/client/model/SignModel.cpp index 2631f5b15..b482db29d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp +++ b/minecraft/minecraft/client/model/SignModel.cpp @@ -1,5 +1,5 @@ #include "SignModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" SignModel::SignModel() { cube = new ModelPart(this, 0, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h b/minecraft/minecraft/client/model/SignModel.h similarity index 75% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h rename to minecraft/minecraft/client/model/SignModel.h index e86ba19c1..746cc8557 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h +++ b/minecraft/minecraft/client/model/SignModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class Cube; class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp b/minecraft/minecraft/client/model/SilverfishModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp rename to minecraft/minecraft/client/model/SilverfishModel.cpp index 69e3a3d52..d982de35e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp +++ b/minecraft/minecraft/client/model/SilverfishModel.cpp @@ -4,7 +4,7 @@ #include #include "SilverfishModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = { {3, 2, 2}, {4, 3, 2}, {6, 4, 3}, {3, 3, 3}, {2, 2, 3}, {2, 1, 2}, {1, 1, 2}, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h b/minecraft/minecraft/client/model/SilverfishModel.h similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h rename to minecraft/minecraft/client/model/SilverfishModel.h index c2b0fd87c..2d5684783 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h +++ b/minecraft/minecraft/client/model/SilverfishModel.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp b/minecraft/minecraft/client/model/SkeletonHeadModel.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp rename to minecraft/minecraft/client/model/SkeletonHeadModel.cpp index ec0c9690c..5ea0f6381 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp +++ b/minecraft/minecraft/client/model/SkeletonHeadModel.cpp @@ -1,9 +1,9 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "SkeletonHeadModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" void SkeletonHeadModel::_init(int u, int v, int tw, int th) { texWidth = tw; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h b/minecraft/minecraft/client/model/SkeletonHeadModel.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h rename to minecraft/minecraft/client/model/SkeletonHeadModel.h index 49e14ddb5..7a102c617 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h +++ b/minecraft/minecraft/client/model/SkeletonHeadModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp b/minecraft/minecraft/client/model/SkeletonModel.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp rename to minecraft/minecraft/client/model/SkeletonModel.cpp index ae92afdcc..30bef509e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp +++ b/minecraft/minecraft/client/model/SkeletonModel.cpp @@ -1,10 +1,10 @@ #include #include "SkeletonModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Skeleton.h" -#include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" +#include "minecraft/client/model/ZombieModel.h" void SkeletonModel::_init(float g) { arm0 = new ModelPart(this, 24 + 16, 16); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.h b/minecraft/minecraft/client/model/SkeletonModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.h rename to minecraft/minecraft/client/model/SkeletonModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp b/minecraft/minecraft/client/model/SkiModel.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp rename to minecraft/minecraft/client/model/SkiModel.cpp index be1ca26cb..617257de2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp +++ b/minecraft/minecraft/client/model/SkiModel.cpp @@ -2,7 +2,7 @@ #include #include "SkiModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h b/minecraft/minecraft/client/model/SkiModel.h similarity index 82% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h rename to minecraft/minecraft/client/model/SkiModel.h index e8886780a..519d5dc05 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h +++ b/minecraft/minecraft/client/model/SkiModel.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" class Entity; class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp b/minecraft/minecraft/client/model/SlimeModel.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp rename to minecraft/minecraft/client/model/SlimeModel.cpp index 9627f159a..40d8fff24 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp +++ b/minecraft/minecraft/client/model/SlimeModel.cpp @@ -1,7 +1,7 @@ #include #include "SlimeModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" SlimeModel::SlimeModel(int vOffs) { cube = new ModelPart(this, 0, vOffs); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h b/minecraft/minecraft/client/model/SlimeModel.h similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h rename to minecraft/minecraft/client/model/SlimeModel.h index ed3815098..532e7dd0a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h +++ b/minecraft/minecraft/client/model/SlimeModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp b/minecraft/minecraft/client/model/SnowManModel.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp rename to minecraft/minecraft/client/model/SnowManModel.cpp index 105d914a0..147db0dfc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp +++ b/minecraft/minecraft/client/model/SnowManModel.cpp @@ -3,8 +3,8 @@ #include #include "SnowManModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" SnowManModel::SnowManModel() : Model() { float yOffset = 4; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h b/minecraft/minecraft/client/model/SnowManModel.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h rename to minecraft/minecraft/client/model/SnowManModel.h index a52af2ac1..e3c187f12 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h +++ b/minecraft/minecraft/client/model/SnowManModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp b/minecraft/minecraft/client/model/SpiderModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp rename to minecraft/minecraft/client/model/SpiderModel.cpp index bbec16586..43c969927 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp +++ b/minecraft/minecraft/client/model/SpiderModel.cpp @@ -3,8 +3,8 @@ #include #include "SpiderModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" SpiderModel::SpiderModel() : Model() { float g = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h b/minecraft/minecraft/client/model/SpiderModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h rename to minecraft/minecraft/client/model/SpiderModel.h index 0a7994e9d..84d4f03be 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h +++ b/minecraft/minecraft/client/model/SpiderModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp b/minecraft/minecraft/client/model/SquidModel.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp rename to minecraft/minecraft/client/model/SquidModel.cpp index a36c85c99..02db9ecfe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp +++ b/minecraft/minecraft/client/model/SquidModel.cpp @@ -3,8 +3,8 @@ #include #include "SquidModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" SquidModel::SquidModel() : Model() { int yoffs = -16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h b/minecraft/minecraft/client/model/SquidModel.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h rename to minecraft/minecraft/client/model/SquidModel.h index eb43a72c3..1b7525660 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h +++ b/minecraft/minecraft/client/model/SquidModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.cpp b/minecraft/minecraft/client/model/Vertex.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.cpp rename to minecraft/minecraft/client/model/Vertex.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h b/minecraft/minecraft/client/model/Vertex.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h rename to minecraft/minecraft/client/model/Vertex.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp b/minecraft/minecraft/client/model/VillagerGolemModel.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp rename to minecraft/minecraft/client/model/VillagerGolemModel.cpp index 05510b0e8..1423b12aa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp +++ b/minecraft/minecraft/client/model/VillagerGolemModel.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "VillagerGolemModel.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/VillagerGolem.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h b/minecraft/minecraft/client/model/VillagerGolemModel.h similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h rename to minecraft/minecraft/client/model/VillagerGolemModel.h index 8c8519257..86eddf506 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h +++ b/minecraft/minecraft/client/model/VillagerGolemModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp b/minecraft/minecraft/client/model/VillagerModel.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp rename to minecraft/minecraft/client/model/VillagerModel.cpp index 16bddf33a..cbe3b1e84 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp +++ b/minecraft/minecraft/client/model/VillagerModel.cpp @@ -3,8 +3,8 @@ #include #include "VillagerModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" void VillagerModel::_init(float g, float yOffset, int xTexSize, int yTexSize) { head = (new ModelPart(this))->setTexSize(xTexSize, yTexSize); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h b/minecraft/minecraft/client/model/VillagerModel.h similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h rename to minecraft/minecraft/client/model/VillagerModel.h index 1b33250ff..bacea0a18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h +++ b/minecraft/minecraft/client/model/VillagerModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp b/minecraft/minecraft/client/model/VillagerZombieModel.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp rename to minecraft/minecraft/client/model/VillagerZombieModel.cpp index 7900ed73e..0660513f9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp +++ b/minecraft/minecraft/client/model/VillagerZombieModel.cpp @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "VillagerZombieModel.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/HumanoidModel.h" void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) { delete head; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.h b/minecraft/minecraft/client/model/VillagerZombieModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.h rename to minecraft/minecraft/client/model/VillagerZombieModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp b/minecraft/minecraft/client/model/WitchModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp rename to minecraft/minecraft/client/model/WitchModel.cpp index 7f6343943..87b7d4b18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp +++ b/minecraft/minecraft/client/model/WitchModel.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "WitchModel.h" #include "VillagerModel.h" #include "minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h b/minecraft/minecraft/client/model/WitchModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h rename to minecraft/minecraft/client/model/WitchModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp b/minecraft/minecraft/client/model/WitherBossModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp rename to minecraft/minecraft/client/model/WitherBossModel.cpp index ebb1ccdc5..6a8d819f4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp +++ b/minecraft/minecraft/client/model/WitherBossModel.cpp @@ -2,7 +2,7 @@ #include "WitherBossModel.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" WitherBossModel::WitherBossModel() { texWidth = 64; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h b/minecraft/minecraft/client/model/WitherBossModel.h similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h rename to minecraft/minecraft/client/model/WitherBossModel.h index f7c91b12c..da59dbb59 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h +++ b/minecraft/minecraft/client/model/WitherBossModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" class WitherBossModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp b/minecraft/minecraft/client/model/WolfModel.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp rename to minecraft/minecraft/client/model/WolfModel.cpp index 461c06d9d..dc5bada17 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp +++ b/minecraft/minecraft/client/model/WolfModel.cpp @@ -4,10 +4,10 @@ #include "WolfModel.h" #include "minecraft/world/entity/animal/Wolf.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" WolfModel::WolfModel() { float g = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h b/minecraft/minecraft/client/model/WolfModel.h similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h rename to minecraft/minecraft/client/model/WolfModel.h index c418cae8c..4f7b71b16 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h +++ b/minecraft/minecraft/client/model/WolfModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" #include "minecraft/world/entity/Mob.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp b/minecraft/minecraft/client/model/ZombieModel.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp rename to minecraft/minecraft/client/model/ZombieModel.cpp index 5b16d5909..42ab6eab2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp +++ b/minecraft/minecraft/client/model/ZombieModel.cpp @@ -3,8 +3,8 @@ #include #include "ZombieModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) {} diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.h b/minecraft/minecraft/client/model/ZombieModel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.h rename to minecraft/minecraft/client/model/ZombieModel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp b/minecraft/minecraft/client/model/dragon/DragonModel.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp rename to minecraft/minecraft/client/model/dragon/DragonModel.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h b/minecraft/minecraft/client/model/dragon/DragonModel.h similarity index 85% rename from minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h rename to minecraft/minecraft/client/model/dragon/DragonModel.h index af24453ab..26e99e594 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h +++ b/minecraft/minecraft/client/model/dragon/DragonModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" class DragonModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp b/minecraft/minecraft/client/model/dragon/EnderCrystalModel.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp rename to minecraft/minecraft/client/model/dragon/EnderCrystalModel.cpp index 2a9bbcbba..8ce194aaf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp +++ b/minecraft/minecraft/client/model/dragon/EnderCrystalModel.cpp @@ -3,7 +3,7 @@ #include "EnderCrystalModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" EnderCrystalModel::EnderCrystalModel(float g) { glass = new ModelPart(this, L"glass"); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h b/minecraft/minecraft/client/model/dragon/EnderCrystalModel.h similarity index 75% rename from minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h rename to minecraft/minecraft/client/model/dragon/EnderCrystalModel.h index 6b9ad7c4e..f724812a9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h +++ b/minecraft/minecraft/client/model/dragon/EnderCrystalModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp b/minecraft/minecraft/client/model/geom/Cube.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp rename to minecraft/minecraft/client/model/geom/Cube.cpp index 6232d7237..28e398447 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp +++ b/minecraft/minecraft/client/model/geom/Cube.cpp @@ -2,9 +2,9 @@ #include #include "ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" +#include "minecraft/client/model/Vertex.h" #include "Cube.h" -#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" +#include "minecraft/client/model/Polygon.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h b/minecraft/minecraft/client/model/geom/Cube.h similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h rename to minecraft/minecraft/client/model/geom/Cube.h index 48cd9f9a5..7341604e9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h +++ b/minecraft/minecraft/client/model/geom/Cube.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" -#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" +#include "minecraft/client/model/Vertex.h" +#include "minecraft/client/model/Polygon.h" class Model; class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp b/minecraft/minecraft/client/model/geom/Model.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp rename to minecraft/minecraft/client/model/geom/Model.cpp index 1a7185ea1..4564e91db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp +++ b/minecraft/minecraft/client/model/geom/Model.cpp @@ -1,6 +1,6 @@ #include "TexOffs.h" #include "Model.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" Model::Model() { riding = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h b/minecraft/minecraft/client/model/geom/Model.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h rename to minecraft/minecraft/client/model/geom/Model.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp b/minecraft/minecraft/client/model/geom/ModelPart.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp rename to minecraft/minecraft/client/model/geom/ModelPart.cpp index 70f00fd7c..a7fa8824f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp +++ b/minecraft/minecraft/client/model/geom/ModelPart.cpp @@ -5,9 +5,9 @@ #include "ModelPart.h" #include "Cube.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Tesselator.h" const float ModelPart::RAD = (180.0f / std::numbers::pi); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h b/minecraft/minecraft/client/model/geom/ModelPart.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h rename to minecraft/minecraft/client/model/geom/ModelPart.h index 0d9e55c54..808dd3610 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h +++ b/minecraft/minecraft/client/model/geom/ModelPart.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" -#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" +#include "minecraft/client/model/Vertex.h" +#include "minecraft/client/model/Polygon.h" #include "Model.h" #include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp b/minecraft/minecraft/client/model/geom/TexOffs.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp rename to minecraft/minecraft/client/model/geom/TexOffs.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.h b/minecraft/minecraft/client/model/geom/TexOffs.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.h rename to minecraft/minecraft/client/model/geom/TexOffs.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/minecraft/client/multiplayer/ClientConnection.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp rename to minecraft/minecraft/client/multiplayer/ClientConnection.cpp index 718fddfbb..3f0a2658e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/minecraft/client/multiplayer/ClientConnection.cpp @@ -5,13 +5,13 @@ #include #include "MultiPlayerLevel.h" #include "MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "minecraft/stats/StatsCounter.h" #include "ReceivingLevelScreen.h" -#include "Minecraft.Client/net/minecraft/client/player/RemotePlayer.h" +#include "minecraft/client/player/RemotePlayer.h" #include "DisconnectedScreen.h" -#include "Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/CritParticle.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/particle/TakeAnimationParticle.h" +#include "minecraft/client/particle/CritParticle.h" +#include "minecraft/client/User.h" #include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "minecraft/stats/net.minecraft.stats.h" @@ -39,18 +39,18 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/Pos.h" #include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/ProgressRenderer.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/Options.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/ClientConstants.h" #include "minecraft/sounds/SoundTypes.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/gui/MerchantScreen.h" #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/gui/Gui.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h b/minecraft/minecraft/client/multiplayer/ClientConnection.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h rename to minecraft/minecraft/client/multiplayer/ClientConnection.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp b/minecraft/minecraft/client/multiplayer/ConnectScreen.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp rename to minecraft/minecraft/client/multiplayer/ConnectScreen.cpp index a325f6a75..27f2a45fa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp +++ b/minecraft/minecraft/client/multiplayer/ConnectScreen.cpp @@ -3,13 +3,13 @@ #include "ConnectScreen.h" #include "ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/title/TitleScreen.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/User.h" #include "minecraft/locale/Language.h" #include "minecraft/network/packet/PreLoginPacket.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::wstring& ip, int port) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h b/minecraft/minecraft/client/multiplayer/ConnectScreen.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h rename to minecraft/minecraft/client/multiplayer/ConnectScreen.h index 33322914d..c66f40d4f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h +++ b/minecraft/minecraft/client/multiplayer/ConnectScreen.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp b/minecraft/minecraft/client/multiplayer/DisconnectedScreen.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp rename to minecraft/minecraft/client/multiplayer/DisconnectedScreen.cpp index 473970a15..71044f827 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp +++ b/minecraft/minecraft/client/multiplayer/DisconnectedScreen.cpp @@ -1,11 +1,11 @@ #include #include "DisconnectedScreen.h" -#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "minecraft/client/title/TitleScreen.h" +#include "minecraft/client/gui/Button.h" #include "minecraft/locale/Language.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Screen.h" DisconnectedScreen::DisconnectedScreen(const std::wstring& title, const std::wstring reason, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h b/minecraft/minecraft/client/multiplayer/DisconnectedScreen.h similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h rename to minecraft/minecraft/client/multiplayer/DisconnectedScreen.h index b2c4ff6fc..9edd7f241 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h +++ b/minecraft/minecraft/client/multiplayer/DisconnectedScreen.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class DisconnectedScreen : public Screen { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/minecraft/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp rename to minecraft/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index a28b9dbd6..ccd303502 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -2,10 +2,10 @@ #include #include "MultiPlayerChunkCache.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" +#include "minecraft/server/level/ServerChunkCache.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/chunk/WaterLevelChunk.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/minecraft/minecraft/client/multiplayer/MultiPlayerChunkCache.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h rename to minecraft/minecraft/client/multiplayer/MultiPlayerChunkCache.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp rename to minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index b2c6ec12e..3f86df5ca 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -3,9 +3,9 @@ #include "MultiPlayerGameMode.h" #include "MultiPlayerLocalPlayer.h" #include "MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "ClientConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "minecraft/network/packet/ContainerButtonClickPacket.h" #include "minecraft/network/packet/ContainerClickPacket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h b/minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.h similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h rename to minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.h index 954bf05b4..dbb9f1861 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerGameMode.h @@ -1,9 +1,9 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "minecraft/server/level/GameMode.h" #include "minecraft/world/item/ItemInstance.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" class ClientConnection; class GameType; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/minecraft/client/multiplayer/MultiPlayerLevel.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp rename to minecraft/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 929b9509c..7faf7358d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -10,8 +10,8 @@ #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" #include "MultiPlayerChunkCache.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/FireworksParticles.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "java/JavaMath.h" @@ -37,7 +37,7 @@ #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/ParticleEngine.h" class LevelSettings; class Scoreboard; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h b/minecraft/minecraft/client/multiplayer/MultiPlayerLevel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h rename to minecraft/minecraft/client/multiplayer/MultiPlayerLevel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp rename to minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 31e2f3f03..6a342d2a5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -4,7 +4,7 @@ #include "ClientConnection.h" #include "minecraft/util/Mth.h" #include "minecraft/world/phys/AABB.h" -#include "Minecraft.Client/net/minecraft/client/player/Input.h" +#include "minecraft/client/player/Input.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" @@ -28,9 +28,9 @@ #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/player/LocalPlayer.h" class User; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h rename to minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index bec2a2e11..aac78306d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/minecraft/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/entity/player/Player.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/PlayerInfo.h b/minecraft/minecraft/client/multiplayer/PlayerInfo.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/PlayerInfo.h rename to minecraft/minecraft/client/multiplayer/PlayerInfo.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp rename to minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.cpp index 0a4342a7b..d158c1ceb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp +++ b/minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.cpp @@ -6,7 +6,7 @@ #include "ClientConnection.h" #include "minecraft/locale/Language.h" #include "minecraft/network/packet/KeepAlivePacket.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection* connection) { tickCount = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h b/minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.h similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h rename to minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.h index e59509222..91d0f13d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h +++ b/minecraft/minecraft/client/multiplayer/ReceivingLevelScreen.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class ClientConnection; class ReceivingLevelScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp b/minecraft/minecraft/client/particle/BreakingItemParticle.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp rename to minecraft/minecraft/client/particle/BreakingItemParticle.cpp index 4d1706ddd..80363c3a4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp +++ b/minecraft/minecraft/client/particle/BreakingItemParticle.cpp @@ -1,11 +1,11 @@ #include "BreakingItemParticle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/Icon.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; class Textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h b/minecraft/minecraft/client/particle/BreakingItemParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h rename to minecraft/minecraft/client/particle/BreakingItemParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp b/minecraft/minecraft/client/particle/BubbleParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp rename to minecraft/minecraft/client/particle/BubbleParticle.cpp index 5162a742d..8e69ebbd2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp +++ b/minecraft/minecraft/client/particle/BubbleParticle.cpp @@ -4,7 +4,7 @@ #include "java/JavaMath.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" BubbleParticle::BubbleParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h b/minecraft/minecraft/client/particle/BubbleParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h rename to minecraft/minecraft/client/particle/BubbleParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp b/minecraft/minecraft/client/particle/CritParticle.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp rename to minecraft/minecraft/client/particle/CritParticle.cpp index c5ea3df80..45a4f6531 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp +++ b/minecraft/minecraft/client/particle/CritParticle.cpp @@ -3,8 +3,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" void CritParticle::_init(Level* level, std::shared_ptr entity, ePARTICLE_TYPE type) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h b/minecraft/minecraft/client/particle/CritParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h rename to minecraft/minecraft/client/particle/CritParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp b/minecraft/minecraft/client/particle/CritParticle2.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp rename to minecraft/minecraft/client/particle/CritParticle2.cpp index 2826e2a7d..7c4e9945b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp +++ b/minecraft/minecraft/client/particle/CritParticle2.cpp @@ -1,6 +1,6 @@ #include "CritParticle2.h" #include "java/JavaMath.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h b/minecraft/minecraft/client/particle/CritParticle2.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h rename to minecraft/minecraft/client/particle/CritParticle2.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp b/minecraft/minecraft/client/particle/DragonBreathParticle.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp rename to minecraft/minecraft/client/particle/DragonBreathParticle.cpp index 00c332e4f..22377324f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp +++ b/minecraft/minecraft/client/particle/DragonBreathParticle.cpp @@ -2,9 +2,9 @@ #include "DragonBreathParticle.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h b/minecraft/minecraft/client/particle/DragonBreathParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h rename to minecraft/minecraft/client/particle/DragonBreathParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp b/minecraft/minecraft/client/particle/DripParticle.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp rename to minecraft/minecraft/client/particle/DripParticle.cpp index 78ea02e45..10592f3a3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp +++ b/minecraft/minecraft/client/particle/DripParticle.cpp @@ -7,8 +7,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" DripParticle::DripParticle(Level* level, double x, double y, double z, Material* material) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h b/minecraft/minecraft/client/particle/DripParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h rename to minecraft/minecraft/client/particle/DripParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp b/minecraft/minecraft/client/particle/EnchantmentTableParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp rename to minecraft/minecraft/client/particle/EnchantmentTableParticle.cpp index 19c595057..27232a578 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/minecraft/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -3,8 +3,8 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" EchantmentTableParticle::EchantmentTableParticle(Level* level, double x, double y, double z, double xd, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h b/minecraft/minecraft/client/particle/EnchantmentTableParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h rename to minecraft/minecraft/client/particle/EnchantmentTableParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp b/minecraft/minecraft/client/particle/EnderParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp rename to minecraft/minecraft/client/particle/EnderParticle.cpp index 0a073083a..8a96d504a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp +++ b/minecraft/minecraft/client/particle/EnderParticle.cpp @@ -3,8 +3,8 @@ #include "java/Random.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h b/minecraft/minecraft/client/particle/EnderParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h rename to minecraft/minecraft/client/particle/EnderParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp b/minecraft/minecraft/client/particle/ExplodeParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp rename to minecraft/minecraft/client/particle/ExplodeParticle.cpp index ac832badc..0ae9d870c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp +++ b/minecraft/minecraft/client/particle/ExplodeParticle.cpp @@ -3,8 +3,8 @@ #include "java/Random.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h b/minecraft/minecraft/client/particle/ExplodeParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h rename to minecraft/minecraft/client/particle/ExplodeParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp b/minecraft/minecraft/client/particle/FireworksParticles.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp rename to minecraft/minecraft/client/particle/FireworksParticles.cpp index 62438b77f..63ae1d094 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp +++ b/minecraft/minecraft/client/particle/FireworksParticles.cpp @@ -4,7 +4,7 @@ #include #include "FireworksParticles.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/world/level/Level.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/SharedConstants.h" @@ -14,9 +14,9 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/Tag.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" FireworksParticles::FireworksStarter::FireworksStarter( Level* level, double x, double y, double z, double xd, double yd, double zd, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h b/minecraft/minecraft/client/particle/FireworksParticles.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h rename to minecraft/minecraft/client/particle/FireworksParticles.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp b/minecraft/minecraft/client/particle/FlameParticle.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp rename to minecraft/minecraft/client/particle/FlameParticle.cpp index 12f3d393a..d7b5b7ed4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp +++ b/minecraft/minecraft/client/particle/FlameParticle.cpp @@ -1,7 +1,7 @@ #include "java/JavaMath.h" #include "java/Random.h" #include "FlameParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h b/minecraft/minecraft/client/particle/FlameParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h rename to minecraft/minecraft/client/particle/FlameParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp b/minecraft/minecraft/client/particle/FootstepParticle.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp rename to minecraft/minecraft/client/particle/FootstepParticle.cpp index 943286184..d746fe49d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp +++ b/minecraft/minecraft/client/particle/FootstepParticle.cpp @@ -1,14 +1,14 @@ #include #include "FootstepParticle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/util/Mth.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" ResourceLocation FootstepParticle::FOOTPRINT_LOCATION = ResourceLocation(TN_MISC_FOOTSTEP); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h b/minecraft/minecraft/client/particle/FootstepParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h rename to minecraft/minecraft/client/particle/FootstepParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp b/minecraft/minecraft/client/particle/HeartParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp rename to minecraft/minecraft/client/particle/HeartParticle.cpp index c5c5a0be4..6b35f97b9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp +++ b/minecraft/minecraft/client/particle/HeartParticle.cpp @@ -1,5 +1,5 @@ #include "HeartParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h b/minecraft/minecraft/client/particle/HeartParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h rename to minecraft/minecraft/client/particle/HeartParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp b/minecraft/minecraft/client/particle/HugeExplosionParticle.cpp similarity index 85% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp rename to minecraft/minecraft/client/particle/HugeExplosionParticle.cpp index cc7ff086c..3008c3b28 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/minecraft/minecraft/client/particle/HugeExplosionParticle.cpp @@ -2,16 +2,16 @@ #include "HugeExplosionParticle.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h b/minecraft/minecraft/client/particle/HugeExplosionParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h rename to minecraft/minecraft/client/particle/HugeExplosionParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/minecraft/minecraft/client/particle/HugeExplosionSeedParticle.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp rename to minecraft/minecraft/client/particle/HugeExplosionSeedParticle.cpp index e80d9015b..0ecc334d3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/minecraft/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -2,9 +2,9 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level* level, double x, double y, double z, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h b/minecraft/minecraft/client/particle/HugeExplosionSeedParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h rename to minecraft/minecraft/client/particle/HugeExplosionSeedParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp b/minecraft/minecraft/client/particle/LavaParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp rename to minecraft/minecraft/client/particle/LavaParticle.cpp index 979aadba0..1a681ba58 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp +++ b/minecraft/minecraft/client/particle/LavaParticle.cpp @@ -3,7 +3,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" LavaParticle::LavaParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h b/minecraft/minecraft/client/particle/LavaParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h rename to minecraft/minecraft/client/particle/LavaParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp b/minecraft/minecraft/client/particle/NetherPortalParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp rename to minecraft/minecraft/client/particle/NetherPortalParticle.cpp index 3544dfefc..48fe63970 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp +++ b/minecraft/minecraft/client/particle/NetherPortalParticle.cpp @@ -1,10 +1,10 @@ #include "NetherPortalParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h b/minecraft/minecraft/client/particle/NetherPortalParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h rename to minecraft/minecraft/client/particle/NetherPortalParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp b/minecraft/minecraft/client/particle/NoteParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp rename to minecraft/minecraft/client/particle/NoteParticle.cpp index f27ac05c8..75867f317 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp +++ b/minecraft/minecraft/client/particle/NoteParticle.cpp @@ -3,8 +3,8 @@ #include "NoteParticle.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h b/minecraft/minecraft/client/particle/NoteParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h rename to minecraft/minecraft/client/particle/NoteParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp b/minecraft/minecraft/client/particle/Particle.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp rename to minecraft/minecraft/client/particle/Particle.cpp index 8b51333bc..f7ec4f4ab 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp +++ b/minecraft/minecraft/client/particle/Particle.cpp @@ -1,15 +1,15 @@ #include #include "Particle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "java/JavaMath.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/Icon.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; class Textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h b/minecraft/minecraft/client/particle/Particle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h rename to minecraft/minecraft/client/particle/Particle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp b/minecraft/minecraft/client/particle/ParticleEngine.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp rename to minecraft/minecraft/client/particle/ParticleEngine.cpp index 02353f37f..05f096d47 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp +++ b/minecraft/minecraft/client/particle/ParticleEngine.cpp @@ -5,12 +5,12 @@ #include "ParticleEngine.h" #include "Particle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/Tesselator.h" #include "TerrainParticle.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" -#include "Minecraft.Client/net/minecraft/client/Camera.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Camera.h" #include "console_helpers/StringHelpers.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h b/minecraft/minecraft/client/particle/ParticleEngine.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h rename to minecraft/minecraft/client/particle/ParticleEngine.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp b/minecraft/minecraft/client/particle/PlayerCloudParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp rename to minecraft/minecraft/client/particle/PlayerCloudParticle.cpp index b7e973597..04d3686cc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp +++ b/minecraft/minecraft/client/particle/PlayerCloudParticle.cpp @@ -5,7 +5,7 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y, double z, double xa, double ya, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h b/minecraft/minecraft/client/particle/PlayerCloudParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h rename to minecraft/minecraft/client/particle/PlayerCloudParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp b/minecraft/minecraft/client/particle/RedDustParticle.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp rename to minecraft/minecraft/client/particle/RedDustParticle.cpp index 545a5ba9b..449bf5e3f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp +++ b/minecraft/minecraft/client/particle/RedDustParticle.cpp @@ -1,6 +1,6 @@ #include "java/JavaMath.h" #include "RedDustParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h b/minecraft/minecraft/client/particle/RedDustParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h rename to minecraft/minecraft/client/particle/RedDustParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp b/minecraft/minecraft/client/particle/SmokeParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp rename to minecraft/minecraft/client/particle/SmokeParticle.cpp index a1925e4d8..c3a15ce17 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp +++ b/minecraft/minecraft/client/particle/SmokeParticle.cpp @@ -2,8 +2,8 @@ #include "SmokeParticle.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h b/minecraft/minecraft/client/particle/SmokeParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h rename to minecraft/minecraft/client/particle/SmokeParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp b/minecraft/minecraft/client/particle/SnowShovelParticle.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp rename to minecraft/minecraft/client/particle/SnowShovelParticle.cpp index e7fade7b5..b7d266afe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp +++ b/minecraft/minecraft/client/particle/SnowShovelParticle.cpp @@ -1,6 +1,6 @@ #include "java/JavaMath.h" #include "SnowShovelParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h b/minecraft/minecraft/client/particle/SnowShovelParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h rename to minecraft/minecraft/client/particle/SnowShovelParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp b/minecraft/minecraft/client/particle/SpellParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp rename to minecraft/minecraft/client/particle/SpellParticle.cpp index 111f19e01..ee01dcd5a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp +++ b/minecraft/minecraft/client/particle/SpellParticle.cpp @@ -1,6 +1,6 @@ #include "java/JavaMath.h" #include "SpellParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h b/minecraft/minecraft/client/particle/SpellParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h rename to minecraft/minecraft/client/particle/SpellParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp b/minecraft/minecraft/client/particle/SplashParticle.cpp similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp rename to minecraft/minecraft/client/particle/SplashParticle.cpp index 9ee1d931a..06904f7be 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp +++ b/minecraft/minecraft/client/particle/SplashParticle.cpp @@ -1,5 +1,5 @@ #include "SplashParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h" +#include "minecraft/client/particle/WaterDropParticle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h b/minecraft/minecraft/client/particle/SplashParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h rename to minecraft/minecraft/client/particle/SplashParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp b/minecraft/minecraft/client/particle/SuspendedParticle.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp rename to minecraft/minecraft/client/particle/SuspendedParticle.cpp index 3a697ee6e..7be5a02e6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp +++ b/minecraft/minecraft/client/particle/SuspendedParticle.cpp @@ -6,8 +6,8 @@ #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/particle/Particle.h" SuspendedParticle::SuspendedParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h b/minecraft/minecraft/client/particle/SuspendedParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h rename to minecraft/minecraft/client/particle/SuspendedParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp b/minecraft/minecraft/client/particle/SuspendedTownParticle.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp rename to minecraft/minecraft/client/particle/SuspendedTownParticle.cpp index 1b9cc7f63..2f84ad9f4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp +++ b/minecraft/minecraft/client/particle/SuspendedTownParticle.cpp @@ -1,7 +1,7 @@ #include "SuspendedTownParticle.h" #include "java/Random.h" #include "java/JavaMath.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h b/minecraft/minecraft/client/particle/SuspendedTownParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h rename to minecraft/minecraft/client/particle/SuspendedTownParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp b/minecraft/minecraft/client/particle/TakeAnimationParticle.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp rename to minecraft/minecraft/client/particle/TakeAnimationParticle.cpp index dcdb5ace5..06918ac66 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/minecraft/minecraft/client/particle/TakeAnimationParticle.cpp @@ -1,14 +1,14 @@ #include #include "TakeAnimationParticle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/util/Mth.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" TakeAnimationParticle::TakeAnimationParticle(Level* level, std::shared_ptr item, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h b/minecraft/minecraft/client/particle/TakeAnimationParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h rename to minecraft/minecraft/client/particle/TakeAnimationParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp b/minecraft/minecraft/client/particle/TerrainParticle.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp rename to minecraft/minecraft/client/particle/TerrainParticle.cpp index 5a9f51e6d..0abb2055e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp +++ b/minecraft/minecraft/client/particle/TerrainParticle.cpp @@ -1,12 +1,12 @@ #include "TerrainParticle.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/Icon.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/GrassTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h b/minecraft/minecraft/client/particle/TerrainParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h rename to minecraft/minecraft/client/particle/TerrainParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp b/minecraft/minecraft/client/particle/WaterDropParticle.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp rename to minecraft/minecraft/client/particle/WaterDropParticle.cpp index 4667f817e..7dcbcabd6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp +++ b/minecraft/minecraft/client/particle/WaterDropParticle.cpp @@ -5,7 +5,7 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/LiquidTile.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/Particle.h" WaterDropParticle::WaterDropParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h b/minecraft/minecraft/client/particle/WaterDropParticle.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h rename to minecraft/minecraft/client/particle/WaterDropParticle.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp b/minecraft/minecraft/client/player/Input.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp rename to minecraft/minecraft/client/player/Input.cpp index d4272418a..97cc844de 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp +++ b/minecraft/minecraft/client/player/Input.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Input.h" #include "LocalPlayer.h" #include "4J_Input.h" @@ -8,7 +8,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/entity/player/Abilities.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" Input::Input() { xa = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.h b/minecraft/minecraft/client/player/Input.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/player/Input.h rename to minecraft/minecraft/client/player/Input.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/minecraft/client/player/LocalPlayer.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp rename to minecraft/minecraft/client/player/LocalPlayer.cpp index e13657dd1..6197f799d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/minecraft/client/player/LocalPlayer.cpp @@ -5,26 +5,26 @@ #include #include "LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/User.h" +#include "minecraft/client/User.h" #include "Input.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" -#include "Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/TakeAnimationParticle.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/level/storage/LevelData.h" #include "java/Random.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "minecraft/util/Mth.h" -#include "Minecraft.Client/net/minecraft/client/particle/CritParticle.h" +#include "minecraft/client/particle/CritParticle.h" // 4J : WESTY : Added for new achievements. #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" // 4J Stu - Added for tutorial callbacks -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/stats/CommonStats.h" #include "4J_Input.h" @@ -63,8 +63,8 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dimension) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h b/minecraft/minecraft/client/player/LocalPlayer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h rename to minecraft/minecraft/client/player/LocalPlayer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp b/minecraft/minecraft/client/player/RemotePlayer.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp rename to minecraft/minecraft/client/player/RemotePlayer.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h b/minecraft/minecraft/client/player/RemotePlayer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h rename to minecraft/minecraft/client/player/RemotePlayer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp b/minecraft/minecraft/client/renderer/BossMobGuiInfo.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp rename to minecraft/minecraft/client/renderer/BossMobGuiInfo.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h b/minecraft/minecraft/client/renderer/BossMobGuiInfo.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h rename to minecraft/minecraft/client/renderer/BossMobGuiInfo.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp b/minecraft/minecraft/client/renderer/Chunk.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp rename to minecraft/minecraft/client/renderer/Chunk.cpp index 4ae810033..583ed92dd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp +++ b/minecraft/minecraft/client/renderer/Chunk.cpp @@ -8,7 +8,7 @@ #include "Chunk.h" #include "TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "LevelRenderer.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Render/4J_Render.h" @@ -23,8 +23,8 @@ #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/culling/Culler.h" int Chunk::updates = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h b/minecraft/minecraft/client/renderer/Chunk.h similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h rename to minecraft/minecraft/client/renderer/Chunk.h index 776d08749..a4f63ed88 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h +++ b/minecraft/minecraft/client/renderer/Chunk.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h" +#include "minecraft/client/renderer/culling/AllowAllCuller.h" #include "Tesselator.h" #include "LevelRenderer.h" #include "minecraft/world/phys/AABB.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp b/minecraft/minecraft/client/renderer/DirtyChunkSorter.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp rename to minecraft/minecraft/client/renderer/DirtyChunkSorter.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h b/minecraft/minecraft/client/renderer/DirtyChunkSorter.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h rename to minecraft/minecraft/client/renderer/DirtyChunkSorter.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp b/minecraft/minecraft/client/renderer/DistanceChunkSorter.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp rename to minecraft/minecraft/client/renderer/DistanceChunkSorter.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h b/minecraft/minecraft/client/renderer/DistanceChunkSorter.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h rename to minecraft/minecraft/client/renderer/DistanceChunkSorter.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp b/minecraft/minecraft/client/renderer/EntityTileRenderer.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp rename to minecraft/minecraft/client/renderer/EntityTileRenderer.cpp index 010ea2cb4..26562c7c2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp +++ b/minecraft/minecraft/client/renderer/EntityTileRenderer.cpp @@ -1,5 +1,5 @@ #include "EntityTileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "minecraft/world/level/tile/ChestTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/ChestTileEntity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h b/minecraft/minecraft/client/renderer/EntityTileRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h rename to minecraft/minecraft/client/renderer/EntityTileRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/minecraft/client/renderer/GameRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp rename to minecraft/minecraft/client/renderer/GameRenderer.cpp index da001f981..cc5d45434 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/minecraft/client/renderer/GameRenderer.cpp @@ -7,18 +7,18 @@ #include "GameRenderer.h" #include "ItemInHandRenderer.h" #include "LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" +#include "minecraft/client/renderer/culling/Frustum.h" +#include "minecraft/client/renderer/culling/FrustumCuller.h" #include "Textures.h" #include "Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" -#include "Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/particle/SmokeParticle.h" +#include "minecraft/client/particle/WaterDropParticle.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/particle/GuiParticles.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Chunk.h" #include "java/System.h" #include "java/FloatBuffer.h" @@ -31,15 +31,15 @@ #include "minecraft/util/SmoothFloat.h" #include "minecraft/world/effect/MobEffectInstance.h" #include "minecraft/world/item/Item.h" -#include "Minecraft.Client/net/minecraft/client/Camera.h" +#include "minecraft/client/Camera.h" #include "minecraft/sounds/SoundTypes.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/HumanoidModel.h" #include "console_helpers/compression.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "BossMobGuiInfo.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Common/4J_Compat.h" #include "4J_Input.h" @@ -74,15 +74,15 @@ #include "Minecraft.Client/include/SkinBox.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/renderer/culling/Culler.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "Minecraft.Client/include/stubs.h" bool GameRenderer::anaglyph3d = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h b/minecraft/minecraft/client/renderer/GameRenderer.h similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h rename to minecraft/minecraft/client/renderer/GameRenderer.h index ed551f08e..499083dcb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h +++ b/minecraft/minecraft/client/renderer/GameRenderer.h @@ -7,7 +7,7 @@ #include "minecraft/util/SmoothFloat.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "Minecraft.Client/Common/App_Defines.h" #include "minecraft/world/phys/Vec3.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp b/minecraft/minecraft/client/renderer/HttpTexture.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp rename to minecraft/minecraft/client/renderer/HttpTexture.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h b/minecraft/minecraft/client/renderer/HttpTexture.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h rename to minecraft/minecraft/client/renderer/HttpTexture.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTextureProcessor.h b/minecraft/minecraft/client/renderer/HttpTextureProcessor.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTextureProcessor.h rename to minecraft/minecraft/client/renderer/HttpTextureProcessor.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp b/minecraft/minecraft/client/renderer/ItemInHandRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp rename to minecraft/minecraft/client/renderer/ItemInHandRenderer.cpp index d98350299..6abd9e8db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/minecraft/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -7,14 +7,14 @@ #include "TileRenderer.h" #include "Tesselator.h" #include "Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/entity/PlayerRenderer.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/Minimap.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" @@ -37,10 +37,10 @@ #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" #include "java/System.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/resources/ResourceLocation.h" class EntityRenderer; class MapItemSavedData; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h b/minecraft/minecraft/client/renderer/ItemInHandRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h rename to minecraft/minecraft/client/renderer/ItemInHandRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/minecraft/client/renderer/LevelRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp rename to minecraft/minecraft/client/renderer/LevelRenderer.cpp index bfd212a65..45f034a46 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp +++ b/minecraft/minecraft/client/renderer/LevelRenderer.cpp @@ -12,48 +12,48 @@ #include "LevelRenderer.h" #include "Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "Tesselator.h" #include "Chunk.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/NoteParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/EnderParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/FlameParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/LavaParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SplashParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/HeartParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/CritParticle2.h" -#include "Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/SpellParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/DripParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h" -#include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/particle/BubbleParticle.h" +#include "minecraft/client/particle/SmokeParticle.h" +#include "minecraft/client/particle/NoteParticle.h" +#include "minecraft/client/particle/NetherPortalParticle.h" +#include "minecraft/client/particle/EnderParticle.h" +#include "minecraft/client/particle/ExplodeParticle.h" +#include "minecraft/client/particle/FlameParticle.h" +#include "minecraft/client/particle/LavaParticle.h" +#include "minecraft/client/particle/FootstepParticle.h" +#include "minecraft/client/particle/SplashParticle.h" +#include "minecraft/client/particle/RedDustParticle.h" +#include "minecraft/client/particle/BreakingItemParticle.h" +#include "minecraft/client/particle/SnowShovelParticle.h" +#include "minecraft/client/particle/HeartParticle.h" +#include "minecraft/client/particle/HugeExplosionParticle.h" +#include "minecraft/client/particle/HugeExplosionSeedParticle.h" +#include "minecraft/client/particle/SuspendedParticle.h" +#include "minecraft/client/particle/SuspendedTownParticle.h" +#include "minecraft/client/particle/CritParticle2.h" +#include "minecraft/client/particle/TerrainParticle.h" +#include "minecraft/client/particle/SpellParticle.h" +#include "minecraft/client/particle/DripParticle.h" +#include "minecraft/client/particle/EnchantmentTableParticle.h" +#include "minecraft/client/particle/DragonBreathParticle.h" +#include "minecraft/client/particle/FireworksParticles.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/Options.h" #include "minecraft/core/particles/ParticleTypes.h" #include "java/JavaMath.h" #include "java/System.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/sounds/SoundTypes.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" +#include "minecraft/client/renderer/culling/FrustumCuller.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Common/4J_Compat.h" #include "4J_Profile.h" @@ -90,18 +90,18 @@ #include "minecraft/world/phys/Vec3.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" -#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/renderer/OffsettedRenderList.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/culling/Culler.h" +#include "minecraft/client/renderer/culling/Frustum.h" +#include "minecraft/client/renderer/culling/FrustumData.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "Minecraft.Client/include/stubs.h" #include "4J_Input.h" #include "minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/minecraft/client/renderer/LevelRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h rename to minecraft/minecraft/client/renderer/LevelRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp b/minecraft/minecraft/client/renderer/MemTexture.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp rename to minecraft/minecraft/client/renderer/MemTexture.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/minecraft/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp rename to minecraft/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/minecraft/minecraft/client/renderer/MobSkinTextureProcessor.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp rename to minecraft/minecraft/client/renderer/MobSkinTextureProcessor.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.h b/minecraft/minecraft/client/renderer/MobSkinTextureProcessor.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.h rename to minecraft/minecraft/client/renderer/MobSkinTextureProcessor.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp b/minecraft/minecraft/client/renderer/OffsettedRenderList.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp rename to minecraft/minecraft/client/renderer/OffsettedRenderList.cpp index 2f2c6a82a..eec780812 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp +++ b/minecraft/minecraft/client/renderer/OffsettedRenderList.cpp @@ -1,7 +1,7 @@ #include "java/IntBuffer.h" #include "OffsettedRenderList.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/MemoryTracker.h" // 4J added OffsettedRenderList::OffsettedRenderList() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.h b/minecraft/minecraft/client/renderer/OffsettedRenderList.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.h rename to minecraft/minecraft/client/renderer/OffsettedRenderList.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp b/minecraft/minecraft/client/renderer/Rect2i.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp rename to minecraft/minecraft/client/renderer/Rect2i.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.h b/minecraft/minecraft/client/renderer/Rect2i.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.h rename to minecraft/minecraft/client/renderer/Rect2i.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp b/minecraft/minecraft/client/renderer/Tesselator.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp rename to minecraft/minecraft/client/renderer/Tesselator.cpp index ab877a7ed..4294dfff1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp +++ b/minecraft/minecraft/client/renderer/Tesselator.cpp @@ -2,10 +2,10 @@ #include #include "Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/MemoryTracker.h" #include "Minecraft.Client/include/stubs.h" bool Tesselator::TRIANGLE_MODE = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h b/minecraft/minecraft/client/renderer/Tesselator.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h rename to minecraft/minecraft/client/renderer/Tesselator.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/minecraft/client/renderer/Textures.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp rename to minecraft/minecraft/client/renderer/Textures.cpp index 233dfccb4..73dfb1ac7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp +++ b/minecraft/minecraft/client/renderer/Textures.cpp @@ -6,28 +6,28 @@ #include #include "Textures.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePackRepository.h" #include "HttpTexture.h" #include "Minecraft.Client/include/MemTexture.h" #include "java/ByteBuffer.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/Options.h" #include "Minecraft.Client/include/MemTextureProcessor.h" #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" +#include "minecraft/client/renderer/texture/PreStitchedTextureMap.h" +#include "minecraft/client/renderer/texture/Texture.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/Textures.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/ItemInstance.h" #include "java/Buffer.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/MemoryTracker.h" // Linux/PC port: disable mipmapping globally so textures are always sampled // from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h b/minecraft/minecraft/client/renderer/Textures.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h rename to minecraft/minecraft/client/renderer/Textures.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp b/minecraft/minecraft/client/renderer/TileRenderer.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp rename to minecraft/minecraft/client/renderer/TileRenderer.cpp index bf87b6c82..0cb40cb5a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp +++ b/minecraft/minecraft/client/renderer/TileRenderer.cpp @@ -7,12 +7,12 @@ #include "TileRenderer.h" #include "GameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Textures.h" #include "Tesselator.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "EntityTileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h b/minecraft/minecraft/client/renderer/TileRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h rename to minecraft/minecraft/client/renderer/TileRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp b/minecraft/minecraft/client/renderer/culling/AllowAllCuller.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp rename to minecraft/minecraft/client/renderer/culling/AllowAllCuller.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h b/minecraft/minecraft/client/renderer/culling/AllowAllCuller.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h rename to minecraft/minecraft/client/renderer/culling/AllowAllCuller.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h b/minecraft/minecraft/client/renderer/culling/Culler.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h rename to minecraft/minecraft/client/renderer/culling/Culler.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp b/minecraft/minecraft/client/renderer/culling/Frustum.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp rename to minecraft/minecraft/client/renderer/culling/Frustum.cpp index b51cf33ae..426af69cf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp +++ b/minecraft/minecraft/client/renderer/culling/Frustum.cpp @@ -6,7 +6,7 @@ #include "java/FloatBuffer.h" #include "Frustum.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "minecraft/client/MemoryTracker.h" class FrustumData; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h b/minecraft/minecraft/client/renderer/culling/Frustum.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h rename to minecraft/minecraft/client/renderer/culling/Frustum.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp b/minecraft/minecraft/client/renderer/culling/FrustumCuller.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp rename to minecraft/minecraft/client/renderer/culling/FrustumCuller.cpp index 534106d3c..4f387548c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp +++ b/minecraft/minecraft/client/renderer/culling/FrustumCuller.cpp @@ -1,7 +1,7 @@ #include "FrustumCuller.h" #include "minecraft/world/phys/AABB.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" -#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h" +#include "minecraft/client/renderer/culling/Frustum.h" +#include "minecraft/client/renderer/culling/FrustumData.h" FrustumCuller::FrustumCuller() { frustum = Frustum::getFrustum(); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h b/minecraft/minecraft/client/renderer/culling/FrustumCuller.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h rename to minecraft/minecraft/client/renderer/culling/FrustumCuller.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp b/minecraft/minecraft/client/renderer/culling/FrustumData.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp rename to minecraft/minecraft/client/renderer/culling/FrustumData.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h b/minecraft/minecraft/client/renderer/culling/FrustumData.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h rename to minecraft/minecraft/client/renderer/culling/FrustumData.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp b/minecraft/minecraft/client/renderer/culling/ViewportCuller.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp rename to minecraft/minecraft/client/renderer/culling/ViewportCuller.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h b/minecraft/minecraft/client/renderer/culling/ViewportCuller.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h rename to minecraft/minecraft/client/renderer/culling/ViewportCuller.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ArrowRenderer.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ArrowRenderer.cpp index 9b36257d2..2b1b14e51 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -6,9 +6,9 @@ #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h b/minecraft/minecraft/client/renderer/entity/ArrowRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h rename to minecraft/minecraft/client/renderer/entity/ArrowRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp b/minecraft/minecraft/client/renderer/entity/BatRenderer.cpp similarity index 81% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/BatRenderer.cpp index 9a701d625..550f677fa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/BatRenderer.cpp @@ -2,14 +2,14 @@ #include #include "BatRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/BatModel.h" +#include "minecraft/client/model/BatModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/ambient/Bat.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation BatRenderer::BAT_LOCATION = ResourceLocation(TN_MOB_BAT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h b/minecraft/minecraft/client/renderer/entity/BatRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h rename to minecraft/minecraft/client/renderer/entity/BatRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp b/minecraft/minecraft/client/renderer/entity/BlazeRenderer.cpp similarity index 78% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/BlazeRenderer.cpp index 6e8aa7f60..f5a9ca370 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/BlazeRenderer.cpp @@ -1,12 +1,12 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/BlazeModel.h" +#include "minecraft/client/model/BlazeModel.h" #include "BlazeRenderer.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/monster/Blaze.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h b/minecraft/minecraft/client/renderer/entity/BlazeRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h rename to minecraft/minecraft/client/renderer/entity/BlazeRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp b/minecraft/minecraft/client/renderer/entity/BoatRenderer.cpp similarity index 79% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/BoatRenderer.cpp index 4cf382a1d..d5e208f11 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -2,14 +2,14 @@ #include #include "BoatRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/BoatModel.h" +#include "minecraft/client/model/BoatModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/Boat.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h b/minecraft/minecraft/client/renderer/entity/BoatRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h rename to minecraft/minecraft/client/renderer/entity/BoatRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp b/minecraft/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp similarity index 71% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp index 26a98e64c..f60073971 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp @@ -2,9 +2,9 @@ #include "CaveSpiderRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/SpiderRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation CaveSpiderRenderer::CAVE_SPIDER_LOCATION = ResourceLocation(TN_MOB_CAVE_SPIDER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h b/minecraft/minecraft/client/renderer/entity/CaveSpiderRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h rename to minecraft/minecraft/client/renderer/entity/CaveSpiderRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ChickenRenderer.cpp similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ChickenRenderer.cpp index ad2a6a072..356a8e6a4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ChickenRenderer.cpp @@ -4,9 +4,9 @@ #include "ChickenRenderer.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Chicken.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h b/minecraft/minecraft/client/renderer/entity/ChickenRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h rename to minecraft/minecraft/client/renderer/entity/ChickenRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp b/minecraft/minecraft/client/renderer/entity/CowRenderer.cpp similarity index 69% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/CowRenderer.cpp index 81f5a0c00..cb7093395 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/CowRenderer.cpp @@ -1,9 +1,9 @@ #include #include "CowRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h b/minecraft/minecraft/client/renderer/entity/CowRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h rename to minecraft/minecraft/client/renderer/entity/CowRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp b/minecraft/minecraft/client/renderer/entity/CreeperRenderer.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/CreeperRenderer.cpp index a40658cef..9da6276ba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -3,13 +3,13 @@ #include #include "CreeperRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/CreeperModel.h" +#include "minecraft/client/model/CreeperModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Creeper.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h b/minecraft/minecraft/client/renderer/entity/CreeperRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h rename to minecraft/minecraft/client/renderer/entity/CreeperRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp b/minecraft/minecraft/client/renderer/entity/DefaultRenderer.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/DefaultRenderer.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h b/minecraft/minecraft/client/renderer/entity/DefaultRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h rename to minecraft/minecraft/client/renderer/entity/DefaultRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/minecraft/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index 5d3773256..09d4b8ca6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h" +#include "minecraft/client/model/dragon/EnderCrystalModel.h" #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.h b/minecraft/minecraft/client/renderer/entity/EnderCrystalRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.h rename to minecraft/minecraft/client/renderer/entity/EnderCrystalRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/minecraft/minecraft/client/renderer/entity/EnderDragonRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index 9b20420ee..9c56fc329 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,11 +1,11 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h" +#include "minecraft/client/model/dragon/DragonModel.h" #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/Lighting.h" #include "EnderDragonRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" +#include "minecraft/client/renderer/BossMobGuiInfo.h" ResourceLocation EnderDragonRenderer::DRAGON_EXPLODING_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_SHUFFLE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h b/minecraft/minecraft/client/renderer/entity/EnderDragonRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h rename to minecraft/minecraft/client/renderer/entity/EnderDragonRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp b/minecraft/minecraft/client/renderer/entity/EndermanRenderer.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/EndermanRenderer.cpp index 835ec60c1..b3f50bf1d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -2,18 +2,18 @@ #include #include "EndermanRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/EndermanModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/model/EndermanModel.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/EnderMan.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION = ResourceLocation(TN_MOB_ENDERMAN_EYES); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h b/minecraft/minecraft/client/renderer/entity/EndermanRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h rename to minecraft/minecraft/client/renderer/entity/EndermanRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/minecraft/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp rename to minecraft/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 496031bed..5524eee13 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/minecraft/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -59,27 +59,27 @@ #include "TntMinecartRenderer.h" #include "MinecartSpawnerRenderer.h" #include "HorseRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SpiderModel.h" -#include "Minecraft.Client/net/minecraft/client/model/PigModel.h" -#include "Minecraft.Client/net/minecraft/client/model/SheepModel.h" -#include "Minecraft.Client/net/minecraft/client/model/CowModel.h" -#include "Minecraft.Client/net/minecraft/client/model/WolfModel.h" -#include "Minecraft.Client/net/minecraft/client/model/ChickenModel.h" -#include "Minecraft.Client/net/minecraft/client/model/CreeperModel.h" -#include "Minecraft.Client/net/minecraft/client/model/SlimeModel.h" -#include "Minecraft.Client/net/minecraft/client/model/GhastModel.h" -#include "Minecraft.Client/net/minecraft/client/model/SquidModel.h" -#include "Minecraft.Client/net/minecraft/client/model/MinecartModel.h" -#include "Minecraft.Client/net/minecraft/client/model/BoatModel.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/client/model/SheepFurModel.h" -#include "Minecraft.Client/net/minecraft/client/model/SkeletonModel.h" -#include "Minecraft.Client/net/minecraft/client/model/ModelHorse.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/model/SpiderModel.h" +#include "minecraft/client/model/PigModel.h" +#include "minecraft/client/model/SheepModel.h" +#include "minecraft/client/model/CowModel.h" +#include "minecraft/client/model/WolfModel.h" +#include "minecraft/client/model/ChickenModel.h" +#include "minecraft/client/model/CreeperModel.h" +#include "minecraft/client/model/SlimeModel.h" +#include "minecraft/client/model/GhastModel.h" +#include "minecraft/client/model/SquidModel.h" +#include "minecraft/client/model/MinecartModel.h" +#include "minecraft/client/model/BoatModel.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/SheepFurModel.h" +#include "minecraft/client/model/SkeletonModel.h" +#include "minecraft/client/model/ModelHorse.h" +#include "minecraft/client/Options.h" #include "ItemFrameRenderer.h" #include "OcelotRenderer.h" #include "VillagerGolemRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/OcelotModel.h" +#include "minecraft/client/model/OcelotModel.h" #include "ZombieRenderer.h" #include "BatRenderer.h" #include "CaveSpiderRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h b/minecraft/minecraft/client/renderer/entity/EntityRenderDispatcher.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h rename to minecraft/minecraft/client/renderer/entity/EntityRenderDispatcher.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp b/minecraft/minecraft/client/renderer/entity/EntityRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/EntityRenderer.cpp index e1ae4124f..68dc469dc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -2,8 +2,8 @@ #include "EntityRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/util/Mth.h" @@ -15,10 +15,10 @@ #include "minecraft/world/level/tile/FireTile.h" #include "minecraft/world/level/tile/Tile.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__MISC_SHADOW); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h b/minecraft/minecraft/client/renderer/entity/EntityRenderer.h similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h rename to minecraft/minecraft/client/renderer/entity/EntityRenderer.h index a585ed8ed..e1dd597d1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h +++ b/minecraft/minecraft/client/renderer/entity/EntityRenderer.h @@ -2,12 +2,12 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Tile; class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index c288054c7..2ad226db6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -4,14 +4,14 @@ #include #include "ExperienceOrbRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h b/minecraft/minecraft/client/renderer/entity/ExperienceOrbRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h rename to minecraft/minecraft/client/renderer/entity/ExperienceOrbRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/minecraft/minecraft/client/renderer/entity/FallingTileRenderer.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 984454725..11100192e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -3,8 +3,8 @@ #include #include "FallingTileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" @@ -12,8 +12,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/AnvilTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" FallingTileRenderer::FallingTileRenderer() : EntityRenderer() { tileRenderer = new TileRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h b/minecraft/minecraft/client/renderer/entity/FallingTileRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h rename to minecraft/minecraft/client/renderer/entity/FallingTileRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp b/minecraft/minecraft/client/renderer/entity/FireballRenderer.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/FireballRenderer.cpp index acd7144c1..014a33c09 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -3,7 +3,7 @@ #include "FireballRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/Entity.h" @@ -13,7 +13,7 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" FireballRenderer::FireballRenderer(float scale) { this->scale = scale; } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.h b/minecraft/minecraft/client/renderer/entity/FireballRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.h rename to minecraft/minecraft/client/renderer/entity/FireballRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/minecraft/minecraft/client/renderer/entity/FishingHookRenderer.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/FishingHookRenderer.cpp index ce2c74fe7..319034191 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -6,15 +6,15 @@ #include "FishingHookRenderer.h" #include "EntityRenderDispatcher.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/FishingHook.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation FishingHookRenderer::PARTICLE_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h b/minecraft/minecraft/client/renderer/entity/FishingHookRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h rename to minecraft/minecraft/client/renderer/entity/FishingHookRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp b/minecraft/minecraft/client/renderer/entity/GhastRenderer.cpp similarity index 79% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/GhastRenderer.cpp index 71ee201ed..fc80c0ec1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/GhastRenderer.cpp @@ -1,14 +1,14 @@ #include #include "GhastRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/GhastModel.h" +#include "minecraft/client/model/GhastModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Ghast.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST); ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h b/minecraft/minecraft/client/renderer/entity/GhastRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h rename to minecraft/minecraft/client/renderer/entity/GhastRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp b/minecraft/minecraft/client/renderer/entity/GiantMobRenderer.cpp similarity index 71% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/GiantMobRenderer.cpp index 648199ca0..9eae2bae6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/GiantMobRenderer.cpp @@ -2,9 +2,9 @@ #include "GiantMobRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h b/minecraft/minecraft/client/renderer/entity/GiantMobRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h rename to minecraft/minecraft/client/renderer/entity/GiantMobRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp b/minecraft/minecraft/client/renderer/entity/HorseRenderer.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/HorseRenderer.cpp index d67629918..93e117487 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -7,10 +7,10 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation HorseRenderer::HORSE_LOCATION = ResourceLocation(TN_MOB_HORSE_WHITE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h b/minecraft/minecraft/client/renderer/entity/HorseRenderer.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h rename to minecraft/minecraft/client/renderer/entity/HorseRenderer.h index 8cca9a9ae..54b650d3d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h +++ b/minecraft/minecraft/client/renderer/entity/HorseRenderer.h @@ -4,7 +4,7 @@ #include #include "MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" class EntityHorse; class PathfinderMob; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/minecraft/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index d37b0f10b..fceeb1934 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -2,9 +2,9 @@ #include #include "HumanoidMobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "console_helpers/StringHelpers.h" @@ -17,11 +17,11 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" const std::wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { L"cloth", L"chain", L"iron", L"diamond", L"gold"}; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h b/minecraft/minecraft/client/renderer/entity/HumanoidMobRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h rename to minecraft/minecraft/client/renderer/entity/HumanoidMobRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ItemFrameRenderer.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index a1974a9eb..bb66c0a6b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -1,15 +1,15 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "EntityRenderDispatcher.h" // #include "ItemFrame" #include "ItemFrameRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/item/Item.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" -#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" +#include "minecraft/client/renderer/texture/custom/CompassTexture.h" +#include "minecraft/client/gui/Minimap.h" #include "4J.Render/4J_Render.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" @@ -22,10 +22,10 @@ #include "minecraft/world/item/MapItem.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/util/Mth.h" class MapItemSavedData; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h b/minecraft/minecraft/client/renderer/entity/ItemFrameRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h rename to minecraft/minecraft/client/renderer/entity/ItemFrameRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ItemRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ItemRenderer.cpp index 98f8e3398..9cbfcec79 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -4,13 +4,13 @@ #include #include "ItemRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "EntityRenderDispatcher.h" #include "java/JavaMath.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/Options.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/util/Mth.h" @@ -24,13 +24,13 @@ #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Gui.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/util/Mth.h" class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h b/minecraft/minecraft/client/renderer/entity/ItemRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h rename to minecraft/minecraft/client/renderer/entity/ItemRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 12ffebeb2..53f442b45 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -3,7 +3,7 @@ #include "ItemSpriteRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/Entity.h" @@ -11,8 +11,8 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/PotionItem.h" #include "minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" ItemSpriteRenderer::ItemSpriteRenderer(Item* sourceItem, int sourceItemAuxValue /*= 0*/) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h b/minecraft/minecraft/client/renderer/entity/ItemSpriteRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h rename to minecraft/minecraft/client/renderer/entity/ItemSpriteRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/minecraft/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp similarity index 79% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 63ed6d957..fd443d08c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -1,13 +1,13 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h" +#include "minecraft/client/model/LavaSlimeModel.h" #include "LavaSlimeRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/LavaSlime.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation LavaSlimeRenderer::MAGMACUBE_LOCATION = ResourceLocation(TN_MOB_LAVA); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h b/minecraft/minecraft/client/renderer/entity/LavaSlimeRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h rename to minecraft/minecraft/client/renderer/entity/LavaSlimeRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/minecraft/minecraft/client/renderer/entity/LeashKnotRenderer.cpp similarity index 75% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/LeashKnotRenderer.cpp index 51f8cfdb4..1719c0fb2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/LeashKnotRenderer.cpp @@ -2,11 +2,11 @@ #include #include "LeashKnotRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h" +#include "minecraft/client/model/LeashKnotModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation LeashKnotRenderer::KNOT_LOCATION = ResourceLocation(TN_ITEM_LEASHKNOT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h b/minecraft/minecraft/client/renderer/entity/LeashKnotRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h rename to minecraft/minecraft/client/renderer/entity/LeashKnotRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/minecraft/minecraft/client/renderer/entity/LightningBoltRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 0de5d0a14..e8ac43d00 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -2,7 +2,7 @@ #include #include "LightningBoltRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/global/LightningBolt.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.h b/minecraft/minecraft/client/renderer/entity/LightningBoltRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.h rename to minecraft/minecraft/client/renderer/entity/LightningBoltRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 0820e1bb3..14944dd89 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -4,11 +4,11 @@ #include #include "LivingEntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Cube.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/model/geom/Cube.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/entity/projectile/Arrow.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/player/Player.h" @@ -19,12 +19,12 @@ #include "minecraft/world/entity/LivingEntity.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/util/Mth.h" ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h b/minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.h similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h rename to minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.h index 3f78b47a8..16044fb5e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h +++ b/minecraft/minecraft/client/renderer/entity/LivingEntityRenderer.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "EntityRenderer.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp b/minecraft/minecraft/client/renderer/entity/MinecartRenderer.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/MinecartRenderer.cpp index 73fa6b94a..22c77bd04 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -4,16 +4,16 @@ #include #include "MinecartRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/MinecartModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/model/MinecartModel.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Tile; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h b/minecraft/minecraft/client/renderer/entity/MinecartRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h rename to minecraft/minecraft/client/renderer/entity/MinecartRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp b/minecraft/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp similarity index 74% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp index e7abd71d5..d59121882 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp @@ -1,8 +1,8 @@ #include "MinecartSpawnerRenderer.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h" +#include "minecraft/client/renderer/tileentity/MobSpawnerRenderer.h" #include "minecraft/world/entity/item/MinecartSpawner.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h" +#include "minecraft/client/renderer/entity/MinecartRenderer.h" void MinecartSpawnerRenderer::renderMinecartContents( std::shared_ptr cart, float a, Tile* tile, int tileData) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h b/minecraft/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h rename to minecraft/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp b/minecraft/minecraft/client/renderer/entity/MobRenderer.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/MobRenderer.cpp index 6f91d9dad..66637bb6c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/MobRenderer.cpp @@ -13,8 +13,8 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/Mob.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/util/Mth.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h b/minecraft/minecraft/client/renderer/entity/MobRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h rename to minecraft/minecraft/client/renderer/entity/MobRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/minecraft/minecraft/client/renderer/entity/MushroomCowRenderer.cpp similarity index 81% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index 6f39920ed..3c03465b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -1,19 +1,19 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "MushroomCowRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/model/QuadrupedModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/MushroomCow.h" #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h b/minecraft/minecraft/client/renderer/entity/MushroomCowRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h rename to minecraft/minecraft/client/renderer/entity/MushroomCowRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp b/minecraft/minecraft/client/renderer/entity/OcelotRenderer.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/OcelotRenderer.cpp index 59dbefeb5..c9b54aaf8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -5,9 +5,9 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Ocelot.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h b/minecraft/minecraft/client/renderer/entity/OcelotRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h rename to minecraft/minecraft/client/renderer/entity/OcelotRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp b/minecraft/minecraft/client/renderer/entity/PaintingRenderer.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/PaintingRenderer.cpp index 161d11018..88335f5b1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -8,9 +8,9 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/Painting.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h b/minecraft/minecraft/client/renderer/entity/PaintingRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h rename to minecraft/minecraft/client/renderer/entity/PaintingRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp b/minecraft/minecraft/client/renderer/entity/PigRenderer.cpp similarity index 83% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/PigRenderer.cpp index 1a5990bbd..d4ffe3f97 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/PigRenderer.cpp @@ -3,9 +3,9 @@ #include "PigRenderer.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Pig.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h b/minecraft/minecraft/client/renderer/entity/PigRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h rename to minecraft/minecraft/client/renderer/entity/PigRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp b/minecraft/minecraft/client/renderer/entity/PlayerRenderer.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/PlayerRenderer.cpp index 754a019a3..794b5f955 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -4,11 +4,11 @@ #include #include "PlayerRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h" +#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h" #include "HumanoidMobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" @@ -27,13 +27,13 @@ #include "minecraft/world/level/tile/Tile.h" #include "java/Class.h" #include "nbt/CompoundTag.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h b/minecraft/minecraft/client/renderer/entity/PlayerRenderer.h similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h rename to minecraft/minecraft/client/renderer/entity/PlayerRenderer.h index 890357045..99a662dcf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/minecraft/minecraft/client/renderer/entity/PlayerRenderer.h @@ -7,7 +7,7 @@ #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h" +#include "minecraft/client/renderer/entity/LivingEntityRenderer.h" class HumanoidModel; class LivingEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SheepRenderer.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SheepRenderer.cpp index 7f39256d9..3ee63d842 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -2,15 +2,15 @@ #include #include "SheepRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h b/minecraft/minecraft/client/renderer/entity/SheepRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h rename to minecraft/minecraft/client/renderer/entity/SheepRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SilverfishRenderer.cpp similarity index 72% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SilverfishRenderer.cpp index d97d84023..de936963a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SilverfishRenderer.cpp @@ -1,10 +1,10 @@ #include #include "SilverfishRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SilverfishModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/SilverfishModel.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation SilverfishRenderer::SILVERFISH_LOCATION(TN_MOB_SILVERFISH); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h b/minecraft/minecraft/client/renderer/entity/SilverfishRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h rename to minecraft/minecraft/client/renderer/entity/SilverfishRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SkeletonRenderer.cpp similarity index 79% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SkeletonRenderer.cpp index d8d42f17f..d5d82f151 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SkeletonRenderer.cpp @@ -1,14 +1,14 @@ #include #include "SkeletonRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SkeletonModel.h" +#include "minecraft/client/model/SkeletonModel.h" #include "minecraft/world/entity/monster/Skeleton.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h b/minecraft/minecraft/client/renderer/entity/SkeletonRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h rename to minecraft/minecraft/client/renderer/entity/SkeletonRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SlimeRenderer.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SlimeRenderer.cpp index a676ce19c..a2477e13c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -5,9 +5,9 @@ #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Slime.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h b/minecraft/minecraft/client/renderer/entity/SlimeRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h rename to minecraft/minecraft/client/renderer/entity/SlimeRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SnowManRenderer.cpp similarity index 78% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SnowManRenderer.cpp index 9f607d08a..d0658ea7b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -1,7 +1,7 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/SnowManModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/SnowManModel.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" #include "SnowManRenderer.h" #include "4J.Render/4J_Render.h" @@ -10,11 +10,11 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation SnowManRenderer::SNOWMAN_LOCATION = ResourceLocation(TN_MOB_SNOWMAN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h b/minecraft/minecraft/client/renderer/entity/SnowManRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h rename to minecraft/minecraft/client/renderer/entity/SnowManRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SpiderRenderer.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SpiderRenderer.cpp index a35c2540b..02594bf68 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -2,14 +2,14 @@ #include #include "SpiderRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SpiderModel.h" +#include "minecraft/client/model/SpiderModel.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Spider.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation SpiderRenderer::SPIDER_LOCATION = ResourceLocation(TN_MOB_SPIDER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h b/minecraft/minecraft/client/renderer/entity/SpiderRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h rename to minecraft/minecraft/client/renderer/entity/SpiderRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp b/minecraft/minecraft/client/renderer/entity/SquidRenderer.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/SquidRenderer.cpp index df9633fc0..72f3127a3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -4,9 +4,9 @@ #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Squid.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h b/minecraft/minecraft/client/renderer/entity/SquidRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h rename to minecraft/minecraft/client/renderer/entity/SquidRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/minecraft/minecraft/client/renderer/entity/TntMinecartRenderer.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index 34ce93d53..0fde1e2c8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/entity/item/MinecartTNT.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MinecartRenderer.h" void TntMinecartRenderer::renderMinecartContents( std::shared_ptr _cart, float a, Tile* tile, int tileData) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.h b/minecraft/minecraft/client/renderer/entity/TntMinecartRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.h rename to minecraft/minecraft/client/renderer/entity/TntMinecartRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp b/minecraft/minecraft/client/renderer/entity/TntRenderer.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/TntRenderer.cpp index 6cbc81fdd..01159ae4d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/TntRenderer.cpp @@ -2,8 +2,8 @@ #include #include "TntRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h b/minecraft/minecraft/client/renderer/entity/TntRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h rename to minecraft/minecraft/client/renderer/entity/TntRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/minecraft/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index a85ef8975..6abf7a4de 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/model/VillagerGolemModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" #include "VillagerGolemRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" @@ -13,10 +13,10 @@ #include "minecraft/world/entity/animal/VillagerGolem.h" #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation VillagerGolemRenderer::GOLEM_LOCATION = ResourceLocation(TN_MOB_VILLAGER_GOLEM); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h b/minecraft/minecraft/client/renderer/entity/VillagerGolemRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h rename to minecraft/minecraft/client/renderer/entity/VillagerGolemRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp b/minecraft/minecraft/client/renderer/entity/VillagerRenderer.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/VillagerRenderer.cpp index e03cbbb6e..e87526f43 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -1,14 +1,14 @@ #include -#include "Minecraft.Client/net/minecraft/client/model/VillagerModel.h" +#include "minecraft/client/model/VillagerModel.h" #include "VillagerRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/npc/Villager.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation VillagerRenderer::VILLAGER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_VILLAGER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h b/minecraft/minecraft/client/renderer/entity/VillagerRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h rename to minecraft/minecraft/client/renderer/entity/VillagerRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp b/minecraft/minecraft/client/renderer/entity/WitchRenderer.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/WitchRenderer.cpp index a07da6f18..5bad8ef43 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/WitchRenderer.cpp @@ -3,8 +3,8 @@ #include "EntityRenderDispatcher.h" #include "WitchRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/WitchModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/WitchModel.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" @@ -14,12 +14,12 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h b/minecraft/minecraft/client/renderer/entity/WitchRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h rename to minecraft/minecraft/client/renderer/entity/WitchRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/minecraft/minecraft/client/renderer/entity/WitherBossRenderer.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/WitherBossRenderer.cpp index 0fc4a3407..e5a77eed5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -1,10 +1,10 @@ #include #include "WitherBossRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h" +#include "minecraft/client/model/WitherBossModel.h" #include "MobRenderer.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" -#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" +#include "minecraft/client/renderer/BossMobGuiInfo.h" ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = ResourceLocation(TN_MOB_WITHER_ARMOR); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.h b/minecraft/minecraft/client/renderer/entity/WitherBossRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.h rename to minecraft/minecraft/client/renderer/entity/WitherBossRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/minecraft/minecraft/client/renderer/entity/WitherSkullRenderer.cpp similarity index 87% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index a225e41ae..f3c28f398 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -2,12 +2,12 @@ #include #include "WitherSkullRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" +#include "minecraft/client/model/SkeletonHeadModel.h" #include "minecraft/world/entity/projectile/WitherSkull.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION( TN_MOB_WITHER_INVULNERABLE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h b/minecraft/minecraft/client/renderer/entity/WitherSkullRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h rename to minecraft/minecraft/client/renderer/entity/WitherSkullRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp b/minecraft/minecraft/client/renderer/entity/WolfRenderer.cpp similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/WolfRenderer.cpp index 77817a084..b7f8fe1bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -1,17 +1,17 @@ #include #include "WolfRenderer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" #include "minecraft/world/entity/animal/Wolf.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h b/minecraft/minecraft/client/renderer/entity/WolfRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h rename to minecraft/minecraft/client/renderer/entity/WolfRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp b/minecraft/minecraft/client/renderer/entity/ZombieRenderer.cpp similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp rename to minecraft/minecraft/client/renderer/entity/ZombieRenderer.cpp index 3dab1dd27..9eca7cb43 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp +++ b/minecraft/minecraft/client/renderer/entity/ZombieRenderer.cpp @@ -1,17 +1,17 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" -#include "Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.h" +#include "minecraft/client/model/ZombieModel.h" +#include "minecraft/client/model/VillagerZombieModel.h" #include "ZombieRenderer.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Zombie.h" #include "java/Class.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE); ResourceLocation ZombieRenderer::ZOMBIE_LOCATION(TN_MOB_ZOMBIE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h b/minecraft/minecraft/client/renderer/entity/ZombieRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h rename to minecraft/minecraft/client/renderer/entity/ZombieRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/minecraft/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp rename to minecraft/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index 71757b88d..030b2bca5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/minecraft/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -1,18 +1,18 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "StitchedTexture.h" #include "Texture.h" #include "TextureManager.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" #include "PreStitchedTextureMap.h" #include "SimpleIcon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h" +#include "minecraft/client/renderer/texture/custom/CompassTexture.h" +#include "minecraft/client/renderer/texture/custom/ClockTexture.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h b/minecraft/minecraft/client/renderer/texture/PreStitchedTextureMap.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h rename to minecraft/minecraft/client/renderer/texture/PreStitchedTextureMap.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp b/minecraft/minecraft/client/renderer/texture/SimpleIcon.cpp similarity index 75% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp rename to minecraft/minecraft/client/renderer/texture/SimpleIcon.cpp index 0ca238693..cd164d185 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp +++ b/minecraft/minecraft/client/renderer/texture/SimpleIcon.cpp @@ -1,5 +1,5 @@ #include "SimpleIcon.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename, float U0, float V0, float U1, float V1) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h b/minecraft/minecraft/client/renderer/texture/SimpleIcon.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h rename to minecraft/minecraft/client/renderer/texture/SimpleIcon.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp b/minecraft/minecraft/client/renderer/texture/StitchSlot.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp rename to minecraft/minecraft/client/renderer/texture/StitchSlot.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h b/minecraft/minecraft/client/renderer/texture/StitchSlot.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h rename to minecraft/minecraft/client/renderer/texture/StitchSlot.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp b/minecraft/minecraft/client/renderer/texture/StitchedTexture.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp rename to minecraft/minecraft/client/renderer/texture/StitchedTexture.cpp index 2fe274a0f..52fa0fe74 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/minecraft/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -2,11 +2,11 @@ #include "Texture.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" +#include "minecraft/client/renderer/texture/custom/ClockTexture.h" +#include "minecraft/client/renderer/texture/custom/CompassTexture.h" #include "StitchedTexture.h" #include "TextureManager.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" #include "minecraft/SharedConstants.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h b/minecraft/minecraft/client/renderer/texture/StitchedTexture.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h rename to minecraft/minecraft/client/renderer/texture/StitchedTexture.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp b/minecraft/minecraft/client/renderer/texture/Stitcher.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp rename to minecraft/minecraft/client/renderer/texture/Stitcher.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h b/minecraft/minecraft/client/renderer/texture/Stitcher.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h rename to minecraft/minecraft/client/renderer/texture/Stitcher.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp b/minecraft/minecraft/client/renderer/texture/Texture.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp rename to minecraft/minecraft/client/renderer/texture/Texture.cpp index 217c187f3..39841bfbc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp +++ b/minecraft/minecraft/client/renderer/texture/Texture.cpp @@ -3,7 +3,7 @@ #include #include "java/ByteBuffer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Rect2i.h" +#include "minecraft/client/renderer/Rect2i.h" #include "TextureManager.h" #include "Texture.h" #include "4J.Render/4J_Render.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h b/minecraft/minecraft/client/renderer/texture/Texture.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h rename to minecraft/minecraft/client/renderer/texture/Texture.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp b/minecraft/minecraft/client/renderer/texture/TextureAtlas.cpp similarity index 55% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp rename to minecraft/minecraft/client/renderer/texture/TextureAtlas.cpp index ccf90bd2d..8fa3bb1dc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp +++ b/minecraft/minecraft/client/renderer/texture/TextureAtlas.cpp @@ -1,6 +1,6 @@ #include "TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" ResourceLocation TextureAtlas::LOCATION_BLOCKS = ResourceLocation(TN_TERRAIN); ResourceLocation TextureAtlas::LOCATION_ITEMS = ResourceLocation(TN_GUI_ITEMS); \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h b/minecraft/minecraft/client/renderer/texture/TextureAtlas.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h rename to minecraft/minecraft/client/renderer/texture/TextureAtlas.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp b/minecraft/minecraft/client/renderer/texture/TextureHolder.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp rename to minecraft/minecraft/client/renderer/texture/TextureHolder.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h b/minecraft/minecraft/client/renderer/texture/TextureHolder.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h rename to minecraft/minecraft/client/renderer/texture/TextureHolder.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp b/minecraft/minecraft/client/renderer/texture/TextureManager.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp rename to minecraft/minecraft/client/renderer/texture/TextureManager.cpp index 2745d5233..ffa670a81 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp +++ b/minecraft/minecraft/client/renderer/texture/TextureManager.cpp @@ -4,9 +4,9 @@ #include "Stitcher.h" #include "Texture.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/Minecraft.h" #include "TextureManager.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h b/minecraft/minecraft/client/renderer/texture/TextureManager.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h rename to minecraft/minecraft/client/renderer/texture/TextureManager.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp b/minecraft/minecraft/client/renderer/texture/TextureMap.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp rename to minecraft/minecraft/client/renderer/texture/TextureMap.cpp index f2ae025f7..20dd270b7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp +++ b/minecraft/minecraft/client/renderer/texture/TextureMap.cpp @@ -2,17 +2,17 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Stitcher.h" #include "StitchSlot.h" #include "StitchedTexture.h" #include "Texture.h" #include "TextureHolder.h" #include "TextureManager.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" #include "TextureMap.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h b/minecraft/minecraft/client/renderer/texture/TextureMap.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h rename to minecraft/minecraft/client/renderer/texture/TextureMap.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/minecraft/minecraft/client/renderer/texture/custom/ClockTexture.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp rename to minecraft/minecraft/client/renderer/texture/custom/ClockTexture.cpp index 6c49e57ff..aef1b14ef 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/minecraft/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -2,15 +2,15 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" +#include "minecraft/client/renderer/texture/Texture.h" #include "ClockTexture.h" #include "4J.Common/4J_Compat.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock") { rot = rota = 0.0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h b/minecraft/minecraft/client/renderer/texture/custom/ClockTexture.h similarity index 84% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h rename to minecraft/minecraft/client/renderer/texture/custom/ClockTexture.h index de6caf9f2..a9a78031f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h +++ b/minecraft/minecraft/client/renderer/texture/custom/ClockTexture.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" class ClockTexture : public StitchedTexture { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/minecraft/minecraft/client/renderer/texture/custom/CompassTexture.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp rename to minecraft/minecraft/client/renderer/texture/custom/CompassTexture.cpp index e05797f51..7bb5e0b20 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/minecraft/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -4,16 +4,16 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" +#include "minecraft/client/renderer/texture/Texture.h" #include "CompassTexture.h" #include "4J.Common/4J_Compat.h" #include "minecraft/Pos.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" CompassTexture* CompassTexture::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h b/minecraft/minecraft/client/renderer/texture/custom/CompassTexture.h similarity index 88% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h rename to minecraft/minecraft/client/renderer/texture/custom/CompassTexture.h index cdc9774be..9066eee8e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h +++ b/minecraft/minecraft/client/renderer/texture/custom/CompassTexture.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "minecraft/client/renderer/texture/StitchedTexture.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/BeaconRenderer.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index f4216a2b2..3fa2bd767 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -4,13 +4,13 @@ #include #include "BeaconRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation BeaconRenderer::BEAM_LOCATION = ResourceLocation(TN_MISC_BEACON_BEAM); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h b/minecraft/minecraft/client/renderer/tileentity/BeaconRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/BeaconRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/ChestRenderer.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/ChestRenderer.cpp index bf24aafa7..868e9c26e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -3,17 +3,17 @@ #include #include "ChestRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" -#include "Minecraft.Client/net/minecraft/client/model/LargeChestModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/ChestModel.h" +#include "minecraft/client/model/LargeChestModel.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/tile/ChestTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/ChestTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h b/minecraft/minecraft/client/renderer/tileentity/ChestRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/ChestRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp similarity index 90% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index dbc8990de..06cd0040d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -3,14 +3,14 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/BookModel.h" +#include "minecraft/client/model/BookModel.h" #include "minecraft/util/Mth.h" #include "EnchantTableRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/util/Mth.h" ResourceLocation EnchantTableRenderer::BOOK_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h b/minecraft/minecraft/client/renderer/tileentity/EnchantTableRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/EnchantTableRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp similarity index 85% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index bc8d16e5a..444324d4e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -2,14 +2,14 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/geom/ModelPart.h" #include "EnderChestRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/ChestModel.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation EnderChestRenderer::ENDER_CHEST_LOCATION = ResourceLocation(TN_TILE_ENDER_CHEST); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h b/minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.h similarity index 86% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.h index 7c90f322b..713162f9c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h +++ b/minecraft/minecraft/client/renderer/tileentity/EnderChestRenderer.h @@ -1,6 +1,6 @@ #pragma once #include "TileEntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" +#include "minecraft/client/model/ChestModel.h" class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp index 7cc77cff4..6c4fe2de0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp @@ -1,5 +1,5 @@ #include "MobSpawnerRenderer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/BaseMobSpawner.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h b/minecraft/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index 15f2cc6b2..791f8b514 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -2,10 +2,10 @@ #include #include "PistonPieceRenderer.h" -#include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/Level.h" @@ -13,8 +13,8 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "minecraft/world/level/tile/piston/PistonBaseTile.h" #include "minecraft/world/level/tile/piston/PistonExtensionTile.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h b/minecraft/minecraft/client/renderer/tileentity/PistonPieceRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/PistonPieceRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/SignRenderer.cpp similarity index 92% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/SignRenderer.cpp index f5a7d37fd..f8ee30695 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -2,11 +2,11 @@ #include "SignRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SignModel.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "minecraft/client/model/SignModel.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" +#include "minecraft/client/gui/Gui.h" #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.h b/minecraft/minecraft/client/renderer/tileentity/SignRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/SignRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp similarity index 89% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 08698e9db..08e89e71c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -2,17 +2,17 @@ #include #include "SkullTileRenderer.h" -#include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h" +#include "minecraft/client/model/SkeletonHeadModel.h" +#include "minecraft/client/renderer/entity/PlayerRenderer.h" #include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "4J.Render/4J_Render.h" #include "minecraft/Facing.h" #include "minecraft/world/level/tile/SkullTile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" SkullTileRenderer* SkullTileRenderer::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h b/minecraft/minecraft/client/renderer/tileentity/SkullTileRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/SkullTileRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index 36da1ca58..5707e66f2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -2,18 +2,18 @@ #include #include "java/Random.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/Tesselator.h" #include "TileEntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/Camera.h" +#include "minecraft/client/Camera.h" #include "java/FloatBuffer.h" #include "TheEndPortalRenderer.h" #include "4J.Render/4J_Render.h" #include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "java/System.h" -#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/MemoryTracker.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION = ResourceLocation(TN_MISC_TUNNEL); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h b/minecraft/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp rename to minecraft/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h rename to minecraft/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h index a6acf1170..d84332f76 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h +++ b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "java/JavaIntHash.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp similarity index 85% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp rename to minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp index 7d4bb4463..3a3ecdd19 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp +++ b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp @@ -1,7 +1,7 @@ #include "TileEntityRenderer.h" #include "TileEntityRenderDispatcher.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" void TileEntityRenderer::bindTexture(ResourceLocation* location) { Textures* t = tileEntityRenderDispatcher->textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.h similarity index 87% rename from minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h rename to minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.h index c58dc3e5d..5d4b3eeec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h +++ b/minecraft/minecraft/client/renderer/tileentity/TileEntityRenderer.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" class TileEntityRenderDispatcher; class TileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h b/minecraft/minecraft/client/resources/ResourceLocation.h similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h rename to minecraft/minecraft/client/resources/ResourceLocation.h index 6a7802a19..61791e318 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h +++ b/minecraft/minecraft/client/resources/ResourceLocation.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" typedef std::vector<_TEXTURE_NAME> textureNameArray; class ResourceLocation { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp b/minecraft/minecraft/client/skins/AbstractTexturePack.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp rename to minecraft/minecraft/client/skins/AbstractTexturePack.cpp index 0daf55b2e..db889d09c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp +++ b/minecraft/minecraft/client/skins/AbstractTexturePack.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "AbstractTexturePack.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/include/BufferedImage.h" @@ -15,7 +15,7 @@ #include "java/InputOutputStream/FileInputStream.h" #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/InputStreamReader.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/client/skins/TexturePack.h" AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, const std::wstring& name, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h b/minecraft/minecraft/client/skins/AbstractTexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h rename to minecraft/minecraft/client/skins/AbstractTexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp b/minecraft/minecraft/client/skins/DLCTexturePack.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp rename to minecraft/minecraft/client/skins/DLCTexturePack.cpp index ac4e5ae62..ca7c88a6b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp +++ b/minecraft/minecraft/client/skins/DLCTexturePack.cpp @@ -29,9 +29,9 @@ #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/File.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/skins/AbstractTexturePack.h" +#include "minecraft/client/skins/TexturePack.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h b/minecraft/minecraft/client/skins/DLCTexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h rename to minecraft/minecraft/client/skins/DLCTexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp b/minecraft/minecraft/client/skins/DefaultTexturePack.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp rename to minecraft/minecraft/client/skins/DefaultTexturePack.cpp index fa2ed3bcc..25a95054c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp +++ b/minecraft/minecraft/client/skins/DefaultTexturePack.cpp @@ -1,6 +1,6 @@ #include "DefaultTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "console_helpers/StringHelpers.h" DefaultTexturePack::DefaultTexturePack() diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h b/minecraft/minecraft/client/skins/DefaultTexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h rename to minecraft/minecraft/client/skins/DefaultTexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp b/minecraft/minecraft/client/skins/FileTexturePack.cpp similarity index 91% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp rename to minecraft/minecraft/client/skins/FileTexturePack.cpp index 9fa3e317d..38c37740c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp +++ b/minecraft/minecraft/client/skins/FileTexturePack.cpp @@ -1,6 +1,6 @@ #include "FileTexturePack.h" #include "java/File.h" -#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" +#include "minecraft/client/skins/AbstractTexturePack.h" class TexturePack; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h b/minecraft/minecraft/client/skins/FileTexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h rename to minecraft/minecraft/client/skins/FileTexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp b/minecraft/minecraft/client/skins/FolderTexturePack.cpp similarity index 95% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp rename to minecraft/minecraft/client/skins/FolderTexturePack.cpp index d16dc119c..c8ce44e07 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp +++ b/minecraft/minecraft/client/skins/FolderTexturePack.cpp @@ -1,7 +1,7 @@ #include "FolderTexturePack.h" #include "java/File.h" #include "java/InputOutputStream/InputStream.h" -#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" +#include "minecraft/client/skins/AbstractTexturePack.h" class TexturePack; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h b/minecraft/minecraft/client/skins/FolderTexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h rename to minecraft/minecraft/client/skins/FolderTexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp b/minecraft/minecraft/client/skins/TexturePack.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp rename to minecraft/minecraft/client/skins/TexturePack.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h b/minecraft/minecraft/client/skins/TexturePack.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h rename to minecraft/minecraft/client/skins/TexturePack.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/minecraft/client/skins/TexturePackRepository.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp rename to minecraft/minecraft/client/skins/TexturePackRepository.cpp index 880ba07fa..9830b0a1d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp +++ b/minecraft/minecraft/client/skins/TexturePackRepository.cpp @@ -5,11 +5,11 @@ #include "FileTexturePack.h" #include "FolderTexturePack.h" #include "DLCTexturePack.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "java/File.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Minimap.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h b/minecraft/minecraft/client/skins/TexturePackRepository.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h rename to minecraft/minecraft/client/skins/TexturePackRepository.h diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp b/minecraft/minecraft/client/title/TitleScreen.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp rename to minecraft/minecraft/client/title/TitleScreen.cpp index 752b2632c..ae2c8e281 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp +++ b/minecraft/minecraft/client/title/TitleScreen.cpp @@ -1,11 +1,11 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h" -#include "Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/OptionsScreen.h" +#include "minecraft/client/gui/SelectWorldScreen.h" +#include "minecraft/client/gui/JoinMultiplayerScreen.h" +#include "minecraft/client/renderer/Textures.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "TitleScreen.h" @@ -17,7 +17,7 @@ #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" Random* TitleScreen::random = new Random(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h b/minecraft/minecraft/client/title/TitleScreen.h similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h rename to minecraft/minecraft/client/title/TitleScreen.h index d556e6bc4..ed2b856f0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h +++ b/minecraft/minecraft/client/title/TitleScreen.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/Screen.h" class Random; class Button; diff --git a/minecraft/minecraft/commands/Command.cpp b/minecraft/minecraft/commands/Command.cpp index 3e2bf0ae5..654aafa84 100644 --- a/minecraft/minecraft/commands/Command.cpp +++ b/minecraft/minecraft/commands/Command.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "Command.h" #include "minecraft/commands/AdminLogCommand.h" #include "minecraft/commands/CommandSender.h" diff --git a/minecraft/minecraft/commands/common/EnchantItemCommand.cpp b/minecraft/minecraft/commands/common/EnchantItemCommand.cpp index 24a766976..4cbfd65a3 100644 --- a/minecraft/minecraft/commands/common/EnchantItemCommand.cpp +++ b/minecraft/minecraft/commands/common/EnchantItemCommand.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/level/ServerPlayer.h" #include "EnchantItemCommand.h" #include "4J.Common/4J_Compat.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/minecraft/minecraft/commands/common/GiveItemCommand.cpp b/minecraft/minecraft/commands/common/GiveItemCommand.cpp index fff599057..870318a04 100644 --- a/minecraft/minecraft/commands/common/GiveItemCommand.cpp +++ b/minecraft/minecraft/commands/common/GiveItemCommand.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/level/ServerPlayer.h" #include "GiveItemCommand.h" #include "4J.Common/4J_Compat.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/minecraft/minecraft/commands/common/TimeCommand.cpp b/minecraft/minecraft/commands/common/TimeCommand.cpp index 152455be7..baabc76fa 100644 --- a/minecraft/minecraft/commands/common/TimeCommand.cpp +++ b/minecraft/minecraft/commands/common/TimeCommand.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "TimeCommand.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp b/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp index 4a921aeb6..f061f65b4 100644 --- a/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp +++ b/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "ToggleDownfallCommand.h" #include "minecraft/network/packet/ChatPacket.h" #include "minecraft/network/packet/GameCommandPacket.h" diff --git a/minecraft/minecraft/meson.build b/minecraft/minecraft/meson.build index 98000bba3..9f7de4687 100644 --- a/minecraft/minecraft/meson.build +++ b/minecraft/minecraft/meson.build @@ -28,6 +28,11 @@ minecraft_sources = run_command( lib_minecraft = static_library('minecraft', minecraft_sources, dependencies : [ + miniaudio_dep, # TODO: remove once a SoundEngine facade is present + render_dep, + input_dep, + profile_dep, + storage_dep, nbt_dep, java_dep, assets_localisation_dep, diff --git a/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp b/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp index 1b4bcb58f..4afd4edf3 100644 --- a/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h b/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h index 7cd0c28fa..cb51f1546 100644 --- a/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/Model.h" #include "Minecraft.Client/include/SkinBox.h" #include "minecraft/network/packet/Packet.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp b/minecraft/minecraft/server/ConsoleInput.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp rename to minecraft/minecraft/server/ConsoleInput.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h b/minecraft/minecraft/server/ConsoleInput.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h rename to minecraft/minecraft/server/ConsoleInput.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h b/minecraft/minecraft/server/ConsoleInputSource.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h rename to minecraft/minecraft/server/ConsoleInputSource.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp b/minecraft/minecraft/server/DispenserBootstrap.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp rename to minecraft/minecraft/server/DispenserBootstrap.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h b/minecraft/minecraft/server/DispenserBootstrap.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h rename to minecraft/minecraft/server/DispenserBootstrap.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/minecraft/server/MinecraftServer.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp rename to minecraft/minecraft/server/MinecraftServer.cpp index 77f37d7ed..e50b6adbe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/minecraft/server/MinecraftServer.cpp @@ -5,16 +5,16 @@ #include #include "ConsoleInput.h" -#include "Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h" +#include "minecraft/server/level/DerivedServerLevel.h" #include "DispenserBootstrap.h" -#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" +#include "minecraft/server/level/EntityTracker.h" #include "MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "minecraft/client/Options.h" #include "PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" -#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h" +#include "minecraft/server/level/ServerChunkCache.h" +#include "minecraft/server/network/ServerConnection.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerLevelListener.h" #include "Settings.h" #include "minecraft/commands/Command.h" #include "minecraft/world/phys/AABB.h" @@ -35,9 +35,9 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "minecraft/client/ProgressRenderer.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/client/renderer/GameRenderer.h" #include "console_helpers/ThreadName.h" #include "minecraft/world/level/chunk/CompressedTileStorage.h" #include "minecraft/world/level/chunk/SparseLightStorage.h" @@ -46,12 +46,12 @@ #include "minecraft/world/level/biome/BiomeSource.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h" -#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" +#include "minecraft/server/commands/ServerCommandDispatcher.h" +#include "minecraft/server/level/PlayerChunkMap.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "4J_Input.h" #include "minecraft/world/level/Level.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h b/minecraft/minecraft/server/MinecraftServer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h rename to minecraft/minecraft/server/MinecraftServer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/minecraft/server/PlayerList.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp rename to minecraft/minecraft/server/PlayerList.cpp index 499dde330..743ad20dd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/minecraft/server/PlayerList.cpp @@ -4,17 +4,17 @@ #include "Minecraft.Client/include/stdafx.h" #include "PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" +#include "minecraft/server/level/PlayerChunkMap.h" #include "MinecraftServer.h" #include "Settings.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" -#include "Minecraft.Client/net/minecraft/server/network/PendingConnection.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerChunkCache.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/level/ServerPlayerGameMode.h" +#include "minecraft/server/network/ServerConnection.h" +#include "minecraft/server/network/PendingConnection.h" +#include "minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/level/EntityTracker.h" #include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" @@ -28,10 +28,10 @@ #include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" #include "java/JavaMath.h" #include "minecraft/world/entity/EntityIO.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" // 4J - this class is fairly substantially altered as there didn't seem any // point in porting code for banning, whitelisting, ops etc. diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h b/minecraft/minecraft/server/PlayerList.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h rename to minecraft/minecraft/server/PlayerList.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerInterface.h b/minecraft/minecraft/server/ServerInterface.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ServerInterface.h rename to minecraft/minecraft/server/ServerInterface.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp b/minecraft/minecraft/server/ServerScoreboard.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp rename to minecraft/minecraft/server/ServerScoreboard.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h b/minecraft/minecraft/server/ServerScoreboard.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h rename to minecraft/minecraft/server/ServerScoreboard.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp b/minecraft/minecraft/server/Settings.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp rename to minecraft/minecraft/server/Settings.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/server/Settings.h b/minecraft/minecraft/server/Settings.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/Settings.h rename to minecraft/minecraft/server/Settings.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp b/minecraft/minecraft/server/commands/ServerCommandDispatcher.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp rename to minecraft/minecraft/server/commands/ServerCommandDispatcher.cpp index 25cbe7160..5e93557ac 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/minecraft/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -1,9 +1,9 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/level/ServerPlayer.h" #include "TeleportCommand.h" #include "ServerCommandDispatcher.h" #include "minecraft/commands/Command.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h b/minecraft/minecraft/server/commands/ServerCommandDispatcher.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h rename to minecraft/minecraft/server/commands/ServerCommandDispatcher.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp b/minecraft/minecraft/server/commands/TeleportCommand.cpp similarity index 93% rename from minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp rename to minecraft/minecraft/server/commands/TeleportCommand.cpp index 294bd70fd..efaf2f7b5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp +++ b/minecraft/minecraft/server/commands/TeleportCommand.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" #include "TeleportCommand.h" #include "minecraft/network/packet/ChatPacket.h" #include "minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h b/minecraft/minecraft/server/commands/TeleportCommand.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h rename to minecraft/minecraft/server/commands/TeleportCommand.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp b/minecraft/minecraft/server/level/CreativeMode.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp rename to minecraft/minecraft/server/level/CreativeMode.cpp index 5a1bc19f8..0ddc3d0d8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp +++ b/minecraft/minecraft/server/level/CreativeMode.cpp @@ -1,7 +1,7 @@ #include "CreativeMode.h" -#include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/User.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.h b/minecraft/minecraft/server/level/CreativeMode.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.h rename to minecraft/minecraft/server/level/CreativeMode.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp b/minecraft/minecraft/server/level/DemoMode.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp rename to minecraft/minecraft/server/level/DemoMode.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.h b/minecraft/minecraft/server/level/DemoMode.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.h rename to minecraft/minecraft/server/level/DemoMode.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp b/minecraft/minecraft/server/level/DerivedServerLevel.cpp similarity index 94% rename from minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp rename to minecraft/minecraft/server/level/DerivedServerLevel.cpp index fe585a5b8..13d73eebb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp +++ b/minecraft/minecraft/server/level/DerivedServerLevel.cpp @@ -1,7 +1,7 @@ #include "DerivedServerLevel.h" #include "minecraft/world/level/storage/SavedDataStorage.h" #include "minecraft/world/level/storage/DerivedLevelData.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerLevel.h" class LevelSettings; class LevelStorage; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h b/minecraft/minecraft/server/level/DerivedServerLevel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h rename to minecraft/minecraft/server/level/DerivedServerLevel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp b/minecraft/minecraft/server/level/EntityTracker.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp rename to minecraft/minecraft/server/level/EntityTracker.cpp index d931847ff..60a3de803 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp +++ b/minecraft/minecraft/server/level/EntityTracker.cpp @@ -1,8 +1,8 @@ #include #include "EntityTracker.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "TrackedEntity.h" #include "ServerPlayer.h" #include "ServerLevel.h" @@ -19,7 +19,7 @@ #include "minecraft/network/net.minecraft.network.h" #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/network/PlayerConnection.h" EntityTracker::EntityTracker(ServerLevel* level) { this->level = level; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h b/minecraft/minecraft/server/level/EntityTracker.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h rename to minecraft/minecraft/server/level/EntityTracker.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp b/minecraft/minecraft/server/level/GameMode.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp rename to minecraft/minecraft/server/level/GameMode.cpp index 23815a83e..15fc7c580 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp +++ b/minecraft/minecraft/server/level/GameMode.cpp @@ -1,7 +1,7 @@ #include "GameMode.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/renderer/LevelRenderer.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.h b/minecraft/minecraft/server/level/GameMode.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.h rename to minecraft/minecraft/server/level/GameMode.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp b/minecraft/minecraft/server/level/PlayerChunkMap.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp rename to minecraft/minecraft/server/level/PlayerChunkMap.cpp index c519611d6..1027dc834 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp +++ b/minecraft/minecraft/server/level/PlayerChunkMap.cpp @@ -7,12 +7,12 @@ #include #include "PlayerChunkMap.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/network/PlayerConnection.h" #include "ServerLevel.h" #include "ServerChunkCache.h" #include "ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h b/minecraft/minecraft/server/level/PlayerChunkMap.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h rename to minecraft/minecraft/server/level/PlayerChunkMap.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/minecraft/server/level/ServerChunkCache.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp rename to minecraft/minecraft/server/level/ServerChunkCache.cpp index d8ca4d562..8e8df1cc7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp +++ b/minecraft/minecraft/server/level/ServerChunkCache.cpp @@ -5,7 +5,7 @@ #include "ServerChunkCache.h" #include "ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/util/ProgressListener.h" #include "console_helpers/compression.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h b/minecraft/minecraft/server/level/ServerChunkCache.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h rename to minecraft/minecraft/server/level/ServerChunkCache.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/minecraft/server/level/ServerLevel.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp rename to minecraft/minecraft/server/level/ServerLevel.cpp index b488efec4..668eb4de6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/minecraft/server/level/ServerLevel.cpp @@ -5,13 +5,13 @@ #include "Minecraft.Client/include/stdafx.h" #include "ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/MinecraftServer.h" #include "ServerChunkCache.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/PlayerList.h" #include "ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/network/PlayerConnection.h" #include "EntityTracker.h" -#include "Minecraft.Client/net/minecraft/server/ServerScoreboard.h" +#include "minecraft/server/ServerScoreboard.h" #include "minecraft/world/scores/ScoreboardSaveData.h" #include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/item/net.minecraft.world.item.h" @@ -37,11 +37,11 @@ #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "ServerLevelListener.h" #include "minecraft/util/WeighedTreasure.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "minecraft/client/skins/TexturePackRepository.h" +#include "minecraft/client/skins/DLCTexturePack.h" #include "minecraft/util/ProgressListener.h" #include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "PlayerChunkMap.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h b/minecraft/minecraft/server/level/ServerLevel.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h rename to minecraft/minecraft/server/level/ServerLevel.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp b/minecraft/minecraft/server/level/ServerLevelListener.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp rename to minecraft/minecraft/server/level/ServerLevelListener.cpp index 0d7c813d9..89bc5bd6a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp +++ b/minecraft/minecraft/server/level/ServerLevelListener.cpp @@ -3,12 +3,12 @@ #include "ServerLevelListener.h" #include "EntityTracker.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/MinecraftServer.h" #include "ServerLevel.h" #include "ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/PlayerList.h" #include "PlayerChunkMap.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/network/PlayerConnection.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/network/packet/LevelEventPacket.h" #include "minecraft/network/packet/LevelSoundPacket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h b/minecraft/minecraft/server/level/ServerLevelListener.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h rename to minecraft/minecraft/server/level/ServerLevelListener.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/minecraft/server/level/ServerPlayer.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp rename to minecraft/minecraft/server/level/ServerPlayer.cpp index c628109ce..652903be6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/minecraft/server/level/ServerPlayer.cpp @@ -4,12 +4,12 @@ #include "ServerPlayer.h" #include "ServerPlayerGameMode.h" #include "ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/MinecraftServer.h" #include "EntityTracker.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/server/Settings.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/Settings.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "minecraft/network/packet/net.minecraft.network.packet.h" @@ -29,7 +29,7 @@ #include "minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h" #include "minecraft/stats/net.minecraft.stats.h" #include "minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "4J_Input.h" @@ -38,7 +38,7 @@ #include "java/Random.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/renderer/LevelRenderer.h" ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, const std::wstring& name, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h b/minecraft/minecraft/server/level/ServerPlayer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h rename to minecraft/minecraft/server/level/ServerPlayer.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp b/minecraft/minecraft/server/level/ServerPlayerGameMode.cpp similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp rename to minecraft/minecraft/server/level/ServerPlayerGameMode.cpp index 0ab7eb498..19fc5ba94 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/minecraft/minecraft/server/level/ServerPlayerGameMode.cpp @@ -3,9 +3,9 @@ #include "ServerPlayerGameMode.h" #include "ServerLevel.h" #include "ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/server/network/PlayerConnection.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "minecraft/network/packet/TileUpdatePacket.h" #include "minecraft/world/entity/player/Inventory.h" @@ -19,7 +19,7 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" ServerPlayerGameMode::ServerPlayerGameMode(Level* level) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h b/minecraft/minecraft/server/level/ServerPlayerGameMode.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h rename to minecraft/minecraft/server/level/ServerPlayerGameMode.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp b/minecraft/minecraft/server/level/SurvivalMode.cpp similarity index 96% rename from minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp rename to minecraft/minecraft/server/level/SurvivalMode.cpp index 95ccf1189..187b0882f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp +++ b/minecraft/minecraft/server/level/SurvivalMode.cpp @@ -1,13 +1,13 @@ #include "SurvivalMode.h" #include "DemoMode.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" +#include "minecraft/client/ClientConstants.h" SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.h b/minecraft/minecraft/server/level/SurvivalMode.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.h rename to minecraft/minecraft/server/level/SurvivalMode.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/minecraft/server/level/TrackedEntity.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp rename to minecraft/minecraft/server/level/TrackedEntity.cpp index 2352ac4a9..7aa61fea3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp +++ b/minecraft/minecraft/server/level/TrackedEntity.cpp @@ -7,10 +7,10 @@ #include "TrackedEntity.h" #include "ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/network/PlayerConnection.h" #include "minecraft/util/Mth.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "EntityTracker.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h b/minecraft/minecraft/server/level/TrackedEntity.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h rename to minecraft/minecraft/server/level/TrackedEntity.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/minecraft/server/network/PendingConnection.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp rename to minecraft/minecraft/server/network/PendingConnection.cpp index 8bbe54081..d8b6b97bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp +++ b/minecraft/minecraft/server/network/PendingConnection.cpp @@ -5,9 +5,9 @@ #include "PendingConnection.h" #include "PlayerConnection.h" #include "ServerConnection.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/SharedConstants.h" #include "4J.Common/4J_Compat.h" #include "4J_Storage.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h b/minecraft/minecraft/server/network/PendingConnection.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h rename to minecraft/minecraft/server/network/PendingConnection.h diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/minecraft/server/network/PlayerConnection.cpp similarity index 99% rename from minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp rename to minecraft/minecraft/server/network/PlayerConnection.cpp index 8d8749990..5ee5cbab8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp +++ b/minecraft/minecraft/server/network/PlayerConnection.cpp @@ -6,11 +6,11 @@ #include #include "PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerPlayerGameMode.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/SharedConstants.h" #include "Minecraft.Client/Common/src/Network/Socket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h b/minecraft/minecraft/server/network/PlayerConnection.h similarity index 98% rename from minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h rename to minecraft/minecraft/server/network/PlayerConnection.h index e2a1eca7e..755e46497 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h +++ b/minecraft/minecraft/server/network/PlayerConnection.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/ConsoleInputSource.h" +#include "minecraft/server/ConsoleInputSource.h" #include "minecraft/network/packet/PacketListener.h" #include "java/JavaIntHash.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp b/minecraft/minecraft/server/network/ServerConnection.cpp similarity index 97% rename from minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp rename to minecraft/minecraft/server/network/ServerConnection.cpp index ffde7c92d..243e5af34 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp +++ b/minecraft/minecraft/server/network/ServerConnection.cpp @@ -3,14 +3,14 @@ #include "ServerConnection.h" #include "PendingConnection.h" #include "PlayerConnection.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/network/packet/ServerSettingsChangedPacket.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" ServerConnection::ServerConnection(MinecraftServer* server) { // 4J - added initialiser diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h b/minecraft/minecraft/server/network/ServerConnection.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h rename to minecraft/minecraft/server/network/ServerConnection.h diff --git a/minecraft/minecraft/stats/Stats.cpp b/minecraft/minecraft/stats/Stats.cpp index 457c51bb4..6c31e9c61 100644 --- a/minecraft/minecraft/stats/Stats.cpp +++ b/minecraft/minecraft/stats/Stats.cpp @@ -5,7 +5,7 @@ #include "ItemStat.h" #include "GeneralStat.h" #include "Stats.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "minecraft/stats/StatsCounter.h" #include "console_helpers/StringHelpers.h" #include "minecraft/stats/Stat.h" #include "minecraft/world/item/FishingRodItem.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp b/minecraft/minecraft/stats/StatsCounter.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp rename to minecraft/minecraft/stats/StatsCounter.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h b/minecraft/minecraft/stats/StatsCounter.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h rename to minecraft/minecraft/stats/StatsCounter.h diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp b/minecraft/minecraft/stats/StatsSyncer.cpp similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp rename to minecraft/minecraft/stats/StatsSyncer.cpp diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h b/minecraft/minecraft/stats/StatsSyncer.h similarity index 100% rename from minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h rename to minecraft/minecraft/stats/StatsSyncer.h diff --git a/minecraft/minecraft/world/entity/Entity.cpp b/minecraft/minecraft/world/entity/Entity.cpp index 1fec12bcb..614c717a2 100644 --- a/minecraft/minecraft/world/entity/Entity.cpp +++ b/minecraft/minecraft/world/entity/Entity.cpp @@ -15,10 +15,10 @@ #include "minecraft/core/particles/ParticleTypes.h" #include "EntityPos.h" #include "Entity.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/client/model/HumanoidModel.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/PlayerList.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/minecraft/world/entity/LivingEntity.cpp b/minecraft/minecraft/world/entity/LivingEntity.cpp index 7a71b45cb..e4246d1c9 100644 --- a/minecraft/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/minecraft/world/entity/LivingEntity.cpp @@ -13,8 +13,8 @@ #include "java/JavaMath.h" #include "LivingEntity.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/EntityTracker.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/stats/GenericStats.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/minecraft/world/entity/Mob.cpp b/minecraft/minecraft/world/entity/Mob.cpp index 3cc3d49eb..cc3b75aeb 100644 --- a/minecraft/minecraft/world/entity/Mob.cpp +++ b/minecraft/minecraft/world/entity/Mob.cpp @@ -7,8 +7,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/EntityTracker.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/entity/Mob.h" diff --git a/minecraft/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/minecraft/world/entity/animal/EntityHorse.cpp index b3da45c4e..bec7af085 100644 --- a/minecraft/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/minecraft/world/entity/animal/EntityHorse.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "EntityHorse.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/minecraft/world/entity/animal/Ocelot.cpp index 65b85b22e..11c5d163f 100644 --- a/minecraft/minecraft/world/entity/animal/Ocelot.cpp +++ b/minecraft/minecraft/world/entity/animal/Ocelot.cpp @@ -3,8 +3,8 @@ #include #include "minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/stats/GenericStats.h" #include "Ocelot.h" #include "console_helpers/StringHelpers.h" diff --git a/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 020088697..f1d6fa20f 100644 --- a/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -9,7 +9,7 @@ #include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "minecraft/world/phys/net.minecraft.world.phys.h" #include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "net.minecraft.world.entity.boss.enderdragon.h" #include "minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" #include "minecraft/SharedConstants.h" diff --git a/minecraft/minecraft/world/entity/global/LightningBolt.cpp b/minecraft/minecraft/world/entity/global/LightningBolt.cpp index 568a09c9d..06c251450 100644 --- a/minecraft/minecraft/world/entity/global/LightningBolt.cpp +++ b/minecraft/minecraft/world/entity/global/LightningBolt.cpp @@ -4,8 +4,8 @@ #include #include "LightningBolt.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/minecraft/minecraft/world/entity/item/Minecart.cpp b/minecraft/minecraft/world/entity/item/Minecart.cpp index 80c954b91..de98b8fb3 100644 --- a/minecraft/minecraft/world/entity/item/Minecart.cpp +++ b/minecraft/minecraft/world/entity/item/Minecart.cpp @@ -9,8 +9,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "Minecart.h" #include "java/Class.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/minecraft/world/entity/monster/Monster.cpp b/minecraft/minecraft/world/entity/monster/Monster.cpp index 3c33a4eed..67db53f89 100644 --- a/minecraft/minecraft/world/entity/monster/Monster.cpp +++ b/minecraft/minecraft/world/entity/monster/Monster.cpp @@ -3,7 +3,7 @@ #include #include "Monster.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/minecraft/minecraft/world/entity/npc/Villager.cpp b/minecraft/minecraft/world/entity/npc/Villager.cpp index 3d5b5e7de..a07ac9a1f 100644 --- a/minecraft/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/minecraft/world/entity/npc/Villager.cpp @@ -16,7 +16,7 @@ #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/util/Mth.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/Textures.h" #include "Villager.h" namespace { diff --git a/minecraft/minecraft/world/entity/player/Player.cpp b/minecraft/minecraft/world/entity/player/Player.cpp index 9cbf34c93..cc56e4ed6 100644 --- a/minecraft/minecraft/world/entity/player/Player.cpp +++ b/minecraft/minecraft/world/entity/player/Player.cpp @@ -21,8 +21,8 @@ #include "Inventory.h" #include "Player.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/model/HumanoidModel.h" #include "minecraft/world/entity/player/Player.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" diff --git a/minecraft/minecraft/world/entity/projectile/Arrow.cpp b/minecraft/minecraft/world/entity/projectile/Arrow.cpp index ae0af47cb..be1d13417 100644 --- a/minecraft/minecraft/world/entity/projectile/Arrow.cpp +++ b/minecraft/minecraft/world/entity/projectile/Arrow.cpp @@ -6,8 +6,8 @@ #include #include -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" #include "Arrow.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index ca5ad00d2..cf57d7087 100644 --- a/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" #include "ThrownEnderpearl.h" #include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" diff --git a/minecraft/minecraft/world/inventory/ContainerMenu.cpp b/minecraft/minecraft/world/inventory/ContainerMenu.cpp index 94b09de7f..2497bcee4 100644 --- a/minecraft/minecraft/world/inventory/ContainerMenu.cpp +++ b/minecraft/minecraft/world/inventory/ContainerMenu.cpp @@ -2,9 +2,9 @@ #include "Slot.h" #include "minecraft/stats/GenericStats.h" -#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "minecraft/stats/StatsCounter.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/player/LocalPlayer.h" #include "ContainerMenu.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Player.h" diff --git a/minecraft/minecraft/world/item/ArmorItem.cpp b/minecraft/minecraft/world/item/ArmorItem.cpp index 04b8ffbf7..37aeb1ac8 100644 --- a/minecraft/minecraft/world/item/ArmorItem.cpp +++ b/minecraft/minecraft/world/item/ArmorItem.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "ArmorItem.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" diff --git a/minecraft/minecraft/world/item/BucketItem.cpp b/minecraft/minecraft/world/item/BucketItem.cpp index 00b9b74a4..d7eb7e261 100644 --- a/minecraft/minecraft/world/item/BucketItem.cpp +++ b/minecraft/minecraft/world/item/BucketItem.cpp @@ -4,8 +4,8 @@ #include "java/JavaMath.h" #include "minecraft/world/level/material/Material.h" #include "BucketItem.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/network/PlayerConnection.h" #include "minecraft/network/packet/ChatPacket.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/minecraft/minecraft/world/item/ClockItem.cpp b/minecraft/minecraft/world/item/ClockItem.cpp index ec9414497..5bb003651 100644 --- a/minecraft/minecraft/world/item/ClockItem.cpp +++ b/minecraft/minecraft/world/item/ClockItem.cpp @@ -1,8 +1,8 @@ #include #include "ClockItem.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" diff --git a/minecraft/minecraft/world/item/CompassItem.cpp b/minecraft/minecraft/world/item/CompassItem.cpp index cbda76cce..e9b0be5e4 100644 --- a/minecraft/minecraft/world/item/CompassItem.cpp +++ b/minecraft/minecraft/world/item/CompassItem.cpp @@ -1,8 +1,8 @@ #include #include "CompassItem.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/Item.h" diff --git a/minecraft/minecraft/world/item/SpawnEggItem.cpp b/minecraft/minecraft/world/item/SpawnEggItem.cpp index f1631db93..eb0bd29f2 100644 --- a/minecraft/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/minecraft/world/item/SpawnEggItem.cpp @@ -1,6 +1,6 @@ #include "minecraft/stdafx.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/net.minecraft.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" diff --git a/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp b/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp index ba8f43115..41e605a42 100644 --- a/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/effect/net.minecraft.world.effect.h" #include "java/JavaMath.h" #include "minecraft/SharedConstants.h" diff --git a/minecraft/minecraft/world/level/FoliageColor.cpp b/minecraft/minecraft/world/level/FoliageColor.cpp index e554e4cd2..f17532c5e 100644 --- a/minecraft/minecraft/world/level/FoliageColor.cpp +++ b/minecraft/minecraft/world/level/FoliageColor.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "FoliageColor.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/minecraft/world/level/Level.cpp b/minecraft/minecraft/world/level/Level.cpp index 8f8066ca4..3b52b3777 100644 --- a/minecraft/minecraft/world/level/Level.cpp +++ b/minecraft/minecraft/world/level/Level.cpp @@ -12,8 +12,8 @@ #include "LevelListener.h" #include "Level.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/minecraft/world/level/MobSpawner.cpp b/minecraft/minecraft/world/level/MobSpawner.cpp index bfe3afb01..4cf055837 100644 --- a/minecraft/minecraft/world/level/MobSpawner.cpp +++ b/minecraft/minecraft/world/level/MobSpawner.cpp @@ -3,7 +3,7 @@ #include "minecraft/world/Difficulty.h" #include "Level.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerLevel.h" #include "MobSpawner.h" #include "minecraft/world/level/dimension/Dimension.h" #include "java/Class.h" diff --git a/minecraft/minecraft/world/level/PortalForcer.cpp b/minecraft/minecraft/world/level/PortalForcer.cpp index 11415ad68..28e04a84d 100644 --- a/minecraft/minecraft/world/level/PortalForcer.cpp +++ b/minecraft/minecraft/world/level/PortalForcer.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerLevel.h" #include "PortalForcer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" diff --git a/minecraft/minecraft/world/level/biome/Biome.cpp b/minecraft/minecraft/world/level/biome/Biome.cpp index d8b8ab5c1..d0c0a7839 100644 --- a/minecraft/minecraft/world/level/biome/Biome.cpp +++ b/minecraft/minecraft/world/level/biome/Biome.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/level/biome/Biome.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/minecraft/world/level/biome/BiomeSource.cpp b/minecraft/minecraft/world/level/biome/BiomeSource.cpp index bf6b1b691..299e527fd 100644 --- a/minecraft/minecraft/world/level/biome/BiomeSource.cpp +++ b/minecraft/minecraft/world/level/biome/BiomeSource.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h" #include "java/System.h" #include "BiomeSource.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "platform/PlatformServices.h" diff --git a/minecraft/minecraft/world/level/chunk/LevelChunk.cpp b/minecraft/minecraft/world/level/chunk/LevelChunk.cpp index 918e6949c..7acc3d193 100644 --- a/minecraft/minecraft/world/level/chunk/LevelChunk.cpp +++ b/minecraft/minecraft/world/level/chunk/LevelChunk.cpp @@ -8,10 +8,10 @@ #include "java/System.h" #include "SparseLightStorage.h" #include "LevelChunk.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" -#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" +#include "minecraft/server/level/ServerChunkCache.h" +#include "minecraft/client/renderer/GameRenderer.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/minecraft/world/level/dimension/Dimension.cpp b/minecraft/minecraft/world/level/dimension/Dimension.cpp index 3e6b9ea1d..8bb26687a 100644 --- a/minecraft/minecraft/world/level/dimension/Dimension.cpp +++ b/minecraft/minecraft/world/level/dimension/Dimension.cpp @@ -8,7 +8,7 @@ #include "HellDimension.h" #include "NormalDimension.h" #include "TheEndDimension.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/minecraft/minecraft/world/level/dimension/HellDimension.cpp b/minecraft/minecraft/world/level/dimension/HellDimension.cpp index 50c2e0c05..26308bd99 100644 --- a/minecraft/minecraft/world/level/dimension/HellDimension.cpp +++ b/minecraft/minecraft/world/level/dimension/HellDimension.cpp @@ -1,7 +1,7 @@ #include #include "HellDimension.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp b/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp index 3f132ae9a..5924fc48a 100644 --- a/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp @@ -3,7 +3,7 @@ #include "TheEndDimension.h" #include "minecraft/world/level/biome/FixedBiomeSource.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" #include "minecraft/Pos.h" diff --git a/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp index 50cd7ecfb..16e922539 100644 --- a/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -3,9 +3,9 @@ #include #include "MapItemSavedData.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerPlayer.h" #include "nbt/CompoundTag.h" #include "minecraft/world/entity/ItemFrame.h" #include "minecraft/world/entity/player/Player.h" diff --git a/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 1255f3281..e0518b996 100644 --- a/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -12,9 +12,9 @@ #include "console_helpers/PortableFileIO.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "java/File.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 757f8a725..48da5531e 100644 --- a/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -13,9 +13,9 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h" #include "java/File.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/minecraft/world/level/tile/CauldronTile.cpp b/minecraft/minecraft/world/level/tile/CauldronTile.cpp index 0dcad3930..2d456fe9d 100644 --- a/minecraft/minecraft/world/level/tile/CauldronTile.cpp +++ b/minecraft/minecraft/world/level/tile/CauldronTile.cpp @@ -2,7 +2,7 @@ #include "CauldronTile.h" #include "minecraft/Facing.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "minecraft/server/level/ServerPlayer.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/world/IconRegister.h" diff --git a/minecraft/minecraft/world/level/tile/FireTile.cpp b/minecraft/minecraft/world/level/tile/FireTile.cpp index ee296e42a..8115b927b 100644 --- a/minecraft/minecraft/world/level/tile/FireTile.cpp +++ b/minecraft/minecraft/world/level/tile/FireTile.cpp @@ -2,8 +2,8 @@ #include #include "FireTile.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "minecraft/server/MinecraftServer.h" +#include "minecraft/server/PlayerList.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/minecraft/minecraft/world/level/tile/GrassTile.cpp b/minecraft/minecraft/world/level/tile/GrassTile.cpp index acd1a323d..9383daeb9 100644 --- a/minecraft/minecraft/world/level/tile/GrassTile.cpp +++ b/minecraft/minecraft/world/level/tile/GrassTile.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "GrassTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/minecraft/world/level/tile/LeafTile.cpp b/minecraft/minecraft/world/level/tile/LeafTile.cpp index 1a2a5d236..ca51210a9 100644 --- a/minecraft/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/minecraft/world/level/tile/LeafTile.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "LeafTile.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" diff --git a/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp b/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp index e3878c7bd..385a45a16 100644 --- a/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "RedStoneDustTile.h" #include "minecraft/Direction.h" #include "DiodeTile.h" diff --git a/minecraft/minecraft/world/level/tile/StemTile.cpp b/minecraft/minecraft/world/level/tile/StemTile.cpp index 2ce7d932f..036c02a05 100644 --- a/minecraft/minecraft/world/level/tile/StemTile.cpp +++ b/minecraft/minecraft/world/level/tile/StemTile.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "StemTile.h" #include "Minecraft.Client/Common/App_enums.h" diff --git a/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp b/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp index 649913b2a..11a791424 100644 --- a/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/level/net.minecraft.world.level.h" #include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" diff --git a/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp b/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp index 0970e6ea7..b679131f9 100644 --- a/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp @@ -2,7 +2,7 @@ #include #include "WaterLilyTile.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Class.h" diff --git a/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp index d0324e77d..728d1b557 100644 --- a/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -1,8 +1,8 @@ #include #include "SignTileEntity.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/Level.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 36be9a400..1733c2384 100644 --- a/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -5,8 +5,8 @@ #include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "PistonExtensionTile.h" #include "minecraft/Facing.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/sounds/SoundTypes.h"