From e68f3d44dd395a0bc5b407bcbb65b726819ba169 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:11:40 -0500 Subject: [PATCH] move Minecraft.World to minecraft --- .github/workflows/build-doxygen.yml | 2 +- meson.build | 2 +- .../Minecraft.Client/Common/Consoles_App.cpp | 28 +-- .../Minecraft.Client/Common/Consoles_App.h | 4 +- .../Common/src/Audio/Consoles_SoundEngine.h | 2 +- .../Common/src/Audio/SoundEngine.cpp | 8 +- .../Common/src/Audio/SoundEngine.h | 2 +- .../Common/src/Audio/SoundNames.cpp | 2 +- .../ApplySchematicRuleDefinition.cpp | 8 +- .../ApplySchematicRuleDefinition.h | 4 +- .../ConsoleGenerateStructure.cpp | 8 +- .../ConsoleGenerateStructure.h | 4 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 22 +-- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../LevelGenerationOptions.cpp | 8 +- .../LevelGeneration/LevelGenerationOptions.h | 2 +- .../GameRules/LevelGeneration/StartFeature.h | 2 +- .../XboxStructureActionGenerateBox.cpp | 2 +- .../XboxStructureActionPlaceBlock.cpp | 2 +- .../XboxStructureActionPlaceContainer.cpp | 12 +- .../XboxStructureActionPlaceSpawner.cpp | 10 +- .../AddEnchantmentRuleDefinition.cpp | 12 +- .../RuleDefinitions/AddItemRuleDefinition.cpp | 8 +- .../CollectItemRuleDefinition.cpp | 6 +- .../CompleteAllRuleDefinition.cpp | 4 +- .../RuleDefinitions/GameRuleDefinition.h | 2 +- .../RuleDefinitions/NamedAreaRuleDefinition.h | 2 +- .../UpdatePlayerRuleDefinition.cpp | 8 +- .../RuleDefinitions/UseTileRuleDefinition.h | 2 +- .../Common/src/Network/GameNetworkManager.cpp | 14 +- .../Tutorial/Constraints/AreaConstraint.cpp | 4 +- .../src/Tutorial/Constraints/AreaConstraint.h | 2 +- .../Constraints/ChangeStateConstraint.cpp | 12 +- .../Constraints/ChangeStateConstraint.h | 2 +- .../Common/src/Tutorial/FullTutorial.cpp | 12 +- .../Common/src/Tutorial/Hints/AreaHint.cpp | 4 +- .../Common/src/Tutorial/Hints/AreaHint.h | 2 +- .../src/Tutorial/Hints/DiggerItemHint.cpp | 8 +- .../src/Tutorial/Hints/LookAtTileHint.cpp | 2 +- .../src/Tutorial/Hints/TakeItemHint.cpp | 2 +- .../src/Tutorial/Hints/TutorialHint.cpp | 2 +- .../Common/src/Tutorial/Tasks/ChoiceTask.cpp | 2 +- .../Tutorial/Tasks/CompleteUsingItemTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/CraftTask.cpp | 2 +- .../src/Tutorial/Tasks/HorseChoiceTask.cpp | 4 +- .../Common/src/Tutorial/Tasks/InfoTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/PickupTask.cpp | 2 +- .../src/Tutorial/Tasks/RideEntityTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/UseItemTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/UseTileTask.cpp | 2 +- .../src/Tutorial/Tasks/XuiCraftingTask.h | 2 +- .../Common/src/Tutorial/Tutorial.cpp | 14 +- .../Common/src/Tutorial/TutorialMode.cpp | 8 +- .../src/UI/All Platforms/IUIController.h | 2 +- .../IUIScene_AbstractContainerMenu.cpp | 10 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 4 +- .../src/UI/All Platforms/IUIScene_AnvilMenu.h | 2 +- .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 10 +- .../UI/All Platforms/IUIScene_BrewingMenu.cpp | 2 +- .../IUIScene_CommandBlockMenu.cpp | 4 +- .../All Platforms/IUIScene_CommandBlockMenu.h | 2 +- .../All Platforms/IUIScene_ContainerMenu.cpp | 2 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_CraftingMenu.h | 4 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 16 +- .../UI/All Platforms/IUIScene_CreativeMenu.h | 2 +- .../All Platforms/IUIScene_EnchantingMenu.cpp | 4 +- .../All Platforms/IUIScene_FireworksMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FurnaceMenu.cpp | 2 +- .../src/UI/All Platforms/IUIScene_HUD.cpp | 20 +- .../UI/All Platforms/IUIScene_HopperMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_HopperMenu.h | 4 +- .../IUIScene_HorseInventoryMenu.cpp | 2 +- .../IUIScene_HorseInventoryMenu.h | 6 +- .../All Platforms/IUIScene_InventoryMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 4 +- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_TradingMenu.h | 6 +- .../UI/Components/UIComponent_Panorama.cpp | 4 +- .../Components/UIComponent_TutorialPopup.cpp | 2 +- .../Common/src/UI/Components/UIScene_HUD.cpp | 8 +- .../UI/Controls/UIControl_EnchantmentBook.cpp | 6 +- .../Controls/UIControl_EnchantmentButton.cpp | 4 +- .../UI/Controls/UIControl_MinecraftHorse.cpp | 6 +- .../Controls/UIControl_PlayerSkinPreview.cpp | 2 +- .../src/UI/Controls/UIControl_Slider.cpp | 2 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 4 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 18 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 2 +- .../UIScene_CreateWorldMenu.cpp | 6 +- .../UIScene_JoinMenu.cpp | 4 +- .../UIScene_LeaderboardsMenu.cpp | 4 +- .../UIScene_LoadMenu.cpp | 2 +- .../UIScene_LoadOrJoinMenu.cpp | 12 +- .../UIScene_MainMenu.cpp | 2 +- .../UIScene_AbstractContainerMenu.cpp | 4 +- .../Containers/UIScene_AnvilMenu.cpp | 4 +- .../Containers/UIScene_AnvilMenu.h | 2 +- .../Containers/UIScene_BeaconMenu.cpp | 4 +- .../Containers/UIScene_BrewingStandMenu.cpp | 8 +- .../Containers/UIScene_ContainerMenu.cpp | 6 +- .../Containers/UIScene_CreativeMenu.cpp | 4 +- .../Containers/UIScene_DispenserMenu.cpp | 4 +- .../Containers/UIScene_EnchantingMenu.cpp | 4 +- .../Containers/UIScene_FireworksMenu.cpp | 4 +- .../Containers/UIScene_FurnaceMenu.cpp | 4 +- .../Containers/UIScene_HopperMenu.cpp | 6 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 8 +- .../Containers/UIScene_InventoryMenu.cpp | 8 +- .../Containers/UIScene_InventoryMenu.h | 2 +- .../Containers/UIScene_TradingMenu.cpp | 8 +- .../UIScene_CraftingMenu.cpp | 2 +- .../UIScene_InGameHostOptionsMenu.cpp | 4 +- .../UIScene_InGameInfoMenu.cpp | 2 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 2 +- .../UIScene_SignEntryMenu.cpp | 4 +- .../UIScene_TeleportMenu.cpp | 2 +- .../Common/src/UI/UIController.cpp | 4 +- .../Common/src/UI/UIScene.cpp | 6 +- .../Minecraft.Client/Linux/Linux_App.cpp | 2 +- .../Linux/Linux_Minecraft.cpp | 20 +- .../Windows64/Iggy/gdraw/gdraw_d3d11.cpp | 2 +- .../Source Files/Windows64_Minecraft.cpp | 20 +- .../Windows64/Windows64_App.cpp | 8 +- minecraft/Minecraft.Client/meson.build | 2 +- .../net/minecraft/client/Camera.cpp | 16 +- .../net/minecraft/client/Lighting.cpp | 2 +- .../net/minecraft/client/Minecraft.cpp | 48 ++--- .../net/minecraft/client/Minecraft.h | 2 +- .../net/minecraft/client/Options.cpp | 4 +- .../net/minecraft/client/ProgressRenderer.h | 2 +- .../net/minecraft/client/User.cpp | 8 +- .../net/minecraft/client/gui/ChatScreen.cpp | 2 +- .../minecraft/client/gui/ConfirmScreen.cpp | 2 +- .../minecraft/client/gui/ControlsScreen.cpp | 2 +- .../client/gui/CreateWorldScreen.cpp | 8 +- .../net/minecraft/client/gui/EditBox.cpp | 2 +- .../client/gui/EnchantmentScreen.cpp | 12 +- .../minecraft/client/gui/EnchantmentScreen.h | 2 +- .../net/minecraft/client/gui/Font.cpp | 2 +- .../net/minecraft/client/gui/Gui.cpp | 34 ++-- .../net/minecraft/client/gui/HopperScreen.cpp | 6 +- .../minecraft/client/gui/InBedChatScreen.cpp | 2 +- .../client/gui/JoinMultiplayerScreen.cpp | 2 +- .../minecraft/client/gui/MerchantScreen.cpp | 12 +- .../net/minecraft/client/gui/MerchantScreen.h | 4 +- .../net/minecraft/client/gui/Minimap.cpp | 6 +- .../net/minecraft/client/gui/Minimap.h | 2 +- .../minecraft/client/gui/OptionsScreen.cpp | 2 +- .../net/minecraft/client/gui/PauseScreen.cpp | 2 +- .../client/gui/RenameWorldScreen.cpp | 4 +- .../net/minecraft/client/gui/RepairScreen.cpp | 12 +- .../net/minecraft/client/gui/RepairScreen.h | 6 +- .../net/minecraft/client/gui/Screen.cpp | 2 +- .../client/gui/SelectWorldScreen.cpp | 6 +- .../client/gui/VideoSettingsScreen.cpp | 2 +- .../gui/achievement/AchievementPopup.cpp | 4 +- .../gui/achievement/AchievementScreen.cpp | 4 +- .../gui/achievement/AchievementScreen.h | 4 +- .../client/gui/achievement/StatsScreen.cpp | 12 +- .../gui/inventory/AbstractContainerScreen.cpp | 8 +- .../gui/inventory/BeaconCancelButton.cpp | 2 +- .../gui/inventory/BeaconConfirmButton.cpp | 2 +- .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../client/gui/inventory/BeaconPowerButton.h | 2 +- .../client/gui/inventory/BeaconScreen.cpp | 12 +- .../client/gui/inventory/BeaconScreen.h | 4 +- .../gui/inventory/BrewingStandScreen.cpp | 6 +- .../client/gui/inventory/BrewingStandScreen.h | 4 +- .../client/gui/inventory/ContainerScreen.cpp | 4 +- .../client/gui/inventory/CraftingScreen.cpp | 8 +- .../gui/inventory/CreativeInventoryScreen.cpp | 16 +- .../gui/inventory/CreativeInventoryScreen.h | 2 +- .../client/gui/inventory/FurnaceScreen.cpp | 6 +- .../gui/inventory/HorseInventoryScreen.cpp | 6 +- .../gui/inventory/HorseInventoryScreen.h | 2 +- .../client/gui/inventory/InventoryScreen.cpp | 4 +- .../client/gui/inventory/TextEditScreen.cpp | 8 +- .../client/gui/inventory/TrapScreen.cpp | 6 +- .../net/minecraft/client/level/DemoLevel.cpp | 8 +- .../net/minecraft/client/level/DemoLevel.h | 4 +- .../net/minecraft/client/model/BatModel.cpp | 4 +- .../minecraft/client/model/HumanoidModel.cpp | 4 +- .../minecraft/client/model/LavaSlimeModel.cpp | 4 +- .../net/minecraft/client/model/ModelHorse.cpp | 10 +- .../minecraft/client/model/OcelotModel.cpp | 4 +- .../net/minecraft/client/model/Polygon.cpp | 2 +- .../minecraft/client/model/SheepFurModel.cpp | 4 +- .../net/minecraft/client/model/SheepModel.cpp | 4 +- .../minecraft/client/model/SkeletonModel.cpp | 4 +- .../net/minecraft/client/model/Vertex.h | 2 +- .../client/model/VillagerGolemModel.cpp | 4 +- .../net/minecraft/client/model/WitchModel.cpp | 6 +- .../client/model/WitherBossModel.cpp | 2 +- .../net/minecraft/client/model/WolfModel.cpp | 4 +- .../net/minecraft/client/model/WolfModel.h | 2 +- .../client/model/dragon/DragonModel.cpp | 4 +- .../client/multiplayer/ClientConnection.cpp | 54 +++--- .../client/multiplayer/ClientConnection.h | 2 +- .../client/multiplayer/ConnectScreen.cpp | 4 +- .../client/multiplayer/DisconnectedScreen.cpp | 2 +- .../multiplayer/MultiPlayerChunkCache.cpp | 18 +- .../multiplayer/MultiPlayerChunkCache.h | 10 +- .../multiplayer/MultiPlayerGameMode.cpp | 42 ++--- .../client/multiplayer/MultiPlayerGameMode.h | 2 +- .../client/multiplayer/MultiPlayerLevel.cpp | 26 +-- .../client/multiplayer/MultiPlayerLevel.h | 8 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 42 ++--- .../multiplayer/MultiPlayerLocalPlayer.h | 6 +- .../multiplayer/ReceivingLevelScreen.cpp | 4 +- .../client/particle/BreakingItemParticle.cpp | 8 +- .../client/particle/BubbleParticle.cpp | 6 +- .../client/particle/CritParticle.cpp | 6 +- .../minecraft/client/particle/CritParticle.h | 2 +- .../client/particle/DripParticle.cpp | 10 +- .../client/particle/FireworksParticles.cpp | 10 +- .../client/particle/FootstepParticle.cpp | 4 +- .../particle/HugeExplosionSeedParticle.cpp | 4 +- .../client/particle/LavaParticle.cpp | 4 +- .../minecraft/client/particle/Particle.cpp | 6 +- .../net/minecraft/client/particle/Particle.h | 4 +- .../client/particle/ParticleEngine.cpp | 10 +- .../client/particle/PlayerCloudParticle.cpp | 6 +- .../client/particle/SuspendedParticle.cpp | 6 +- .../client/particle/TakeAnimationParticle.cpp | 8 +- .../client/particle/TerrainParticle.cpp | 10 +- .../client/particle/WaterDropParticle.cpp | 8 +- .../net/minecraft/client/player/Input.cpp | 2 +- .../minecraft/client/player/LocalPlayer.cpp | 64 +++---- .../net/minecraft/client/player/LocalPlayer.h | 10 +- .../minecraft/client/player/RemotePlayer.cpp | 8 +- .../minecraft/client/player/RemotePlayer.h | 10 +- .../client/renderer/BossMobGuiInfo.cpp | 4 +- .../net/minecraft/client/renderer/Chunk.cpp | 14 +- .../net/minecraft/client/renderer/Chunk.h | 2 +- .../client/renderer/DirtyChunkSorter.cpp | 2 +- .../client/renderer/DistanceChunkSorter.cpp | 2 +- .../client/renderer/EntityTileRenderer.cpp | 8 +- .../client/renderer/GameRenderer.cpp | 56 +++--- .../minecraft/client/renderer/GameRenderer.h | 4 +- .../client/renderer/ItemInHandRenderer.cpp | 28 +-- .../client/renderer/LevelRenderer.cpp | 56 +++--- .../minecraft/client/renderer/LevelRenderer.h | 8 +- .../minecraft/client/renderer/Textures.cpp | 8 +- .../client/renderer/TileRenderer.cpp | 94 ++++----- .../client/renderer/culling/Culler.h | 2 +- .../client/renderer/culling/FrustumCuller.cpp | 2 +- .../client/renderer/culling/FrustumData.cpp | 2 +- .../client/renderer/culling/FrustumData.h | 2 +- .../renderer/culling/ViewportCuller.cpp | 4 +- .../client/renderer/culling/ViewportCuller.h | 2 +- .../client/renderer/entity/ArrowRenderer.cpp | 4 +- .../client/renderer/entity/BatRenderer.cpp | 4 +- .../client/renderer/entity/BlazeRenderer.cpp | 4 +- .../client/renderer/entity/BoatRenderer.cpp | 4 +- .../renderer/entity/ChickenRenderer.cpp | 4 +- .../renderer/entity/CreeperRenderer.cpp | 4 +- .../renderer/entity/EnderCrystalRenderer.cpp | 2 +- .../renderer/entity/EnderDragonRenderer.cpp | 2 +- .../renderer/entity/EndermanRenderer.cpp | 10 +- .../entity/EntityRenderDispatcher.cpp | 26 +-- .../renderer/entity/EntityRenderDispatcher.h | 2 +- .../client/renderer/entity/EntityRenderer.cpp | 18 +- .../renderer/entity/ExperienceOrbRenderer.cpp | 6 +- .../renderer/entity/FallingTileRenderer.cpp | 12 +- .../renderer/entity/FireballRenderer.cpp | 14 +- .../renderer/entity/FishingHookRenderer.cpp | 8 +- .../client/renderer/entity/GhastRenderer.cpp | 6 +- .../client/renderer/entity/HorseRenderer.cpp | 6 +- .../renderer/entity/HumanoidMobRenderer.cpp | 16 +- .../renderer/entity/ItemFrameRenderer.cpp | 26 +-- .../client/renderer/entity/ItemRenderer.cpp | 18 +- .../renderer/entity/ItemSpriteRenderer.cpp | 12 +- .../renderer/entity/LavaSlimeRenderer.cpp | 4 +- .../renderer/entity/LightningBoltRenderer.cpp | 4 +- .../renderer/entity/LivingEntityRenderer.cpp | 12 +- .../renderer/entity/LivingEntityRenderer.h | 2 +- .../renderer/entity/MinecartRenderer.cpp | 6 +- .../entity/MinecartSpawnerRenderer.cpp | 4 +- .../client/renderer/entity/MobRenderer.cpp | 10 +- .../renderer/entity/MushroomCowRenderer.cpp | 8 +- .../client/renderer/entity/OcelotRenderer.cpp | 6 +- .../renderer/entity/PaintingRenderer.cpp | 8 +- .../client/renderer/entity/PigRenderer.cpp | 4 +- .../client/renderer/entity/PlayerRenderer.cpp | 24 +-- .../client/renderer/entity/PlayerRenderer.h | 2 +- .../client/renderer/entity/SheepRenderer.cpp | 6 +- .../renderer/entity/SkeletonRenderer.cpp | 6 +- .../client/renderer/entity/SlimeRenderer.cpp | 4 +- .../renderer/entity/SnowManRenderer.cpp | 10 +- .../client/renderer/entity/SpiderRenderer.cpp | 6 +- .../client/renderer/entity/SquidRenderer.cpp | 4 +- .../renderer/entity/TntMinecartRenderer.cpp | 6 +- .../client/renderer/entity/TntRenderer.cpp | 8 +- .../renderer/entity/VillagerGolemRenderer.cpp | 10 +- .../renderer/entity/VillagerRenderer.cpp | 6 +- .../client/renderer/entity/WitchRenderer.cpp | 16 +- .../renderer/entity/WitherBossRenderer.cpp | 2 +- .../renderer/entity/WitherSkullRenderer.cpp | 4 +- .../client/renderer/entity/WolfRenderer.cpp | 10 +- .../client/renderer/entity/ZombieRenderer.cpp | 6 +- .../texture/PreStitchedTextureMap.cpp | 6 +- .../renderer/texture/PreStitchedTextureMap.h | 2 +- .../renderer/texture/StitchedTexture.cpp | 2 +- .../client/renderer/texture/StitchedTexture.h | 2 +- .../client/renderer/texture/TextureMap.cpp | 6 +- .../client/renderer/texture/TextureMap.h | 2 +- .../renderer/texture/custom/ClockTexture.cpp | 4 +- .../texture/custom/CompassTexture.cpp | 6 +- .../renderer/tileentity/BeaconRenderer.cpp | 6 +- .../renderer/tileentity/ChestRenderer.cpp | 8 +- .../tileentity/EnchantTableRenderer.cpp | 8 +- .../tileentity/EnderChestRenderer.cpp | 4 +- .../tileentity/MobSpawnerRenderer.cpp | 8 +- .../tileentity/PistonPieceRenderer.cpp | 12 +- .../renderer/tileentity/SignRenderer.cpp | 8 +- .../renderer/tileentity/SkullTileRenderer.cpp | 8 +- .../tileentity/TheEndPortalRenderer.cpp | 4 +- .../tileentity/TileEntityRenderDispatcher.cpp | 8 +- .../minecraft/client/title/TitleScreen.cpp | 2 +- .../net/minecraft/server/DispenserBootstrap.h | 8 +- .../net/minecraft/server/MinecraftServer.cpp | 36 ++-- .../net/minecraft/server/MinecraftServer.h | 6 +- .../net/minecraft/server/PlayerList.cpp | 24 +-- .../net/minecraft/server/ServerScoreboard.h | 2 +- .../commands/ServerCommandDispatcher.cpp | 20 +- .../server/commands/ServerCommandDispatcher.h | 6 +- .../server/commands/TeleportCommand.cpp | 6 +- .../server/commands/TeleportCommand.h | 6 +- .../minecraft/server/level/CreativeMode.cpp | 10 +- .../net/minecraft/server/level/DemoMode.cpp | 2 +- .../server/level/DerivedServerLevel.cpp | 4 +- .../minecraft/server/level/EntityTracker.cpp | 26 +-- .../net/minecraft/server/level/GameMode.cpp | 14 +- .../minecraft/server/level/PlayerChunkMap.cpp | 18 +- .../minecraft/server/level/PlayerChunkMap.h | 2 +- .../server/level/ServerChunkCache.cpp | 16 +- .../minecraft/server/level/ServerChunkCache.h | 10 +- .../minecraft/server/level/ServerLevel.cpp | 50 ++--- .../net/minecraft/server/level/ServerLevel.h | 2 +- .../server/level/ServerLevelListener.cpp | 10 +- .../server/level/ServerLevelListener.h | 4 +- .../minecraft/server/level/ServerPlayer.cpp | 38 ++-- .../net/minecraft/server/level/ServerPlayer.h | 6 +- .../server/level/ServerPlayerGameMode.cpp | 24 +-- .../minecraft/server/level/SurvivalMode.cpp | 8 +- .../minecraft/server/level/TrackedEntity.cpp | 78 ++++---- .../minecraft/server/level/TrackedEntity.h | 2 +- .../server/network/PendingConnection.cpp | 8 +- .../server/network/PendingConnection.h | 4 +- .../server/network/PlayerConnection.cpp | 142 +++++++------- .../server/network/PlayerConnection.h | 4 +- .../server/network/ServerConnection.cpp | 6 +- .../net/minecraft/stats/StatsCounter.cpp | 14 +- .../net/minecraft/StaticConstructors.cpp | 98 ---------- ....minecraft.world.entity.boss.enderdragon.h | 5 - .../ConsoleSaveFileIO/ConsoleSaveFileIO.h | 7 - .../minecraft/world/level/tile/AirTile.cpp | 5 - .../minecraft/world/level/tile/DirtTile.cpp | 5 - .../minecraft/world/level/tile/MetalTile.cpp | 5 - .../world/level/tile/NetherrackTile.cpp | 5 - .../minecraft/world/level/tile/SpongeTile.cpp | 7 - .../net.minecraft.world.level.tile.piston.h | 6 - .../include/console_helpers/compression.h | 2 +- minecraft/console_helpers/meson.build | 2 +- minecraft/console_helpers/src/compression.cpp | 2 +- .../net => }/minecraft/Direction.cpp | 2 +- .../net => }/minecraft/Direction.h | 0 .../net => }/minecraft/Facing.cpp | 0 .../net => }/minecraft/Facing.h | 0 .../net => }/minecraft/Pos.cpp | 4 +- .../{Minecraft.World/net => }/minecraft/Pos.h | 0 .../net => }/minecraft/SharedConstants.cpp | 4 +- .../net => }/minecraft/SharedConstants.h | 0 minecraft/minecraft/StaticConstructors.cpp | 98 ++++++++++ .../net => }/minecraft/StaticConstructors.h | 0 .../minecraft/commands/AdminLogCommand.h | 2 +- .../net => }/minecraft/commands/Command.cpp | 6 +- .../net => }/minecraft/commands/Command.h | 2 +- .../minecraft/commands/CommandDispatcher.cpp | 4 +- .../minecraft/commands/CommandDispatcher.h | 2 +- .../minecraft/commands/CommandSender.h | 2 +- .../minecraft/commands/CommandsEnum.h | 0 .../minecraft/commands/PlayerSelector.h | 0 .../common/DefaultGameModeCommand.cpp | 0 .../commands/common/DefaultGameModeCommand.h | 2 +- .../commands/common/EffectCommand.cpp | 4 +- .../minecraft/commands/common/EffectCommand.h | 4 +- .../commands/common/EnchantItemCommand.cpp | 10 +- .../commands/common/EnchantItemCommand.h | 4 +- .../commands/common/ExperienceCommand.cpp | 0 .../commands/common/ExperienceCommand.h | 4 +- .../commands/common/GameDifficultyCommand.h | 0 .../commands/common/GameModeCommand.cpp | 0 .../commands/common/GameModeCommand.h | 4 +- .../commands/common/GameRuleCommand.h | 0 .../commands/common/GiveItemCommand.cpp | 12 +- .../commands/common/GiveItemCommand.h | 4 +- .../minecraft/commands/common/KillCommand.cpp | 6 +- .../minecraft/commands/common/KillCommand.h | 4 +- .../commands/common/PlaySoundCommand.h | 0 .../commands/common/SetPlayerTimeoutCommand.h | 0 .../commands/common/ShowSeedCommand.h | 0 .../commands/common/SpreadPlayersCommand.h | 0 .../minecraft/commands/common/TimeCommand.cpp | 2 +- .../minecraft/commands/common/TimeCommand.h | 6 +- .../commands/common/ToggleDownfallCommand.cpp | 6 +- .../commands/common/ToggleDownfallCommand.h | 4 +- .../commands/common/WeatherCommand.h | 0 .../common/net.minecraft.commands.common.h | 0 .../commands/net.minecraft.commands.h | 0 .../AbstractProjectileDispenseBehavior.cpp | 20 +- .../core/AbstractProjectileDispenseBehavior.h | 0 .../net => }/minecraft/core/Behavior.h | 0 .../minecraft/core/BehaviorRegistry.cpp | 2 +- .../minecraft/core/BehaviorRegistry.h | 0 .../net => }/minecraft/core/BlockSource.h | 0 .../minecraft/core/BlockSourceImpl.cpp | 4 +- .../net => }/minecraft/core/BlockSourceImpl.h | 0 .../core/DefaultDispenseItemBehavior.cpp | 14 +- .../core/DefaultDispenseItemBehavior.h | 2 +- .../minecraft/core/DispenseItemBehavior.cpp | 0 .../minecraft/core/DispenseItemBehavior.h | 0 .../net => }/minecraft/core/FacingEnum.cpp | 0 .../net => }/minecraft/core/FacingEnum.h | 0 .../minecraft/core/ItemDispenseBehaviors.cpp | 56 +++--- .../minecraft/core/ItemDispenseBehaviors.h | 0 .../net => }/minecraft/core/LocatableSource.h | 0 .../net => }/minecraft/core/Location.h | 0 .../net => }/minecraft/core/Position.h | 0 .../net => }/minecraft/core/PositionImpl.h | 0 .../net => }/minecraft/core/Source.h | 0 .../minecraft/core/net.minecraft.core.h | 0 .../minecraft/core/particles/ParticleTypes.h | 0 .../net => }/minecraft/locale/I18n.cpp | 0 .../net => }/minecraft/locale/I18n.h | 0 .../net => }/minecraft/locale/Language.cpp | 0 .../net => }/minecraft/locale/Language.h | 0 .../minecraft/locale/net.minecraft.locale.h | 0 .../meson.build | 10 +- .../net => }/minecraft/net.minecraft.h | 0 .../net => }/minecraft/network/Connection.cpp | 6 +- .../net => }/minecraft/network/Connection.h | 4 +- .../minecraft/network/net.minecraft.network.h | 0 .../network/packet/AddEntityPacket.cpp | 2 +- .../network/packet/AddEntityPacket.h | 2 +- .../network/packet/AddExperienceOrbPacket.cpp | 4 +- .../network/packet/AddExperienceOrbPacket.h | 2 +- .../network/packet/AddGlobalEntityPacket.cpp | 4 +- .../network/packet/AddGlobalEntityPacket.h | 2 +- .../minecraft/network/packet/AddMobPacket.cpp | 6 +- .../minecraft/network/packet/AddMobPacket.h | 4 +- .../network/packet/AddPaintingPacket.cpp | 2 +- .../network/packet/AddPaintingPacket.h | 2 +- .../network/packet/AddPlayerPacket.cpp | 8 +- .../network/packet/AddPlayerPacket.h | 4 +- .../network/packet/AnimatePacket.cpp | 2 +- .../minecraft/network/packet/AnimatePacket.h | 2 +- .../network/packet/AwardStatPacket.cpp | 0 .../network/packet/AwardStatPacket.h | 2 +- .../packet/BlockRegionUpdatePacket.cpp | 6 +- .../network/packet/BlockRegionUpdatePacket.h | 2 +- .../network/packet/ChatAutoCompletePacket.h | 0 .../minecraft/network/packet/ChatPacket.cpp | 6 +- .../minecraft/network/packet/ChatPacket.h | 2 +- .../network/packet/ChunkTilesUpdatePacket.cpp | 6 +- .../network/packet/ChunkTilesUpdatePacket.h | 2 +- .../packet/ChunkVisibilityAreaPacket.cpp | 0 .../packet/ChunkVisibilityAreaPacket.h | 2 +- .../network/packet/ChunkVisibilityPacket.cpp | 0 .../network/packet/ChunkVisibilityPacket.h | 2 +- .../network/packet/ClientCommandPacket.cpp | 0 .../network/packet/ClientCommandPacket.h | 2 +- .../network/packet/ClientInformationPacket.h | 0 .../network/packet/ClientProtocolPacket.h | 0 .../network/packet/ComplexItemDataPacket.cpp | 0 .../network/packet/ComplexItemDataPacket.h | 2 +- .../network/packet/ContainerAckPacket.cpp | 0 .../network/packet/ContainerAckPacket.h | 2 +- .../packet/ContainerButtonClickPacket.cpp | 0 .../packet/ContainerButtonClickPacket.h | 2 +- .../network/packet/ContainerClickPacket.cpp | 2 +- .../network/packet/ContainerClickPacket.h | 2 +- .../network/packet/ContainerClosePacket.cpp | 0 .../network/packet/ContainerClosePacket.h | 2 +- .../network/packet/ContainerOpenPacket.cpp | 0 .../network/packet/ContainerOpenPacket.h | 2 +- .../packet/ContainerSetContentPacket.cpp | 2 +- .../packet/ContainerSetContentPacket.h | 2 +- .../network/packet/ContainerSetDataPacket.cpp | 0 .../network/packet/ContainerSetDataPacket.h | 2 +- .../network/packet/ContainerSetSlotPacket.cpp | 2 +- .../network/packet/ContainerSetSlotPacket.h | 2 +- .../network/packet/CraftItemPacket.cpp | 0 .../network/packet/CraftItemPacket.h | 2 +- .../network/packet/CustomPayloadPacket.cpp | 0 .../network/packet/CustomPayloadPacket.h | 2 +- .../network/packet/DebugOptionsPacket.cpp | 0 .../network/packet/DebugOptionsPacket.h | 2 +- .../network/packet/DisconnectPacket.cpp | 4 +- .../network/packet/DisconnectPacket.h | 0 .../packet/EntityActionAtPositionPacket.cpp | 2 +- .../packet/EntityActionAtPositionPacket.h | 2 +- .../network/packet/EntityEventPacket.cpp | 0 .../network/packet/EntityEventPacket.h | 2 +- .../network/packet/ExplodePacket.cpp | 2 +- .../minecraft/network/packet/ExplodePacket.h | 6 +- .../network/packet/GameCommandPacket.cpp | 2 +- .../network/packet/GameCommandPacket.h | 4 +- .../network/packet/GameEventPacket.cpp | 0 .../network/packet/GameEventPacket.h | 0 .../network/packet/GetInfoPacket.cpp | 0 .../minecraft/network/packet/GetInfoPacket.h | 2 +- .../network/packet/InteractPacket.cpp | 0 .../minecraft/network/packet/InteractPacket.h | 2 +- .../network/packet/KeepAlivePacket.cpp | 0 .../network/packet/KeepAlivePacket.h | 2 +- .../network/packet/KickPlayerPacket.cpp | 0 .../network/packet/KickPlayerPacket.h | 2 +- .../network/packet/LevelEventPacket.cpp | 0 .../network/packet/LevelEventPacket.h | 2 +- .../network/packet/LevelParticlesPacket.cpp | 0 .../network/packet/LevelParticlesPacket.h | 2 +- .../network/packet/LevelSoundPacket.cpp | 2 +- .../network/packet/LevelSoundPacket.h | 2 +- .../minecraft/network/packet/LoginPacket.cpp | 6 +- .../minecraft/network/packet/LoginPacket.h | 2 +- .../network/packet/MoveEntityPacket.cpp | 0 .../network/packet/MoveEntityPacket.h | 2 +- .../network/packet/MoveEntityPacketSmall.cpp | 0 .../network/packet/MoveEntityPacketSmall.h | 2 +- .../network/packet/MovePlayerPacket.cpp | 0 .../network/packet/MovePlayerPacket.h | 2 +- .../minecraft/network/packet/Packet.cpp | 178 +++++++++--------- .../minecraft/network/packet/Packet.h | 0 .../network/packet/PacketListener.cpp | 174 ++++++++--------- .../minecraft/network/packet/PacketListener.h | 2 +- .../network/packet/PlayerAbilitiesPacket.cpp | 4 +- .../network/packet/PlayerAbilitiesPacket.h | 2 +- .../network/packet/PlayerActionPacket.cpp | 0 .../network/packet/PlayerActionPacket.h | 2 +- .../network/packet/PlayerCommandPacket.cpp | 2 +- .../network/packet/PlayerCommandPacket.h | 2 +- .../network/packet/PlayerInfoPacket.cpp | 2 +- .../network/packet/PlayerInfoPacket.h | 2 +- .../network/packet/PlayerInputPacket.cpp | 0 .../network/packet/PlayerInputPacket.h | 2 +- .../network/packet/PreLoginPacket.cpp | 0 .../minecraft/network/packet/PreLoginPacket.h | 2 +- .../network/packet/RemoveEntitiesPacket.cpp | 0 .../network/packet/RemoveEntitiesPacket.h | 2 +- .../network/packet/RemoveMobEffectPacket.cpp | 2 +- .../network/packet/RemoveMobEffectPacket.h | 2 +- .../network/packet/RespawnPacket.cpp | 6 +- .../minecraft/network/packet/RespawnPacket.h | 2 +- .../network/packet/RotateHeadPacket.cpp | 2 +- .../network/packet/RotateHeadPacket.h | 2 +- .../network/packet/ServerAuthDataPacket.h | 0 .../packet/ServerSettingsChangedPacket.cpp | 0 .../packet/ServerSettingsChangedPacket.h | 2 +- .../network/packet/SetCarriedItemPacket.cpp | 0 .../network/packet/SetCarriedItemPacket.h | 2 +- .../packet/SetCreativeModeSlotPacket.cpp | 2 +- .../packet/SetCreativeModeSlotPacket.h | 2 +- .../packet/SetDisplayObjectivePacket.cpp | 2 +- .../packet/SetDisplayObjectivePacket.h | 2 +- .../network/packet/SetEntityDataPacket.cpp | 2 +- .../network/packet/SetEntityDataPacket.h | 4 +- .../network/packet/SetEntityLinkPacket.cpp | 2 +- .../network/packet/SetEntityLinkPacket.h | 2 +- .../network/packet/SetEntityMotionPacket.cpp | 2 +- .../network/packet/SetEntityMotionPacket.h | 2 +- .../network/packet/SetEquippedItemPacket.cpp | 0 .../network/packet/SetEquippedItemPacket.h | 4 +- .../network/packet/SetExperiencePacket.cpp | 0 .../network/packet/SetExperiencePacket.h | 2 +- .../network/packet/SetHealthPacket.cpp | 0 .../network/packet/SetHealthPacket.h | 2 +- .../network/packet/SetObjectivePacket.cpp | 2 +- .../network/packet/SetObjectivePacket.h | 2 +- .../network/packet/SetPlayerTeamPacket.cpp | 6 +- .../network/packet/SetPlayerTeamPacket.h | 2 +- .../network/packet/SetScorePacket.cpp | 6 +- .../minecraft/network/packet/SetScorePacket.h | 2 +- .../network/packet/SetSpawnPositionPacket.cpp | 0 .../network/packet/SetSpawnPositionPacket.h | 2 +- .../network/packet/SetTimePacket.cpp | 0 .../minecraft/network/packet/SetTimePacket.h | 2 +- .../network/packet/SharedKeyPacket.h | 0 .../network/packet/SignUpdatePacket.cpp | 2 +- .../network/packet/SignUpdatePacket.h | 2 +- .../network/packet/TakeItemEntityPacket.cpp | 0 .../network/packet/TakeItemEntityPacket.h | 2 +- .../network/packet/TeleportEntityPacket.cpp | 4 +- .../network/packet/TeleportEntityPacket.h | 2 +- .../packet/TextureAndGeometryChangePacket.cpp | 2 +- .../packet/TextureAndGeometryChangePacket.h | 2 +- .../packet/TextureAndGeometryPacket.cpp | 0 .../network/packet/TextureAndGeometryPacket.h | 2 +- .../network/packet/TextureChangePacket.cpp | 2 +- .../network/packet/TextureChangePacket.h | 2 +- .../network/packet/TexturePacket.cpp | 0 .../minecraft/network/packet/TexturePacket.h | 2 +- .../network/packet/TileDestructionPacket.cpp | 2 +- .../network/packet/TileDestructionPacket.h | 2 +- .../network/packet/TileEditorOpenPacket.cpp | 0 .../network/packet/TileEditorOpenPacket.h | 2 +- .../network/packet/TileEntityDataPacket.cpp | 0 .../network/packet/TileEntityDataPacket.h | 2 +- .../network/packet/TileEventPacket.cpp | 2 +- .../network/packet/TileEventPacket.h | 2 +- .../network/packet/TileUpdatePacket.cpp | 4 +- .../network/packet/TileUpdatePacket.h | 2 +- .../network/packet/TradeItemPacket.cpp | 0 .../network/packet/TradeItemPacket.h | 2 +- .../network/packet/UpdateAttributesPacket.cpp | 4 +- .../network/packet/UpdateAttributesPacket.h | 4 +- .../packet/UpdateGameRuleProgressPacket.cpp | 0 .../packet/UpdateGameRuleProgressPacket.h | 2 +- .../network/packet/UpdateMobEffectPacket.cpp | 2 +- .../network/packet/UpdateMobEffectPacket.h | 2 +- .../network/packet/UpdateProgressPacket.cpp | 0 .../network/packet/UpdateProgressPacket.h | 2 +- .../network/packet/UseItemPacket.cpp | 0 .../minecraft/network/packet/UseItemPacket.h | 4 +- .../minecraft/network/packet/XZPacket.cpp | 0 .../minecraft/network/packet/XZPacket.h | 2 +- .../packet/net.minecraft.network.packet.h | 0 .../net => }/minecraft/sounds/SoundTypes.h | 0 .../net => }/minecraft/stats/Achievement.cpp | 6 +- .../net => }/minecraft/stats/Achievement.h | 0 .../net => }/minecraft/stats/Achievements.cpp | 8 +- .../net => }/minecraft/stats/Achievements.h | 0 .../net => }/minecraft/stats/CommonStats.cpp | 8 +- .../net => }/minecraft/stats/CommonStats.h | 0 .../net => }/minecraft/stats/DescFormatter.h | 0 .../net => }/minecraft/stats/DurangoStats.h | 0 .../net => }/minecraft/stats/GeneralStat.cpp | 4 +- .../net => }/minecraft/stats/GeneralStat.h | 0 .../net => }/minecraft/stats/GenericStats.cpp | 0 .../net => }/minecraft/stats/GenericStats.h | 2 +- .../net => }/minecraft/stats/ItemStat.cpp | 2 +- .../net => }/minecraft/stats/ItemStat.h | 0 .../minecraft/stats/NumberFormatters.h | 0 .../net => }/minecraft/stats/Stat.cpp | 0 .../net => }/minecraft/stats/Stat.h | 0 .../net => }/minecraft/stats/StatFormatter.h | 0 .../net => }/minecraft/stats/Stats.cpp | 12 +- .../net => }/minecraft/stats/Stats.h | 0 .../minecraft/stats/net.minecraft.stats.h | 0 .../{Minecraft.World => minecraft}/stdafx.h | 0 .../net => }/minecraft/util/Hasher.cpp | 0 .../net => }/minecraft/util/Hasher.h | 0 .../net => }/minecraft/util/HtmlString.cpp | 0 .../net => }/minecraft/util/HtmlString.h | 0 .../net => }/minecraft/util/Mth.cpp | 4 +- .../net => }/minecraft/util/Mth.h | 0 .../minecraft/util/ProgressListener.h | 0 .../net => }/minecraft/util/SmoothFloat.cpp | 0 .../net => }/minecraft/util/SmoothFloat.h | 0 .../net => }/minecraft/util/WeighedRandom.cpp | 4 +- .../net => }/minecraft/util/WeighedRandom.h | 0 .../minecraft/util/WeighedTreasure.cpp | 6 +- .../net => }/minecraft/util/WeighedTreasure.h | 2 +- .../minecraft/world/CompoundContainer.cpp | 2 +- .../minecraft/world/CompoundContainer.h | 2 +- .../net => }/minecraft/world/Container.h | 0 .../net => }/minecraft/world/Difficulty.h | 0 .../net => }/minecraft/world/FlippedIcon.cpp | 4 +- .../net => }/minecraft/world/FlippedIcon.h | 0 .../net => }/minecraft/world/Icon.h | 0 .../net => }/minecraft/world/IconRegister.h | 0 .../world/MouseInventoryClickHandler.h | 0 .../minecraft/world/SimpleContainer.cpp | 2 +- .../minecraft/world/SimpleContainer.h | 2 +- .../minecraft/world/WorldlyContainer.h | 0 .../world/damageSource/CombatEntry.cpp | 6 +- .../world/damageSource/CombatEntry.h | 0 .../world/damageSource/CombatTracker.cpp | 22 +-- .../world/damageSource/CombatTracker.h | 4 +- .../world/damageSource/DamageSource.cpp | 20 +- .../world/damageSource/DamageSource.h | 2 +- .../world/damageSource/EntityDamageSource.cpp | 16 +- .../world/damageSource/EntityDamageSource.h | 2 +- .../IndirectEntityDamageSource.cpp | 14 +- .../damageSource/IndirectEntityDamageSource.h | 2 +- .../net.minecraft.world.damagesource.h | 0 .../world/effect/AbsoptionMobEffect.cpp | 4 +- .../world/effect/AbsoptionMobEffect.h | 0 .../world/effect/AttackDamageMobEffect.cpp | 2 +- .../world/effect/AttackDamageMobEffect.h | 0 .../world/effect/HealthBoostMobEffect.cpp | 4 +- .../world/effect/HealthBoostMobEffect.h | 0 .../world/effect/InstantaneousMobEffect.cpp | 4 +- .../world/effect/InstantaneousMobEffect.h | 0 .../minecraft/world/effect/MobEffect.cpp | 16 +- .../minecraft/world/effect/MobEffect.h | 2 +- .../world/effect/MobEffectInstance.cpp | 4 +- .../world/effect/MobEffectInstance.h | 0 .../world/effect/net.minecraft.world.effect.h | 0 .../minecraft/world/entity/AgeableMob.cpp | 20 +- .../minecraft/world/entity/AgeableMob.h | 0 .../minecraft/world/entity/Creature.cpp | 0 .../minecraft/world/entity/Creature.h | 0 .../minecraft/world/entity/DelayedRelease.cpp | 2 +- .../minecraft/world/entity/DelayedRelease.h | 2 +- .../minecraft/world/entity/Entity.cpp | 36 ++-- .../net => }/minecraft/world/entity/Entity.h | 4 +- .../minecraft/world/entity/EntityEvent.h | 0 .../minecraft/world/entity/EntityIO.cpp | 18 +- .../minecraft/world/entity/EntityIO.h | 0 .../minecraft/world/entity/EntityPos.cpp | 4 +- .../minecraft/world/entity/EntityPos.h | 0 .../minecraft/world/entity/EntitySelector.cpp | 8 +- .../minecraft/world/entity/EntitySelector.h | 0 .../minecraft/world/entity/ExperienceOrb.cpp | 20 +- .../minecraft/world/entity/ExperienceOrb.h | 2 +- .../minecraft/world/entity/FlyingMob.cpp | 8 +- .../minecraft/world/entity/FlyingMob.h | 2 +- .../minecraft/world/entity/HangingEntity.cpp | 18 +- .../minecraft/world/entity/HangingEntity.h | 2 +- .../minecraft/world/entity/ItemFrame.cpp | 22 +-- .../minecraft/world/entity/ItemFrame.h | 2 +- .../world/entity/LeashFenceKnotEntity.cpp | 18 +- .../world/entity/LeashFenceKnotEntity.h | 0 .../minecraft/world/entity/LivingEntity.cpp | 84 ++++----- .../minecraft/world/entity/LivingEntity.h | 4 +- .../net => }/minecraft/world/entity/Mob.cpp | 70 +++---- .../net => }/minecraft/world/entity/Mob.h | 2 +- .../minecraft/world/entity/MobCategory.cpp | 2 +- .../minecraft/world/entity/MobCategory.h | 0 .../minecraft/world/entity/MobGroupData.h | 0 .../net => }/minecraft/world/entity/MobType.h | 0 .../minecraft/world/entity/OwnableEntity.h | 0 .../minecraft/world/entity/Painting.cpp | 12 +- .../minecraft/world/entity/Painting.h | 0 .../minecraft/world/entity/PathfinderMob.cpp | 30 +-- .../minecraft/world/entity/PathfinderMob.h | 4 +- .../world/entity/SyncedEntityData.cpp | 4 +- .../minecraft/world/entity/SyncedEntityData.h | 2 +- .../minecraft/world/entity/TamableAnimal.cpp | 16 +- .../minecraft/world/entity/TamableAnimal.h | 2 +- .../world/entity/ai/attributes/Attribute.cpp | 0 .../world/entity/ai/attributes/Attribute.h | 0 .../entity/ai/attributes/AttributeInstance.h | 0 .../ai/attributes/AttributeModifier.cpp | 2 +- .../entity/ai/attributes/AttributeModifier.h | 2 +- .../entity/ai/attributes/BaseAttribute.cpp | 0 .../entity/ai/attributes/BaseAttribute.h | 2 +- .../entity/ai/attributes/BaseAttributeMap.cpp | 6 +- .../entity/ai/attributes/BaseAttributeMap.h | 2 +- .../ModifiableAttributeInstance.cpp | 4 +- .../attributes/ModifiableAttributeInstance.h | 2 +- .../entity/ai/attributes/RangedAttribute.cpp | 2 +- .../entity/ai/attributes/RangedAttribute.h | 2 +- .../ai/attributes/ServersideAttributeMap.cpp | 2 +- .../ai/attributes/ServersideAttributeMap.h | 2 +- ...net.minecraft.world.entity.ai.attributes.h | 0 .../world/entity/ai/control/BodyControl.cpp | 6 +- .../world/entity/ai/control/BodyControl.h | 0 .../world/entity/ai/control/Control.h | 0 .../world/entity/ai/control/JumpControl.cpp | 2 +- .../world/entity/ai/control/JumpControl.h | 0 .../world/entity/ai/control/LookControl.cpp | 12 +- .../world/entity/ai/control/LookControl.h | 0 .../world/entity/ai/control/MoveControl.cpp | 12 +- .../world/entity/ai/control/MoveControl.h | 0 .../net.minecraft.world.entity.ai.control.h | 0 .../world/entity/ai/goal/AvoidPlayerGoal.cpp | 26 +-- .../world/entity/ai/goal/AvoidPlayerGoal.h | 2 +- .../world/entity/ai/goal/BegGoal.cpp | 16 +- .../minecraft/world/entity/ai/goal/BegGoal.h | 0 .../world/entity/ai/goal/BreakDoorGoal.cpp | 14 +- .../world/entity/ai/goal/BreakDoorGoal.h | 4 +- .../world/entity/ai/goal/BreedGoal.cpp | 22 +-- .../world/entity/ai/goal/BreedGoal.h | 0 .../entity/ai/goal/ControlledByPlayerGoal.cpp | 34 ++-- .../entity/ai/goal/ControlledByPlayerGoal.h | 4 +- .../world/entity/ai/goal/DoorInteractGoal.cpp | 16 +- .../world/entity/ai/goal/DoorInteractGoal.h | 0 .../world/entity/ai/goal/EatTileGoal.cpp | 18 +- .../world/entity/ai/goal/EatTileGoal.h | 4 +- .../world/entity/ai/goal/FleeSunGoal.cpp | 12 +- .../world/entity/ai/goal/FleeSunGoal.h | 4 +- .../world/entity/ai/goal/FloatGoal.cpp | 8 +- .../world/entity/ai/goal/FloatGoal.h | 0 .../world/entity/ai/goal/FollowOwnerGoal.cpp | 18 +- .../world/entity/ai/goal/FollowOwnerGoal.h | 0 .../world/entity/ai/goal/FollowParentGoal.cpp | 8 +- .../world/entity/ai/goal/FollowParentGoal.h | 0 .../minecraft/world/entity/ai/goal/Goal.cpp | 0 .../minecraft/world/entity/ai/goal/Goal.h | 0 .../world/entity/ai/goal/GoalSelector.cpp | 4 +- .../world/entity/ai/goal/GoalSelector.h | 0 .../world/entity/ai/goal/InteractGoal.cpp | 4 +- .../world/entity/ai/goal/InteractGoal.h | 0 .../world/entity/ai/goal/LeapAtTargetGoal.cpp | 6 +- .../world/entity/ai/goal/LeapAtTargetGoal.h | 0 .../world/entity/ai/goal/LookAtPlayerGoal.cpp | 14 +- .../world/entity/ai/goal/LookAtPlayerGoal.h | 0 .../ai/goal/LookAtTradingPlayerGoal.cpp | 6 +- .../entity/ai/goal/LookAtTradingPlayerGoal.h | 0 .../world/entity/ai/goal/MakeLoveGoal.cpp | 22 +-- .../world/entity/ai/goal/MakeLoveGoal.h | 0 .../world/entity/ai/goal/MeleeAttackGoal.cpp | 18 +- .../world/entity/ai/goal/MeleeAttackGoal.h | 0 .../world/entity/ai/goal/MoveIndoorsGoal.cpp | 22 +-- .../world/entity/ai/goal/MoveIndoorsGoal.h | 0 .../entity/ai/goal/MoveThroughVillageGoal.cpp | 22 +-- .../entity/ai/goal/MoveThroughVillageGoal.h | 0 .../ai/goal/MoveTowardsRestrictionGoal.cpp | 12 +- .../ai/goal/MoveTowardsRestrictionGoal.h | 0 .../entity/ai/goal/MoveTowardsTargetGoal.cpp | 14 +- .../entity/ai/goal/MoveTowardsTargetGoal.h | 0 .../world/entity/ai/goal/OcelotAttackGoal.cpp | 14 +- .../world/entity/ai/goal/OcelotAttackGoal.h | 0 .../entity/ai/goal/OcelotSitOnTileGoal.cpp | 18 +- .../entity/ai/goal/OcelotSitOnTileGoal.h | 0 .../world/entity/ai/goal/OfferFlowerGoal.cpp | 12 +- .../world/entity/ai/goal/OfferFlowerGoal.h | 0 .../world/entity/ai/goal/OpenDoorGoal.cpp | 6 +- .../world/entity/ai/goal/OpenDoorGoal.h | 0 .../world/entity/ai/goal/PanicGoal.cpp | 10 +- .../world/entity/ai/goal/PanicGoal.h | 0 .../world/entity/ai/goal/PlayGoal.cpp | 20 +- .../minecraft/world/entity/ai/goal/PlayGoal.h | 0 .../entity/ai/goal/RandomLookAroundGoal.cpp | 6 +- .../entity/ai/goal/RandomLookAroundGoal.h | 0 .../world/entity/ai/goal/RandomStrollGoal.cpp | 12 +- .../world/entity/ai/goal/RandomStrollGoal.h | 0 .../world/entity/ai/goal/RangedAttackGoal.cpp | 18 +- .../world/entity/ai/goal/RangedAttackGoal.h | 0 .../entity/ai/goal/RestrictOpenDoorGoal.cpp | 14 +- .../entity/ai/goal/RestrictOpenDoorGoal.h | 0 .../world/entity/ai/goal/RestrictSunGoal.cpp | 6 +- .../world/entity/ai/goal/RestrictSunGoal.h | 0 .../entity/ai/goal/RunAroundLikeCrazyGoal.cpp | 22 +-- .../entity/ai/goal/RunAroundLikeCrazyGoal.h | 0 .../world/entity/ai/goal/SitGoal.cpp | 10 +- .../minecraft/world/entity/ai/goal/SitGoal.h | 0 .../world/entity/ai/goal/SwellGoal.cpp | 10 +- .../world/entity/ai/goal/SwellGoal.h | 0 .../world/entity/ai/goal/TakeFlowerGoal.cpp | 16 +- .../world/entity/ai/goal/TakeFlowerGoal.h | 0 .../world/entity/ai/goal/TemptGoal.cpp | 14 +- .../world/entity/ai/goal/TemptGoal.h | 0 .../entity/ai/goal/TradeWithPlayerGoal.cpp | 8 +- .../entity/ai/goal/TradeWithPlayerGoal.h | 0 .../goal/net.minecraft.world.entity.ai.goal.h | 0 .../goal/target/DefendVillageTargetGoal.cpp | 10 +- .../ai/goal/target/DefendVillageTargetGoal.h | 0 .../ai/goal/target/HurtByTargetGoal.cpp | 8 +- .../entity/ai/goal/target/HurtByTargetGoal.h | 0 .../target/NearestAttackableTargetGoal.cpp | 14 +- .../goal/target/NearestAttackableTargetGoal.h | 2 +- .../goal/target/NonTameRandomTargetGoal.cpp | 4 +- .../ai/goal/target/NonTameRandomTargetGoal.h | 0 .../ai/goal/target/OwnerHurtByTargetGoal.cpp | 8 +- .../ai/goal/target/OwnerHurtByTargetGoal.h | 0 .../ai/goal/target/OwnerHurtTargetGoal.cpp | 8 +- .../ai/goal/target/OwnerHurtTargetGoal.h | 0 .../entity/ai/goal/target/TargetGoal.cpp | 24 +-- .../world/entity/ai/goal/target/TargetGoal.h | 2 +- ...et.minecraft.world.entity.ai.goal.target.h | 0 .../entity/ai/navigation/PathNavigation.cpp | 22 +-- .../entity/ai/navigation/PathNavigation.h | 2 +- ...net.minecraft.world.entity.ai.navigation.h | 0 .../world/entity/ai/sensing/Sensing.cpp | 2 +- .../world/entity/ai/sensing/Sensing.h | 0 .../net.minecraft.world.entity.ai.sensing.h | 0 .../world/entity/ai/util/RandomPos.cpp | 6 +- .../world/entity/ai/util/RandomPos.h | 2 +- .../util/net.minecraft.world.entity.ai.util.h | 0 .../world/entity/ai/village/DoorInfo.cpp | 0 .../world/entity/ai/village/DoorInfo.h | 0 .../world/entity/ai/village/Village.cpp | 18 +- .../world/entity/ai/village/Village.h | 8 +- .../world/entity/ai/village/VillageSiege.cpp | 16 +- .../world/entity/ai/village/VillageSiege.h | 2 +- .../world/entity/ai/village/Villages.cpp | 8 +- .../world/entity/ai/village/Villages.h | 8 +- .../net.minecraft.world.entity.ai.village.h | 0 .../world/entity/ambient/AmbientCreature.cpp | 0 .../world/entity/ambient/AmbientCreature.h | 6 +- .../minecraft/world/entity/ambient/Bat.cpp | 22 +-- .../minecraft/world/entity/ambient/Bat.h | 0 .../net.minecraft.world.entity.ambient.h | 0 .../minecraft/world/entity/animal/Animal.cpp | 24 +-- .../minecraft/world/entity/animal/Animal.h | 4 +- .../minecraft/world/entity/animal/Chicken.cpp | 34 ++-- .../minecraft/world/entity/animal/Chicken.h | 0 .../minecraft/world/entity/animal/Cow.cpp | 42 ++--- .../minecraft/world/entity/animal/Cow.h | 0 .../world/entity/animal/EntityHorse.cpp | 76 ++++---- .../world/entity/animal/EntityHorse.h | 8 +- .../minecraft/world/entity/animal/Golem.cpp | 2 +- .../minecraft/world/entity/animal/Golem.h | 4 +- .../world/entity/animal/MushroomCow.cpp | 28 +-- .../world/entity/animal/MushroomCow.h | 0 .../minecraft/world/entity/animal/Ocelot.cpp | 74 ++++---- .../minecraft/world/entity/animal/Ocelot.h | 2 +- .../minecraft/world/entity/animal/Pig.cpp | 46 ++--- .../minecraft/world/entity/animal/Pig.h | 0 .../minecraft/world/entity/animal/Sheep.cpp | 60 +++--- .../minecraft/world/entity/animal/Sheep.h | 6 +- .../minecraft/world/entity/animal/SnowMan.cpp | 46 ++--- .../minecraft/world/entity/animal/SnowMan.h | 2 +- .../minecraft/world/entity/animal/Squid.cpp | 22 +-- .../minecraft/world/entity/animal/Squid.h | 0 .../world/entity/animal/VillagerGolem.cpp | 70 +++---- .../world/entity/animal/VillagerGolem.h | 0 .../world/entity/animal/WaterAnimal.cpp | 6 +- .../world/entity/animal/WaterAnimal.h | 4 +- .../minecraft/world/entity/animal/Wolf.cpp | 82 ++++---- .../minecraft/world/entity/animal/Wolf.h | 2 +- .../net.minecraft.world.entity.animal.h | 0 .../minecraft/world/entity/boss/BossMob.h | 0 .../world/entity/boss/MultiEntityMob.h | 0 .../world/entity/boss/MultiEntityMobPart.cpp | 0 .../world/entity/boss/MultiEntityMobPart.h | 4 +- .../entity/boss/enderdragon/EnderCrystal.cpp | 10 +- .../entity/boss/enderdragon/EnderCrystal.h | 2 +- .../entity/boss/enderdragon/EnderDragon.cpp | 26 +-- .../entity/boss/enderdragon/EnderDragon.h | 8 +- ....minecraft.world.entity.boss.enderdragon.h | 5 + .../boss/net.minecraft.world.entity.boss.h | 0 .../world/entity/boss/wither/WitherBoss.cpp | 30 +-- .../world/entity/boss/wither/WitherBoss.h | 8 +- .../world/entity/global/GlobalEntity.cpp | 0 .../world/entity/global/GlobalEntity.h | 4 +- .../world/entity/global/LightningBolt.cpp | 20 +- .../world/entity/global/LightningBolt.h | 2 +- .../net.minecraft.world.entity.global.h | 0 .../minecraft/world/entity/item/Boat.cpp | 26 +-- .../minecraft/world/entity/item/Boat.h | 4 +- .../world/entity/item/FallingTile.cpp | 14 +- .../minecraft/world/entity/item/FallingTile.h | 4 +- .../world/entity/item/ItemEntity.cpp | 24 +-- .../minecraft/world/entity/item/ItemEntity.h | 10 +- .../minecraft/world/entity/item/Minecart.cpp | 46 ++--- .../minecraft/world/entity/item/Minecart.h | 2 +- .../world/entity/item/MinecartChest.cpp | 6 +- .../world/entity/item/MinecartChest.h | 2 +- .../world/entity/item/MinecartContainer.cpp | 10 +- .../world/entity/item/MinecartContainer.h | 2 +- .../world/entity/item/MinecartFurnace.cpp | 26 +-- .../world/entity/item/MinecartFurnace.h | 2 +- .../world/entity/item/MinecartHopper.cpp | 22 +-- .../world/entity/item/MinecartHopper.h | 2 +- .../world/entity/item/MinecartRideable.cpp | 6 +- .../world/entity/item/MinecartRideable.h | 2 +- .../world/entity/item/MinecartSpawner.cpp | 8 +- .../world/entity/item/MinecartSpawner.h | 4 +- .../world/entity/item/MinecartTNT.cpp | 14 +- .../minecraft/world/entity/item/MinecartTNT.h | 2 +- .../minecraft/world/entity/item/PrimedTnt.cpp | 4 +- .../minecraft/world/entity/item/PrimedTnt.h | 6 +- .../item/net.minecraft.world.entity.item.h | 0 .../minecraft/world/entity/monster/Blaze.cpp | 30 +-- .../minecraft/world/entity/monster/Blaze.h | 0 .../world/entity/monster/CaveSpider.cpp | 20 +- .../world/entity/monster/CaveSpider.h | 0 .../world/entity/monster/Creeper.cpp | 46 ++--- .../minecraft/world/entity/monster/Creeper.h | 0 .../world/entity/monster/EnderMan.cpp | 44 ++--- .../minecraft/world/entity/monster/EnderMan.h | 0 .../minecraft/world/entity/monster/Enemy.cpp | 2 +- .../minecraft/world/entity/monster/Enemy.h | 4 +- .../minecraft/world/entity/monster/Ghast.cpp | 38 ++-- .../minecraft/world/entity/monster/Ghast.h | 2 +- .../minecraft/world/entity/monster/Giant.cpp | 8 +- .../minecraft/world/entity/monster/Giant.h | 0 .../world/entity/monster/LavaSlime.cpp | 14 +- .../world/entity/monster/LavaSlime.h | 2 +- .../world/entity/monster/Monster.cpp | 32 ++-- .../minecraft/world/entity/monster/Monster.h | 2 +- .../world/entity/monster/PigZombie.cpp | 26 +-- .../world/entity/monster/PigZombie.h | 0 .../world/entity/monster/RangedAttackMob.h | 0 .../monster/SharedMonsterAttributes.cpp | 12 +- .../entity/monster/SharedMonsterAttributes.h | 0 .../world/entity/monster/Silverfish.cpp | 30 +-- .../world/entity/monster/Silverfish.h | 2 +- .../world/entity/monster/Skeleton.cpp | 76 ++++---- .../minecraft/world/entity/monster/Skeleton.h | 2 +- .../minecraft/world/entity/monster/Slime.cpp | 32 ++-- .../minecraft/world/entity/monster/Slime.h | 6 +- .../minecraft/world/entity/monster/Spider.cpp | 28 +-- .../minecraft/world/entity/monster/Spider.h | 4 +- .../minecraft/world/entity/monster/Witch.cpp | 60 +++--- .../minecraft/world/entity/monster/Witch.h | 0 .../minecraft/world/entity/monster/Zombie.cpp | 82 ++++---- .../minecraft/world/entity/monster/Zombie.h | 8 +- .../net.minecraft.world.entity.monster.h | 0 .../world/entity/net.minecraft.world.entity.h | 0 .../world/entity/npc/ClientSideMerchant.cpp | 6 +- .../world/entity/npc/ClientSideMerchant.h | 2 +- .../minecraft/world/entity/npc/Npc.cpp | 0 .../net => }/minecraft/world/entity/npc/Npc.h | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 32 ++-- .../minecraft/world/entity/npc/Villager.h | 6 +- .../npc/net.minecraft.world.entity.npc.h | 0 .../world/entity/player/Abilities.cpp | 0 .../minecraft/world/entity/player/Abilities.h | 0 .../world/entity/player/Inventory.cpp | 8 +- .../minecraft/world/entity/player/Inventory.h | 4 +- .../minecraft/world/entity/player/Player.cpp | 102 +++++----- .../minecraft/world/entity/player/Player.h | 18 +- .../net.minecraft.world.entity.player.h | 0 .../world/entity/projectile/Arrow.cpp | 38 ++-- .../minecraft/world/entity/projectile/Arrow.h | 4 +- .../entity/projectile/DragonFireball.cpp | 14 +- .../world/entity/projectile/DragonFireball.h | 2 +- .../entity/projectile/EyeOfEnderSignal.cpp | 16 +- .../entity/projectile/EyeOfEnderSignal.h | 4 +- .../world/entity/projectile/Fireball.cpp | 18 +- .../world/entity/projectile/Fireball.h | 6 +- .../projectile/FireworksRocketEntity.cpp | 18 +- .../entity/projectile/FireworksRocketEntity.h | 4 +- .../world/entity/projectile/FishingHook.cpp | 30 +-- .../world/entity/projectile/FishingHook.h | 4 +- .../world/entity/projectile/LargeFireball.cpp | 14 +- .../world/entity/projectile/LargeFireball.h | 0 .../world/entity/projectile/Projectile.h | 0 .../world/entity/projectile/SmallFireball.cpp | 16 +- .../world/entity/projectile/SmallFireball.h | 0 .../world/entity/projectile/Snowball.cpp | 12 +- .../world/entity/projectile/Snowball.h | 0 .../world/entity/projectile/Throwable.cpp | 14 +- .../world/entity/projectile/Throwable.h | 6 +- .../world/entity/projectile/ThrownEgg.cpp | 16 +- .../world/entity/projectile/ThrownEgg.h | 0 .../entity/projectile/ThrownEnderpearl.cpp | 14 +- .../entity/projectile/ThrownEnderpearl.h | 0 .../entity/projectile/ThrownExpBottle.cpp | 8 +- .../world/entity/projectile/ThrownExpBottle.h | 0 .../world/entity/projectile/ThrownPotion.cpp | 24 +-- .../world/entity/projectile/ThrownPotion.h | 0 .../world/entity/projectile/WitherSkull.cpp | 26 +-- .../world/entity/projectile/WitherSkull.h | 0 .../net.minecraft.world.entity.projectile.h | 0 .../minecraft/world/food/FoodConstants.cpp | 0 .../minecraft/world/food/FoodConstants.h | 0 .../minecraft/world/food/FoodData.cpp | 14 +- .../net => }/minecraft/world/food/FoodData.h | 0 .../world/food/net.minecraft.world.food.h | 0 .../world/inventory/AbstractContainerMenu.cpp | 16 +- .../world/inventory/AbstractContainerMenu.h | 2 +- .../minecraft/world/inventory/AnimalChest.cpp | 0 .../minecraft/world/inventory/AnimalChest.h | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 10 +- .../minecraft/world/inventory/AnvilMenu.h | 0 .../minecraft/world/inventory/ArmorSlot.cpp | 10 +- .../minecraft/world/inventory/ArmorSlot.h | 0 .../minecraft/world/inventory/BeaconMenu.cpp | 12 +- .../minecraft/world/inventory/BeaconMenu.h | 0 .../world/inventory/BrewingStandMenu.cpp | 20 +- .../world/inventory/BrewingStandMenu.h | 0 .../world/inventory/ContainerMenu.cpp | 12 +- .../minecraft/world/inventory/ContainerMenu.h | 0 .../world/inventory/CraftingContainer.cpp | 0 .../world/inventory/CraftingContainer.h | 6 +- .../world/inventory/CraftingMenu.cpp | 18 +- .../minecraft/world/inventory/CraftingMenu.h | 0 .../world/inventory/EnchantmentContainer.cpp | 0 .../world/inventory/EnchantmentContainer.h | 2 +- .../world/inventory/EnchantmentMenu.cpp | 32 ++-- .../world/inventory/EnchantmentMenu.h | 0 .../world/inventory/EnchantmentSlot.h | 0 .../world/inventory/FireworksMenu.cpp | 18 +- .../minecraft/world/inventory/FireworksMenu.h | 0 .../minecraft/world/inventory/FurnaceMenu.cpp | 20 +- .../minecraft/world/inventory/FurnaceMenu.h | 0 .../world/inventory/FurnaceResultSlot.cpp | 16 +- .../world/inventory/FurnaceResultSlot.h | 0 .../minecraft/world/inventory/HopperMenu.cpp | 6 +- .../minecraft/world/inventory/HopperMenu.h | 2 +- .../world/inventory/HorseInventoryMenu.cpp | 12 +- .../world/inventory/HorseInventoryMenu.h | 2 +- .../world/inventory/InventoryMenu.cpp | 20 +- .../minecraft/world/inventory/InventoryMenu.h | 0 .../minecraft/world/inventory/MenuBackup.cpp | 4 +- .../minecraft/world/inventory/MenuBackup.h | 0 .../world/inventory/MerchantContainer.cpp | 8 +- .../world/inventory/MerchantContainer.h | 4 +- .../world/inventory/MerchantMenu.cpp | 16 +- .../minecraft/world/inventory/MerchantMenu.h | 2 +- .../world/inventory/MerchantResultSlot.cpp | 14 +- .../world/inventory/MerchantResultSlot.h | 0 .../inventory/PlayerEnderChestContainer.cpp | 4 +- .../inventory/PlayerEnderChestContainer.h | 2 +- .../world/inventory/RepairContainer.cpp | 2 +- .../world/inventory/RepairContainer.h | 2 +- .../world/inventory/RepairResultSlot.cpp | 18 +- .../world/inventory/RepairResultSlot.h | 0 .../world/inventory/ResultContainer.cpp | 0 .../world/inventory/ResultContainer.h | 4 +- .../minecraft/world/inventory/ResultSlot.cpp | 16 +- .../minecraft/world/inventory/ResultSlot.h | 0 .../minecraft/world/inventory/Slot.cpp | 12 +- .../net => }/minecraft/world/inventory/Slot.h | 2 +- .../minecraft/world/inventory/TrapMenu.cpp | 4 +- .../minecraft/world/inventory/TrapMenu.h | 0 ...ecraft.world.inventory.ContainerListener.h | 0 .../inventory/net.minecraft.world.inventory.h | 0 .../minecraft/world/item/AnvilTileItem.cpp | 6 +- .../minecraft/world/item/AnvilTileItem.h | 0 .../minecraft/world/item/ArmorItem.cpp | 26 +-- .../net => }/minecraft/world/item/ArmorItem.h | 2 +- .../minecraft/world/item/AuxDataTileItem.cpp | 4 +- .../minecraft/world/item/AuxDataTileItem.h | 0 .../net => }/minecraft/world/item/BedItem.cpp | 20 +- .../net => }/minecraft/world/item/BedItem.h | 0 .../minecraft/world/item/BoatItem.cpp | 14 +- .../net => }/minecraft/world/item/BoatItem.h | 0 .../minecraft/world/item/BookItem.cpp | 4 +- .../net => }/minecraft/world/item/BookItem.h | 0 .../minecraft/world/item/BottleItem.cpp | 16 +- .../minecraft/world/item/BottleItem.h | 0 .../net => }/minecraft/world/item/BowItem.cpp | 22 +-- .../net => }/minecraft/world/item/BowItem.h | 2 +- .../minecraft/world/item/BowlFoodItem.cpp | 6 +- .../minecraft/world/item/BowlFoodItem.h | 0 .../minecraft/world/item/BucketItem.cpp | 30 +-- .../minecraft/world/item/BucketItem.h | 0 .../world/item/CarrotOnAStickItem.cpp | 14 +- .../minecraft/world/item/CarrotOnAStickItem.h | 0 .../minecraft/world/item/ClockItem.cpp | 4 +- .../net => }/minecraft/world/item/ClockItem.h | 0 .../minecraft/world/item/CoalItem.cpp | 6 +- .../net => }/minecraft/world/item/CoalItem.h | 0 .../minecraft/world/item/ColoredTileItem.cpp | 6 +- .../minecraft/world/item/ColoredTileItem.h | 0 .../minecraft/world/item/CompassItem.cpp | 4 +- .../minecraft/world/item/CompassItem.h | 0 .../minecraft/world/item/ComplexItem.cpp | 2 +- .../minecraft/world/item/ComplexItem.h | 0 .../minecraft/world/item/DiggerItem.cpp | 10 +- .../minecraft/world/item/DiggerItem.h | 2 +- .../minecraft/world/item/DoorItem.cpp | 18 +- .../net => }/minecraft/world/item/DoorItem.h | 0 .../minecraft/world/item/DyePowderItem.cpp | 20 +- .../minecraft/world/item/DyePowderItem.h | 0 .../net => }/minecraft/world/item/EggItem.cpp | 14 +- .../net => }/minecraft/world/item/EggItem.h | 0 .../minecraft/world/item/EmptyMapItem.cpp | 12 +- .../minecraft/world/item/EmptyMapItem.h | 0 .../world/item/EnchantedBookItem.cpp | 12 +- .../minecraft/world/item/EnchantedBookItem.h | 2 +- .../minecraft/world/item/EnderEyeItem.cpp | 30 +-- .../minecraft/world/item/EnderEyeItem.h | 0 .../minecraft/world/item/EnderpearlItem.cpp | 14 +- .../minecraft/world/item/EnderpearlItem.h | 0 .../minecraft/world/item/ExperienceItem.cpp | 14 +- .../minecraft/world/item/ExperienceItem.h | 0 .../minecraft/world/item/FireChargeItem.cpp | 16 +- .../minecraft/world/item/FireChargeItem.h | 0 .../world/item/FireworksChargeItem.cpp | 4 +- .../world/item/FireworksChargeItem.h | 0 .../minecraft/world/item/FireworksItem.cpp | 8 +- .../minecraft/world/item/FireworksItem.h | 0 .../minecraft/world/item/FishingRodItem.cpp | 14 +- .../minecraft/world/item/FishingRodItem.h | 0 .../world/item/FlintAndSteelItem.cpp | 16 +- .../minecraft/world/item/FlintAndSteelItem.h | 0 .../minecraft/world/item/FoodItem.cpp | 18 +- .../net => }/minecraft/world/item/FoodItem.h | 2 +- .../minecraft/world/item/GoldenAppleItem.cpp | 8 +- .../minecraft/world/item/GoldenAppleItem.h | 0 .../world/item/HangingEntityItem.cpp | 18 +- .../minecraft/world/item/HangingEntityItem.h | 0 .../minecraft/world/item/HatchetItem.cpp | 10 +- .../minecraft/world/item/HatchetItem.h | 0 .../net => }/minecraft/world/item/HoeItem.cpp | 10 +- .../net => }/minecraft/world/item/HoeItem.h | 0 .../net => }/minecraft/world/item/Item.cpp | 26 +-- .../net => }/minecraft/world/item/Item.h | 4 +- .../minecraft/world/item/ItemInstance.cpp | 36 ++-- .../minecraft/world/item/ItemInstance.h | 2 +- .../minecraft/world/item/LeafTileItem.cpp | 10 +- .../minecraft/world/item/LeafTileItem.h | 0 .../minecraft/world/item/LeashItem.cpp | 14 +- .../net => }/minecraft/world/item/LeashItem.h | 0 .../net => }/minecraft/world/item/MapItem.cpp | 32 ++-- .../net => }/minecraft/world/item/MapItem.h | 0 .../minecraft/world/item/MilkBucketItem.cpp | 10 +- .../minecraft/world/item/MilkBucketItem.h | 2 +- .../minecraft/world/item/MinecartItem.cpp | 22 +-- .../minecraft/world/item/MinecartItem.h | 2 +- .../world/item/MultiTextureTileItem.cpp | 8 +- .../world/item/MultiTextureTileItem.h | 0 .../minecraft/world/item/NameTagItem.cpp | 8 +- .../minecraft/world/item/NameTagItem.h | 0 .../minecraft/world/item/PickaxeItem.cpp | 8 +- .../minecraft/world/item/PickaxeItem.h | 0 .../minecraft/world/item/PistonTileItem.cpp | 4 +- .../minecraft/world/item/PistonTileItem.h | 0 .../minecraft/world/item/PlanterTileItem.cpp | 16 +- .../minecraft/world/item/PlanterTileItem.h | 0 .../minecraft/world/item/PotionItem.cpp | 24 +-- .../minecraft/world/item/PotionItem.h | 0 .../net => }/minecraft/world/item/Rarity.cpp | 0 .../net => }/minecraft/world/item/Rarity.h | 0 .../minecraft/world/item/RecordingItem.cpp | 22 +-- .../minecraft/world/item/RecordingItem.h | 0 .../minecraft/world/item/RedStoneItem.cpp | 14 +- .../minecraft/world/item/RedStoneItem.h | 0 .../minecraft/world/item/SaddleItem.cpp | 8 +- .../minecraft/world/item/SaddleItem.h | 0 .../minecraft/world/item/SaplingTileItem.cpp | 6 +- .../minecraft/world/item/SaplingTileItem.h | 0 .../minecraft/world/item/SeedFoodItem.cpp | 10 +- .../minecraft/world/item/SeedFoodItem.h | 0 .../minecraft/world/item/SeedItem.cpp | 6 +- .../net => }/minecraft/world/item/SeedItem.h | 0 .../minecraft/world/item/ShearsItem.cpp | 6 +- .../minecraft/world/item/ShearsItem.h | 0 .../minecraft/world/item/ShovelItem.cpp | 8 +- .../minecraft/world/item/ShovelItem.h | 0 .../minecraft/world/item/SignItem.cpp | 18 +- .../net => }/minecraft/world/item/SignItem.h | 0 .../minecraft/world/item/SimpleFoiledItem.cpp | 2 +- .../minecraft/world/item/SimpleFoiledItem.h | 0 .../minecraft/world/item/SkullItem.cpp | 14 +- .../net => }/minecraft/world/item/SkullItem.h | 0 .../minecraft/world/item/SnowItem.cpp | 12 +- .../net => }/minecraft/world/item/SnowItem.h | 0 .../minecraft/world/item/SnowballItem.cpp | 14 +- .../minecraft/world/item/SnowballItem.h | 0 .../minecraft/world/item/SpawnEggItem.cpp | 22 +-- .../minecraft/world/item/SpawnEggItem.h | 0 .../world/item/StoneSlabTileItem.cpp | 14 +- .../minecraft/world/item/StoneSlabTileItem.h | 2 +- .../minecraft/world/item/TileItem.cpp | 22 +-- .../net => }/minecraft/world/item/TileItem.h | 0 .../net => }/minecraft/world/item/UseAnim.h | 0 .../world/item/WaterLilyTileItem.cpp | 16 +- .../minecraft/world/item/WaterLilyTileItem.h | 0 .../minecraft/world/item/WeaponItem.cpp | 14 +- .../minecraft/world/item/WeaponItem.h | 4 +- .../minecraft/world/item/WoolTileItem.cpp | 2 +- .../minecraft/world/item/WoolTileItem.h | 0 .../minecraft/world/item/WrittenBookItem.h | 0 .../world/item/alchemy/PotionBrewing.cpp | 4 +- .../world/item/alchemy/PotionBrewing.h | 0 .../world/item/alchemy/PotionMacros.h | 0 .../net.minecraft.world.item.alchemy.h | 0 .../world/item/crafting/ArmorDyeRecipe.cpp | 16 +- .../world/item/crafting/ArmorDyeRecipe.h | 2 +- .../world/item/crafting/ArmorRecipes.cpp | 6 +- .../world/item/crafting/ArmorRecipes.h | 0 .../world/item/crafting/ClothDyeRecipes.cpp | 10 +- .../world/item/crafting/ClothDyeRecipes.h | 0 .../world/item/crafting/FireworksRecipe.cpp | 10 +- .../world/item/crafting/FireworksRecipe.h | 0 .../world/item/crafting/FoodRecipes.cpp | 8 +- .../world/item/crafting/FoodRecipes.h | 0 .../world/item/crafting/FurnaceRecipes.cpp | 10 +- .../world/item/crafting/FurnaceRecipes.h | 0 .../world/item/crafting/MapCloningRecipe.h | 0 .../world/item/crafting/MapExtendingRecipe.h | 0 .../world/item/crafting/OreRecipes.cpp | 10 +- .../world/item/crafting/OreRecipes.h | 0 .../minecraft/world/item/crafting/Recipes.cpp | 50 ++--- .../minecraft/world/item/crafting/Recipes.h | 2 +- .../minecraft/world/item/crafting/Recipy.h | 2 +- .../world/item/crafting/ShapedRecipy.cpp | 4 +- .../world/item/crafting/ShapedRecipy.h | 2 +- .../world/item/crafting/ShapelessRecipy.cpp | 4 +- .../world/item/crafting/ShapelessRecipy.h | 2 +- .../world/item/crafting/StructureRecipes.cpp | 18 +- .../world/item/crafting/StructureRecipes.h | 0 .../world/item/crafting/ToolRecipes.cpp | 8 +- .../world/item/crafting/ToolRecipes.h | 0 .../world/item/crafting/WeaponRecipes.cpp | 6 +- .../world/item/crafting/WeaponRecipes.h | 0 .../net.minecraft.world.item.crafting.h | 0 .../enchantment/ArrowDamageEnchantment.cpp | 0 .../item/enchantment/ArrowDamageEnchantment.h | 0 .../item/enchantment/ArrowFireEnchantment.cpp | 0 .../item/enchantment/ArrowFireEnchantment.h | 0 .../enchantment/ArrowInfiniteEnchantment.cpp | 0 .../enchantment/ArrowInfiniteEnchantment.h | 0 .../enchantment/ArrowKnockbackEnchantment.cpp | 0 .../enchantment/ArrowKnockbackEnchantment.h | 0 .../item/enchantment/DamageEnchantment.cpp | 4 +- .../item/enchantment/DamageEnchantment.h | 0 .../enchantment/DigDurabilityEnchantment.cpp | 2 +- .../enchantment/DigDurabilityEnchantment.h | 0 .../item/enchantment/DiggingEnchantment.cpp | 2 +- .../item/enchantment/DiggingEnchantment.h | 0 .../world/item/enchantment/Enchantment.cpp | 4 +- .../world/item/enchantment/Enchantment.h | 2 +- .../item/enchantment/EnchantmentCategory.cpp | 10 +- .../item/enchantment/EnchantmentCategory.h | 0 .../item/enchantment/EnchantmentHelper.cpp | 16 +- .../item/enchantment/EnchantmentHelper.h | 0 .../item/enchantment/EnchantmentInstance.cpp | 2 +- .../item/enchantment/EnchantmentInstance.h | 4 +- .../enchantment/FireAspectEnchantment.cpp | 0 .../item/enchantment/FireAspectEnchantment.h | 0 .../item/enchantment/KnockbackEnchantment.cpp | 0 .../item/enchantment/KnockbackEnchantment.h | 0 .../item/enchantment/LootBonusEnchantment.cpp | 0 .../item/enchantment/LootBonusEnchantment.h | 0 .../item/enchantment/OxygenEnchantment.cpp | 0 .../item/enchantment/OxygenEnchantment.h | 0 .../enchantment/ProtectionEnchantment.cpp | 6 +- .../item/enchantment/ProtectionEnchantment.h | 0 .../item/enchantment/ThornsEnchantment.cpp | 6 +- .../item/enchantment/ThornsEnchantment.h | 0 .../enchantment/UntouchingEnchantment.cpp | 2 +- .../item/enchantment/UntouchingEnchantment.h | 0 .../enchantment/WaterWorkerEnchantment.cpp | 0 .../item/enchantment/WaterWorkerEnchantment.h | 0 .../net.minecraft.world.item.enchantment.h | 0 .../world/item/net.minecraft.world.item.h | 4 +- .../minecraft/world/item/trading/Merchant.h | 0 .../world/item/trading/MerchantRecipe.cpp | 0 .../world/item/trading/MerchantRecipe.h | 2 +- .../world/item/trading/MerchantRecipeList.cpp | 6 +- .../world/item/trading/MerchantRecipeList.h | 0 .../net.minecraft.world.item.trading.h | 0 .../minecraft/world/level/BaseMobSpawner.cpp | 18 +- .../minecraft/world/level/BaseMobSpawner.h | 6 +- .../world/level/BlockDestructionProgress.cpp | 0 .../world/level/BlockDestructionProgress.h | 0 .../minecraft/world/level/Calendar.cpp | 0 .../net => }/minecraft/world/level/Calendar.h | 0 .../minecraft/world/level/ChunkPos.cpp | 8 +- .../net => }/minecraft/world/level/ChunkPos.h | 0 .../net => }/minecraft/world/level/Coord.h | 0 .../minecraft/world/level/Explosion.cpp | 22 +-- .../minecraft/world/level/Explosion.h | 8 +- .../minecraft/world/level/FoliageColor.cpp | 0 .../minecraft/world/level/FoliageColor.h | 0 .../minecraft/world/level/GameRules.cpp | 0 .../minecraft/world/level/GameRules.h | 0 .../minecraft/world/level/GrassColor.cpp | 0 .../minecraft/world/level/GrassColor.h | 0 .../net => }/minecraft/world/level/Level.cpp | 86 ++++----- .../net => }/minecraft/world/level/Level.h | 14 +- .../world/level/LevelConflictException.cpp | 0 .../world/level/LevelConflictException.h | 0 .../minecraft/world/level/LevelListener.h | 4 +- .../world/level/LevelObjectInputStream.h | 0 .../minecraft/world/level/LevelSettings.cpp | 4 +- .../minecraft/world/level/LevelSettings.h | 0 .../minecraft/world/level/LevelSource.h | 0 .../minecraft/world/level/LevelType.cpp | 2 +- .../minecraft/world/level/LevelType.h | 0 .../minecraft/world/level/LightLayer.h | 0 .../minecraft/world/level/MobSpawner.cpp | 26 +-- .../minecraft/world/level/MobSpawner.h | 4 +- .../minecraft/world/level/PortalForcer.cpp | 16 +- .../minecraft/world/level/PortalForcer.h | 2 +- .../net => }/minecraft/world/level/Region.cpp | 10 +- .../net => }/minecraft/world/level/Region.h | 4 +- .../world/level/TickNextTickData.cpp | 2 +- .../minecraft/world/level/TickNextTickData.h | 0 .../minecraft/world/level/TileEventData.cpp | 0 .../minecraft/world/level/TileEventData.h | 0 .../minecraft/world/level/TilePos.cpp | 8 +- .../net => }/minecraft/world/level/TilePos.h | 0 .../minecraft/world/level/WaterColor.cpp | 0 .../minecraft/world/level/WaterColor.h | 0 .../world/level/biome/BeachBiome.cpp | 2 +- .../minecraft/world/level/biome/BeachBiome.h | 2 +- .../minecraft/world/level/biome/Biome.cpp | 46 ++--- .../minecraft/world/level/biome/Biome.h | 6 +- .../world/level/biome/BiomeCache.cpp | 0 .../minecraft/world/level/biome/BiomeCache.h | 2 +- .../world/level/biome/BiomeDecorator.cpp | 32 ++-- .../world/level/biome/BiomeDecorator.h | 0 .../world/level/biome/BiomeSource.cpp | 8 +- .../minecraft/world/level/biome/BiomeSource.h | 2 +- .../world/level/biome/DesertBiome.cpp | 14 +- .../minecraft/world/level/biome/DesertBiome.h | 2 +- .../world/level/biome/ExtremeHillsBiome.cpp | 8 +- .../world/level/biome/ExtremeHillsBiome.h | 2 +- .../world/level/biome/FixedBiomeSource.cpp | 4 +- .../world/level/biome/FixedBiomeSource.h | 0 .../world/level/biome/ForestBiome.cpp | 8 +- .../minecraft/world/level/biome/ForestBiome.h | 2 +- .../minecraft/world/level/biome/HellBiome.cpp | 0 .../minecraft/world/level/biome/HellBiome.h | 2 +- .../minecraft/world/level/biome/IceBiome.cpp | 0 .../minecraft/world/level/biome/IceBiome.h | 2 +- .../world/level/biome/JungleBiome.cpp | 24 +-- .../minecraft/world/level/biome/JungleBiome.h | 2 +- .../world/level/biome/MushroomIslandBiome.cpp | 2 +- .../world/level/biome/MushroomIslandBiome.h | 2 +- .../minecraft/world/level/biome/OceanBiome.h | 0 .../world/level/biome/PlainsBiome.cpp | 6 +- .../minecraft/world/level/biome/PlainsBiome.h | 2 +- .../world/level/biome/RainforestBiome.cpp | 4 +- .../world/level/biome/RainforestBiome.h | 2 +- .../minecraft/world/level/biome/RiverBiome.h | 0 .../world/level/biome/SwampBiome.cpp | 8 +- .../minecraft/world/level/biome/SwampBiome.h | 2 +- .../world/level/biome/TaigaBiome.cpp | 6 +- .../minecraft/world/level/biome/TaigaBiome.h | 2 +- .../world/level/biome/TheEndBiome.cpp | 2 +- .../minecraft/world/level/biome/TheEndBiome.h | 2 +- .../level/biome/TheEndBiomeDecorator.cpp | 8 +- .../world/level/biome/TheEndBiomeDecorator.h | 0 .../world/level/biome/WaterlilyFeature.cpp | 4 +- .../world/level/biome/WaterlilyFeature.h | 2 +- .../biome/net.minecraft.world.level.biome.h | 2 +- .../world/level/chunk/BlockReplacements.cpp | 2 +- .../world/level/chunk/BlockReplacements.h | 0 .../minecraft/world/level/chunk/ChunkSource.h | 2 +- .../level/chunk/CompressedTileStorage.cpp | 0 .../world/level/chunk/CompressedTileStorage.h | 0 .../minecraft/world/level/chunk/DataLayer.cpp | 0 .../minecraft/world/level/chunk/DataLayer.h | 0 .../world/level/chunk/EmptyLevelChunk.cpp | 6 +- .../world/level/chunk/EmptyLevelChunk.h | 2 +- .../world/level/chunk/LevelChunk.cpp | 50 ++--- .../minecraft/world/level/chunk/LevelChunk.h | 10 +- .../world/level/chunk/ReadOnlyChunkCache.cpp | 8 +- .../world/level/chunk/ReadOnlyChunkCache.h | 6 +- .../world/level/chunk/SparseDataStorage.cpp | 0 .../world/level/chunk/SparseDataStorage.h | 0 .../world/level/chunk/SparseLightStorage.cpp | 0 .../world/level/chunk/SparseLightStorage.h | 0 .../world/level/chunk/WaterLevelChunk.cpp | 6 +- .../world/level/chunk/WaterLevelChunk.h | 2 +- .../chunk/net.minecraft.world.level.chunk.h | 0 .../world/level/chunk/storage/ChunkStorage.h | 0 .../storage/ChunkStorageProfileDecorator.cpp | 2 +- .../storage/ChunkStorageProfileDecorator.h | 0 .../chunk/storage/McRegionChunkStorage.cpp | 20 +- .../chunk/storage/McRegionChunkStorage.h | 2 +- .../chunk/storage/MemoryChunkStorage.cpp | 4 +- .../level/chunk/storage/MemoryChunkStorage.h | 2 +- .../world/level/chunk/storage/NbtSlotFile.cpp | 0 .../world/level/chunk/storage/NbtSlotFile.h | 0 .../level/chunk/storage/OldChunkStorage.cpp | 18 +- .../level/chunk/storage/OldChunkStorage.h | 2 +- .../world/level/chunk/storage/RegionFile.cpp | 4 +- .../world/level/chunk/storage/RegionFile.h | 0 .../level/chunk/storage/RegionFileCache.cpp | 4 +- .../level/chunk/storage/RegionFileCache.h | 2 +- .../world/level/chunk/storage/ZoneFile.cpp | 0 .../world/level/chunk/storage/ZoneFile.h | 0 .../world/level/chunk/storage/ZoneIo.cpp | 0 .../world/level/chunk/storage/ZoneIo.h | 0 .../level/chunk/storage/ZonedChunkStorage.cpp | 8 +- .../level/chunk/storage/ZonedChunkStorage.h | 2 +- .../net.minecraft.world.level.chunk.storage.h | 0 .../world/level/dimension/Dimension.cpp | 24 +-- .../world/level/dimension/Dimension.h | 8 +- .../world/level/dimension/HellDimension.cpp | 16 +- .../world/level/dimension/HellDimension.h | 0 .../world/level/dimension/NormalDimension.h | 0 .../world/level/dimension/TheEndDimension.cpp | 16 +- .../world/level/dimension/TheEndDimension.h | 0 .../net.minecraft.world.level.dimension.h | 0 .../world/level/levelgen/CanyonFeature.cpp | 8 +- .../world/level/levelgen/CanyonFeature.h | 2 +- .../level/levelgen/CustomLevelSource.cpp | 34 ++-- .../world/level/levelgen/CustomLevelSource.h | 6 +- .../world/level/levelgen/DungeonFeature.cpp | 6 +- .../world/level/levelgen/DungeonFeature.h | 2 +- .../world/level/levelgen/FlatLevelSource.cpp | 10 +- .../world/level/levelgen/FlatLevelSource.h | 6 +- .../level/levelgen/HellFlatLevelSource.cpp | 14 +- .../level/levelgen/HellFlatLevelSource.h | 20 +- .../level/levelgen/HellRandomLevelSource.cpp | 32 ++-- .../level/levelgen/HellRandomLevelSource.h | 22 +-- .../world/level/levelgen/LargeCaveFeature.cpp | 8 +- .../world/level/levelgen/LargeCaveFeature.h | 2 +- .../world/level/levelgen/LargeFeature.cpp | 4 +- .../world/level/levelgen/LargeFeature.h | 2 +- .../level/levelgen/LargeHellCaveFeature.cpp | 6 +- .../level/levelgen/LargeHellCaveFeature.h | 2 +- .../level/levelgen/RandomLevelSource.cpp | 40 ++-- .../world/level/levelgen/RandomLevelSource.h | 6 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 12 +- .../levelgen/TheEndLevelRandomLevelSource.h | 6 +- .../world/level/levelgen/TownFeature.h | 0 .../levelgen/feature/BasicTreeFeature.cpp | 10 +- .../level/levelgen/feature/BasicTreeFeature.h | 0 .../level/levelgen/feature/BirchFeature.cpp | 10 +- .../level/levelgen/feature/BirchFeature.h | 0 .../levelgen/feature/BonusChestFeature.cpp | 8 +- .../levelgen/feature/BonusChestFeature.h | 0 .../level/levelgen/feature/CactusFeature.cpp | 4 +- .../level/levelgen/feature/CactusFeature.h | 0 .../level/levelgen/feature/CaveFeature.cpp | 10 +- .../level/levelgen/feature/CaveFeature.h | 2 +- .../level/levelgen/feature/ClayFeature.cpp | 6 +- .../level/levelgen/feature/ClayFeature.h | 2 +- .../levelgen/feature/DeadBushFeature.cpp | 4 +- .../level/levelgen/feature/DeadBushFeature.h | 0 .../levelgen/feature/DesertWellFeature.cpp | 6 +- .../levelgen/feature/DesertWellFeature.h | 0 .../levelgen/feature/EndPodiumFeature.cpp | 6 +- .../level/levelgen/feature/EndPodiumFeature.h | 0 .../world/level/levelgen/feature/Feature.cpp | 4 +- .../world/level/levelgen/feature/Feature.h | 0 .../level/levelgen/feature/FlowerFeature.cpp | 6 +- .../level/levelgen/feature/FlowerFeature.h | 0 .../levelgen/feature/GroundBushFeature.cpp | 4 +- .../levelgen/feature/GroundBushFeature.h | 0 .../levelgen/feature/HellFireFeature.cpp | 4 +- .../level/levelgen/feature/HellFireFeature.h | 0 .../levelgen/feature/HellPortalFeature.cpp | 4 +- .../levelgen/feature/HellPortalFeature.h | 0 .../levelgen/feature/HellSpringFeature.cpp | 4 +- .../levelgen/feature/HellSpringFeature.h | 0 .../level/levelgen/feature/HouseFeature.cpp | 10 +- .../level/levelgen/feature/HouseFeature.h | 2 +- .../levelgen/feature/HugeMushroomFeature.cpp | 6 +- .../levelgen/feature/HugeMushroomFeature.h | 0 .../level/levelgen/feature/LakeFeature.cpp | 10 +- .../level/levelgen/feature/LakeFeature.h | 2 +- .../levelgen/feature/LightGemFeature.cpp | 4 +- .../level/levelgen/feature/LightGemFeature.h | 0 .../levelgen/feature/MegaTreeFeature.cpp | 10 +- .../level/levelgen/feature/MegaTreeFeature.h | 0 .../levelgen/feature/MonsterRoomFeature.cpp | 18 +- .../levelgen/feature/MonsterRoomFeature.h | 2 +- .../levelgen/feature/NetherSphereFeature.cpp | 0 .../levelgen/feature/NetherSphereFeature.h | 4 +- .../level/levelgen/feature/OreFeature.cpp | 6 +- .../world/level/levelgen/feature/OreFeature.h | 0 .../level/levelgen/feature/PineFeature.cpp | 8 +- .../level/levelgen/feature/PineFeature.h | 0 .../level/levelgen/feature/PumpkinFeature.cpp | 4 +- .../level/levelgen/feature/PumpkinFeature.h | 0 .../level/levelgen/feature/ReedsFeature.cpp | 6 +- .../level/levelgen/feature/ReedsFeature.h | 2 +- .../level/levelgen/feature/SandFeature.cpp | 6 +- .../level/levelgen/feature/SandFeature.h | 0 .../level/levelgen/feature/SpikeFeature.cpp | 6 +- .../level/levelgen/feature/SpikeFeature.h | 0 .../level/levelgen/feature/SpringFeature.cpp | 4 +- .../level/levelgen/feature/SpringFeature.h | 0 .../level/levelgen/feature/SpruceFeature.cpp | 10 +- .../level/levelgen/feature/SpruceFeature.h | 0 .../levelgen/feature/SwampTreeFeature.cpp | 8 +- .../level/levelgen/feature/SwampTreeFeature.h | 0 .../levelgen/feature/TallGrassFeature.cpp | 4 +- .../level/levelgen/feature/TallGrassFeature.h | 0 .../level/levelgen/feature/TreeFeature.cpp | 10 +- .../level/levelgen/feature/TreeFeature.h | 0 .../level/levelgen/feature/VinesFeature.cpp | 8 +- .../level/levelgen/feature/VinesFeature.h | 0 ...t.minecraft.world.level.levelgen.feature.h | 0 .../level/levelgen/flat/FlatGeneratorInfo.cpp | 6 +- .../level/levelgen/flat/FlatGeneratorInfo.h | 0 .../level/levelgen/flat/FlatLayerInfo.cpp | 0 .../world/level/levelgen/flat/FlatLayerInfo.h | 0 .../net.minecraft.world.level.levelgen.flat.h | 0 .../net.minecraft.world.level.levelgen.h | 0 .../levelgen/structure/BlockGenMethods.cpp | 6 +- .../levelgen/structure/BlockGenMethods.h | 0 .../level/levelgen/structure/BoundingBox.cpp | 4 +- .../level/levelgen/structure/BoundingBox.h | 0 .../levelgen/structure/MineShaftFeature.cpp | 6 +- .../levelgen/structure/MineShaftFeature.h | 2 +- .../levelgen/structure/MineShaftPieces.cpp | 28 +-- .../levelgen/structure/MineShaftPieces.h | 4 +- .../levelgen/structure/MineShaftStart.cpp | 6 +- .../level/levelgen/structure/MineShaftStart.h | 2 +- .../structure/NetherBridgeFeature.cpp | 10 +- .../levelgen/structure/NetherBridgeFeature.h | 8 +- .../levelgen/structure/NetherBridgePieces.cpp | 18 +- .../levelgen/structure/NetherBridgePieces.h | 4 +- .../structure/RandomScatteredLargeFeature.cpp | 10 +- .../structure/RandomScatteredLargeFeature.h | 6 +- .../structure/ScatteredFeaturePieces.cpp | 42 ++--- .../structure/ScatteredFeaturePieces.h | 4 +- .../levelgen/structure/SkyIslandDimension.cpp | 8 +- .../levelgen/structure/StrongholdFeature.cpp | 20 +- .../levelgen/structure/StrongholdFeature.h | 6 +- .../levelgen/structure/StrongholdPieces.cpp | 36 ++-- .../levelgen/structure/StrongholdPieces.h | 4 +- .../levelgen/structure/StructureFeature.cpp | 18 +- .../levelgen/structure/StructureFeature.h | 2 +- .../levelgen/structure/StructureFeatureIO.cpp | 26 +-- .../levelgen/structure/StructureFeatureIO.h | 0 .../structure/StructureFeatureSavedData.cpp | 4 +- .../structure/StructureFeatureSavedData.h | 2 +- .../levelgen/structure/StructurePiece.cpp | 36 ++-- .../level/levelgen/structure/StructurePiece.h | 2 +- .../levelgen/structure/StructureStart.cpp | 6 +- .../level/levelgen/structure/StructureStart.h | 2 +- .../levelgen/structure/VillageFeature.cpp | 16 +- .../level/levelgen/structure/VillageFeature.h | 4 +- .../levelgen/structure/VillagePieces.cpp | 26 +-- .../level/levelgen/structure/VillagePieces.h | 4 +- ...minecraft.world.level.levelgen.structure.h | 0 .../world/level/levelgen/synth/Distort.cpp | 2 +- .../world/level/levelgen/synth/Distort.h | 0 .../world/level/levelgen/synth/Emboss.cpp | 2 +- .../world/level/levelgen/synth/Emboss.h | 0 .../world/level/levelgen/synth/FastNoise.cpp | 0 .../world/level/levelgen/synth/FastNoise.h | 0 .../level/levelgen/synth/ImprovedNoise.cpp | 0 .../level/levelgen/synth/ImprovedNoise.h | 0 .../level/levelgen/synth/PerlinNoise.cpp | 4 +- .../world/level/levelgen/synth/PerlinNoise.h | 0 .../levelgen/synth/PerlinSimplexNoise.cpp | 2 +- .../level/levelgen/synth/PerlinSimplexNoise.h | 0 .../world/level/levelgen/synth/Rotate.cpp | 2 +- .../world/level/levelgen/synth/Rotate.h | 0 .../world/level/levelgen/synth/Scale.cpp | 2 +- .../world/level/levelgen/synth/Scale.h | 0 .../level/levelgen/synth/SimplexNoise.cpp | 0 .../world/level/levelgen/synth/SimplexNoise.h | 0 .../world/level/levelgen/synth/Synth.cpp | 0 .../world/level/levelgen/synth/Synth.h | 0 ...net.minecraft.world.level.levelgen.synth.h | 0 .../world/level/material/DecorationMaterial.h | 0 .../world/level/material/GasMaterial.h | 0 .../world/level/material/LiquidMaterial.h | 0 .../world/level/material/Material.cpp | 2 +- .../minecraft/world/level/material/Material.h | 0 .../world/level/material/MaterialColor.cpp | 0 .../world/level/material/MaterialColor.h | 0 .../world/level/material/PortalMaterial.h | 0 .../world/level/material/WebMaterial.h | 0 .../net.minecraft.world.level.material.h | 0 .../world/level/net.minecraft.world.level.h | 0 .../level/newbiome/layer/AddIslandLayer.cpp | 6 +- .../level/newbiome/layer/AddIslandLayer.h | 0 .../newbiome/layer/AddMushroomIslandLayer.cpp | 6 +- .../newbiome/layer/AddMushroomIslandLayer.h | 0 .../level/newbiome/layer/AddSnowLayer.cpp | 6 +- .../world/level/newbiome/layer/AddSnowLayer.h | 0 .../level/newbiome/layer/BiomeInitLayer.cpp | 6 +- .../level/newbiome/layer/BiomeInitLayer.h | 0 .../newbiome/layer/BiomeOverrideLayer.cpp | 4 +- .../level/newbiome/layer/BiomeOverrideLayer.h | 0 .../level/newbiome/layer/DownfallLayer.cpp | 6 +- .../level/newbiome/layer/DownfallLayer.h | 0 .../newbiome/layer/DownfallMixerLayer.cpp | 6 +- .../level/newbiome/layer/DownfallMixerLayer.h | 0 .../world/level/newbiome/layer/FlatLayer.cpp | 4 +- .../world/level/newbiome/layer/FlatLayer.h | 0 .../level/newbiome/layer/FuzzyZoomLayer.cpp | 4 +- .../level/newbiome/layer/FuzzyZoomLayer.h | 0 .../layer/GrowMushroomIslandLayer.cpp | 6 +- .../newbiome/layer/GrowMushroomIslandLayer.h | 0 .../level/newbiome/layer/IslandLayer.cpp | 4 +- .../world/level/newbiome/layer/IslandLayer.h | 0 .../world/level/newbiome/layer/Layer.cpp | 36 ++-- .../world/level/newbiome/layer/Layer.h | 0 .../level/newbiome/layer/RegionHillsLayer.cpp | 4 +- .../level/newbiome/layer/RegionHillsLayer.h | 0 .../level/newbiome/layer/RiverInitLayer.cpp | 4 +- .../level/newbiome/layer/RiverInitLayer.h | 0 .../world/level/newbiome/layer/RiverLayer.cpp | 6 +- .../world/level/newbiome/layer/RiverLayer.h | 0 .../level/newbiome/layer/RiverMixerLayer.cpp | 6 +- .../level/newbiome/layer/RiverMixerLayer.h | 0 .../world/level/newbiome/layer/ShoreLayer.cpp | 6 +- .../world/level/newbiome/layer/ShoreLayer.h | 0 .../level/newbiome/layer/SmoothLayer.cpp | 4 +- .../world/level/newbiome/layer/SmoothLayer.h | 0 .../level/newbiome/layer/SmoothZoomLayer.cpp | 4 +- .../level/newbiome/layer/SmoothZoomLayer.h | 0 .../level/newbiome/layer/SwampRiversLayer.cpp | 4 +- .../level/newbiome/layer/SwampRiversLayer.h | 0 .../level/newbiome/layer/TemperatureLayer.cpp | 6 +- .../level/newbiome/layer/TemperatureLayer.h | 0 .../newbiome/layer/TemperatureMixerLayer.cpp | 6 +- .../newbiome/layer/TemperatureMixerLayer.h | 0 .../level/newbiome/layer/VoronoiZoom.cpp | 4 +- .../world/level/newbiome/layer/VoronoiZoom.h | 0 .../world/level/newbiome/layer/ZoomLayer.cpp | 4 +- .../world/level/newbiome/layer/ZoomLayer.h | 0 ...net.minecraft.world.level.newbiome.layer.h | 0 .../world/level/pathfinder/BinaryHeap.cpp | 0 .../world/level/pathfinder/BinaryHeap.h | 0 .../minecraft/world/level/pathfinder/Node.cpp | 4 +- .../minecraft/world/level/pathfinder/Node.h | 0 .../minecraft/world/level/pathfinder/Path.cpp | 2 +- .../minecraft/world/level/pathfinder/Path.h | 4 +- .../world/level/pathfinder/PathFinder.cpp | 14 +- .../world/level/pathfinder/PathFinder.h | 2 +- .../net.minecraft.world.level.pathfinder.h | 0 .../world/level/redstone/Redstone.cpp | 0 .../minecraft/world/level/redstone/Redstone.h | 0 .../net.minecraft.world.level.redstone.h | 0 .../level/saveddata/MapItemSavedData.cpp | 12 +- .../world/level/saveddata/MapItemSavedData.h | 4 +- .../world/level/saveddata/SavedData.cpp | 2 +- .../world/level/saveddata/SavedData.h | 0 .../net.minecraft.world.level.saveddata.h | 0 .../ConsoleSaveFileIO/ConsoleSaveFile.h | 4 +- .../ConsoleSaveFileConverter.cpp | 10 +- .../ConsoleSaveFileConverter.h | 0 .../ConsoleSaveFileIO/ConsoleSaveFileIO.h | 7 + .../ConsoleSaveFileInputStream.cpp | 4 +- .../ConsoleSaveFileInputStream.h | 2 +- .../ConsoleSaveFileOriginal.cpp | 10 +- .../ConsoleSaveFileOriginal.h | 8 +- .../ConsoleSaveFileOutputStream.cpp | 4 +- .../ConsoleSaveFileOutputStream.h | 2 +- .../ConsoleSaveFileSplit.cpp | 12 +- .../ConsoleSaveFileIO/ConsoleSaveFileSplit.h | 8 +- .../ConsoleSaveFileIO/ConsoleSavePath.h | 0 .../storage/ConsoleSaveFileIO/FileHeader.cpp | 4 +- .../storage/ConsoleSaveFileIO/FileHeader.h | 0 .../world/level/storage/DerivedLevelData.cpp | 2 +- .../world/level/storage/DerivedLevelData.h | 0 .../level/storage/DirectoryLevelStorage.cpp | 24 +-- .../level/storage/DirectoryLevelStorage.h | 2 +- .../storage/DirectoryLevelStorageSource.cpp | 10 +- .../storage/DirectoryLevelStorageSource.h | 0 .../world/level/storage/LevelData.cpp | 8 +- .../minecraft/world/level/storage/LevelData.h | 2 +- .../world/level/storage/LevelStorage.cpp | 0 .../world/level/storage/LevelStorage.h | 2 +- .../storage/LevelStorageProfilerDecorator.cpp | 6 +- .../storage/LevelStorageProfilerDecorator.h | 0 .../world/level/storage/LevelStorageSource.h | 0 .../world/level/storage/LevelSummary.cpp | 0 .../world/level/storage/LevelSummary.h | 0 .../level/storage/McRegionLevelStorage.cpp | 18 +- .../level/storage/McRegionLevelStorage.h | 0 .../storage/McRegionLevelStorageSource.cpp | 4 +- .../storage/McRegionLevelStorageSource.h | 0 .../level/storage/MemoryLevelStorage.cpp | 10 +- .../world/level/storage/MemoryLevelStorage.h | 10 +- .../storage/MemoryLevelStorageSource.cpp | 2 +- .../level/storage/MemoryLevelStorageSource.h | 0 .../level/storage/MockedLevelStorage.cpp | 2 +- .../world/level/storage/MockedLevelStorage.h | 2 +- .../minecraft/world/level/storage/PlayerIO.h | 0 .../world/level/storage/SavedDataStorage.cpp | 18 +- .../world/level/storage/SavedDataStorage.h | 4 +- .../net.minecraft.world.level.storage.h | 0 .../minecraft/world/level/tile/AirTile.cpp | 5 + .../minecraft/world/level/tile/AirTile.h | 2 +- .../minecraft/world/level/tile/AnvilTile.cpp | 12 +- .../minecraft/world/level/tile/AnvilTile.h | 0 .../world/level/tile/BaseEntityTile.cpp | 6 +- .../world/level/tile/BaseEntityTile.h | 0 .../level/tile/BasePressurePlateTile.cpp | 20 +- .../world/level/tile/BasePressurePlateTile.h | 2 +- .../world/level/tile/BaseRailTile.cpp | 12 +- .../minecraft/world/level/tile/BaseRailTile.h | 2 +- .../minecraft/world/level/tile/BeaconTile.cpp | 12 +- .../minecraft/world/level/tile/BeaconTile.h | 0 .../minecraft/world/level/tile/BedTile.cpp | 12 +- .../minecraft/world/level/tile/BedTile.h | 0 .../world/level/tile/BookshelfTile.cpp | 8 +- .../world/level/tile/BookshelfTile.h | 2 +- .../world/level/tile/BrewingStandTile.cpp | 26 +-- .../world/level/tile/BrewingStandTile.h | 0 .../minecraft/world/level/tile/ButtonTile.cpp | 18 +- .../minecraft/world/level/tile/ButtonTile.h | 0 .../minecraft/world/level/tile/CactusTile.cpp | 16 +- .../minecraft/world/level/tile/CactusTile.h | 2 +- .../minecraft/world/level/tile/CakeTile.cpp | 22 +-- .../minecraft/world/level/tile/CakeTile.h | 2 +- .../minecraft/world/level/tile/CarrotTile.cpp | 6 +- .../minecraft/world/level/tile/CarrotTile.h | 0 .../world/level/tile/CauldronTile.cpp | 26 +-- .../minecraft/world/level/tile/CauldronTile.h | 0 .../minecraft/world/level/tile/ChestTile.cpp | 22 +-- .../minecraft/world/level/tile/ChestTile.h | 2 +- .../minecraft/world/level/tile/ClayTile.cpp | 6 +- .../minecraft/world/level/tile/ClayTile.h | 2 +- .../minecraft/world/level/tile/CocoaTile.cpp | 28 +-- .../minecraft/world/level/tile/CocoaTile.h | 2 +- .../world/level/tile/ColoredTile.cpp | 6 +- .../minecraft/world/level/tile/ColoredTile.h | 0 .../world/level/tile/CommandBlock.cpp | 18 +- .../minecraft/world/level/tile/CommandBlock.h | 0 .../world/level/tile/ComparatorTile.cpp | 24 +-- .../world/level/tile/ComparatorTile.h | 0 .../minecraft/world/level/tile/CoralTile.cpp | 4 +- .../minecraft/world/level/tile/CoralTile.h | 2 +- .../minecraft/world/level/tile/CropTile.cpp | 12 +- .../minecraft/world/level/tile/CropTile.h | 2 +- .../world/level/tile/DaylightDetectorTile.cpp | 20 +- .../world/level/tile/DaylightDetectorTile.h | 0 .../world/level/tile/DeadBushTile.cpp | 16 +- .../minecraft/world/level/tile/DeadBushTile.h | 0 .../world/level/tile/DetectorRailTile.cpp | 26 +-- .../world/level/tile/DetectorRailTile.h | 0 .../minecraft/world/level/tile/DiodeTile.cpp | 26 +-- .../minecraft/world/level/tile/DiodeTile.h | 0 .../world/level/tile/DirectionalTile.cpp | 2 +- .../world/level/tile/DirectionalTile.h | 0 .../minecraft/world/level/tile/DirtTile.cpp | 5 + .../minecraft/world/level/tile/DirtTile.h | 0 .../world/level/tile/DispenserTile.cpp | 42 ++--- .../world/level/tile/DispenserTile.h | 2 +- .../minecraft/world/level/tile/DoorTile.cpp | 22 +-- .../minecraft/world/level/tile/DoorTile.h | 0 .../world/level/tile/DropperTile.cpp | 24 +-- .../minecraft/world/level/tile/DropperTile.h | 0 .../minecraft/world/level/tile/EggTile.cpp | 14 +- .../minecraft/world/level/tile/EggTile.h | 0 .../world/level/tile/EnchantmentTableTile.cpp | 20 +- .../world/level/tile/EnchantmentTableTile.h | 0 .../world/level/tile/EnderChestTile.cpp | 24 +-- .../world/level/tile/EnderChestTile.h | 0 .../minecraft/world/level/tile/EntityTile.h | 0 .../minecraft/world/level/tile/FarmTile.cpp | 18 +- .../minecraft/world/level/tile/FarmTile.h | 0 .../world/level/tile/FenceGateTile.cpp | 20 +- .../world/level/tile/FenceGateTile.h | 0 .../minecraft/world/level/tile/FenceTile.cpp | 12 +- .../minecraft/world/level/tile/FenceTile.h | 0 .../minecraft/world/level/tile/FireTile.cpp | 24 +-- .../minecraft/world/level/tile/FireTile.h | 0 .../world/level/tile/FlowerPotTile.cpp | 22 +-- .../world/level/tile/FlowerPotTile.h | 2 +- .../world/level/tile/FurnaceTile.cpp | 32 ++-- .../minecraft/world/level/tile/FurnaceTile.h | 0 .../minecraft/world/level/tile/GlassTile.cpp | 2 +- .../minecraft/world/level/tile/GlassTile.h | 0 .../world/level/tile/GlowstoneTile.cpp | 6 +- .../world/level/tile/GlowstoneTile.h | 0 .../minecraft/world/level/tile/GrassTile.cpp | 14 +- .../minecraft/world/level/tile/GrassTile.h | 0 .../minecraft/world/level/tile/GravelTile.cpp | 4 +- .../minecraft/world/level/tile/GravelTile.h | 0 .../world/level/tile/HalfSlabTile.cpp | 8 +- .../minecraft/world/level/tile/HalfSlabTile.h | 0 .../world/level/tile/HalfTransparentTile.cpp | 6 +- .../world/level/tile/HalfTransparentTile.h | 0 .../world/level/tile/HayBlockTile.cpp | 6 +- .../minecraft/world/level/tile/HayBlockTile.h | 0 .../minecraft/world/level/tile/HeavyTile.cpp | 8 +- .../minecraft/world/level/tile/HeavyTile.h | 0 .../minecraft/world/level/tile/HopperTile.cpp | 26 +-- .../minecraft/world/level/tile/HopperTile.h | 0 .../world/level/tile/HugeMushroomTile.cpp | 4 +- .../world/level/tile/HugeMushroomTile.h | 0 .../minecraft/world/level/tile/IceTile.cpp | 20 +- .../minecraft/world/level/tile/IceTile.h | 0 .../world/level/tile/JukeboxTile.cpp | 20 +- .../minecraft/world/level/tile/JukeboxTile.h | 4 +- .../minecraft/world/level/tile/LadderTile.cpp | 10 +- .../minecraft/world/level/tile/LadderTile.h | 0 .../minecraft/world/level/tile/LeafTile.cpp | 10 +- .../minecraft/world/level/tile/LeafTile.h | 0 .../minecraft/world/level/tile/LevelEvent.h | 0 .../minecraft/world/level/tile/LeverTile.cpp | 20 +- .../minecraft/world/level/tile/LeverTile.h | 0 .../minecraft/world/level/tile/LiquidTile.cpp | 22 +-- .../minecraft/world/level/tile/LiquidTile.h | 2 +- .../world/level/tile/LiquidTileDynamic.cpp | 10 +- .../world/level/tile/LiquidTileDynamic.h | 0 .../world/level/tile/LiquidTileStatic.cpp | 8 +- .../world/level/tile/LiquidTileStatic.h | 0 .../world/level/tile/LockedChestTile.cpp | 6 +- .../world/level/tile/LockedChestTile.h | 0 .../minecraft/world/level/tile/MelonTile.cpp | 10 +- .../minecraft/world/level/tile/MelonTile.h | 0 .../minecraft/world/level/tile/MetalTile.cpp | 5 + .../minecraft/world/level/tile/MetalTile.h | 0 .../world/level/tile/MobSpawnerTile.cpp | 10 +- .../world/level/tile/MobSpawnerTile.h | 0 .../world/level/tile/MushroomPlantTile.cpp | 10 +- .../world/level/tile/MushroomPlantTile.h | 0 .../minecraft/world/level/tile/MycelTile.cpp | 14 +- .../minecraft/world/level/tile/MycelTile.h | 0 .../world/level/tile/NetherWartTile.cpp | 12 +- .../world/level/tile/NetherWartTile.h | 0 .../world/level/tile/NetherrackTile.cpp | 5 + .../world/level/tile/NetherrackTile.h | 0 .../world/level/tile/NotGateTile.cpp | 14 +- .../minecraft/world/level/tile/NotGateTile.h | 0 .../world/level/tile/NoteBlockTile.cpp | 12 +- .../world/level/tile/NoteBlockTile.h | 0 .../world/level/tile/ObsidianTile.cpp | 4 +- .../minecraft/world/level/tile/ObsidianTile.h | 0 .../minecraft/world/level/tile/OreTile.cpp | 10 +- .../minecraft/world/level/tile/OreTile.h | 0 .../minecraft/world/level/tile/PlantTile.cpp | 8 +- .../minecraft/world/level/tile/PlantTile.h | 2 +- .../minecraft/world/level/tile/PortalTile.cpp | 22 +-- .../minecraft/world/level/tile/PortalTile.h | 0 .../minecraft/world/level/tile/PotatoTile.cpp | 10 +- .../minecraft/world/level/tile/PotatoTile.h | 0 .../world/level/tile/PoweredMetalTile.cpp | 4 +- .../world/level/tile/PoweredMetalTile.h | 0 .../world/level/tile/PoweredRailTile.cpp | 8 +- .../world/level/tile/PoweredRailTile.h | 0 .../world/level/tile/PressurePlateTile.cpp | 14 +- .../world/level/tile/PressurePlateTile.h | 0 .../world/level/tile/PumpkinTile.cpp | 22 +-- .../minecraft/world/level/tile/PumpkinTile.h | 0 .../world/level/tile/QuartzBlockTile.cpp | 10 +- .../world/level/tile/QuartzBlockTile.h | 0 .../minecraft/world/level/tile/RailTile.cpp | 6 +- .../minecraft/world/level/tile/RailTile.h | 0 .../world/level/tile/RedStoneDustTile.cpp | 24 +-- .../world/level/tile/RedStoneDustTile.h | 2 +- .../world/level/tile/RedStoneOreTile.cpp | 12 +- .../world/level/tile/RedStoneOreTile.h | 0 .../world/level/tile/RedlightTile.cpp | 8 +- .../minecraft/world/level/tile/RedlightTile.h | 0 .../minecraft/world/level/tile/ReedTile.cpp | 10 +- .../minecraft/world/level/tile/ReedTile.h | 0 .../world/level/tile/RepeaterTile.cpp | 14 +- .../minecraft/world/level/tile/RepeaterTile.h | 0 .../world/level/tile/RotatedPillarTile.cpp | 6 +- .../world/level/tile/RotatedPillarTile.h | 0 .../world/level/tile/SandStoneTile.cpp | 6 +- .../world/level/tile/SandStoneTile.h | 0 .../world/level/tile/SaplingPlantTile.cpp | 6 +- .../world/level/tile/SaplingPlantTile.h | 0 .../minecraft/world/level/tile/SignTile.cpp | 16 +- .../minecraft/world/level/tile/SignTile.h | 4 +- .../minecraft/world/level/tile/SkullTile.cpp | 16 +- .../minecraft/world/level/tile/SkullTile.h | 0 .../world/level/tile/SmoothStoneBrickTile.cpp | 2 +- .../world/level/tile/SmoothStoneBrickTile.h | 0 .../minecraft/world/level/tile/SnowTile.cpp | 10 +- .../minecraft/world/level/tile/SnowTile.h | 0 .../world/level/tile/SoulSandTile.cpp | 8 +- .../minecraft/world/level/tile/SoulSandTile.h | 0 .../minecraft/world/level/tile/SpongeTile.cpp | 7 + .../minecraft/world/level/tile/SpongeTile.h | 0 .../world/level/tile/StainedGlassBlock.cpp | 6 +- .../world/level/tile/StainedGlassBlock.h | 0 .../level/tile/StainedGlassPaneBlock.cpp | 8 +- .../world/level/tile/StainedGlassPaneBlock.h | 0 .../minecraft/world/level/tile/StairTile.cpp | 18 +- .../minecraft/world/level/tile/StairTile.h | 0 .../minecraft/world/level/tile/StemTile.cpp | 14 +- .../minecraft/world/level/tile/StemTile.h | 0 .../world/level/tile/StoneButtonTile.cpp | 6 +- .../world/level/tile/StoneButtonTile.h | 0 .../world/level/tile/StoneMonsterTile.cpp | 6 +- .../world/level/tile/StoneMonsterTile.h | 0 .../world/level/tile/StoneSlabTile.cpp | 6 +- .../world/level/tile/StoneSlabTile.h | 0 .../minecraft/world/level/tile/StoneTile.cpp | 4 +- .../minecraft/world/level/tile/StoneTile.h | 0 .../world/level/tile/TallGrassPlantTile.cpp | 10 +- .../world/level/tile/TallGrassPlantTile.h | 0 .../level/tile/TheEndPortalFrameTile.cpp | 16 +- .../world/level/tile/TheEndPortalFrameTile.h | 0 .../world/level/tile/ThinFenceTile.cpp | 12 +- .../world/level/tile/ThinFenceTile.h | 0 .../minecraft/world/level/tile/Tile.cpp | 32 ++-- .../minecraft/world/level/tile/Tile.h | 6 +- .../minecraft/world/level/tile/TntTile.cpp | 28 +-- .../minecraft/world/level/tile/TntTile.h | 0 .../world/level/tile/TopSnowTile.cpp | 20 +- .../minecraft/world/level/tile/TopSnowTile.h | 0 .../minecraft/world/level/tile/TorchTile.cpp | 12 +- .../minecraft/world/level/tile/TorchTile.h | 0 .../world/level/tile/TransparentTile.cpp | 4 +- .../world/level/tile/TransparentTile.h | 0 .../world/level/tile/TrapDoorTile.cpp | 18 +- .../minecraft/world/level/tile/TrapDoorTile.h | 0 .../minecraft/world/level/tile/TreeTile.cpp | 8 +- .../minecraft/world/level/tile/TreeTile.h | 0 .../world/level/tile/TripWireSourceTile.cpp | 20 +- .../world/level/tile/TripWireSourceTile.h | 0 .../world/level/tile/TripWireTile.cpp | 22 +-- .../minecraft/world/level/tile/TripWireTile.h | 0 .../minecraft/world/level/tile/VineTile.cpp | 28 +-- .../minecraft/world/level/tile/VineTile.h | 2 +- .../minecraft/world/level/tile/WallTile.cpp | 8 +- .../minecraft/world/level/tile/WallTile.h | 0 .../world/level/tile/WaterLilyTile.cpp | 12 +- .../world/level/tile/WaterLilyTile.h | 0 .../minecraft/world/level/tile/WebTile.cpp | 10 +- .../minecraft/world/level/tile/WebTile.h | 0 .../level/tile/WeightedPressurePlateTile.cpp | 14 +- .../level/tile/WeightedPressurePlateTile.h | 0 .../world/level/tile/WoodButtonTile.cpp | 6 +- .../world/level/tile/WoodButtonTile.h | 0 .../world/level/tile/WoodSlabTile.cpp | 8 +- .../minecraft/world/level/tile/WoodSlabTile.h | 0 .../minecraft/world/level/tile/WoodTile.cpp | 10 +- .../minecraft/world/level/tile/WoodTile.h | 0 .../world/level/tile/WoolCarpetTile.cpp | 12 +- .../world/level/tile/WoolCarpetTile.h | 0 .../world/level/tile/WorkbenchTile.cpp | 12 +- .../world/level/tile/WorkbenchTile.h | 0 .../level/tile/entity/BeaconTileEntity.cpp | 16 +- .../level/tile/entity/BeaconTileEntity.h | 4 +- .../tile/entity/BrewingStandTileEntity.cpp | 14 +- .../tile/entity/BrewingStandTileEntity.h | 2 +- .../level/tile/entity/ChestTileEntity.cpp | 22 +-- .../world/level/tile/entity/ChestTileEntity.h | 2 +- .../level/tile/entity/CommandBlockEntity.cpp | 6 +- .../level/tile/entity/CommandBlockEntity.h | 6 +- .../tile/entity/ComparatorTileEntity.cpp | 2 +- .../level/tile/entity/ComparatorTileEntity.h | 0 .../entity/DaylightDetectorTileEntity.cpp | 8 +- .../tile/entity/DaylightDetectorTileEntity.h | 2 +- .../level/tile/entity/DispenserTileEntity.cpp | 10 +- .../level/tile/entity/DispenserTileEntity.h | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.h | 0 .../entity/EnchantmentTableTileEntity.cpp | 6 +- .../tile/entity/EnchantmentTableTileEntity.h | 0 .../tile/entity/EnderChestTileEntity.cpp | 12 +- .../level/tile/entity/EnderChestTileEntity.h | 0 .../level/tile/entity/FurnaceTileEntity.cpp | 16 +- .../level/tile/entity/FurnaceTileEntity.h | 4 +- .../world/level/tile/entity/Hopper.h | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 20 +- .../level/tile/entity/HopperTileEntity.h | 0 .../tile/entity/MobSpawnerTileEntity.cpp | 10 +- .../level/tile/entity/MobSpawnerTileEntity.h | 2 +- .../level/tile/entity/MusicTileEntity.cpp | 8 +- .../world/level/tile/entity/MusicTileEntity.h | 0 .../tile/entity/PistonMovingTileEntity.cpp | 14 +- .../tile/entity/PistonMovingTileEntity.h | 6 +- .../tile/entity/PistonPieceTileEntity.cpp | 10 +- .../level/tile/entity/PistonPieceTileEntity.h | 0 .../level/tile/entity/SignTileEntity.cpp | 6 +- .../world/level/tile/entity/SignTileEntity.h | 2 +- .../level/tile/entity/SkullTileEntity.cpp | 4 +- .../world/level/tile/entity/SkullTileEntity.h | 0 .../level/tile/entity/TheEndPortalTile.cpp | 14 +- .../level/tile/entity/TheEndPortalTile.h | 4 +- .../tile/entity/TheEndPortalTileEntity.cpp | 2 +- .../tile/entity/TheEndPortalTileEntity.h | 0 .../world/level/tile/entity/TileEntity.cpp | 42 ++--- .../world/level/tile/entity/TileEntity.h | 0 .../net.minecraft.world.level.tile.entity.h | 0 .../tile/net.minecraft.world.level.tile.h | 6 +- .../level/tile/piston/PistonBaseTile.cpp | 32 ++-- .../world/level/tile/piston/PistonBaseTile.h | 2 +- .../level/tile/piston/PistonExtensionTile.cpp | 14 +- .../level/tile/piston/PistonExtensionTile.h | 2 +- .../net.minecraft.world.level.tile.piston.h | 6 + .../net.minecraft.world.ContainerListener.h | 0 .../minecraft/world/net.minecraft.world.h | 0 .../net => }/minecraft/world/phys/AABB.cpp | 6 +- .../net => }/minecraft/world/phys/AABB.h | 0 .../minecraft/world/phys/HitResult.cpp | 2 +- .../net => }/minecraft/world/phys/HitResult.h | 2 +- .../net => }/minecraft/world/phys/Vec3.cpp | 6 +- .../net => }/minecraft/world/phys/Vec3.h | 0 .../world/phys/net.minecraft.world.phys.h | 0 .../minecraft/world/scores/Objective.cpp | 2 +- .../minecraft/world/scores/Objective.h | 0 .../minecraft/world/scores/PlayerTeam.cpp | 4 +- .../minecraft/world/scores/PlayerTeam.h | 0 .../net => }/minecraft/world/scores/Score.cpp | 6 +- .../net => }/minecraft/world/scores/Score.h | 0 .../minecraft/world/scores/ScoreHolder.h | 0 .../minecraft/world/scores/Scoreboard.cpp | 0 .../minecraft/world/scores/Scoreboard.h | 2 +- .../world/scores/ScoreboardSaveData.h | 0 .../net => }/minecraft/world/scores/Team.cpp | 0 .../net => }/minecraft/world/scores/Team.h | 0 .../world/scores/criteria/DummyCriteria.cpp | 2 +- .../world/scores/criteria/DummyCriteria.h | 0 .../world/scores/criteria/HealthCriteria.cpp | 6 +- .../world/scores/criteria/HealthCriteria.h | 0 .../scores/criteria/ObjectiveCriteria.cpp | 4 +- .../world/scores/criteria/ObjectiveCriteria.h | 0 .../net.minecraft.world.scores.criteria.h | 0 .../world/scores/net.minecraft.world.scores.h | 0 2064 files changed, 6626 insertions(+), 6626 deletions(-) delete mode 100644 minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp delete mode 100644 minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h rename minecraft/{Minecraft.World/net => }/minecraft/Direction.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/Direction.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/Facing.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/Facing.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/Pos.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/Pos.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/SharedConstants.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/SharedConstants.h (100%) create mode 100644 minecraft/minecraft/StaticConstructors.cpp rename minecraft/{Minecraft.World/net => }/minecraft/StaticConstructors.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/AdminLogCommand.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/Command.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/Command.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/CommandDispatcher.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/CommandDispatcher.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/CommandSender.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/CommandsEnum.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/PlayerSelector.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/DefaultGameModeCommand.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/DefaultGameModeCommand.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/EffectCommand.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/EffectCommand.h (78%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/EnchantItemCommand.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/EnchantItemCommand.h (79%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/ExperienceCommand.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/ExperienceCommand.h (71%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GameDifficultyCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GameModeCommand.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GameModeCommand.h (79%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GameRuleCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GiveItemCommand.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/GiveItemCommand.h (81%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/KillCommand.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/KillCommand.h (69%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/PlaySoundCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/SetPlayerTimeoutCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/ShowSeedCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/SpreadPlayersCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/TimeCommand.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/TimeCommand.h (73%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/ToggleDownfallCommand.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/ToggleDownfallCommand.h (78%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/WeatherCommand.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/common/net.minecraft.commands.common.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/commands/net.minecraft.commands.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/AbstractProjectileDispenseBehavior.cpp (69%) rename minecraft/{Minecraft.World/net => }/minecraft/core/AbstractProjectileDispenseBehavior.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/Behavior.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/BehaviorRegistry.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/core/BehaviorRegistry.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/BlockSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/BlockSourceImpl.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/core/BlockSourceImpl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/DefaultDispenseItemBehavior.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/core/DefaultDispenseItemBehavior.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/core/DispenseItemBehavior.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/DispenseItemBehavior.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/FacingEnum.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/FacingEnum.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/ItemDispenseBehaviors.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/core/ItemDispenseBehaviors.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/LocatableSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/Location.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/Position.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/PositionImpl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/Source.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/net.minecraft.core.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/core/particles/ParticleTypes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/locale/I18n.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/locale/I18n.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/locale/Language.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/locale/Language.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/locale/net.minecraft.locale.h (100%) rename minecraft/{Minecraft.World => minecraft}/meson.build (87%) rename minecraft/{Minecraft.World/net => }/minecraft/net.minecraft.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/Connection.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/network/Connection.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/net.minecraft.network.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddEntityPacket.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddEntityPacket.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddExperienceOrbPacket.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddExperienceOrbPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddGlobalEntityPacket.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddGlobalEntityPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddMobPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddMobPacket.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddPaintingPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddPaintingPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddPlayerPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AddPlayerPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AnimatePacket.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AnimatePacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AwardStatPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/AwardStatPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/BlockRegionUpdatePacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/BlockRegionUpdatePacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChatAutoCompletePacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChatPacket.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChatPacket.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkTilesUpdatePacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkTilesUpdatePacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkVisibilityAreaPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkVisibilityPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ChunkVisibilityPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ClientCommandPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ClientCommandPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ClientInformationPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ClientProtocolPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ComplexItemDataPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ComplexItemDataPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerAckPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerAckPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerButtonClickPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerButtonClickPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerClickPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerClickPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerClosePacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerClosePacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerOpenPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerOpenPacket.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetContentPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetContentPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetDataPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetDataPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetSlotPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ContainerSetSlotPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/CraftItemPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/CraftItemPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/CustomPayloadPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/CustomPayloadPacket.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/DebugOptionsPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/DebugOptionsPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/DisconnectPacket.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/DisconnectPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/EntityActionAtPositionPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/EntityActionAtPositionPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/EntityEventPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/EntityEventPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ExplodePacket.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ExplodePacket.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GameCommandPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GameCommandPacket.h (85%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GameEventPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GameEventPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GetInfoPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/GetInfoPacket.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/InteractPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/InteractPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/KeepAlivePacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/KeepAlivePacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/KickPlayerPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/KickPlayerPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelEventPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelEventPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelParticlesPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelParticlesPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelSoundPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LevelSoundPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LoginPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/LoginPacket.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MoveEntityPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MoveEntityPacket.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MoveEntityPacketSmall.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MoveEntityPacketSmall.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MovePlayerPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/MovePlayerPacket.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/Packet.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/Packet.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PacketListener.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PacketListener.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerAbilitiesPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerAbilitiesPacket.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerActionPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerActionPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerCommandPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerCommandPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerInfoPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerInfoPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerInputPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PlayerInputPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PreLoginPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/PreLoginPacket.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RemoveEntitiesPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RemoveEntitiesPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RemoveMobEffectPacket.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RemoveMobEffectPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RespawnPacket.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RespawnPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RotateHeadPacket.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/RotateHeadPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ServerAuthDataPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ServerSettingsChangedPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/ServerSettingsChangedPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetCarriedItemPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetCarriedItemPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetCreativeModeSlotPacket.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetCreativeModeSlotPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetDisplayObjectivePacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetDisplayObjectivePacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityDataPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityDataPacket.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityLinkPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityLinkPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityMotionPacket.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEntityMotionPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEquippedItemPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetEquippedItemPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetExperiencePacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetExperiencePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetHealthPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetHealthPacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetObjectivePacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetObjectivePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetPlayerTeamPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetPlayerTeamPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetScorePacket.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetScorePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetSpawnPositionPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetSpawnPositionPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetTimePacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SetTimePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SharedKeyPacket.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SignUpdatePacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/SignUpdatePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TakeItemEntityPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TakeItemEntityPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TeleportEntityPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TeleportEntityPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureAndGeometryChangePacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureAndGeometryChangePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureAndGeometryPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureAndGeometryPacket.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureChangePacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TextureChangePacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TexturePacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TexturePacket.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileDestructionPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileDestructionPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEditorOpenPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEditorOpenPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEntityDataPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEntityDataPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEventPacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileEventPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileUpdatePacket.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TileUpdatePacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TradeItemPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/TradeItemPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateAttributesPacket.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateAttributesPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateGameRuleProgressPacket.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateMobEffectPacket.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateMobEffectPacket.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateProgressPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UpdateProgressPacket.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UseItemPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/UseItemPacket.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/XZPacket.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/XZPacket.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/network/packet/net.minecraft.network.packet.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/sounds/SoundTypes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Achievement.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Achievement.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Achievements.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Achievements.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/CommonStats.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/CommonStats.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/DescFormatter.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/DurangoStats.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/GeneralStat.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/GeneralStat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/GenericStats.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/GenericStats.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/ItemStat.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/ItemStat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/NumberFormatters.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Stat.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Stat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/StatFormatter.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Stats.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/Stats.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/stats/net.minecraft.stats.h (100%) rename minecraft/{Minecraft.World => minecraft}/stdafx.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/Hasher.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/Hasher.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/HtmlString.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/HtmlString.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/Mth.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/util/Mth.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/ProgressListener.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/SmoothFloat.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/SmoothFloat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/WeighedRandom.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/util/WeighedRandom.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/util/WeighedTreasure.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/util/WeighedTreasure.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/CompoundContainer.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/CompoundContainer.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/Container.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/Difficulty.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/FlippedIcon.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/FlippedIcon.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/Icon.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/IconRegister.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/MouseInventoryClickHandler.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/SimpleContainer.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/SimpleContainer.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/WorldlyContainer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/CombatEntry.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/CombatEntry.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/CombatTracker.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/CombatTracker.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/DamageSource.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/DamageSource.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/EntityDamageSource.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/EntityDamageSource.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/IndirectEntityDamageSource.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/IndirectEntityDamageSource.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/damageSource/net.minecraft.world.damagesource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/AbsoptionMobEffect.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/AbsoptionMobEffect.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/AttackDamageMobEffect.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/AttackDamageMobEffect.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/HealthBoostMobEffect.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/HealthBoostMobEffect.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/InstantaneousMobEffect.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/InstantaneousMobEffect.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/MobEffect.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/MobEffect.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/MobEffectInstance.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/MobEffectInstance.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/effect/net.minecraft.world.effect.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/AgeableMob.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/AgeableMob.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Creature.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Creature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/DelayedRelease.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/DelayedRelease.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Entity.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Entity.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntityEvent.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntityIO.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntityIO.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntityPos.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntityPos.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntitySelector.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/EntitySelector.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ExperienceOrb.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ExperienceOrb.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/FlyingMob.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/FlyingMob.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/HangingEntity.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/HangingEntity.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ItemFrame.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ItemFrame.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/LeashFenceKnotEntity.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/LeashFenceKnotEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/LivingEntity.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/LivingEntity.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Mob.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Mob.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/MobCategory.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/MobCategory.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/MobGroupData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/MobType.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/OwnableEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Painting.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/Painting.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/PathfinderMob.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/PathfinderMob.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/SyncedEntityData.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/SyncedEntityData.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/TamableAnimal.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/TamableAnimal.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/Attribute.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/Attribute.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/AttributeInstance.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/AttributeModifier.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/AttributeModifier.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/BaseAttribute.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/BaseAttribute.h (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/BaseAttributeMap.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/RangedAttribute.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/RangedAttribute.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/BodyControl.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/BodyControl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/Control.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/JumpControl.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/JumpControl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/LookControl.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/LookControl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/MoveControl.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/MoveControl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BegGoal.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BegGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BreakDoorGoal.h (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BreedGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/BreedGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/DoorInteractGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/EatTileGoal.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/EatTileGoal.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FleeSunGoal.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FleeSunGoal.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FloatGoal.cpp (56%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FloatGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FollowOwnerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FollowParentGoal.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/FollowParentGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/Goal.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/Goal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/GoalSelector.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/GoalSelector.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/InteractGoal.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/InteractGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MakeLoveGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MeleeAttackGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OcelotAttackGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OfferFlowerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/OpenDoorGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/PanicGoal.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/PanicGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/PlayGoal.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/PlayGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RandomStrollGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RangedAttackGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp (59%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RestrictSunGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp (71%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/SitGoal.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/SitGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/SwellGoal.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/SwellGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TakeFlowerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TemptGoal.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TemptGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp (70%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/TargetGoal.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/TargetGoal.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/navigation/PathNavigation.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/navigation/PathNavigation.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/sensing/Sensing.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/sensing/Sensing.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/util/RandomPos.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/util/RandomPos.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/DoorInfo.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/DoorInfo.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/Village.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/Village.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/VillageSiege.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/VillageSiege.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/Villages.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/Villages.h (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ambient/AmbientCreature.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ambient/AmbientCreature.h (56%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ambient/Bat.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ambient/Bat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Animal.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Animal.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Chicken.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Chicken.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Cow.cpp (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Cow.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/EntityHorse.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/EntityHorse.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Golem.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Golem.h (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/MushroomCow.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/MushroomCow.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Ocelot.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Ocelot.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Pig.cpp (73%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Pig.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Sheep.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Sheep.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/SnowMan.cpp (63%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/SnowMan.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Squid.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Squid.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/VillagerGolem.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/VillagerGolem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/WaterAnimal.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/WaterAnimal.h (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Wolf.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/Wolf.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/BossMob.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/MultiEntityMob.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/MultiEntityMobPart.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/MultiEntityMobPart.h (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/enderdragon/EnderCrystal.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/enderdragon/EnderDragon.h (95%) create mode 100644 minecraft/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/wither/WitherBoss.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/boss/wither/WitherBoss.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/global/GlobalEntity.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/global/GlobalEntity.h (56%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/global/LightningBolt.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/global/LightningBolt.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/global/net.minecraft.world.entity.global.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/Boat.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/Boat.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/FallingTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/FallingTile.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/ItemEntity.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/ItemEntity.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/Minecart.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/Minecart.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartChest.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartChest.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartContainer.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartContainer.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartFurnace.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartFurnace.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartHopper.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartHopper.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartRideable.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartRideable.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartSpawner.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartSpawner.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartTNT.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/MinecartTNT.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/PrimedTnt.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/PrimedTnt.h (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/item/net.minecraft.world.entity.item.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Blaze.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Blaze.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/CaveSpider.cpp (67%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/CaveSpider.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Creeper.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Creeper.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/EnderMan.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/EnderMan.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Enemy.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Enemy.h (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Ghast.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Ghast.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Giant.cpp (70%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Giant.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/LavaSlime.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/LavaSlime.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Monster.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Monster.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/PigZombie.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/PigZombie.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/RangedAttackMob.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/SharedMonsterAttributes.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/SharedMonsterAttributes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Silverfish.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Silverfish.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Skeleton.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Skeleton.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Slime.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Slime.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Spider.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Spider.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Witch.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Witch.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Zombie.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/Zombie.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/net.minecraft.world.entity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/ClientSideMerchant.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/ClientSideMerchant.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/Npc.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/Npc.h (55%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/Villager.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/Villager.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Abilities.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Abilities.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Inventory.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Inventory.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Player.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/Player.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/player/net.minecraft.world.entity.player.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Arrow.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Arrow.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/DragonFireball.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/DragonFireball.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/EyeOfEnderSignal.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Fireball.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Fireball.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/FireworksRocketEntity.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/FireworksRocketEntity.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/FishingHook.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/FishingHook.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/LargeFireball.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/LargeFireball.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Projectile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/SmallFireball.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/SmallFireball.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Snowball.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Snowball.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Throwable.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/Throwable.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownEgg.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownEgg.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownEnderpearl.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownEnderpearl.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownExpBottle.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownExpBottle.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownPotion.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/ThrownPotion.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/WitherSkull.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/WitherSkull.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/food/FoodConstants.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/food/FoodConstants.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/food/FoodData.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/food/FoodData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/food/net.minecraft.world.food.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AbstractContainerMenu.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AbstractContainerMenu.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AnimalChest.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AnimalChest.h (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AnvilMenu.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/AnvilMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ArmorSlot.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ArmorSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/BeaconMenu.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/BeaconMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/BrewingStandMenu.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/BrewingStandMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ContainerMenu.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ContainerMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/CraftingContainer.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/CraftingContainer.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/CraftingMenu.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/CraftingMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/EnchantmentContainer.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/EnchantmentContainer.h (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/EnchantmentMenu.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/EnchantmentMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/EnchantmentSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FireworksMenu.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FireworksMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FurnaceMenu.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FurnaceMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FurnaceResultSlot.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/FurnaceResultSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/HopperMenu.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/HopperMenu.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/HorseInventoryMenu.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/HorseInventoryMenu.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/InventoryMenu.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/InventoryMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MenuBackup.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MenuBackup.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantContainer.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantContainer.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantMenu.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantMenu.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantResultSlot.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/MerchantResultSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/PlayerEnderChestContainer.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/PlayerEnderChestContainer.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/RepairContainer.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/RepairContainer.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/RepairResultSlot.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/RepairResultSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ResultContainer.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ResultContainer.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ResultSlot.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/ResultSlot.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/Slot.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/Slot.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/TrapMenu.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/TrapMenu.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/inventory/net.minecraft.world.inventory.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/AnvilTileItem.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/AnvilTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ArmorItem.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ArmorItem.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/AuxDataTileItem.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/AuxDataTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BedItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BedItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BoatItem.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BoatItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BookItem.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BookItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BottleItem.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BottleItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BowItem.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BowItem.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BowlFoodItem.cpp (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BowlFoodItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BucketItem.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/BucketItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CarrotOnAStickItem.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CarrotOnAStickItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ClockItem.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ClockItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CoalItem.cpp (71%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CoalItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ColoredTileItem.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ColoredTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CompassItem.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/CompassItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ComplexItem.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ComplexItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DiggerItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DiggerItem.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DoorItem.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DoorItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DyePowderItem.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/DyePowderItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EggItem.cpp (56%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EggItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EmptyMapItem.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EmptyMapItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnchantedBookItem.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnchantedBookItem.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnderEyeItem.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnderEyeItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnderpearlItem.cpp (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/EnderpearlItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ExperienceItem.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ExperienceItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireChargeItem.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireChargeItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireworksChargeItem.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireworksChargeItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireworksItem.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FireworksItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FishingRodItem.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FishingRodItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FlintAndSteelItem.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FlintAndSteelItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FoodItem.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/FoodItem.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/GoldenAppleItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/GoldenAppleItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HangingEntityItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HangingEntityItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HatchetItem.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HatchetItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HoeItem.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/HoeItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/Item.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/Item.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ItemInstance.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ItemInstance.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/LeafTileItem.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/LeafTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/LeashItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/LeashItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MapItem.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MapItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MilkBucketItem.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MilkBucketItem.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MinecartItem.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MinecartItem.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MultiTextureTileItem.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/MultiTextureTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/NameTagItem.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/NameTagItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PickaxeItem.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PickaxeItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PistonTileItem.cpp (64%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PistonTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PlanterTileItem.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PlanterTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PotionItem.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/PotionItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/Rarity.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/Rarity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/RecordingItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/RecordingItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/RedStoneItem.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/RedStoneItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SaddleItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SaddleItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SaplingTileItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SaplingTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SeedFoodItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SeedFoodItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SeedItem.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SeedItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ShearsItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ShearsItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ShovelItem.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/ShovelItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SignItem.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SignItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SimpleFoiledItem.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SimpleFoiledItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SkullItem.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SkullItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SnowItem.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SnowItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SnowballItem.cpp (60%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SnowballItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SpawnEggItem.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/SpawnEggItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/StoneSlabTileItem.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/StoneSlabTileItem.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/TileItem.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/TileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/UseAnim.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WaterLilyTileItem.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WaterLilyTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WeaponItem.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WeaponItem.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WoolTileItem.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WoolTileItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/WrittenBookItem.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/alchemy/PotionBrewing.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/alchemy/PotionBrewing.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/alchemy/PotionMacros.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ArmorDyeRecipe.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ArmorDyeRecipe.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ArmorRecipes.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ArmorRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ClothDyeRecipes.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ClothDyeRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FireworksRecipe.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FireworksRecipe.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FoodRecipes.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FoodRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FurnaceRecipes.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/FurnaceRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/MapCloningRecipe.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/MapExtendingRecipe.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/OreRecipes.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/OreRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/Recipes.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/Recipes.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/Recipy.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ShapedRecipy.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ShapedRecipy.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ShapelessRecipy.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ShapelessRecipy.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/StructureRecipes.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/StructureRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ToolRecipes.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/ToolRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/WeaponRecipes.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/WeaponRecipes.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowDamageEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowFireEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DamageEnchantment.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DamageEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DigDurabilityEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DiggingEnchantment.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/DiggingEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/Enchantment.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/Enchantment.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentCategory.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentCategory.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentHelper.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentHelper.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentInstance.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/EnchantmentInstance.h (71%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/FireAspectEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/FireAspectEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/KnockbackEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/KnockbackEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/LootBonusEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/LootBonusEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/OxygenEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/OxygenEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ProtectionEnchantment.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ProtectionEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ThornsEnchantment.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/ThornsEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/UntouchingEnchantment.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/UntouchingEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/WaterWorkerEnchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/net.minecraft.world.item.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/Merchant.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/MerchantRecipe.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/MerchantRecipe.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/MerchantRecipeList.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/MerchantRecipeList.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/item/trading/net.minecraft.world.item.trading.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/BaseMobSpawner.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/BaseMobSpawner.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/BlockDestructionProgress.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/BlockDestructionProgress.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Calendar.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Calendar.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/ChunkPos.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/ChunkPos.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Coord.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Explosion.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Explosion.h (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/FoliageColor.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/FoliageColor.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/GameRules.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/GameRules.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/GrassColor.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/GrassColor.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Level.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Level.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelConflictException.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelConflictException.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelListener.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelObjectInputStream.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelSettings.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelSettings.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelType.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LevelType.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/LightLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/MobSpawner.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/MobSpawner.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/PortalForcer.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/PortalForcer.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Region.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/Region.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TickNextTickData.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TickNextTickData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TileEventData.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TileEventData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TilePos.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/TilePos.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/WaterColor.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/WaterColor.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BeachBiome.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BeachBiome.h (60%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/Biome.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/Biome.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeCache.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeCache.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeDecorator.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeDecorator.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeSource.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/BiomeSource.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/DesertBiome.cpp (64%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/DesertBiome.h (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/ExtremeHillsBiome.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/ExtremeHillsBiome.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/FixedBiomeSource.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/FixedBiomeSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/ForestBiome.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/ForestBiome.h (70%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/HellBiome.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/HellBiome.h (59%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/IceBiome.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/IceBiome.h (59%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/JungleBiome.cpp (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/JungleBiome.h (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/MushroomIslandBiome.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/MushroomIslandBiome.h (63%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/OceanBiome.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/PlainsBiome.cpp (54%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/PlainsBiome.h (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/RainforestBiome.cpp (62%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/RainforestBiome.h (70%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/RiverBiome.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/SwampBiome.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/SwampBiome.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TaigaBiome.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TaigaBiome.h (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TheEndBiome.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TheEndBiome.h (73%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TheEndBiomeDecorator.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/TheEndBiomeDecorator.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/WaterlilyFeature.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/WaterlilyFeature.h (62%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/biome/net.minecraft.world.level.biome.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/BlockReplacements.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/BlockReplacements.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/ChunkSource.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/CompressedTileStorage.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/CompressedTileStorage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/DataLayer.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/DataLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/EmptyLevelChunk.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/EmptyLevelChunk.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/LevelChunk.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/LevelChunk.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/ReadOnlyChunkCache.h (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/SparseDataStorage.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/SparseDataStorage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/SparseLightStorage.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/SparseLightStorage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/WaterLevelChunk.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/WaterLevelChunk.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ChunkStorage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/McRegionChunkStorage.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp (73%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/MemoryChunkStorage.h (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/NbtSlotFile.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/NbtSlotFile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/OldChunkStorage.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/OldChunkStorage.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/RegionFile.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/RegionFile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/RegionFileCache.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/RegionFileCache.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZoneFile.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZoneFile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZoneIo.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZoneIo.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/ZonedChunkStorage.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/Dimension.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/Dimension.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/HellDimension.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/HellDimension.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/NormalDimension.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/TheEndDimension.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/TheEndDimension.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/CanyonFeature.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/CanyonFeature.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/CustomLevelSource.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/CustomLevelSource.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/DungeonFeature.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/DungeonFeature.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/FlatLevelSource.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/FlatLevelSource.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/HellFlatLevelSource.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/HellFlatLevelSource.h (64%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/HellRandomLevelSource.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/HellRandomLevelSource.h (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeCaveFeature.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeCaveFeature.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeFeature.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeFeature.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/LargeHellCaveFeature.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/RandomLevelSource.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/RandomLevelSource.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/TownFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BasicTreeFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BirchFeature.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BirchFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/BonusChestFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/CactusFeature.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/CactusFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/CaveFeature.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/CaveFeature.h (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/ClayFeature.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/ClayFeature.h (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/DeadBushFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/DesertWellFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/EndPodiumFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/Feature.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/Feature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/FlowerFeature.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/FlowerFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/GroundBushFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellFireFeature.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellFireFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellPortalFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HellSpringFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HouseFeature.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HouseFeature.h (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/LakeFeature.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/LakeFeature.h (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/LightGemFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/LightGemFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/MegaTreeFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/NetherSphereFeature.h (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/OreFeature.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/OreFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/PineFeature.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/PineFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/PumpkinFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/ReedsFeature.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/ReedsFeature.h (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SandFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SandFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpikeFeature.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpikeFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpringFeature.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpringFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpruceFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SpruceFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/SwampTreeFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/TallGrassFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/TreeFeature.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/TreeFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/VinesFeature.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/VinesFeature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/flat/FlatLayerInfo.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/BlockGenMethods.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/BoundingBox.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/BoundingBox.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftFeature.h (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftPieces.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftStart.cpp (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/MineShaftStart.h (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/NetherBridgePieces.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StrongholdFeature.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StrongholdPieces.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeature.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeature.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeatureIO.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructurePiece.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructurePiece.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureStart.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/StructureStart.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/VillageFeature.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/VillageFeature.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/VillagePieces.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/VillagePieces.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Distort.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Distort.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Emboss.cpp (71%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Emboss.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/FastNoise.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/FastNoise.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/ImprovedNoise.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/PerlinNoise.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/PerlinNoise.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Rotate.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Rotate.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Scale.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Scale.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/SimplexNoise.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/SimplexNoise.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Synth.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/Synth.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/DecorationMaterial.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/GasMaterial.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/LiquidMaterial.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/Material.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/Material.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/MaterialColor.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/MaterialColor.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/PortalMaterial.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/WebMaterial.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/material/net.minecraft.world.level.material.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/net.minecraft.world.level.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddIslandLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/AddSnowLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/BiomeInitLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/DownfallLayer.cpp (65%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/DownfallLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/FlatLayer.cpp (68%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/FlatLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/IslandLayer.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/IslandLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/Layer.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/Layer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RegionHillsLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverInitLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverLayer.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/RiverMixerLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/ShoreLayer.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/ShoreLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SmoothLayer.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SmoothLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/SwampRiversLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp (66%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/TemperatureLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/VoronoiZoom.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/ZoomLayer.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/ZoomLayer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/BinaryHeap.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/BinaryHeap.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/Node.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/Node.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/Path.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/Path.h (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/PathFinder.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/PathFinder.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/redstone/Redstone.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/redstone/Redstone.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/saveddata/MapItemSavedData.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/saveddata/MapItemSavedData.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/saveddata/SavedData.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/saveddata/SavedData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h (100%) create mode 100644 minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DerivedLevelData.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DerivedLevelData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DirectoryLevelStorage.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DirectoryLevelStorage.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/DirectoryLevelStorageSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelData.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelData.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelStorage.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelStorage.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelStorageProfilerDecorator.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelStorageSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelSummary.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/LevelSummary.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/McRegionLevelStorage.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/McRegionLevelStorage.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/McRegionLevelStorageSource.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/McRegionLevelStorageSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MemoryLevelStorage.cpp (67%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MemoryLevelStorage.h (63%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MemoryLevelStorageSource.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MemoryLevelStorageSource.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MockedLevelStorage.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/MockedLevelStorage.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/PlayerIO.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/SavedDataStorage.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/SavedDataStorage.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/storage/net.minecraft.world.level.storage.h (100%) create mode 100644 minecraft/minecraft/world/level/tile/AirTile.cpp rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/AirTile.h (62%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/AnvilTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/AnvilTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BaseEntityTile.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BaseEntityTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BasePressurePlateTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BasePressurePlateTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BaseRailTile.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BaseRailTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BeaconTile.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BeaconTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BedTile.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BedTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BookshelfTile.cpp (65%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BookshelfTile.h (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BrewingStandTile.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/BrewingStandTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ButtonTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ButtonTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CactusTile.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CactusTile.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CakeTile.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CakeTile.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CarrotTile.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CarrotTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CauldronTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CauldronTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ChestTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ChestTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ClayTile.cpp (55%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ClayTile.h (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CocoaTile.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CocoaTile.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ColoredTile.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ColoredTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CommandBlock.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CommandBlock.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ComparatorTile.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ComparatorTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CoralTile.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CoralTile.h (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CropTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/CropTile.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DaylightDetectorTile.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DaylightDetectorTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DeadBushTile.cpp (69%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DeadBushTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DetectorRailTile.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DetectorRailTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DiodeTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DiodeTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DirectionalTile.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DirectionalTile.h (100%) create mode 100644 minecraft/minecraft/world/level/tile/DirtTile.cpp rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DirtTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DispenserTile.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DispenserTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DoorTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DoorTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DropperTile.cpp (73%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/DropperTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EggTile.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EggTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EnchantmentTableTile.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EnchantmentTableTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EnderChestTile.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EnderChestTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/EntityTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FarmTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FarmTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FenceGateTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FenceGateTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FenceTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FenceTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FireTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FireTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FlowerPotTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FlowerPotTile.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FurnaceTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/FurnaceTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GlassTile.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GlassTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GlowstoneTile.cpp (77%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GlowstoneTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GrassTile.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GrassTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GravelTile.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/GravelTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HalfSlabTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HalfSlabTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HalfTransparentTile.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HalfTransparentTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HayBlockTile.cpp (67%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HayBlockTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HeavyTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HeavyTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HopperTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HopperTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HugeMushroomTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/HugeMushroomTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/IceTile.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/IceTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/JukeboxTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/JukeboxTile.h (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LadderTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LadderTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LeafTile.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LeafTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LevelEvent.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LeverTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LeverTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTileDynamic.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTileDynamic.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTileStatic.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LiquidTileStatic.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LockedChestTile.cpp (65%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/LockedChestTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MelonTile.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MelonTile.h (100%) create mode 100644 minecraft/minecraft/world/level/tile/MetalTile.cpp rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MetalTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MobSpawnerTile.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MobSpawnerTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MushroomPlantTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MushroomPlantTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MycelTile.cpp (84%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/MycelTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NetherWartTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NetherWartTile.h (100%) create mode 100644 minecraft/minecraft/world/level/tile/NetherrackTile.cpp rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NetherrackTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NotGateTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NotGateTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NoteBlockTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/NoteBlockTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ObsidianTile.cpp (65%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ObsidianTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/OreTile.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/OreTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PlantTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PlantTile.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PortalTile.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PortalTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PotatoTile.cpp (80%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PotatoTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PoweredMetalTile.cpp (67%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PoweredMetalTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PoweredRailTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PoweredRailTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PressurePlateTile.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PressurePlateTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PumpkinTile.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/PumpkinTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/QuartzBlockTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/QuartzBlockTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RailTile.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RailTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedStoneDustTile.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedStoneDustTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedStoneOreTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedStoneOreTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedlightTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RedlightTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ReedTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ReedTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RepeaterTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RepeaterTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RotatedPillarTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/RotatedPillarTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SandStoneTile.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SandStoneTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SaplingPlantTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SaplingPlantTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SignTile.cpp (85%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SignTile.h (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SkullTile.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SkullTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SmoothStoneBrickTile.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SmoothStoneBrickTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SnowTile.cpp (67%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SnowTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SoulSandTile.cpp (64%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SoulSandTile.h (100%) create mode 100644 minecraft/minecraft/world/level/tile/SpongeTile.cpp rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/SpongeTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StainedGlassBlock.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StainedGlassBlock.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StainedGlassPaneBlock.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StainedGlassPaneBlock.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StairTile.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StairTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StemTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StemTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneButtonTile.cpp (52%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneButtonTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneMonsterTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneMonsterTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneSlabTile.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneSlabTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneTile.cpp (58%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/StoneTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TallGrassPlantTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TallGrassPlantTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TheEndPortalFrameTile.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TheEndPortalFrameTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ThinFenceTile.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/ThinFenceTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/Tile.cpp (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/Tile.h (99%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TntTile.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TntTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TopSnowTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TopSnowTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TorchTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TorchTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TransparentTile.cpp (83%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TransparentTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TrapDoorTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TrapDoorTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TreeTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TreeTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TripWireSourceTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TripWireSourceTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TripWireTile.cpp (89%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/TripWireTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/VineTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/VineTile.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WallTile.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WallTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WaterLilyTile.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WaterLilyTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WebTile.cpp (72%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WebTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WeightedPressurePlateTile.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WeightedPressurePlateTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodButtonTile.cpp (51%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodButtonTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodSlabTile.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodSlabTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodTile.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoodTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoolCarpetTile.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WoolCarpetTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WorkbenchTile.cpp (76%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/WorkbenchTile.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/BeaconTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/BeaconTileEntity.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/BrewingStandTileEntity.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/ChestTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/ChestTileEntity.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/CommandBlockEntity.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/CommandBlockEntity.h (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/ComparatorTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp (75%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DispenserTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DispenserTileEntity.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DropperTileEntity.cpp (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/DropperTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp (87%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/EnderChestTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/FurnaceTileEntity.h (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/Hopper.h (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/HopperTileEntity.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/HopperTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/MusicTileEntity.cpp (81%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/MusicTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/PistonMovingTileEntity.h (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp (93%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/PistonPieceTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/SignTileEntity.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/SignTileEntity.h (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/SkullTileEntity.cpp (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/SkullTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TheEndPortalTile.cpp (88%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TheEndPortalTile.h (91%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TileEntity.cpp (79%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/TileEntity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/net.minecraft.world.level.tile.h (92%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/piston/PistonBaseTile.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/piston/PistonBaseTile.h (98%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/piston/PistonExtensionTile.cpp (94%) rename minecraft/{Minecraft.World/net => }/minecraft/world/level/tile/piston/PistonExtensionTile.h (96%) create mode 100644 minecraft/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h rename minecraft/{Minecraft.World/net => }/minecraft/world/net.minecraft.world.ContainerListener.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/net.minecraft.world.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/AABB.cpp (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/AABB.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/HitResult.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/HitResult.h (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/Vec3.cpp (96%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/Vec3.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/phys/net.minecraft.world.phys.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Objective.cpp (90%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Objective.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/PlayerTeam.cpp (95%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/PlayerTeam.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Score.cpp (86%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Score.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/ScoreHolder.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Scoreboard.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Scoreboard.h (97%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/ScoreboardSaveData.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Team.cpp (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/Team.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/DummyCriteria.cpp (82%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/DummyCriteria.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/HealthCriteria.cpp (74%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/HealthCriteria.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/ObjectiveCriteria.cpp (78%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/ObjectiveCriteria.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h (100%) rename minecraft/{Minecraft.World/net => }/minecraft/world/scores/net.minecraft.world.scores.h (100%) diff --git a/.github/workflows/build-doxygen.yml b/.github/workflows/build-doxygen.yml index 51fbce205..f8dbca6ca 100644 --- a/.github/workflows/build-doxygen.yml +++ b/.github/workflows/build-doxygen.yml @@ -6,7 +6,7 @@ on: paths: - "Minecraft.Assets/**" - "Minecraft.Client/**" - - "Minecraft.World/**" + - "minecraft/**" - "docs/**" jobs: diff --git a/meson.build b/meson.build index eb83ff943..1d6c1dab4 100644 --- a/meson.build +++ b/meson.build @@ -73,6 +73,6 @@ subdir('minecraft/4J.Input') subdir('minecraft/4J.Profile') subdir('minecraft/4J.Storage') subdir('minecraft/Minecraft.Assets') -subdir('minecraft/Minecraft.World') +subdir('minecraft/minecraft') subdir('minecraft/Minecraft.Client') diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index a7bddbb81..ef77c6f1d 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/Recipy.h" #include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.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" @@ -12,14 +12,14 @@ #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.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#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" @@ -35,11 +35,11 @@ #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/net/minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelSettings.h" #include "Minecraft.Client/net/minecraft/client/User.h" #include -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#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 "console_helpers/compression.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h index 67af236e6..30c7b8de1 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.h +++ b/minecraft/Minecraft.Client/Common/Consoles_App.h @@ -13,7 +13,7 @@ #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" @@ -21,7 +21,7 @@ #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" #include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/item/MinecartHopper.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" diff --git a/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h index be38ff46c..f26c680fb 100644 --- a/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" class File; diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp index a556c74f6..159b0cf47 100644 --- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp @@ -13,17 +13,17 @@ #include #include "console_helpers/PathHelper.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/util/Mth.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/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/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #if defined(__linux__) #define STB_VORBIS_HEADER_ONLY diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h index 2a82de7a2..8f16ba231 100644 --- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h @@ -7,7 +7,7 @@ class Random; using namespace std; #include -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "miniaudio.h" #include "Minecraft.Client/Common/App_Defines.h" #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp index ad1ca0b50..63fe2f80d 100644 --- a/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp @@ -1,5 +1,5 @@ #include "Consoles_SoundEngine.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { L"mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 77ac35770..310ed8424 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -5,13 +5,13 @@ #include "ApplySchematicRuleDefinition.h" #include "LevelGenerationOptions.h" #include "ConsoleSchematicFile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index fa6a52407..979ae67e0 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -5,9 +5,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "ConsoleSchematicFile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class AABB; class Vec3; diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index b4ab7855c..6db3b8512 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -11,10 +11,10 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/Direction.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "java/InputOutputStream/DataOutputStream.h" ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h index 38f494b49..f6189a46e 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -3,9 +3,9 @@ #include #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; class Random; diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 804706534..645fa3364 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -8,17 +8,17 @@ #include "ConsoleSchematicFile.h" #include "console_helpers/compression.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" -#include "Minecraft.World/net/minecraft/world/entity/Painting.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/Painting.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 4da479709..958283e76 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -13,7 +13,7 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Level; class DataOutputStream; diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index a8eee781c..f0f923a3b 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -5,10 +5,10 @@ #include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/Pos.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "LevelGenerationOptions.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h index 65536d49e..1cb35dec6 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -5,7 +5,7 @@ #include -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h index 5d7687607..104b2dfaf 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h @@ -4,7 +4,7 @@ #include #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class StartFeature : public GameRuleDefinition { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index cf829b5d3..2ee40b431 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index 95d3c211c..1aaf30909 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index efb8c3762..056680269 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -7,12 +7,12 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { m_tile = Tile::chest_Id; diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 9a3dba06b..60f79a334 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -4,11 +4,11 @@ #include "XboxStructureActionPlaceSpawner.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" #include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 307b90b1a..df8d10f40 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -6,12 +6,12 @@ #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" #include "java/InputOutputStream/DataOutputStream.h" AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index d993fdf2e..0ccebf182 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -5,10 +5,10 @@ #include "AddEnchantmentRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" #include "java/InputOutputStream/DataOutputStream.h" AddItemRuleDefinition::AddItemRuleDefinition() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 296031486..df4dac2c6 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,12 +1,12 @@ #include "console_helpers/StringHelpers.h" #include "CollectItemRuleDefinition.h" -#include "Minecraft.World/net/minecraft/network/Connection.h" +#include "minecraft/network/Connection.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "minecraft/world/item/ItemInstance.h" #include "java/InputOutputStream/DataOutputStream.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 24a5092c9..b04078ec2 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -4,13 +4,13 @@ #include "CompleteAllRuleDefinition.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/network/Connection.h" +#include "minecraft/network/Connection.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" void CompleteAllRuleDefinition::getChildren( std::vector* children) { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 75c0d686b..6996580b3 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index d5e583331..667da161c 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition : public GameRuleDefinition { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index b1bf30dcb..2ae159b7d 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -2,15 +2,15 @@ #include #include "UpdatePlayerRuleDefinition.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/Pos.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodData.h" #include "java/InputOutputStream/DataOutputStream.h" UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() { diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index dac36ab02..4e6194495 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/Pos.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index 8b07df8dc..e5a1ffc44 100644 --- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -6,13 +6,13 @@ #include #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" #include "Socket.h" #include "console_helpers/ThreadName.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" +#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" @@ -23,9 +23,9 @@ #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.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.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" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp index 00ef900b3..12d1e0631 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp @@ -3,9 +3,9 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h index 11acf7f06..a05a30507 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h @@ -1,7 +1,7 @@ #pragma once #include "TutorialConstraint.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class AABB; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp index 5714b3e2e..7186c63ad 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -4,16 +4,16 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ChangeStateConstraint.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/net/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" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/phys/Vec3.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial* tutorial, eTutorial_State targetState, diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h index 8973910e1..41a346ea2 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h @@ -4,7 +4,7 @@ #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "TutorialConstraint.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class AABB; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp index 3428d3c40..34d65fc61 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp @@ -2,18 +2,18 @@ #include "4J.Common/4J_InputActions.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.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/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h" #include "FullTutorial.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" +#include "minecraft/world/item/alchemy/PotionMacros.h" FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) : Tutorial(iPad, true) { diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp index 7f6c8d542..295a5f66b 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp @@ -3,10 +3,10 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaHint.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h index faae17b7f..47151989b 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h @@ -2,7 +2,7 @@ #include "TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class AABB; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp index 9720856a1..508748faa 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "DiggerItemHint.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp index 2d0b67da1..27d7fbb63 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp @@ -3,7 +3,7 @@ #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "LookAtTileHint.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/item/Item.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, int tiles[], unsigned int tilesLength, diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp index 4492f0eeb..1602d628f 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp @@ -3,7 +3,7 @@ #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TakeItemHint.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], unsigned int itemsLength) diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp index e26c9a227..9db8b2b8d 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/net/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/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Entity; class ItemInstance; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp index bdcc29933..e373496f2 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -5,7 +5,7 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "ChoiceTask.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp index 87908144c..ceda9381a 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" #include "CompleteUsingItemTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp index 08c7d718d..780dfe75f 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp @@ -4,7 +4,7 @@ #include "CraftTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Tutorial; class TutorialConstraint; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp index 96d19cad2..e15d76561 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/animal/EntityHorse.h" #include "HorseChoiceTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp index 336dc82f7..bc9ee4fb4 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp @@ -7,7 +7,7 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "InfoTask.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp index f563f7100..90e2335ee 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp @@ -1,7 +1,7 @@ #include #include "PickupTask.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" void PickupTask::onTake(std::shared_ptr item, unsigned int invItemCountAnyAux, diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp index 167ed9b9d..40e27aae4 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp @@ -2,7 +2,7 @@ #include "RideEntityTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp index 6cb5bd368..6f975e54e 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" #include "UseItemTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp index f5455d2f7..49fbea800 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" #include "UseTileTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h index 0bf06c950..760b53885 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h @@ -2,7 +2,7 @@ #include #include "TutorialTask.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/Recipy.h" class Tutorial; class TutorialConstraint; diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp index 60c4dd3db..c34ec72c4 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp @@ -1,14 +1,14 @@ #include "Minecraft.Client/include/stdafx.h" #include "console_helpers/PlatformTime.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "minecraft/stats/net.minecraft.stats.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.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" diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp index 1ae59e168..6815ea99c 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp @@ -1,16 +1,16 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #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.World/net/minecraft/world/entity/player/Inventory.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/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" class ClientConnection; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h index 307ab94ca..cd6e237ec 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h @@ -3,7 +3,7 @@ #include "UIEnums.h" #include "UIStructs.h" #include "4J_Storage.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" // 4J Stu - An interface class that defines all the public functions that we use // within the game code. This allows us to build the Xbox 360 version without 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 98531b62e..adfe47f74 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 @@ -4,11 +4,11 @@ #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#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" 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 dd1507b69..3c90704ac 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 @@ -1,9 +1,9 @@ #include "Minecraft.Client/include/stdafx.h" #include "IUIScene_AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "java/InputOutputStream/InputOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h index 857557f60..e64ae39ac 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h @@ -1,6 +1,6 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" // The 0-indexed slot in the inventory list that lines up with the result slot #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5 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 77dc82639..5d8d9a90f 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 @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#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" @@ -11,9 +11,9 @@ #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" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp index f32db1cb6..15f7dcdda 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_BrewingMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" +#include "minecraft/world/inventory/BrewingStandMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection(ESceneSection eSection, 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 0bd8ce8e8..a96df4d46 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,10 +1,10 @@ #include -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#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 "IUIScene_CommandBlockMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h index 82bf697c5..0549e6647 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" class CommandBlockEntity; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp index a12122bd1..3249f69f1 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_ContainerMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection(ESceneSection eSection, 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 3cf4863f3..2343217c1 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 @@ -1,9 +1,9 @@ #include "Minecraft.Client/include/stdafx.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#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 "IUIScene_CraftingMenu.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" 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 7a19c7ca9..dc1c91be5 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 @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#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" 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 120b4924f..0952fa9c8 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 @@ -6,15 +6,15 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.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" +#include "minecraft/world/item/net.minecraft.world.item.h" +#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.World/net/minecraft/world/item/alchemy/PotionMacros.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_CreativeMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h index b63f25758..a777e264f 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h @@ -1,6 +1,6 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" // 4J Stu - This class is for code that is common between XUI and Iggy class SimpleContainer; 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 5c6ce4c20..4c8b1e707 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 @@ -5,8 +5,8 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" class Player; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp index a72a38c3c..7d96b0608 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_FireworksMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h" +#include "minecraft/world/inventory/FireworksMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp index 0a3858137..cf770afaf 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_FurnaceMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h" +#include "minecraft/world/inventory/FurnaceMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection(ESceneSection eSection, 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 38dde5bec..96d66aa66 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 @@ -9,16 +9,16 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp index 7f12b0894..a024700e9 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_HopperMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" +#include "minecraft/world/inventory/HopperMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HopperMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h index b17cad9ea..c4f7f93de 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h @@ -1,8 +1,8 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" class IUIScene_HopperMenu : public virtual IUIScene_AbstractContainerMenu { public: diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index 558de5ba6..c6d9c38e5 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_HorseInventoryMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/animal/EntityHorse.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h index a7d7feb7f..40de92f80 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h @@ -3,9 +3,9 @@ #include #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/animal/EntityHorse.h" class Container; class EntityHorse; diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp index 3fe7cd86f..4b90c3060 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_InventoryMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection(ESceneSection eSection, 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 02d349231..9710dca83 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 @@ -8,8 +8,8 @@ #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.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.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" 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 19714b279..d271ca159 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 @@ -1,9 +1,9 @@ #include "Minecraft.Client/include/stdafx.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h index 501f195ee..ba0a72ce3 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/item/Rarity.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/item/Rarity.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" class MerchantRecipe; 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 00c2f84dd..a87bec92d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp @@ -8,8 +8,8 @@ #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/LevelData.h" UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData, UILayer* parentLayer) 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 595cde6a1..19e6bffb1 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -6,7 +6,7 @@ #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, UILayer* parentLayer) 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 0673cb1e3..5aa237128 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp @@ -4,11 +4,11 @@ #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.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.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" 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 3404fe2d2..0079b1e6d 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -11,9 +11,9 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" +#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" 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 370a071bc..fb70c8af0 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -16,8 +16,8 @@ #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { 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 603ed039c..5276cc3d9 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -11,10 +11,10 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/EntityHorse.h" // #include -// "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h" +// "../../../minecraft/net.minecraft.world.entity.animal.EntityHorse.h" #include "UIControl_MinecraftHorse.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 cca43a1fe..366b3f6d4 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -16,7 +16,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp index 840c4ede2..a081d45ec 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp @@ -5,7 +5,7 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" UIControl_Slider::UIControl_Slider() { m_id = 0; diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 9e55e9cfc..b86897055 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -10,8 +10,8 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class UILayer; #ifdef _DEBUG_MENUS_ENABLED 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 e7887a865..ae2eabd62 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 @@ -10,15 +10,15 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/TimeCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/commands/common/EnchantItemCommand.h" +#include "minecraft/commands/common/GiveItemCommand.h" +#include "minecraft/commands/common/TimeCommand.h" +#include "minecraft/commands/common/ToggleDownfallCommand.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/level/storage/LevelData.h" class Player; class UILayer; 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 6a96b4c5c..ef2fa12ef 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 @@ -9,7 +9,7 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class UILayer; #ifdef _DEBUG_MENUS_ENABLED 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 8632592a9..95d35f324 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 @@ -6,10 +6,10 @@ #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.World/net/minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelSettings.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.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/Common/src/DLC/DLCPack.h" 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 82f75ffa5..5d6c091ae 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 @@ -5,8 +5,8 @@ #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.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/net.minecraft.world.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index d4a099e9c..a9fc87de7 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LeaderboardsMenu.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 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 4eab0aebc..34a6621b4 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 @@ -5,7 +5,7 @@ #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.World/net/minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelSettings.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" 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 0d91cb2ec..c8b5071f6 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 @@ -6,12 +6,12 @@ #include "UIScene_LoadOrJoinMenu.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#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" 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 a4111aa9d..d60012abf 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 @@ -1,5 +1,5 @@ -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/User.h" 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 85461f259..2c571fb2a 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 @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#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/Common/src/Tutorial/TutorialMode.h" 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 18eae3db8..70ac348b9 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 @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.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 "console_helpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index 4a81a7bb3..b4ee0998e 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -2,7 +2,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/MerchantMenu.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "4J_Input.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 4680b7d37..92c7177c0 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 @@ -1,8 +1,8 @@ #include "Minecraft.Client/include/stdafx.h" #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.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 "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 5bffd0893..a02969686 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 @@ -9,10 +9,10 @@ #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/inventory/BrewingStandMenu.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" class UILayer; 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 ba2d3b464..a2e6dc6f7 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 @@ -9,9 +9,9 @@ #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/ContainerMenu.h" class UILayer; 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 7a88d62ed..8d7f76a4b 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 @@ -12,8 +12,8 @@ #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/SimpleContainer.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" 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 7c0b6e000..1a29d983b 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 @@ -9,8 +9,8 @@ #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/inventory/TrapMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/inventory/TrapMenu.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" class UILayer; 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 b0a1b59e5..af9b3ae8b 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 @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.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 "UIScene_EnchantingMenu.h" 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 fafba59af..b5d48762d 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 @@ -1,8 +1,8 @@ #include "Minecraft.Client/include/stdafx.h" #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.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 "UIScene_FireworksMenu.h" 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 404d59e67..12b778b76 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 @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.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 "UIScene_FurnaceMenu.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 ce53a72b1..26f7817f3 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 @@ -9,9 +9,9 @@ #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/HopperMenu.h" class UILayer; 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 43189c73e..b61ba875d 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 @@ -10,10 +10,10 @@ #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/HorseInventoryMenu.h" class UILayer; 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 df021049e..fd05faf55 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 @@ -2,10 +2,10 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index ac70e8fb9..ed491bd66 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -4,7 +4,7 @@ #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffect.h" class InventoryMenu; 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 1c1df6a28..1eeba9cbf 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 @@ -1,9 +1,9 @@ #include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/util/HtmlString.h" +#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 "console_helpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" 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 0392e6c1d..5e45160c4 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 @@ -2,7 +2,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.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, 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 91a3f05fd..acb324d92 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 @@ -4,8 +4,8 @@ #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.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/network/net.minecraft.network.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu( int iPad, void* initData, UILayer* parentLayer) 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 1bcf2c25f..544af0c85 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 @@ -3,7 +3,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameInfoMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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" 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 28e86713a..2929c96d7 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 @@ -4,7 +4,7 @@ #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.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" #define CHECKBOXES_TIMER_ID 0 #define CHECKBOXES_TIMER_TIME 100 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 81c0fc017..4d8fc86d2 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 @@ -6,8 +6,8 @@ #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.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.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" UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData, 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 b4405d6a2..9c5ee8be3 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 @@ -2,7 +2,7 @@ #include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_TeleportMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp index 971686143..3dabf0191 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "console_helpers/PlatformTime.h" #include "UIController.h" #include "UI.h" @@ -9,7 +9,7 @@ #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.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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" diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp index 3d69b4f5f..f233b0ba4 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -18,9 +18,9 @@ #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/item/ItemInstance.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.cpp b/minecraft/Minecraft.Client/Linux/Linux_App.cpp index 131cd46e9..8e0b56c39 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp @@ -5,7 +5,7 @@ #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.World/net/minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelSettings.h" #include "Linux_App.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "4J_Profile.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index d533425cf..304292dac 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -38,16 +38,16 @@ static void sigsegv_handler(int sig) { #endif #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/locale/Language.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" +#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" @@ -62,7 +62,7 @@ static void sigsegv_handler(int sig) { #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_Defines.h" diff --git a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp index 909af852d..f1d152a23 100644 --- a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp +++ b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/stdafx.h" // 4J +#include "minecraft/stdafx.h" // 4J // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools // diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp index 5fac51455..1d6a63931 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -7,16 +7,16 @@ #include #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/locale/Language.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" +#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" @@ -34,7 +34,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "../Resource.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" HINSTANCE hMyInst; LRESULT CALLBACK DlgProc(HWND hWndDlg, uint32_t Msg, WPARAM wParam, diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp index e035d4745..cbeaa919e 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp @@ -5,10 +5,10 @@ #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.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/LevelType.h" #include "Windows64_App.h" CConsoleMinecraftApp app; diff --git a/minecraft/Minecraft.Client/meson.build b/minecraft/Minecraft.Client/meson.build index b22e578e9..05a4c9a7f 100644 --- a/minecraft/Minecraft.Client/meson.build +++ b/minecraft/Minecraft.Client/meson.build @@ -53,7 +53,7 @@ client_dependencies = [ storage_dep, assets_localisation_dep, platform_dep, - world_dep, + minecraft_dep, gl_dep, glu_dep, thread_dep, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp index 807969395..fca7b13d7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp @@ -5,15 +5,15 @@ #include "Camera.h" #include "MemoryTracker.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/level/TilePos.h" #include "Minecraft.Client/Linux/Stubs/d3d11_stubs.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/Vec3.h" #include "java/FloatBuffer.h" #include "Minecraft.Client/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp index 61273c2bd..11f69a866 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp @@ -2,7 +2,7 @@ #include "Lighting.h" #include "java/FloatBuffer.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index 931b75201..e70c03ab4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -43,33 +43,33 @@ #include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" #include "Camera.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/stats/net.minecraft.stats.h" #include "java/System.h" #include "java/ByteBuffer.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/StaticConstructors.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#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.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.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" +#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "minecraft/world/entity/npc/Villager.h" +#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/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Common/src/UI/UIFontData.h" @@ -85,7 +85,7 @@ #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" +#include "minecraft/world/item/alchemy/PotionMacros.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h index afd305d6d..3ec1e2d07 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h @@ -41,7 +41,7 @@ class MultiPlayerGameMode; class LivingEntity; #include "java/File.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" #include "console_helpers/C4JThread.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp index c6402becc..a52a31d0d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp @@ -2,7 +2,7 @@ #include "KeyMapping.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/InputStreamReader.h" @@ -12,7 +12,7 @@ #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "minecraft/locale/I18n.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h index 539d2730b..2bd436198 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/net/minecraft/util/ProgressListener.h" +#include "minecraft/util/ProgressListener.h" class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.cpp b/minecraft/Minecraft.Client/net/minecraft/client/User.cpp index 5940a9cc0..6efd1ff35 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/User.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/User.cpp @@ -1,10 +1,10 @@ #include #include "User.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector User::allowedTiles; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp index 346854798..2f62d9741 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp @@ -2,7 +2,7 @@ #include "ChatScreen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/SharedConstants.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp index 33f373ee3..adaea08aa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp @@ -2,7 +2,7 @@ #include "ConfirmScreen.h" #include "SmallButton.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/gui/Button.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp index 3f4298bf7..818989738 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp @@ -3,7 +3,7 @@ #include "ControlsScreen.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "SmallButton.h" -#include "Minecraft.World/net/minecraft/locale/Language.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp index a1abfd022..d4faefa92 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp @@ -7,7 +7,7 @@ #include "EditBox.h" #include "Button.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "MessageScreen.h" @@ -18,9 +18,9 @@ #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/locale/Language.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/chunk/ChunkSource.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp index 76fc320d4..7f338ed0a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp @@ -1,5 +1,5 @@ #include "EditBox.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "Minecraft.Client/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp index 7039da466..4c5525115 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp @@ -6,13 +6,13 @@ #include "EnchantmentScreen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" +#include "minecraft/world/inventory/Slot.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h index 841112737..7a2cd5a84 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h @@ -5,7 +5,7 @@ #include #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" #include "java/Random.h" class EnchantmentMenu; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp index 652520411..58838dd25 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp @@ -12,7 +12,7 @@ #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" Font::Font(Options* options, const std::wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation* textureLocation, int cols, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp index c5d0f7adf..c12431173 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp @@ -12,31 +12,31 @@ #include "ChatScreen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/food/net.minecraft.world.food.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "java/System.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.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.World/net/minecraft/util/Mth.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/HopperScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp index 203205fba..16094c8f5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp @@ -2,9 +2,9 @@ #include "HopperScreen.h" #include "Font.h" -#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#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" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp index 194db0fb9..a47dd7754 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp @@ -6,7 +6,7 @@ #include "Button.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/locale/Language.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/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp index 390de9604..33d06d79d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -5,7 +5,7 @@ #include "EditBox.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/locale/Language.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/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp index ef3d55eb5..6dc6a8944 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp @@ -5,16 +5,16 @@ #include "MerchantScreen.h" #include "TradeSwitchButton.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.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 "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/world/entity/player/Inventory.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h index 828233d55..332aa9248 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h @@ -3,8 +3,8 @@ #include #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" class TradeSwitchButton; class Inventory; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp index 7aa41368b..02df7336d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp @@ -13,9 +13,9 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/material/MaterialColor.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" int Minimap::LUT[256]; // 4J added bool Minimap::genLUT = true; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h index f65d28b0a..5e306f889 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "minecraft/world/item/MapItem.h" class Options; class Font; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp index 1ade5f896..eff4d2dee 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/net/minecraft/client/Options.h" #include "ControlsScreen.h" #include "VideoSettingsScreen.h" -#include "Minecraft.World/net/minecraft/locale/Language.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp index 517c3b502..58bf2666e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp @@ -15,7 +15,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "minecraft/locale/I18n.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp index 158cd24ae..ba4a1f98d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp @@ -4,8 +4,8 @@ #include "EditBox.h" #include "Button.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.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/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp index 55b3730db..952ccc5a4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp @@ -5,15 +5,15 @@ #include "RepairScreen.h" #include "EditBox.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.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 "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/locale/Language.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/world/entity/player/Abilities.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h index 550018b07..61d99620e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h @@ -4,9 +4,9 @@ #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" class EditBox; class AnvilMenu; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp index f9fc6b413..e03db7ca1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp @@ -1,7 +1,7 @@ #include "Screen.h" #include "Button.h" #include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "4J_Profile.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp index c1cc792e6..8c304353c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp @@ -11,9 +11,9 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp index 5024f30c0..cb609fb24 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp @@ -4,7 +4,7 @@ #include "SmallButton.h" #include "SlideButton.h" #include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.World/net/minecraft/locale/Language.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp index a54f1274e..b9806240d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -4,8 +4,8 @@ #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "java/System.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" -#include "Minecraft.World/net/minecraft/stats/Achievement.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp index b5d515bed..a5a88029b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -8,8 +8,8 @@ #include "Minecraft.Client/net/minecraft/client/KeyMapping.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" -#include "Minecraft.World/net/minecraft/stats/Achievement.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h index 71d821b83..70b6f0105 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h @@ -1,7 +1,7 @@ #pragma once #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/stats/Achievements.h" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/stats/Achievements.h" class StatsCounter; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp index e5449a86f..f5addffa7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp @@ -5,12 +5,12 @@ #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/stats/ItemStat.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/stats/Stats.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/locale/I18n.h" +#include "minecraft/locale/Language.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 3d5d21b89..a68068a35 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -7,10 +7,10 @@ #include "Minecraft.Client/net/minecraft/client/KeyMapping.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/Rarity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp index c4a94d513..7ce9061a6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -2,7 +2,7 @@ #include "BeaconCancelButton.h" #include "BeaconScreen.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index c9a4cbd47..4c36a20ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -2,7 +2,7 @@ #include "BeaconConfirmButton.h" #include "BeaconScreen.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp index b1196c70a..d6f91fbf8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -2,7 +2,7 @@ #include "BeaconPowerButton.h" #include "BeaconScreen.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffect.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h index b60cf8a1f..6752a727c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.h @@ -1,6 +1,6 @@ #pragma once #include "AbstractBeaconButton.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" class BeaconScreen; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp index a85f8700d..8eb16f9fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -13,12 +13,12 @@ #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/locale/Language.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/world/effect/MobEffect.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h index 4126aabbf..725b232cd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h @@ -3,8 +3,8 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" class BeaconConfirmButton; class BeaconCancelButton; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp index 8654b4bfb..165496590 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -2,9 +2,9 @@ #include #include "BrewingStandScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h index 5a005cff5..145eb526c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h @@ -3,8 +3,8 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/inventory/BrewingStandMenu.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" class BrewingStandMenu; class BrewingStandTileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp index 3492d0a78..c3e68123f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -1,6 +1,6 @@ #include "ContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/inventory/ContainerMenu.h" #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" ContainerScreen::ContainerScreen(std::shared_ptr inventory, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp index f6101f332..1f42875a1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp @@ -2,10 +2,10 @@ #include "CraftingScreen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingMenu.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 16f2b86cd..08032c89d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -3,19 +3,19 @@ #include #include "CreativeInventoryScreen.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#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.World/net/minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/player/Player.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h index 142b6c6c2..d081244e6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -3,7 +3,7 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp index 7dfd427af..fdafac4b5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp @@ -2,9 +2,9 @@ #include "FurnaceScreen.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.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" #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index d247b7e4b..0463b0e82 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -1,9 +1,9 @@ #include #include "HorseInventoryScreen.h" -#include "Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h index 9c532bb22..f0674e751 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h @@ -2,7 +2,7 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" class Container; class EntityHorse; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp index 7b6fce1c1..8c08bd0ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -7,8 +7,8 @@ #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.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp index 6bafa5df1..93c72b442 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -5,11 +5,11 @@ #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.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/SharedConstants.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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/include/stubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp index 81428eed3..627f14c25 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp @@ -1,9 +1,9 @@ #include #include "TrapScreen.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/TrapMenu.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp index 86d4d4c58..9b630bf70 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp @@ -1,8 +1,8 @@ #include "DemoLevel.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/storage/LevelData.h" class LevelStorage; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h index 31bdf3df3..b3c0a3b49 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/Level.h" class Dimension; class LevelSettings; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp index a2cda41d2..0fcc5c2bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp @@ -4,8 +4,8 @@ #include "BatModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/Bat.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ambient/Bat.h" #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" BatModel::BatModel() : Model() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp index 1e5056a65..f607d1c1c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp @@ -3,8 +3,8 @@ #include #include "HumanoidModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.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 "4J.Render/4J_Render.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp index 48f88e185..58c1dcc9b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp @@ -2,8 +2,8 @@ #include "LavaSlimeModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/monster/LavaSlime.h" +#include "minecraft/world/entity/LivingEntity.h" LavaSlimeModel::LavaSlimeModel() { for (int i = 0; i < BODYCUBESLENGTH; i++) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp index 0aaa29f3a..697f14d5b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp @@ -3,15 +3,15 @@ #include #include -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "ModelHorse.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" ModelHorse::ModelHorse() { texWidth = 128; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp index cab74a860..da5b0a323 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp @@ -6,8 +6,8 @@ #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "OcelotModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Ocelot.h" const float OcelotModel::xo = 0; const float OcelotModel::yo = 16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp index f8eb90600..01e6eea53 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp @@ -4,7 +4,7 @@ #include "Vertex.h" #include "Polygon.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" _Polygon::_Polygon(const std::span vertices) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp index 141fe23c6..24197f38f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp @@ -2,8 +2,8 @@ #include "SheepFurModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Sheep.h" #include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp index 66e65ba04..e641affa6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp @@ -2,8 +2,8 @@ #include "SheepModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Sheep.h" #include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" SheepModel::SheepModel() : QuadrupedModel(12, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp index f12d72517..ae92afdcc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp @@ -2,8 +2,8 @@ #include "SkeletonModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/monster/Skeleton.h" #include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" void SkeletonModel::_init(float g) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h b/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h index e88ebf242..830f026c7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/Vertex.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Vertex { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp index da0116c4a..05510b0e8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp @@ -4,8 +4,8 @@ #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "VillagerGolemModel.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" VillagerGolemModel::VillagerGolemModel(float g, float yOffset) { int xTexSize = 128; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp index 1d66f3f08..7f6343943 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp @@ -5,9 +5,9 @@ #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "WitchModel.h" #include "VillagerModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/util/Mth.h" WitchModel::WitchModel(float g) : VillagerModel(g, 0, 64, 128) { mole = (new ModelPart(this))->setTexSize(64, 128); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp index 77aef7fd5..ebb1ccdc5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp @@ -1,7 +1,7 @@ #include #include "WitherBossModel.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" +#include "minecraft/world/entity/boss/wither/WitherBoss.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" WitherBossModel::WitherBossModel() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp index 4c5e95d49..461c06d9d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp @@ -3,10 +3,10 @@ #include #include "WolfModel.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" +#include "minecraft/world/entity/animal/Wolf.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/LivingEntity.h" #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" WolfModel::WolfModel() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h index 083ad0e26..c418cae8c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h @@ -1,6 +1,6 @@ #pragma once #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp index 1718cd5dc..11ac76a91 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp @@ -1,8 +1,8 @@ #include "Minecraft.Client/include/stdafx.h" #include "DragonModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" DragonModel::DragonModel(float g) : Model() { // 4J-PB diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 0192095ca..718fddfbb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -12,32 +12,32 @@ #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.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/Pos.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" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" +#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/food/net.minecraft.world.food.h" +#include "minecraft/SharedConstants.h" +#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" @@ -45,7 +45,7 @@ #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.World/net/minecraft/sounds/SoundTypes.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/Common/src/UI/UI.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h index bdbe38e3b..f60bf5692 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" +#include "minecraft/network/net.minecraft.network.h" #include "4J_Storage.h" class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp index 5c75a08a7..a325f6a75 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp @@ -7,8 +7,8 @@ #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.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/locale/Language.h" +#include "minecraft/network/packet/PreLoginPacket.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::wstring& ip, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp index 85762c2d2..473970a15 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp @@ -3,7 +3,7 @@ #include "DisconnectedScreen.h" #include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" #include "Minecraft.Client/net/minecraft/client/gui/Button.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 7927fa57b..a28b9dbd6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -6,17 +6,17 @@ #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/chunk/WaterLevelChunk.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/chunk/EmptyLevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/LevelData.h" MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { XZSIZE = level->dimension->getXZSize(); // 4J Added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h index a3b92dc5d..473ebc001 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h @@ -3,11 +3,11 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/world/level/levelgen/RandomLevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ServerChunkCache; class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 86ec8a69d..b2c6ec12e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -7,27 +7,27 @@ #include "ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/network/packet/ContainerButtonClickPacket.h" +#include "minecraft/network/packet/ContainerClickPacket.h" +#include "minecraft/network/packet/CraftItemPacket.h" +#include "minecraft/network/packet/DebugOptionsPacket.h" +#include "minecraft/network/packet/InteractPacket.h" +#include "minecraft/network/packet/PlayerActionPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "minecraft/network/packet/UseItemPacket.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/item/WeaponItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/Vec3.h" #include "java/Class.h" MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h index 354c3eaae..954bf05b4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h @@ -2,7 +2,7 @@ #include #include "Minecraft.Client/net/minecraft/server/level/GameMode.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" class ClientConnection; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp index ff37cc6af..929b9509c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -12,8 +12,8 @@ #include "MultiPlayerChunkCache.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "java/JavaMath.h" #include "4J.Common/4J_Compat.h" #include "4J_Profile.h" @@ -22,17 +22,17 @@ #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/MockedLevelStorage.h" +#include "minecraft/world/level/storage/SavedDataStorage.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h index 8b1c06ae5..31d425956 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h @@ -7,11 +7,11 @@ #include #include "console_helpers/HashExtension.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" class ClientConnection; class MultiPlayerChunkCache; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 3c77c2094..31e2f3f03 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -2,32 +2,32 @@ #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/net/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" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ClientCommandPacket.h" +#include "minecraft/network/packet/ContainerClosePacket.h" +#include "minecraft/network/packet/MovePlayerPacket.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerActionPacket.h" +#include "minecraft/network/packet/PlayerCommandPacket.h" +#include "minecraft/network/packet/PlayerInputPacket.h" +#include "minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "minecraft/network/packet/TextureChangePacket.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index ee38b103d..bec2a2e11 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -5,9 +5,9 @@ #include #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp index 30de3e4c4..0a4342a7b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp @@ -4,8 +4,8 @@ #include "ReceivingLevelScreen.h" #include "ClientConnection.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" -#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/locale/Language.h" +#include "minecraft/network/packet/KeepAlivePacket.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection* connection) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp index 2eac00b58..4d1706ddd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp @@ -1,9 +1,9 @@ #include "BreakingItemParticle.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp index a528cb3e4..5162a742d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp @@ -1,9 +1,9 @@ #include "BubbleParticle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" BubbleParticle::BubbleParticle(Level* level, double x, double y, double z, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp index 05afcf6d6..c5ea3df80 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp @@ -1,8 +1,8 @@ #include "CritParticle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h index 7ab23a14e..7367f5711 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h @@ -3,7 +3,7 @@ #include #include "Particle.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp index 5dbdad7a8..78ea02e45 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp @@ -1,12 +1,12 @@ #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "DripParticle.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/core/particles/ParticleTypes.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp index 74939bb7f..62438b77f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp @@ -5,11 +5,11 @@ #include "FireworksParticles.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/FireworksItem.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp index e4ba675ce..943286184 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp @@ -3,10 +3,10 @@ #include "FootstepParticle.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/Level.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp index e87bf18d6..e80d9015b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -1,7 +1,7 @@ #include "HugeExplosionSeedParticle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp index fecfbf765..979aadba0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp @@ -1,8 +1,8 @@ #include "LavaParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" LavaParticle::LavaParticle(Level* level, double x, double y, double z) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp index 2eac6581c..8b51333bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp @@ -3,11 +3,11 @@ #include "Particle.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "java/JavaMath.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Icon.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h index c5ecda0ed..39a34696f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "ParticleEngine.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp index 70ce3b6ed..02353f37f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp @@ -13,11 +13,11 @@ #include "Minecraft.Client/net/minecraft/client/Camera.h" #include "console_helpers/StringHelpers.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/Tile.h" #include "java/Class.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp index cba1a4320..b7e973597 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp @@ -2,9 +2,9 @@ #include "PlayerCloudParticle.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#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" PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp index c88912f81..3a697ee6e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp @@ -1,11 +1,11 @@ #include "SuspendedParticle.h" #include "java/Random.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp index 570e81738..dcdb5ace5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp @@ -2,11 +2,11 @@ #include "TakeAnimationParticle.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp index 4cc07daa6..5a9f51e6d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp @@ -1,10 +1,10 @@ #include "TerrainParticle.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp index d6c61c335..4667f817e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp @@ -1,9 +1,9 @@ #include "WaterDropParticle.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp index 8872a528a..d4272418a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp @@ -7,7 +7,7 @@ #include "4J.Common/4J_InputActions.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Abilities.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" Input::Input() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index c1e54c080..e13657dd1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -14,19 +14,19 @@ #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.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/level/storage/LevelData.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/net/minecraft/client/particle/CritParticle.h" // 4J : WESTY : Added for new achievements. -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#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.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/stats/CommonStats.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/stats/CommonStats.h" #include "4J_Input.h" #include "4J_Profile.h" #include "4J.Render/4J_Render.h" @@ -40,29 +40,29 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/stats/Achievement.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/stats/Achievement.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#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" @@ -1207,7 +1207,7 @@ void LocalPlayer::setAndBroadcastCustomCape(std::uint32_t capeId) { } // 4J TODO - Remove -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h index 299cd42a1..403d1247e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h @@ -4,11 +4,11 @@ #include #include -#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/util/SmoothFloat.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/Pos.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/world/entity/player/Player.h" #include "java/Class.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp index ed8fb55ac..b32389088 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp @@ -3,11 +3,11 @@ #include #include "RemotePlayer.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h index e3f9b177b..e9bab437d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h @@ -1,11 +1,11 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/util/SmoothFloat.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/Pos.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/world/entity/player/Player.h" #include "java/Class.h" class Input; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp index ebd062d56..a6d0dec38 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp @@ -1,6 +1,6 @@ #include "BossMobGuiInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/entity/boss/BossMob.h" +#include "minecraft/SharedConstants.h" float BossMobGuiInfo::healthProgress = 0.0f; int BossMobGuiInfo::displayTicks = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp index c41aa5ae3..4ae810033 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp @@ -13,13 +13,13 @@ #include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/Region.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/Region.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h index 88cd8bba4..776d08749 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h @@ -7,7 +7,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h" #include "Tesselator.h" #include "LevelRenderer.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class Level; class TileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp index 1960a67eb..bb765f109 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp @@ -1,6 +1,6 @@ #include "DirtyChunkSorter.h" #include "Chunk.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/LivingEntity.h" DirtyChunkSorter::DirtyChunkSorter(std::shared_ptr cameraEntity, int playerIndex) // 4J - added player index diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp index dafc56388..cc14823b1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp @@ -1,6 +1,6 @@ #include "DistanceChunkSorter.h" #include "Chunk.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" DistanceChunkSorter::DistanceChunkSorter(std::shared_ptr player) { ix = -player->x; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp index b4dd1292f..010ea2cb4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp @@ -1,9 +1,9 @@ #include "EntityTileRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.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/EnderChestTileEntity.h" EntityTileRenderer* EntityTileRenderer::instance = new EntityTileRenderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index d52450c51..da001f981 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -22,17 +22,17 @@ #include "Chunk.h" #include "java/System.h" #include "java/FloatBuffer.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" +#include "minecraft/world/level/chunk/SparseLightStorage.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/chunk/SparseDataStorage.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/Facing.h" +#include "minecraft/world/effect/MobEffect.h" +#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.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" #include "console_helpers/compression.h" #include "Minecraft.Client/Common/ShutdownManager.h" @@ -50,25 +50,25 @@ #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h index c4459f2cb..ed551f08e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h @@ -5,11 +5,11 @@ #include #include -#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" +#include "minecraft/util/SmoothFloat.h" #include "console_helpers/C4JThread.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Minecraft; class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp index b54a67f18..d98350299 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -19,20 +19,20 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp index 93d7d3595..bfd212a65 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp @@ -46,13 +46,13 @@ #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.World/net/minecraft/core/particles/ParticleTypes.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.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" #include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Common/4J_Compat.h" @@ -63,31 +63,31 @@ #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/item/RecordingItem.h" -#include "Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/EggTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/DragonFireball.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/RecordingItem.h" +#include "minecraft/world/level/BlockDestructionProgress.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/EggTile.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" @@ -104,7 +104,7 @@ #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "Minecraft.Client/include/stubs.h" #include "4J_Input.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" class Icon; class ItemInstance; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h index b5f56d3ca..6aa95d3c7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h @@ -1,12 +1,12 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/LevelListener.h" +#include "minecraft/world/level/LevelListener.h" #include "console_helpers/Definitions.h" #include "OffsettedRenderList.h" #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp index 80055c8b7..233dfccb4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp @@ -18,14 +18,14 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.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/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp index a51113e62..bf87b6c82 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp @@ -16,53 +16,53 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/EggTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FenceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StemTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/WallTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/AnvilTile.h" +#include "minecraft/world/level/tile/BeaconTile.h" +#include "minecraft/world/level/tile/BedTile.h" +#include "minecraft/world/level/tile/BrewingStandTile.h" +#include "minecraft/world/level/tile/CauldronTile.h" +#include "minecraft/world/level/tile/CocoaTile.h" +#include "minecraft/world/level/tile/ComparatorTile.h" +#include "minecraft/world/level/tile/DeadBushTile.h" +#include "minecraft/world/level/tile/DiodeTile.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/EggTile.h" +#include "minecraft/world/level/tile/FenceGateTile.h" +#include "minecraft/world/level/tile/FenceTile.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/FlowerPotTile.h" +#include "minecraft/world/level/tile/GrassTile.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/QuartzBlockTile.h" +#include "minecraft/world/level/tile/RailTile.h" +#include "minecraft/world/level/tile/RedStoneDustTile.h" +#include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/StainedGlassPaneBlock.h" +#include "minecraft/world/level/tile/StairTile.h" +#include "minecraft/world/level/tile/StemTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "minecraft/world/level/tile/ThinFenceTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/TripWireSourceTile.h" +#include "minecraft/world/level/tile/TripWireTile.h" +#include "minecraft/world/level/tile/VineTile.h" +#include "minecraft/world/level/tile/WallTile.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "minecraft/world/phys/Vec3.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h index 28fc13a97..bba869708 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class Culler { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp index 95c3e5577..534106d3c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp @@ -1,5 +1,5 @@ #include "FrustumCuller.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp index d6b708f09..11815c513 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp @@ -1,5 +1,5 @@ #include "FrustumData.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" // float** m_Frustum; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h index dd9fde6ac..62d724c55 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class AABB; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp index 8aa86193b..5b3ac5a04 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp @@ -2,8 +2,8 @@ #include #include "ViewportCuller.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/phys/AABB.h" ViewportCuller::Face::Face(double x, double y, double z, float yRot, float xRot) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h index f97c3dd8b..42d8df11c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h @@ -2,7 +2,7 @@ #include #include "Culler.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" class Mob; class AABB; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp index d8a84e44f..9b36257d2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -4,8 +4,8 @@ #include "ArrowRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp index 68f7265f1..9a701d625 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp @@ -4,8 +4,8 @@ #include "BatRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/BatModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/Bat.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp index 554771f2d..6e8aa7f60 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/net/minecraft/client/model/BlazeModel.h" #include "BlazeRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Blaze.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp index 99e12f22c..4cf382a1d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -4,8 +4,8 @@ #include "BoatRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/BoatModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Boat.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp index 2c5d92fad..ad2a6a072 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp @@ -2,8 +2,8 @@ #include #include "ChickenRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp index ca2c8e903..a40658cef 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -5,8 +5,8 @@ #include "CreeperRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/CreeperModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Creeper.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index 9951cba31..5d3773256 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,7 +1,7 @@ #include #include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" ResourceLocation EnderCrystalRenderer::ENDER_CRYSTAL_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index 0fab71f97..9b20420ee 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,7 +1,7 @@ #include #include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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 "EnderDragonRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp index 9a4dcb5ef..835ec60c1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -5,11 +5,11 @@ #include "Minecraft.Client/net/minecraft/client/model/EndermanModel.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 961fe625e..496031bed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -1,19 +1,19 @@ #include #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" #include "SpiderRenderer.h" #include "PigRenderer.h" #include "SheepRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h index d37a69845..5ba00bbca 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h @@ -1,6 +1,6 @@ #pragma once #include "EntityRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/JavaIntHash.h" class font; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp index 369ab4a07..e1ae4124f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -4,16 +4,16 @@ #include "EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/animal/Animal.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index 1513b31e5..c288054c7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 36c278b67..984454725 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -6,12 +6,12 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/FallingTile.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp index 43b032a89..acd7144c1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -5,13 +5,13 @@ #include "EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/FireTile.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp index a06cca3e8..ce2c74fe7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -5,12 +5,12 @@ #include "FishingHookRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp index f8ccceb28..71ee201ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp @@ -3,9 +3,9 @@ #include "GhastRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/GhastModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Ghast.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp index 23f92f940..d67629918 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -4,9 +4,9 @@ #include "MobRenderer.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.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/net/minecraft/client/renderer/Textures.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index 96a9d5528..d37b0f10b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -8,14 +8,14 @@ #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index d471a363d..a1974a9eb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -7,26 +7,26 @@ #include "ItemFrameRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/world/item/Item.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 "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/item/ItemInstance.h" +#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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" class MapItemSavedData; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp index 724120505..98f8e3398 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -12,14 +12,14 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" @@ -31,7 +31,7 @@ #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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 4ac8b435d..12ffebeb2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -5,12 +5,12 @@ #include "EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 3bf66669e..63ed6d957 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -3,8 +3,8 @@ #include "Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h" #include "LavaSlimeRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 886373ac0..0de5d0a14 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -4,8 +4,8 @@ #include "LightningBoltRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/global/LightningBolt.h" #include "java/Random.h" void LightningBoltRenderer::render(std::shared_ptr _bolt, double x, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 0c2fbbc57..0820e1bb3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -9,14 +9,14 @@ #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/player/Player.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" @@ -25,7 +25,7 @@ #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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h index 29e37567f..3f78b47a8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h @@ -4,7 +4,7 @@ #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "EntityRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/LivingEntity.h" class LivingEntity; class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp index 093491832..73fa6b94a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/net/minecraft/client/model/MinecartModel.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp index 0cf28590f..e7abd71d5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp @@ -1,7 +1,7 @@ #include "MinecartSpawnerRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h" +#include "minecraft/world/entity/item/MinecartSpawner.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h" void MinecartSpawnerRenderer::renderMinecartContents( diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp index 3583efee9..6f91d9dad 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp @@ -4,18 +4,18 @@ #include "MobRenderer.h" #include "LivingEntityRenderer.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Entity.h" +#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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index eabe65862..6f39920ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -6,10 +6,10 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp index cad7f1ebb..59dbefeb5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -2,9 +2,9 @@ #include "OcelotRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp index fdbaab860..161d11018 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -3,11 +3,11 @@ #include "PaintingRenderer.h" #include "EntityRenderDispatcher.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Painting.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp index b4144c158..1a5990bbd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp @@ -1,8 +1,8 @@ #include #include "PigRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp index 980d2ed74..754a019a3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -13,18 +13,18 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/level/tile/Tile.h" #include "java/Class.h" #include "nbt/CompoundTag.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h index 44677c2b7..890357045 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h @@ -3,7 +3,7 @@ #include #include "MobRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp index d277acdf4..7f39256d9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -4,9 +4,9 @@ #include "SheepRenderer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp index 767d10ebf..d8d42f17f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp @@ -2,10 +2,10 @@ #include "SkeletonRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/SkeletonModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/world/entity/monster/Skeleton.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp index 1d46dcdeb..a676ce19c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -3,8 +3,8 @@ #include "SlimeRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Slime.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp index a0faa6323..9f607d08a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -5,11 +5,11 @@ #include "EntityRenderDispatcher.h" #include "SnowManRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/SnowMan.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp index 7400d86bd..a35c2540b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -4,9 +4,9 @@ #include "SpiderRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/SpiderModel.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Spider.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp index 69112e1bc..df9633fc0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -2,8 +2,8 @@ #include "SquidRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Squid.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index eb9d85376..34ce93d53 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -3,9 +3,9 @@ #include "TntMinecartRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp index 673429f3d..6cbc81fdd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp @@ -5,10 +5,10 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/level/tile/Tile.h" TntRenderer::TntRenderer() { renderer = new TileRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index 4a1bc5f6b..a85ef8975 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -8,11 +8,11 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "VillagerGolemRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/LivingEntity.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp index 825793f47..e03cbbb6e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -3,9 +3,9 @@ #include "Minecraft.Client/net/minecraft/client/model/VillagerModel.h" #include "VillagerRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp index bfe2b991c..a07da6f18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp @@ -6,14 +6,14 @@ #include "Minecraft.Client/net/minecraft/client/model/WitchModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/item/BowItem.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp index ee098c19e..0fc4a3407 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -3,7 +3,7 @@ #include "WitherBossRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h" #include "MobRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" +#include "minecraft/world/entity/boss/wither/WitherBoss.h" #include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index 84eac6db9..a225e41ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -3,9 +3,9 @@ #include "WitherSkullRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h" +#include "minecraft/world/entity/projectile/WitherSkull.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp index 33d3a0c5b..77817a084 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -3,11 +3,11 @@ #include "WolfRenderer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp index 7f2080a08..3dab1dd27 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp @@ -4,9 +4,9 @@ #include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" #include "Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.h" #include "ZombieRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index d8ec7c38f..71757b88d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -16,9 +16,9 @@ #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/Tile.h" class Stitcher; class TextureHolder; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h index 185727215..3285d4679 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "minecraft/world/IconRegister.h" class Icon; class StitchedTexture; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp index dfdcdd412..2fe274a0f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -7,7 +7,7 @@ #include "StitchedTexture.h" #include "TextureManager.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "java/InputOutputStream/BufferedReader.h" StitchedTexture* StitchedTexture::create(const std::wstring& name) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h index 2e15c2f7e..740b8fe11 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "minecraft/world/Icon.h" class Texture; class BufferedReader; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp index 5f4e4692d..f2ae025f7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp @@ -17,9 +17,9 @@ #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/Tile.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/InputStreamReader.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h index acd9a350c..f2c172af8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "minecraft/world/IconRegister.h" class StitchedTexture; class Texture; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp index 803d470cd..6c49e57ff 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -8,8 +8,8 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "ClockTexture.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock") { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp index b6af2d4ba..e05797f51 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -10,9 +10,9 @@ #include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "CompassTexture.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.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" CompassTexture* CompassTexture::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index fe1fa332e..f4216a2b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -6,9 +6,9 @@ #include "BeaconRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp index b6d728f40..bf24aafa7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -7,10 +7,10 @@ #include "Minecraft.Client/net/minecraft/client/model/LargeChestModel.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index 7c2352b3f..dbc8990de 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -4,14 +4,14 @@ #include #include "Minecraft.Client/net/minecraft/client/model/BookModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "EnchantTableRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" ResourceLocation EnchantTableRenderer::BOOK_LOCATION = ResourceLocation(TN_ITEM_BOOK); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index 593d31b86..bc8d16e5a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -5,8 +5,8 @@ #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EnderChestRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp index bff619a1c..7cc77cff4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp @@ -1,10 +1,10 @@ #include "MobSpawnerRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" void MobSpawnerRenderer::render(std::shared_ptr _spawner, double x, double y, double z, float a, bool setColor, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index d730c5eae..15f2cc6b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -6,13 +6,13 @@ #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.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" +#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp index 104a023bb..f5a7d37fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -8,10 +8,10 @@ #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.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" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index c2b747941..08698e9db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -4,11 +4,11 @@ #include "SkullTileRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SkullTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index 008bcaaca..36da1ca58 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -8,8 +8,8 @@ #include "java/FloatBuffer.h" #include "TheEndPortalRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index 174d8d3dc..a5f3add9b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -13,10 +13,10 @@ #include "EnderChestRenderer.h" #include "BeaconRenderer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class Font; class Textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp index ff01e7468..752b2632c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp @@ -13,7 +13,7 @@ #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "minecraft/locale/Language.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h b/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h index 2f5f9fd87..1a5084376 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/core/net.minecraft.core.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/core/net.minecraft.core.h" +#include "minecraft/world/level/tile/LevelEvent.h" class DispenserBootstrap { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index e35a5c4c0..77f37d7ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -16,41 +16,41 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h" #include "Settings.h" -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/commands/Command.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/network/net.minecraft.network.h" +#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/Pos.h" #include "java/System.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/PlatformTime.h" #if defined(SPLIT_SAVES) -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.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 "console_helpers/ThreadName.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/chunk/SparseLightStorage.h" +#include "minecraft/world/level/chunk/SparseDataStorage.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#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.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "4J_Input.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h index 01e5c78c6..6d52bc2c2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h @@ -3,10 +3,10 @@ #include #include "ConsoleInputSource.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ServerConnection; class Settings; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index eee8ec5cb..499dde330 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -15,19 +15,19 @@ #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.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.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" +#include "minecraft/network/net.minecraft.network.h" +#include "minecraft/Pos.h" +#include "minecraft/util/ProgressListener.h" +#include "minecraft/world/level/levelgen/HellRandomLevelSource.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/EntityIO.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h index d284c2afe..f7494e1fc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/Scoreboard.h" class MinecraftServer; class ScoreboardSaveData; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp index cc020a9fb..25cbe7160 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -6,16 +6,16 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "TeleportCommand.h" #include "ServerCommandDispatcher.h" -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" -#include "Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/GameModeCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/KillCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/TimeCommand.h" -#include "Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandSender.h" +#include "minecraft/commands/common/DefaultGameModeCommand.h" +#include "minecraft/commands/common/EnchantItemCommand.h" +#include "minecraft/commands/common/ExperienceCommand.h" +#include "minecraft/commands/common/GameModeCommand.h" +#include "minecraft/commands/common/GiveItemCommand.h" +#include "minecraft/commands/common/KillCommand.h" +#include "minecraft/commands/common/TimeCommand.h" +#include "minecraft/commands/common/ToggleDownfallCommand.h" ServerCommandDispatcher::ServerCommandDispatcher() { addCommand(new TimeCommand()); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h index 56ef82c6b..333ca64df 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.World/net/minecraft/commands/CommandDispatcher.h" -#include "Minecraft.World/net/minecraft/commands/AdminLogCommand.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/commands/CommandDispatcher.h" +#include "minecraft/commands/AdminLogCommand.h" +#include "minecraft/network/packet/ChatPacket.h" class ServerCommandDispatcher : public CommandDispatcher, public AdminLogCommand { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp index a8c429b1d..294bd70fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp @@ -5,9 +5,9 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "TeleportCommand.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h index 0fbed9eec..bad65ea22 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h @@ -3,10 +3,10 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "minecraft/commands/Command.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/GameCommandPacket.h" class TeleportCommand : public Command { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp index 8fb9b7db8..5a1bc19f8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp @@ -2,11 +2,11 @@ #include "CreativeMode.h" #include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/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/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" CreativeMode::CreativeMode(Minecraft* minecraft) : GameMode(minecraft) { destroyDelay = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp index 7f234b670..7b20ba63a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp @@ -1,6 +1,6 @@ #include "DemoMode.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" DemoMode::DemoMode(Minecraft* minecraft) : SurvivalMode(minecraft) { demoHasEnded = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp index 5c713d8bc..fe585a5b8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp @@ -1,6 +1,6 @@ #include "DerivedServerLevel.h" -#include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h" +#include "minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/world/level/storage/DerivedLevelData.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" class LevelSettings; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp index fc28a21a1..d931847ff 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp @@ -6,19 +6,19 @@ #include "TrackedEntity.h" #include "ServerPlayer.h" #include "ServerLevel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" +#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" EntityTracker::EntityTracker(ServerLevel* level) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp index 4b0c13227..23815a83e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp @@ -2,13 +2,13 @@ #include "GameMode.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.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" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" GameMode::GameMode(Minecraft* minecraft) { instaBuild = false; // 4J - added diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp index 1eaa5e293..c519611d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp @@ -16,15 +16,15 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "minecraft/network/packet/ChunkVisibilityPacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap* pcm) : pos(x, z) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h index 8e33d6565..fbf135e76 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h @@ -5,7 +5,7 @@ #include #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/ChunkPos.h" class ServerPlayer; class ServerLevel; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp index 4695933ed..d8ca4d562 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp @@ -6,17 +6,17 @@ #include "ServerChunkCache.h" #include "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.World/net/minecraft/util/ProgressListener.h" +#include "minecraft/util/ProgressListener.h" #include "console_helpers/compression.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/EmptyLevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h index 8c991ebbe..0e3425b2b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h @@ -5,14 +5,14 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" +#include "minecraft/world/level/levelgen/RandomLevelSource.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ServerLevel; class ChunkStorage; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index 6b55dafea..b488efec4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp @@ -12,34 +12,34 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "EntityTracker.h" #include "Minecraft.Client/net/minecraft/server/ServerScoreboard.h" -#include "Minecraft.World/net/minecraft/world/scores/ScoreboardSaveData.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/scores/net.minecraft.world.scores.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" -#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/scores/ScoreboardSaveData.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" +#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/scores/net.minecraft.world.scores.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "ServerLevelListener.h" -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.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.World/net/minecraft/util/ProgressListener.h" +#include "minecraft/util/ProgressListener.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "PlayerChunkMap.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h index d207cb666..18655047c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h @@ -3,7 +3,7 @@ #include #include #include -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "java/JavaIntHash.h" class ServerChunkCache; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp index 418729299..0d7c813d9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp @@ -10,11 +10,11 @@ #include "PlayerChunkMap.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/network/packet/LevelEventPacket.h" +#include "minecraft/network/packet/LevelSoundPacket.h" +#include "minecraft/network/packet/TileDestructionPacket.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/dimension/Dimension.h" ServerLevelListener::ServerLevelListener(MinecraftServer* server, ServerLevel* level) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h index 1b53097e1..f51e01f6f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/level/LevelListener.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/LevelListener.h" +#include "minecraft/core/particles/ParticleTypes.h" class Player; class TileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index 1b1ed4037..c628109ce 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -12,32 +12,32 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/scores/net.minecraft.world.scores.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/level/net.minecraft.world.level.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/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/scores/net.minecraft.world.scores.h" +#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/Common/src/Network/GameNetworkManager.h" #include "4J_Input.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/Pos.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h index 831ed4f99..1f1361497 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/level/ChunkPos.h" class PlayerConnection; class MinecraftServer; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp index a2b75a538..0ab7eb498 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp @@ -7,18 +7,18 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/WeaponItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#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" ServerPlayerGameMode::ServerPlayerGameMode(Level* level) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp index d35b53c24..95ccf1189 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp @@ -3,10 +3,10 @@ #include "DemoMode.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/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/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" SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp index ff1b8ac76..2352ac4a9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp @@ -8,51 +8,51 @@ #include "TrackedEntity.h" #include "ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "EntityTracker.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" -#include "Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/Painting.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/network/packet/AddEntityPacket.h" +#include "minecraft/network/packet/AddExperienceOrbPacket.h" +#include "minecraft/network/packet/AddMobPacket.h" +#include "minecraft/network/packet/AddPaintingPacket.h" +#include "minecraft/network/packet/AddPlayerPacket.h" +#include "minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "minecraft/network/packet/MoveEntityPacket.h" +#include "minecraft/network/packet/MoveEntityPacketSmall.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/RotateHeadPacket.h" +#include "minecraft/network/packet/SetEntityDataPacket.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/network/packet/SetEntityMotionPacket.h" +#include "minecraft/network/packet/SetEquippedItemPacket.h" +#include "minecraft/network/packet/TeleportEntityPacket.h" +#include "minecraft/network/packet/UpdateAttributesPacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/LeashFenceKnotEntity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Painting.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/entity/projectile/FishingHook.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h index 9cb4585c4..2569ff888 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h @@ -5,7 +5,7 @@ // class ServerPlayer; #include "ServerPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" class Entity; class Packet; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp index 2de3f68ef..8bbe54081 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp @@ -8,16 +8,16 @@ #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.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "4J.Common/4J_Compat.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/network/Connection.h" +#include "minecraft/network/packet/LoginPacket.h" +#include "minecraft/network/packet/PreLoginPacket.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h index e499fc47b..cb2b2d4cc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/DisconnectPacket.h" class MinecraftServer; class Socket; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp index 22f12dc39..8d8749990 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp @@ -11,11 +11,11 @@ #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.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "ServerConnection.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "java/JavaMath.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" @@ -24,74 +24,74 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/commands/CommandDispatcher.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/commands/CommandDispatcher.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/Connection.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ClientCommandPacket.h" +#include "minecraft/network/packet/ContainerAckPacket.h" +#include "minecraft/network/packet/ContainerButtonClickPacket.h" +#include "minecraft/network/packet/ContainerClickPacket.h" +#include "minecraft/network/packet/ContainerSetSlotPacket.h" +#include "minecraft/network/packet/CraftItemPacket.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/DebugOptionsPacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/InteractPacket.h" +#include "minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/network/packet/KickPlayerPacket.h" +#include "minecraft/network/packet/MovePlayerPacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerActionPacket.h" +#include "minecraft/network/packet/PlayerCommandPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/network/packet/PlayerInputPacket.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "minecraft/network/packet/TextureAndGeometryPacket.h" +#include "minecraft/network/packet/TextureChangePacket.h" +#include "minecraft/network/packet/TexturePacket.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/network/packet/TradeItemPacket.h" +#include "minecraft/network/packet/UseItemPacket.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/inventory/CraftingMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h index d8d4391d5..e2a1eca7e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h @@ -7,10 +7,10 @@ #include #include "Minecraft.Client/net/minecraft/server/ConsoleInputSource.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/PacketListener.h" #include "java/JavaIntHash.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" class MinecraftServer; class Connection; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp index 67ddd43e4..ffde7c92d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.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" ServerConnection::ServerConnection(MinecraftServer* server) { diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp index 404f74f4b..9de9e2e8b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp @@ -7,17 +7,17 @@ #include #include "StatsCounter.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/stats/Stats.h" -#include "Minecraft.World/net/minecraft/stats/Achievement.h" -#include "Minecraft.World/net/minecraft/stats/Achievements.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/stats/Stats.h" +#include "minecraft/stats/Achievement.h" +#include "minecraft/stats/Achievements.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/Tile.h" Stat** StatsCounter::LARGE_STATS[] = {&Stats::walkOneM, &Stats::swimOneM, &Stats::fallOneM, &Stats::climbOneM, diff --git a/minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp b/minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp deleted file mode 100644 index 86ed8d649..000000000 --- a/minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "Minecraft.World/net/minecraft/StaticConstructors.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.World/net/minecraft/stats/CommonStats.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/stats/Stats.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/item/HatchetItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/PickaxeItem.h" -#include "Minecraft.World/net/minecraft/world/item/ShovelItem.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" - -void Minecraft_RunStaticCtors() { - // The ordering of these static ctors can be important. If they are within - // statement blocks then DO NOT CHANGE the ordering - 4J Stu - - Packet::staticCtor(); - - { - MaterialColor::staticCtor(); - Material::staticCtor(); - Tile::staticCtor(); - HatchetItem::staticCtor(); - PickaxeItem::staticCtor(); - ShovelItem::staticCtor(); - BlockReplacements::staticCtor(); - Biome::staticCtor(); - MobEffect::staticCtor(); - Item::staticCtor(); - FurnaceRecipes::staticCtor(); - Recipes::staticCtor(); - GenericStats::setInstance(new CommonStats()); - Stats::staticCtor(); - // Achievements::staticCtor(); // 4J Stu - This is now called from - // within the Stats::staticCtor() - TileEntity::staticCtor(); - EntityIO::staticCtor(); - MobCategory::staticCtor(); - - Item::staticInit(); - LevelChunk::staticCtor(); - - LevelType::staticCtor(); - - { - StructureFeatureIO::staticCtor(); - - MineShaftPieces::staticCtor(); - StrongholdFeature::staticCtor(); - VillagePieces::Smithy::staticCtor(); - VillageFeature::staticCtor(); - RandomScatteredLargeFeature::staticCtor(); - } - } - EnderMan::staticCtor(); - PotionBrewing::staticCtor(); - Enchantment::staticCtor(); - - SharedConstants::staticCtor(); - - ServerLevel::staticCtor(); - SparseLightStorage::staticCtor(); - CompressedTileStorage::staticCtor(); - SparseDataStorage::staticCtor(); - McRegionChunkStorage::staticCtor(); - Villager::staticCtor(); - GameType::staticCtor(); - BeaconTileEntity::staticCtor(); -} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h deleted file mode 100644 index cf9e0c1be..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "EnderCrystal.h" -#include "EnderDragon.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h deleted file mode 100644 index f430eeb9a..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp deleted file mode 100644 index f56d45a53..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "AirTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - -AirTile::AirTile(int id) : Tile(id, Material::air) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp deleted file mode 100644 index 54a642b7a..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "DirtTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - -DirtTile::DirtTile(int id) : Tile(id, Material::dirt) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp deleted file mode 100644 index 7e30ceb26..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "MetalTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - -MetalTile::MetalTile(int id) : Tile(id, Material::metal) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp deleted file mode 100644 index 259219eeb..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "NetherrackTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - -NetherrackTile::NetherrackTile(int id) : Tile(id, Material::stone) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp deleted file mode 100644 index e09ff23c0..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "SpongeTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - -const int RANGE = 2; - -Sponge::Sponge(int id) : Tile(id, Material::sponge) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h deleted file mode 100644 index 31634eb17..000000000 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "PistonBaseTile.h" -#include "PistonExtensionTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" \ No newline at end of file diff --git a/minecraft/console_helpers/include/console_helpers/compression.h b/minecraft/console_helpers/include/console_helpers/compression.h index 18f84b72c..bb741d1bf 100644 --- a/minecraft/console_helpers/include/console_helpers/compression.h +++ b/minecraft/console_helpers/include/console_helpers/compression.h @@ -1,6 +1,6 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" class Compression { public: diff --git a/minecraft/console_helpers/meson.build b/minecraft/console_helpers/meson.build index 32a7e3532..24e08671a 100644 --- a/minecraft/console_helpers/meson.build +++ b/minecraft/console_helpers/meson.build @@ -13,7 +13,7 @@ simdutf_dep = dependency('simdutf', lib_console_helpers = static_library('console_helpers', console_helpers_sources, - dependencies: [simdutf_dep], + dependencies: [simdutf_dep, dependency('zlib')], include_directories : include_directories('include', '..'), cpp_args : global_cpp_args + global_cpp_defs, ) diff --git a/minecraft/console_helpers/src/compression.cpp b/minecraft/console_helpers/src/compression.cpp index b934da8c6..d36c13cbf 100644 --- a/minecraft/console_helpers/src/compression.cpp +++ b/minecraft/console_helpers/src/compression.cpp @@ -5,7 +5,7 @@ #include // #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/compression.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" diff --git a/minecraft/Minecraft.World/net/minecraft/Direction.cpp b/minecraft/minecraft/Direction.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/Direction.cpp rename to minecraft/minecraft/Direction.cpp index d055be3d1..b771e4aa5 100644 --- a/minecraft/Minecraft.World/net/minecraft/Direction.cpp +++ b/minecraft/minecraft/Direction.cpp @@ -1,6 +1,6 @@ #include "Direction.h" #include "Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" const int Direction::STEP_X[] = {0, -1, 0, 1}; diff --git a/minecraft/Minecraft.World/net/minecraft/Direction.h b/minecraft/minecraft/Direction.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/Direction.h rename to minecraft/minecraft/Direction.h diff --git a/minecraft/Minecraft.World/net/minecraft/Facing.cpp b/minecraft/minecraft/Facing.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/Facing.cpp rename to minecraft/minecraft/Facing.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/Facing.h b/minecraft/minecraft/Facing.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/Facing.h rename to minecraft/minecraft/Facing.h diff --git a/minecraft/Minecraft.World/net/minecraft/Pos.cpp b/minecraft/minecraft/Pos.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/Pos.cpp rename to minecraft/minecraft/Pos.cpp index 567c03f6e..62287bc35 100644 --- a/minecraft/Minecraft.World/net/minecraft/Pos.cpp +++ b/minecraft/minecraft/Pos.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/Pos.h" +#include "minecraft/Pos.h" Pos::Pos() { x = y = z = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/Pos.h b/minecraft/minecraft/Pos.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/Pos.h rename to minecraft/minecraft/Pos.h diff --git a/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp b/minecraft/minecraft/SharedConstants.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp rename to minecraft/minecraft/SharedConstants.cpp index 7b824ecb4..31cdca7c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp +++ b/minecraft/minecraft/SharedConstants.cpp @@ -1,8 +1,8 @@  #include -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" const std::wstring SharedConstants::VERSION_STRING = L"1.6.4"; const bool SharedConstants::TEXTURE_LIGHTING = true; diff --git a/minecraft/Minecraft.World/net/minecraft/SharedConstants.h b/minecraft/minecraft/SharedConstants.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/SharedConstants.h rename to minecraft/minecraft/SharedConstants.h diff --git a/minecraft/minecraft/StaticConstructors.cpp b/minecraft/minecraft/StaticConstructors.cpp new file mode 100644 index 000000000..a0ef294c2 --- /dev/null +++ b/minecraft/minecraft/StaticConstructors.cpp @@ -0,0 +1,98 @@ +#include "minecraft/StaticConstructors.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "minecraft/stats/CommonStats.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stats.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/entity/monster/EnderMan.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/item/HatchetItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/PickaxeItem.h" +#include "minecraft/world/item/ShovelItem.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/item/crafting/FurnaceRecipes.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/BlockReplacements.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/SparseDataStorage.h" +#include "minecraft/world/level/chunk/SparseLightStorage.h" +#include "minecraft/world/level/chunk/storage/McRegionChunkStorage.h" +#include "minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "minecraft/world/level/levelgen/structure/VillagePieces.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/MaterialColor.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" + +void Minecraft_RunStaticCtors() { + // The ordering of these static ctors can be important. If they are within + // statement blocks then DO NOT CHANGE the ordering - 4J Stu + + Packet::staticCtor(); + + { + MaterialColor::staticCtor(); + Material::staticCtor(); + Tile::staticCtor(); + HatchetItem::staticCtor(); + PickaxeItem::staticCtor(); + ShovelItem::staticCtor(); + BlockReplacements::staticCtor(); + Biome::staticCtor(); + MobEffect::staticCtor(); + Item::staticCtor(); + FurnaceRecipes::staticCtor(); + Recipes::staticCtor(); + GenericStats::setInstance(new CommonStats()); + Stats::staticCtor(); + // Achievements::staticCtor(); // 4J Stu - This is now called from + // within the Stats::staticCtor() + TileEntity::staticCtor(); + EntityIO::staticCtor(); + MobCategory::staticCtor(); + + Item::staticInit(); + LevelChunk::staticCtor(); + + LevelType::staticCtor(); + + { + StructureFeatureIO::staticCtor(); + + MineShaftPieces::staticCtor(); + StrongholdFeature::staticCtor(); + VillagePieces::Smithy::staticCtor(); + VillageFeature::staticCtor(); + RandomScatteredLargeFeature::staticCtor(); + } + } + EnderMan::staticCtor(); + PotionBrewing::staticCtor(); + Enchantment::staticCtor(); + + SharedConstants::staticCtor(); + + ServerLevel::staticCtor(); + SparseLightStorage::staticCtor(); + CompressedTileStorage::staticCtor(); + SparseDataStorage::staticCtor(); + McRegionChunkStorage::staticCtor(); + Villager::staticCtor(); + GameType::staticCtor(); + BeaconTileEntity::staticCtor(); +} diff --git a/minecraft/Minecraft.World/net/minecraft/StaticConstructors.h b/minecraft/minecraft/StaticConstructors.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/StaticConstructors.h rename to minecraft/minecraft/StaticConstructors.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h b/minecraft/minecraft/commands/AdminLogCommand.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h rename to minecraft/minecraft/commands/AdminLogCommand.h index 11d0c81c2..fcb74f0b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h +++ b/minecraft/minecraft/commands/AdminLogCommand.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp b/minecraft/minecraft/commands/Command.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/commands/Command.cpp rename to minecraft/minecraft/commands/Command.cpp index 1b530ada2..3e2bf0ae5 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp +++ b/minecraft/minecraft/commands/Command.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Command.h" -#include "Minecraft.World/net/minecraft/commands/AdminLogCommand.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/commands/AdminLogCommand.h" +#include "minecraft/commands/CommandSender.h" +#include "minecraft/network/packet/ChatPacket.h" AdminLogCommand* Command::logger; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/Command.h b/minecraft/minecraft/commands/Command.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/commands/Command.h rename to minecraft/minecraft/commands/Command.h index 29b6cb5aa..1ece8e27f 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/Command.h +++ b/minecraft/minecraft/commands/Command.h @@ -8,7 +8,7 @@ #include #include "CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" #include "4J.Common/4J_Compat.h" class AdminLogCommand; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp b/minecraft/minecraft/commands/CommandDispatcher.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp rename to minecraft/minecraft/commands/CommandDispatcher.cpp index d88c96a21..efda74407 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp +++ b/minecraft/minecraft/commands/CommandDispatcher.cpp @@ -3,8 +3,8 @@ #include "CommandDispatcher.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandSender.h" int CommandDispatcher::performCommand(std::shared_ptr sender, EGameCommand command, diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h b/minecraft/minecraft/commands/CommandDispatcher.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h rename to minecraft/minecraft/commands/CommandDispatcher.h index ba18ac6d9..cf93ed9d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h +++ b/minecraft/minecraft/commands/CommandDispatcher.h @@ -7,7 +7,7 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/CommandsEnum.h" class Command; class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h b/minecraft/minecraft/commands/CommandSender.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h rename to minecraft/minecraft/commands/CommandSender.h index f263bc12e..21e539113 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h +++ b/minecraft/minecraft/commands/CommandSender.h @@ -1,7 +1,7 @@ #pragma once #include "CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class CommandSender { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandsEnum.h b/minecraft/minecraft/commands/CommandsEnum.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/CommandsEnum.h rename to minecraft/minecraft/commands/CommandsEnum.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/PlayerSelector.h b/minecraft/minecraft/commands/PlayerSelector.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/PlayerSelector.h rename to minecraft/minecraft/commands/PlayerSelector.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp b/minecraft/minecraft/commands/common/DefaultGameModeCommand.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp rename to minecraft/minecraft/commands/common/DefaultGameModeCommand.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h b/minecraft/minecraft/commands/common/DefaultGameModeCommand.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h rename to minecraft/minecraft/commands/common/DefaultGameModeCommand.h index 04f1e49c7..260dd0c14 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h +++ b/minecraft/minecraft/commands/common/DefaultGameModeCommand.h @@ -3,7 +3,7 @@ #include #include "GameModeCommand.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/CommandsEnum.h" class GameType; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp b/minecraft/minecraft/commands/common/EffectCommand.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp rename to minecraft/minecraft/commands/common/EffectCommand.cpp index f65bfd7b0..e2fa4d736 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp +++ b/minecraft/minecraft/commands/common/EffectCommand.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/commands/common/EffectCommand.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/common/EffectCommand.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h b/minecraft/minecraft/commands/common/EffectCommand.h similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h rename to minecraft/minecraft/commands/common/EffectCommand.h index f7b58640d..0042e5ea2 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h +++ b/minecraft/minecraft/commands/common/EffectCommand.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp b/minecraft/minecraft/commands/common/EnchantItemCommand.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp rename to minecraft/minecraft/commands/common/EnchantItemCommand.cpp index 5ac60aa28..24a766976 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp +++ b/minecraft/minecraft/commands/common/EnchantItemCommand.cpp @@ -10,11 +10,11 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" EGameCommand EnchantItemCommand::getId() { return eGameCommand_EnchantItem; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h b/minecraft/minecraft/commands/common/EnchantItemCommand.h similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h rename to minecraft/minecraft/commands/common/EnchantItemCommand.h index 28ecb336c..49838e719 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h +++ b/minecraft/minecraft/commands/common/EnchantItemCommand.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class GameCommandPacket; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp b/minecraft/minecraft/commands/common/ExperienceCommand.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp rename to minecraft/minecraft/commands/common/ExperienceCommand.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h b/minecraft/minecraft/commands/common/ExperienceCommand.h similarity index 71% rename from minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h rename to minecraft/minecraft/commands/common/ExperienceCommand.h index 993e88617..7e87ef8f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h +++ b/minecraft/minecraft/commands/common/ExperienceCommand.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameDifficultyCommand.h b/minecraft/minecraft/commands/common/GameDifficultyCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GameDifficultyCommand.h rename to minecraft/minecraft/commands/common/GameDifficultyCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp b/minecraft/minecraft/commands/common/GameModeCommand.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp rename to minecraft/minecraft/commands/common/GameModeCommand.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h b/minecraft/minecraft/commands/common/GameModeCommand.h similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h rename to minecraft/minecraft/commands/common/GameModeCommand.h index 02727ad01..a17046fb9 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h +++ b/minecraft/minecraft/commands/common/GameModeCommand.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class GameType; class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameRuleCommand.h b/minecraft/minecraft/commands/common/GameRuleCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GameRuleCommand.h rename to minecraft/minecraft/commands/common/GameRuleCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp b/minecraft/minecraft/commands/common/GiveItemCommand.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp rename to minecraft/minecraft/commands/common/GiveItemCommand.cpp index 8af59ef16..fff599057 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp +++ b/minecraft/minecraft/commands/common/GiveItemCommand.cpp @@ -7,12 +7,12 @@ #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" EGameCommand GiveItemCommand::getId() { return eGameCommand_Give; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h b/minecraft/minecraft/commands/common/GiveItemCommand.h similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h rename to minecraft/minecraft/commands/common/GiveItemCommand.h index 5fab7f622..9046f0884 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h +++ b/minecraft/minecraft/commands/common/GiveItemCommand.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class GameCommandPacket; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp b/minecraft/minecraft/commands/common/KillCommand.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp rename to minecraft/minecraft/commands/common/KillCommand.cpp index 1306b4aa1..ed460dca7 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp +++ b/minecraft/minecraft/commands/common/KillCommand.cpp @@ -3,9 +3,9 @@ #include #include "KillCommand.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/commands/CommandSender.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/player/Player.h" EGameCommand KillCommand::getId() { return eGameCommand_Kill; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h b/minecraft/minecraft/commands/common/KillCommand.h similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h rename to minecraft/minecraft/commands/common/KillCommand.h index b9f6e8ae5..918d8108a 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h +++ b/minecraft/minecraft/commands/common/KillCommand.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class KillCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/PlaySoundCommand.h b/minecraft/minecraft/commands/common/PlaySoundCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/PlaySoundCommand.h rename to minecraft/minecraft/commands/common/PlaySoundCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/SetPlayerTimeoutCommand.h b/minecraft/minecraft/commands/common/SetPlayerTimeoutCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/SetPlayerTimeoutCommand.h rename to minecraft/minecraft/commands/common/SetPlayerTimeoutCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ShowSeedCommand.h b/minecraft/minecraft/commands/common/ShowSeedCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/ShowSeedCommand.h rename to minecraft/minecraft/commands/common/ShowSeedCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/SpreadPlayersCommand.h b/minecraft/minecraft/commands/common/SpreadPlayersCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/SpreadPlayersCommand.h rename to minecraft/minecraft/commands/common/SpreadPlayersCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp b/minecraft/minecraft/commands/common/TimeCommand.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp rename to minecraft/minecraft/commands/common/TimeCommand.cpp index 6204242c6..152455be7 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp +++ b/minecraft/minecraft/commands/common/TimeCommand.cpp @@ -8,7 +8,7 @@ #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h b/minecraft/minecraft/commands/common/TimeCommand.h similarity index 73% rename from minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h rename to minecraft/minecraft/commands/common/TimeCommand.h index 7905ee44b..cf2dd6008 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h +++ b/minecraft/minecraft/commands/common/TimeCommand.h @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/GameCommandPacket.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp b/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp rename to minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp index cabc05881..4a921aeb6 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp +++ b/minecraft/minecraft/commands/common/ToggleDownfallCommand.cpp @@ -4,9 +4,9 @@ #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "ToggleDownfallCommand.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/world/level/storage/LevelData.h" EGameCommand ToggleDownfallCommand::getId() { return eGameCommand_ToggleDownfall; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h b/minecraft/minecraft/commands/common/ToggleDownfallCommand.h similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h rename to minecraft/minecraft/commands/common/ToggleDownfallCommand.h index 12cd7af19..c9be2155d 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h +++ b/minecraft/minecraft/commands/common/ToggleDownfallCommand.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/Command.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/Command.h" +#include "minecraft/commands/CommandsEnum.h" class GameCommandPacket; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/WeatherCommand.h b/minecraft/minecraft/commands/common/WeatherCommand.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/WeatherCommand.h rename to minecraft/minecraft/commands/common/WeatherCommand.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/net.minecraft.commands.common.h b/minecraft/minecraft/commands/common/net.minecraft.commands.common.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/common/net.minecraft.commands.common.h rename to minecraft/minecraft/commands/common/net.minecraft.commands.common.h diff --git a/minecraft/Minecraft.World/net/minecraft/commands/net.minecraft.commands.h b/minecraft/minecraft/commands/net.minecraft.commands.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/commands/net.minecraft.commands.h rename to minecraft/minecraft/commands/net.minecraft.commands.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp b/minecraft/minecraft/core/AbstractProjectileDispenseBehavior.cpp similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp rename to minecraft/minecraft/core/AbstractProjectileDispenseBehavior.cpp index dad13d99b..81b8ceb41 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp +++ b/minecraft/minecraft/core/AbstractProjectileDispenseBehavior.cpp @@ -1,15 +1,15 @@ #include "AbstractProjectileDispenseBehavior.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Projectile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/entity/projectile/Projectile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/core/Position.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/core/Position.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/ItemInstance.h" std::shared_ptr AbstractProjectileDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h b/minecraft/minecraft/core/AbstractProjectileDispenseBehavior.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h rename to minecraft/minecraft/core/AbstractProjectileDispenseBehavior.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/Behavior.h b/minecraft/minecraft/core/Behavior.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/Behavior.h rename to minecraft/minecraft/core/Behavior.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp b/minecraft/minecraft/core/BehaviorRegistry.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp rename to minecraft/minecraft/core/BehaviorRegistry.cpp index e91d33a07..1df13a18a 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp +++ b/minecraft/minecraft/core/BehaviorRegistry.cpp @@ -1,7 +1,7 @@ #include #include "BehaviorRegistry.h" -#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" +#include "minecraft/core/DispenseItemBehavior.h" class Item; diff --git a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h b/minecraft/minecraft/core/BehaviorRegistry.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h rename to minecraft/minecraft/core/BehaviorRegistry.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/BlockSource.h b/minecraft/minecraft/core/BlockSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/BlockSource.h rename to minecraft/minecraft/core/BlockSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp b/minecraft/minecraft/core/BlockSourceImpl.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp rename to minecraft/minecraft/core/BlockSourceImpl.cpp index fa0acdcb9..6d659c0b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp +++ b/minecraft/minecraft/core/BlockSourceImpl.cpp @@ -1,8 +1,8 @@ #include #include "BlockSourceImpl.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" BlockSourceImpl::BlockSourceImpl(Level* world, int x, int y, int z) { this->world = world; diff --git a/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.h b/minecraft/minecraft/core/BlockSourceImpl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.h rename to minecraft/minecraft/core/BlockSourceImpl.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp b/minecraft/minecraft/core/DefaultDispenseItemBehavior.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp rename to minecraft/minecraft/core/DefaultDispenseItemBehavior.cpp index 954fea29f..ca918569d 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp +++ b/minecraft/minecraft/core/DefaultDispenseItemBehavior.cpp @@ -1,12 +1,12 @@ #include "DefaultDispenseItemBehavior.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/core/Position.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/core/Position.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" std::shared_ptr DefaultDispenseItemBehavior::dispense( BlockSource* source, std::shared_ptr dispensed) { diff --git a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h b/minecraft/minecraft/core/DefaultDispenseItemBehavior.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h rename to minecraft/minecraft/core/DefaultDispenseItemBehavior.h index e7ad77b5e..65e221dda 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h +++ b/minecraft/minecraft/core/DefaultDispenseItemBehavior.h @@ -2,7 +2,7 @@ #include #include "DispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class FacingEnum; class Position; diff --git a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp b/minecraft/minecraft/core/DispenseItemBehavior.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp rename to minecraft/minecraft/core/DispenseItemBehavior.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h b/minecraft/minecraft/core/DispenseItemBehavior.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h rename to minecraft/minecraft/core/DispenseItemBehavior.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp b/minecraft/minecraft/core/FacingEnum.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp rename to minecraft/minecraft/core/FacingEnum.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.h b/minecraft/minecraft/core/FacingEnum.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/FacingEnum.h rename to minecraft/minecraft/core/FacingEnum.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp b/minecraft/minecraft/core/ItemDispenseBehaviors.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp rename to minecraft/minecraft/core/ItemDispenseBehaviors.cpp index ce70fd7aa..e190172f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp +++ b/minecraft/minecraft/core/ItemDispenseBehaviors.cpp @@ -6,34 +6,34 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/core/Position.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Boat.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" -#include "Minecraft.World/net/minecraft/world/item/BucketItem.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/core/AbstractProjectileDispenseBehavior.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/core/Position.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/item/Boat.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/projectile/FireworksRocketEntity.h" +#include "minecraft/world/entity/projectile/SmallFireball.h" +#include "minecraft/world/entity/projectile/Snowball.h" +#include "minecraft/world/entity/projectile/ThrownEgg.h" +#include "minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/item/BucketItem.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/SpawnEggItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" /* Arrow */ diff --git a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.h b/minecraft/minecraft/core/ItemDispenseBehaviors.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.h rename to minecraft/minecraft/core/ItemDispenseBehaviors.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/LocatableSource.h b/minecraft/minecraft/core/LocatableSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/LocatableSource.h rename to minecraft/minecraft/core/LocatableSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/Location.h b/minecraft/minecraft/core/Location.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/Location.h rename to minecraft/minecraft/core/Location.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/Position.h b/minecraft/minecraft/core/Position.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/Position.h rename to minecraft/minecraft/core/Position.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/PositionImpl.h b/minecraft/minecraft/core/PositionImpl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/PositionImpl.h rename to minecraft/minecraft/core/PositionImpl.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/Source.h b/minecraft/minecraft/core/Source.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/Source.h rename to minecraft/minecraft/core/Source.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/net.minecraft.core.h b/minecraft/minecraft/core/net.minecraft.core.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/net.minecraft.core.h rename to minecraft/minecraft/core/net.minecraft.core.h diff --git a/minecraft/Minecraft.World/net/minecraft/core/particles/ParticleTypes.h b/minecraft/minecraft/core/particles/ParticleTypes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/core/particles/ParticleTypes.h rename to minecraft/minecraft/core/particles/ParticleTypes.h diff --git a/minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp b/minecraft/minecraft/locale/I18n.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp rename to minecraft/minecraft/locale/I18n.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/locale/I18n.h b/minecraft/minecraft/locale/I18n.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/locale/I18n.h rename to minecraft/minecraft/locale/I18n.h diff --git a/minecraft/Minecraft.World/net/minecraft/locale/Language.cpp b/minecraft/minecraft/locale/Language.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/locale/Language.cpp rename to minecraft/minecraft/locale/Language.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/locale/Language.h b/minecraft/minecraft/locale/Language.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/locale/Language.h rename to minecraft/minecraft/locale/Language.h diff --git a/minecraft/Minecraft.World/net/minecraft/locale/net.minecraft.locale.h b/minecraft/minecraft/locale/net.minecraft.locale.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/locale/net.minecraft.locale.h rename to minecraft/minecraft/locale/net.minecraft.locale.h diff --git a/minecraft/Minecraft.World/meson.build b/minecraft/minecraft/meson.build similarity index 87% rename from minecraft/Minecraft.World/meson.build rename to minecraft/minecraft/meson.build index aa35455cb..98000bba3 100644 --- a/minecraft/Minecraft.World/meson.build +++ b/minecraft/minecraft/meson.build @@ -16,7 +16,7 @@ exclude_sources = [ # GET IT ALLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL # TODO: make this process more portable using a python script :3 -world_sources = run_command( +minecraft_sources = run_command( 'sh', '-c', 'find "' + meson.current_source_dir() @@ -25,8 +25,8 @@ world_sources = run_command( check : true, ).stdout().strip().split('\n') -lib_world = static_library('Minecraft.World', - world_sources, +lib_minecraft = static_library('minecraft', + minecraft_sources, dependencies : [ nbt_dep, java_dep, @@ -41,7 +41,7 @@ lib_world = static_library('Minecraft.World', zlib_dep = dependency('zlib') crypto_dep = dependency('libcrypto') # for MD5 in Hasher.cpp on Linux -world_dep = declare_dependency( - link_with : lib_world, +minecraft_dep = declare_dependency( + link_with : lib_minecraft, dependencies : [crypto_dep, zlib_dep], ) diff --git a/minecraft/Minecraft.World/net/minecraft/net.minecraft.h b/minecraft/minecraft/net.minecraft.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/net.minecraft.h rename to minecraft/minecraft/net.minecraft.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/minecraft/network/Connection.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/network/Connection.cpp rename to minecraft/minecraft/network/Connection.cpp index f2133021d..219f3ee9b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp +++ b/minecraft/minecraft/network/Connection.cpp @@ -14,9 +14,9 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" -#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/PacketListener.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.h b/minecraft/minecraft/network/Connection.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/Connection.h rename to minecraft/minecraft/network/Connection.h index 91697c1f2..3e1c83df8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.h +++ b/minecraft/minecraft/network/Connection.h @@ -9,12 +9,12 @@ #include "java/System.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "console_helpers/C4JThread.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "console_helpers/C4JThread.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" class DataInputStream; class DataOutputStream; diff --git a/minecraft/Minecraft.World/net/minecraft/network/net.minecraft.network.h b/minecraft/minecraft/network/net.minecraft.network.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/net.minecraft.network.h rename to minecraft/minecraft/network/net.minecraft.network.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp b/minecraft/minecraft/network/packet/AddEntityPacket.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp rename to minecraft/minecraft/network/packet/AddEntityPacket.cpp index 3d89313ba..126e20160 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp +++ b/minecraft/minecraft/network/packet/AddEntityPacket.cpp @@ -2,7 +2,7 @@ #include "AddEntityPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" void AddEntityPacket::_init(std::shared_ptr e, int type, int data, int xp, int yp, int zp, int yRotp, int xRotp) { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h b/minecraft/minecraft/network/packet/AddEntityPacket.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h rename to minecraft/minecraft/network/packet/AddEntityPacket.h index 6fded3fa7..f4dd88335 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h +++ b/minecraft/minecraft/network/packet/AddEntityPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp b/minecraft/minecraft/network/packet/AddExperienceOrbPacket.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp rename to minecraft/minecraft/network/packet/AddExperienceOrbPacket.cpp index 160916c92..cbc970832 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp +++ b/minecraft/minecraft/network/packet/AddExperienceOrbPacket.cpp @@ -2,8 +2,8 @@ #include "AddExperienceOrbPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/ExperienceOrb.h" AddExperienceOrbPacket::AddExperienceOrbPacket() { id = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h b/minecraft/minecraft/network/packet/AddExperienceOrbPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h rename to minecraft/minecraft/network/packet/AddExperienceOrbPacket.h index 96e1befe6..30b41c0b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h +++ b/minecraft/minecraft/network/packet/AddExperienceOrbPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ExperienceOrb; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp b/minecraft/minecraft/network/packet/AddGlobalEntityPacket.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp rename to minecraft/minecraft/network/packet/AddGlobalEntityPacket.cpp index 4673a6a19..ff0b9ca1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp +++ b/minecraft/minecraft/network/packet/AddGlobalEntityPacket.cpp @@ -5,8 +5,8 @@ #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" const int AddGlobalEntityPacket::LIGHTNING = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h b/minecraft/minecraft/network/packet/AddGlobalEntityPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h rename to minecraft/minecraft/network/packet/AddGlobalEntityPacket.h index 94a9ed294..8b44371ab 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h +++ b/minecraft/minecraft/network/packet/AddGlobalEntityPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp b/minecraft/minecraft/network/packet/AddMobPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp rename to minecraft/minecraft/network/packet/AddMobPacket.cpp index 54d39f7d9..a42006b6f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp +++ b/minecraft/minecraft/network/packet/AddMobPacket.cpp @@ -4,9 +4,9 @@ #include "AddMobPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" AddMobPacket::AddMobPacket() { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h b/minecraft/minecraft/network/packet/AddMobPacket.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h rename to minecraft/minecraft/network/packet/AddMobPacket.h index 92177a139..446c40af8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h +++ b/minecraft/minecraft/network/packet/AddMobPacket.h @@ -5,8 +5,8 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/network/packet/Packet.h" class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp b/minecraft/minecraft/network/packet/AddPaintingPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp rename to minecraft/minecraft/network/packet/AddPaintingPacket.cpp index aab5632c9..2b940d19d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp +++ b/minecraft/minecraft/network/packet/AddPaintingPacket.cpp @@ -2,7 +2,7 @@ #include "AddPaintingPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Painting.h" +#include "minecraft/world/entity/Painting.h" AddPaintingPacket::AddPaintingPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h b/minecraft/minecraft/network/packet/AddPaintingPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h rename to minecraft/minecraft/network/packet/AddPaintingPacket.h index a6316792c..80f848cf2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h +++ b/minecraft/minecraft/network/packet/AddPaintingPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Painting; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp b/minecraft/minecraft/network/packet/AddPlayerPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp rename to minecraft/minecraft/network/packet/AddPlayerPacket.cpp index 00a8b0eac..af0dcbbad 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp +++ b/minecraft/minecraft/network/packet/AddPlayerPacket.cpp @@ -4,10 +4,10 @@ #include "AddPlayerPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h b/minecraft/minecraft/network/packet/AddPlayerPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h rename to minecraft/minecraft/network/packet/AddPlayerPacket.h index 04e134947..8b637f7e8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h +++ b/minecraft/minecraft/network/packet/AddPlayerPacket.h @@ -6,9 +6,9 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/SyncedEntityData.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp b/minecraft/minecraft/network/packet/AnimatePacket.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp rename to minecraft/minecraft/network/packet/AnimatePacket.cpp index 0104570c8..0a7239cdc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp +++ b/minecraft/minecraft/network/packet/AnimatePacket.cpp @@ -4,7 +4,7 @@ #include "AnimatePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" AnimatePacket::AnimatePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h b/minecraft/minecraft/network/packet/AnimatePacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h rename to minecraft/minecraft/network/packet/AnimatePacket.h index eacf592a0..b7e52addb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h +++ b/minecraft/minecraft/network/packet/AnimatePacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp b/minecraft/minecraft/network/packet/AwardStatPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp rename to minecraft/minecraft/network/packet/AwardStatPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h b/minecraft/minecraft/network/packet/AwardStatPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h rename to minecraft/minecraft/network/packet/AwardStatPacket.h index 3e652bd07..41d2acaa8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h +++ b/minecraft/minecraft/network/packet/AwardStatPacket.h @@ -6,7 +6,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class AwardStatPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/minecraft/minecraft/network/packet/BlockRegionUpdatePacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp rename to minecraft/minecraft/network/packet/BlockRegionUpdatePacket.cpp index 5c396f30f..f3193e956 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/minecraft/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -3,13 +3,13 @@ #include "PacketListener.h" #include "BlockRegionUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" #define BLOCK_REGION_UPDATE_FULLCHUNK 0x01 #define BLOCK_REGION_UPDATE_ZEROHEIGHT \ diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h b/minecraft/minecraft/network/packet/BlockRegionUpdatePacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h rename to minecraft/minecraft/network/packet/BlockRegionUpdatePacket.h index dd05cb4c1..fa3f26fc6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h +++ b/minecraft/minecraft/network/packet/BlockRegionUpdatePacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatAutoCompletePacket.h b/minecraft/minecraft/network/packet/ChatAutoCompletePacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChatAutoCompletePacket.h rename to minecraft/minecraft/network/packet/ChatAutoCompletePacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp b/minecraft/minecraft/network/packet/ChatPacket.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp rename to minecraft/minecraft/network/packet/ChatPacket.cpp index 2af673e75..5026792b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp +++ b/minecraft/minecraft/network/packet/ChatPacket.cpp @@ -1,10 +1,10 @@ #include "PacketListener.h" #include "ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/player/Player.h" // longest allowed string is "<" + name + "> " + message const unsigned int ChatPacket::MAX_LENGTH = diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h b/minecraft/minecraft/network/packet/ChatPacket.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h rename to minecraft/minecraft/network/packet/ChatPacket.h index 9e0ebc533..1fa574b8a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h +++ b/minecraft/minecraft/network/packet/ChatPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ChatPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp b/minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp rename to minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.cpp index f7c164a91..51975a616 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp +++ b/minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.cpp @@ -1,10 +1,10 @@ #include "PacketListener.h" #include "ChunkTilesUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" ChunkTilesUpdatePacket::~ChunkTilesUpdatePacket() { } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h b/minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h rename to minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.h index bdf1d76ec..e23c99cce 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h +++ b/minecraft/minecraft/network/packet/ChunkTilesUpdatePacket.h @@ -6,7 +6,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp b/minecraft/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp rename to minecraft/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h b/minecraft/minecraft/network/packet/ChunkVisibilityAreaPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h rename to minecraft/minecraft/network/packet/ChunkVisibilityAreaPacket.h index 83e32dd81..1c5638f46 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h +++ b/minecraft/minecraft/network/packet/ChunkVisibilityAreaPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp b/minecraft/minecraft/network/packet/ChunkVisibilityPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp rename to minecraft/minecraft/network/packet/ChunkVisibilityPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h b/minecraft/minecraft/network/packet/ChunkVisibilityPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h rename to minecraft/minecraft/network/packet/ChunkVisibilityPacket.h index 3b8e195f8..a65b7c15b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h +++ b/minecraft/minecraft/network/packet/ChunkVisibilityPacket.h @@ -5,7 +5,7 @@ #include "Packet.h" #include "PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ChunkVisibilityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp b/minecraft/minecraft/network/packet/ClientCommandPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp rename to minecraft/minecraft/network/packet/ClientCommandPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h b/minecraft/minecraft/network/packet/ClientCommandPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h rename to minecraft/minecraft/network/packet/ClientCommandPacket.h index 62772e41d..e19e2dfd6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h +++ b/minecraft/minecraft/network/packet/ClientCommandPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ClientCommandPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h b/minecraft/minecraft/network/packet/ClientInformationPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h rename to minecraft/minecraft/network/packet/ClientInformationPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientProtocolPacket.h b/minecraft/minecraft/network/packet/ClientProtocolPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ClientProtocolPacket.h rename to minecraft/minecraft/network/packet/ClientProtocolPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp b/minecraft/minecraft/network/packet/ComplexItemDataPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp rename to minecraft/minecraft/network/packet/ComplexItemDataPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h b/minecraft/minecraft/network/packet/ComplexItemDataPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h rename to minecraft/minecraft/network/packet/ComplexItemDataPacket.h index d71e61c18..fe15cb3f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h +++ b/minecraft/minecraft/network/packet/ComplexItemDataPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ComplexItemDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp b/minecraft/minecraft/network/packet/ContainerAckPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp rename to minecraft/minecraft/network/packet/ContainerAckPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h b/minecraft/minecraft/network/packet/ContainerAckPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h rename to minecraft/minecraft/network/packet/ContainerAckPacket.h index 5e34d1fb2..20e999e0c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h +++ b/minecraft/minecraft/network/packet/ContainerAckPacket.h @@ -5,7 +5,7 @@ #include "Packet.h" #include "PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ContainerAckPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp b/minecraft/minecraft/network/packet/ContainerButtonClickPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp rename to minecraft/minecraft/network/packet/ContainerButtonClickPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h b/minecraft/minecraft/network/packet/ContainerButtonClickPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h rename to minecraft/minecraft/network/packet/ContainerButtonClickPacket.h index 59fce6daf..eb81cee7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h +++ b/minecraft/minecraft/network/packet/ContainerButtonClickPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ContainerButtonClickPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp b/minecraft/minecraft/network/packet/ContainerClickPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp rename to minecraft/minecraft/network/packet/ContainerClickPacket.cpp index 9030b0b6d..bd3e22be3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp +++ b/minecraft/minecraft/network/packet/ContainerClickPacket.cpp @@ -4,7 +4,7 @@ #include "ContainerClickPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" ContainerClickPacket::~ContainerClickPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h b/minecraft/minecraft/network/packet/ContainerClickPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h rename to minecraft/minecraft/network/packet/ContainerClickPacket.h index 8670a8339..ba459f085 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h +++ b/minecraft/minecraft/network/packet/ContainerClickPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp b/minecraft/minecraft/network/packet/ContainerClosePacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp rename to minecraft/minecraft/network/packet/ContainerClosePacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h b/minecraft/minecraft/network/packet/ContainerClosePacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h rename to minecraft/minecraft/network/packet/ContainerClosePacket.h index ca389e4b2..200d14a63 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h +++ b/minecraft/minecraft/network/packet/ContainerClosePacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ContainerClosePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp b/minecraft/minecraft/network/packet/ContainerOpenPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp rename to minecraft/minecraft/network/packet/ContainerOpenPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h b/minecraft/minecraft/network/packet/ContainerOpenPacket.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h rename to minecraft/minecraft/network/packet/ContainerOpenPacket.h index fdc1aecfa..32bb11662 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h +++ b/minecraft/minecraft/network/packet/ContainerOpenPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ContainerOpenPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp b/minecraft/minecraft/network/packet/ContainerSetContentPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp rename to minecraft/minecraft/network/packet/ContainerSetContentPacket.cpp index 478438fd6..48dc420c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp +++ b/minecraft/minecraft/network/packet/ContainerSetContentPacket.cpp @@ -4,7 +4,7 @@ #include "ContainerSetContentPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" ContainerSetContentPacket::~ContainerSetContentPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h b/minecraft/minecraft/network/packet/ContainerSetContentPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h rename to minecraft/minecraft/network/packet/ContainerSetContentPacket.h index 2279c0c42..374b88454 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h +++ b/minecraft/minecraft/network/packet/ContainerSetContentPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp b/minecraft/minecraft/network/packet/ContainerSetDataPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp rename to minecraft/minecraft/network/packet/ContainerSetDataPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h b/minecraft/minecraft/network/packet/ContainerSetDataPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h rename to minecraft/minecraft/network/packet/ContainerSetDataPacket.h index 6d5f2265f..276b415e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h +++ b/minecraft/minecraft/network/packet/ContainerSetDataPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ContainerSetDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp b/minecraft/minecraft/network/packet/ContainerSetSlotPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp rename to minecraft/minecraft/network/packet/ContainerSetSlotPacket.cpp index 5591db87c..282d7369c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp +++ b/minecraft/minecraft/network/packet/ContainerSetSlotPacket.cpp @@ -4,7 +4,7 @@ #include "ContainerSetSlotPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" const int ContainerSetSlotPacket::CONTAINER = 0; const int ContainerSetSlotPacket::WORKBENCH = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h b/minecraft/minecraft/network/packet/ContainerSetSlotPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h rename to minecraft/minecraft/network/packet/ContainerSetSlotPacket.h index 3d878ae8b..00ebb5674 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h +++ b/minecraft/minecraft/network/packet/ContainerSetSlotPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp b/minecraft/minecraft/network/packet/CraftItemPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp rename to minecraft/minecraft/network/packet/CraftItemPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h b/minecraft/minecraft/network/packet/CraftItemPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h rename to minecraft/minecraft/network/packet/CraftItemPacket.h index 120b634d0..acb049c1c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h +++ b/minecraft/minecraft/network/packet/CraftItemPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class CraftItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp b/minecraft/minecraft/network/packet/CustomPayloadPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp rename to minecraft/minecraft/network/packet/CustomPayloadPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h b/minecraft/minecraft/network/packet/CustomPayloadPacket.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h rename to minecraft/minecraft/network/packet/CustomPayloadPacket.h index e5109f2ed..715c091e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h +++ b/minecraft/minecraft/network/packet/CustomPayloadPacket.h @@ -7,7 +7,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class CustomPayloadPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp b/minecraft/minecraft/network/packet/DebugOptionsPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp rename to minecraft/minecraft/network/packet/DebugOptionsPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h b/minecraft/minecraft/network/packet/DebugOptionsPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h rename to minecraft/minecraft/network/packet/DebugOptionsPacket.h index 04564c443..b47b9d97c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h +++ b/minecraft/minecraft/network/packet/DebugOptionsPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class DebugOptionsPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp b/minecraft/minecraft/network/packet/DisconnectPacket.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp rename to minecraft/minecraft/network/packet/DisconnectPacket.cpp index b8dd1b4b4..11d785aa0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp +++ b/minecraft/minecraft/network/packet/DisconnectPacket.cpp @@ -2,10 +2,10 @@ #include #include "PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" DisconnectPacket::DisconnectPacket() { reason = eDisconnect_None; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h b/minecraft/minecraft/network/packet/DisconnectPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h rename to minecraft/minecraft/network/packet/DisconnectPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp b/minecraft/minecraft/network/packet/EntityActionAtPositionPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp rename to minecraft/minecraft/network/packet/EntityActionAtPositionPacket.cpp index c9c1b9121..5ac2a1beb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp +++ b/minecraft/minecraft/network/packet/EntityActionAtPositionPacket.cpp @@ -4,7 +4,7 @@ #include "EntityActionAtPositionPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" const int EntityActionAtPositionPacket::START_SLEEP = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h b/minecraft/minecraft/network/packet/EntityActionAtPositionPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h rename to minecraft/minecraft/network/packet/EntityActionAtPositionPacket.h index f942193a2..d99fc2c2c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h +++ b/minecraft/minecraft/network/packet/EntityActionAtPositionPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp b/minecraft/minecraft/network/packet/EntityEventPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp rename to minecraft/minecraft/network/packet/EntityEventPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h b/minecraft/minecraft/network/packet/EntityEventPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h rename to minecraft/minecraft/network/packet/EntityEventPacket.h index 144bdddf8..0b9904cc0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h +++ b/minecraft/minecraft/network/packet/EntityEventPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class EntityEventPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp b/minecraft/minecraft/network/packet/ExplodePacket.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp rename to minecraft/minecraft/network/packet/ExplodePacket.cpp index 55a8c12f0..6214c89a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp +++ b/minecraft/minecraft/network/packet/ExplodePacket.cpp @@ -4,7 +4,7 @@ #include "ExplodePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" ExplodePacket::ExplodePacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h b/minecraft/minecraft/network/packet/ExplodePacket.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h rename to minecraft/minecraft/network/packet/ExplodePacket.h index ec2c04610..87083dd75 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h +++ b/minecraft/minecraft/network/packet/ExplodePacket.h @@ -4,10 +4,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/level/TilePos.h" #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/level/TilePos.h" class Vec3; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp b/minecraft/minecraft/network/packet/GameCommandPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp rename to minecraft/minecraft/network/packet/GameCommandPacket.cpp index 6f7b9d8f5..9fd127d05 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp +++ b/minecraft/minecraft/network/packet/GameCommandPacket.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/CommandsEnum.h" GameCommandPacket::GameCommandPacket() { length = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h b/minecraft/minecraft/network/packet/GameCommandPacket.h similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h rename to minecraft/minecraft/network/packet/GameCommandPacket.h index 30b549efb..4b0f58d93 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h +++ b/minecraft/minecraft/network/packet/GameCommandPacket.h @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "minecraft/commands/CommandsEnum.h" #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class GameCommandPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp b/minecraft/minecraft/network/packet/GameEventPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp rename to minecraft/minecraft/network/packet/GameEventPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h b/minecraft/minecraft/network/packet/GameEventPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h rename to minecraft/minecraft/network/packet/GameEventPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp b/minecraft/minecraft/network/packet/GetInfoPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp rename to minecraft/minecraft/network/packet/GetInfoPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h b/minecraft/minecraft/network/packet/GetInfoPacket.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h rename to minecraft/minecraft/network/packet/GetInfoPacket.h index 8d687bcad..2170977f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h +++ b/minecraft/minecraft/network/packet/GetInfoPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class GetInfoPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp b/minecraft/minecraft/network/packet/InteractPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp rename to minecraft/minecraft/network/packet/InteractPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h b/minecraft/minecraft/network/packet/InteractPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h rename to minecraft/minecraft/network/packet/InteractPacket.h index 927169a2c..152800fcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h +++ b/minecraft/minecraft/network/packet/InteractPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class InteractPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp b/minecraft/minecraft/network/packet/KeepAlivePacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp rename to minecraft/minecraft/network/packet/KeepAlivePacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h b/minecraft/minecraft/network/packet/KeepAlivePacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h rename to minecraft/minecraft/network/packet/KeepAlivePacket.h index 7c108ac23..8fbbf07d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h +++ b/minecraft/minecraft/network/packet/KeepAlivePacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class KeepAlivePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp b/minecraft/minecraft/network/packet/KickPlayerPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp rename to minecraft/minecraft/network/packet/KickPlayerPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h b/minecraft/minecraft/network/packet/KickPlayerPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h rename to minecraft/minecraft/network/packet/KickPlayerPacket.h index 38e410fc3..785b5ce1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h +++ b/minecraft/minecraft/network/packet/KickPlayerPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class KickPlayerPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp b/minecraft/minecraft/network/packet/LevelEventPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp rename to minecraft/minecraft/network/packet/LevelEventPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h b/minecraft/minecraft/network/packet/LevelEventPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h rename to minecraft/minecraft/network/packet/LevelEventPacket.h index f7de00d44..0e6c00c62 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h +++ b/minecraft/minecraft/network/packet/LevelEventPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class LevelEventPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp b/minecraft/minecraft/network/packet/LevelParticlesPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp rename to minecraft/minecraft/network/packet/LevelParticlesPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h b/minecraft/minecraft/network/packet/LevelParticlesPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h rename to minecraft/minecraft/network/packet/LevelParticlesPacket.h index 988b6310c..21f541848 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h +++ b/minecraft/minecraft/network/packet/LevelParticlesPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class LevelParticlesPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp b/minecraft/minecraft/network/packet/LevelSoundPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp rename to minecraft/minecraft/network/packet/LevelSoundPacket.cpp index 1eb507863..8ef620eae 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp +++ b/minecraft/minecraft/network/packet/LevelSoundPacket.cpp @@ -3,7 +3,7 @@ #include "LevelSoundPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/PacketListener.h" const float LevelSoundPacket::PITCH_ACCURACY = std::numeric_limits::max() / 2.0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h b/minecraft/minecraft/network/packet/LevelSoundPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h rename to minecraft/minecraft/network/packet/LevelSoundPacket.h index 01bfa7e46..dd614143f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h +++ b/minecraft/minecraft/network/packet/LevelSoundPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class LevelSoundPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp b/minecraft/minecraft/network/packet/LoginPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp rename to minecraft/minecraft/network/packet/LoginPacket.cpp index dd4c27467..31d07f423 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp +++ b/minecraft/minecraft/network/packet/LoginPacket.cpp @@ -1,11 +1,11 @@ #include "PacketListener.h" #include "LoginPacket.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "minecraft/world/level/LevelType.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/chunk/ChunkSource.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h b/minecraft/minecraft/network/packet/LoginPacket.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h rename to minecraft/minecraft/network/packet/LoginPacket.h index 023d00b89..314221b44 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h +++ b/minecraft/minecraft/network/packet/LoginPacket.h @@ -6,7 +6,7 @@ #include "Packet.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class LevelType; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp b/minecraft/minecraft/network/packet/MoveEntityPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp rename to minecraft/minecraft/network/packet/MoveEntityPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h b/minecraft/minecraft/network/packet/MoveEntityPacket.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h rename to minecraft/minecraft/network/packet/MoveEntityPacket.h index 4a5670fa5..23a54fe42 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h +++ b/minecraft/minecraft/network/packet/MoveEntityPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class MoveEntityPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp b/minecraft/minecraft/network/packet/MoveEntityPacketSmall.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp rename to minecraft/minecraft/network/packet/MoveEntityPacketSmall.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h b/minecraft/minecraft/network/packet/MoveEntityPacketSmall.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h rename to minecraft/minecraft/network/packet/MoveEntityPacketSmall.h index 701fef708..edefef030 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h +++ b/minecraft/minecraft/network/packet/MoveEntityPacketSmall.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class MoveEntityPacketSmall : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp b/minecraft/minecraft/network/packet/MovePlayerPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp rename to minecraft/minecraft/network/packet/MovePlayerPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h b/minecraft/minecraft/network/packet/MovePlayerPacket.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h rename to minecraft/minecraft/network/packet/MovePlayerPacket.h index a0dbd2688..ed4668b11 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h +++ b/minecraft/minecraft/network/packet/MovePlayerPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class MovePlayerPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp b/minecraft/minecraft/network/packet/Packet.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp rename to minecraft/minecraft/network/packet/Packet.cpp index 9a7b335ef..5fb22c54a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp +++ b/minecraft/minecraft/network/packet/Packet.cpp @@ -18,95 +18,95 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "nbt/NbtIo.h" -#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ExplodePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" -#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RespawnPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetScorePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetTimePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/XZPacket.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/AddEntityPacket.h" +#include "minecraft/network/packet/AddExperienceOrbPacket.h" +#include "minecraft/network/packet/AddGlobalEntityPacket.h" +#include "minecraft/network/packet/AddMobPacket.h" +#include "minecraft/network/packet/AddPaintingPacket.h" +#include "minecraft/network/packet/AddPlayerPacket.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/AwardStatPacket.h" +#include "minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "minecraft/network/packet/ChunkVisibilityPacket.h" +#include "minecraft/network/packet/ClientCommandPacket.h" +#include "minecraft/network/packet/ComplexItemDataPacket.h" +#include "minecraft/network/packet/ContainerAckPacket.h" +#include "minecraft/network/packet/ContainerButtonClickPacket.h" +#include "minecraft/network/packet/ContainerClickPacket.h" +#include "minecraft/network/packet/ContainerClosePacket.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/network/packet/ContainerSetContentPacket.h" +#include "minecraft/network/packet/ContainerSetDataPacket.h" +#include "minecraft/network/packet/ContainerSetSlotPacket.h" +#include "minecraft/network/packet/CraftItemPacket.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/DebugOptionsPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "minecraft/network/packet/EntityEventPacket.h" +#include "minecraft/network/packet/ExplodePacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/GetInfoPacket.h" +#include "minecraft/network/packet/InteractPacket.h" +#include "minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/network/packet/KickPlayerPacket.h" +#include "minecraft/network/packet/LevelEventPacket.h" +#include "minecraft/network/packet/LevelParticlesPacket.h" +#include "minecraft/network/packet/LevelSoundPacket.h" +#include "minecraft/network/packet/LoginPacket.h" +#include "minecraft/network/packet/MoveEntityPacket.h" +#include "minecraft/network/packet/MoveEntityPacketSmall.h" +#include "minecraft/network/packet/MovePlayerPacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerActionPacket.h" +#include "minecraft/network/packet/PlayerCommandPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/network/packet/PlayerInputPacket.h" +#include "minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/network/packet/RemoveEntitiesPacket.h" +#include "minecraft/network/packet/RemoveMobEffectPacket.h" +#include "minecraft/network/packet/RespawnPacket.h" +#include "minecraft/network/packet/RotateHeadPacket.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "minecraft/network/packet/SetDisplayObjectivePacket.h" +#include "minecraft/network/packet/SetEntityDataPacket.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/network/packet/SetEntityMotionPacket.h" +#include "minecraft/network/packet/SetEquippedItemPacket.h" +#include "minecraft/network/packet/SetExperiencePacket.h" +#include "minecraft/network/packet/SetHealthPacket.h" +#include "minecraft/network/packet/SetObjectivePacket.h" +#include "minecraft/network/packet/SetPlayerTeamPacket.h" +#include "minecraft/network/packet/SetScorePacket.h" +#include "minecraft/network/packet/SetSpawnPositionPacket.h" +#include "minecraft/network/packet/SetTimePacket.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/network/packet/TakeItemEntityPacket.h" +#include "minecraft/network/packet/TeleportEntityPacket.h" +#include "minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "minecraft/network/packet/TextureAndGeometryPacket.h" +#include "minecraft/network/packet/TextureChangePacket.h" +#include "minecraft/network/packet/TexturePacket.h" +#include "minecraft/network/packet/TileDestructionPacket.h" +#include "minecraft/network/packet/TileEditorOpenPacket.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/network/packet/TileEventPacket.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/network/packet/TradeItemPacket.h" +#include "minecraft/network/packet/UpdateAttributesPacket.h" +#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/network/packet/UpdateProgressPacket.h" +#include "minecraft/network/packet/UseItemPacket.h" +#include "minecraft/network/packet/XZPacket.h" +#include "minecraft/world/item/ItemInstance.h" class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h b/minecraft/minecraft/network/packet/Packet.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h rename to minecraft/minecraft/network/packet/Packet.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp b/minecraft/minecraft/network/packet/PacketListener.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp rename to minecraft/minecraft/network/packet/PacketListener.cpp index 08d045324..1622f9e05 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp +++ b/minecraft/minecraft/network/packet/PacketListener.cpp @@ -1,91 +1,91 @@ #include "PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatAutoCompletePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ClientProtocolPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ExplodePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" -#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RespawnPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ServerAuthDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetScorePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetTimePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEventPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/XZPacket.h" +#include "minecraft/network/packet/AddEntityPacket.h" +#include "minecraft/network/packet/AddExperienceOrbPacket.h" +#include "minecraft/network/packet/AddGlobalEntityPacket.h" +#include "minecraft/network/packet/AddMobPacket.h" +#include "minecraft/network/packet/AddPaintingPacket.h" +#include "minecraft/network/packet/AddPlayerPacket.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/AwardStatPacket.h" +#include "minecraft/network/packet/ChatAutoCompletePacket.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "minecraft/network/packet/ChunkVisibilityPacket.h" +#include "minecraft/network/packet/ClientInformationPacket.h" +#include "minecraft/network/packet/ClientProtocolPacket.h" +#include "minecraft/network/packet/ComplexItemDataPacket.h" +#include "minecraft/network/packet/ContainerAckPacket.h" +#include "minecraft/network/packet/ContainerButtonClickPacket.h" +#include "minecraft/network/packet/ContainerClickPacket.h" +#include "minecraft/network/packet/ContainerClosePacket.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/network/packet/ContainerSetContentPacket.h" +#include "minecraft/network/packet/ContainerSetDataPacket.h" +#include "minecraft/network/packet/ContainerSetSlotPacket.h" +#include "minecraft/network/packet/CraftItemPacket.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/DebugOptionsPacket.h" +#include "minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "minecraft/network/packet/EntityEventPacket.h" +#include "minecraft/network/packet/ExplodePacket.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/GetInfoPacket.h" +#include "minecraft/network/packet/InteractPacket.h" +#include "minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/network/packet/KickPlayerPacket.h" +#include "minecraft/network/packet/LevelEventPacket.h" +#include "minecraft/network/packet/LevelParticlesPacket.h" +#include "minecraft/network/packet/LevelSoundPacket.h" +#include "minecraft/network/packet/LoginPacket.h" +#include "minecraft/network/packet/MoveEntityPacket.h" +#include "minecraft/network/packet/MoveEntityPacketSmall.h" +#include "minecraft/network/packet/MovePlayerPacket.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerActionPacket.h" +#include "minecraft/network/packet/PlayerCommandPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/network/packet/PlayerInputPacket.h" +#include "minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/network/packet/RemoveEntitiesPacket.h" +#include "minecraft/network/packet/RemoveMobEffectPacket.h" +#include "minecraft/network/packet/RespawnPacket.h" +#include "minecraft/network/packet/RotateHeadPacket.h" +#include "minecraft/network/packet/ServerAuthDataPacket.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "minecraft/network/packet/SetDisplayObjectivePacket.h" +#include "minecraft/network/packet/SetEntityDataPacket.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/network/packet/SetEntityMotionPacket.h" +#include "minecraft/network/packet/SetEquippedItemPacket.h" +#include "minecraft/network/packet/SetExperiencePacket.h" +#include "minecraft/network/packet/SetHealthPacket.h" +#include "minecraft/network/packet/SetObjectivePacket.h" +#include "minecraft/network/packet/SetPlayerTeamPacket.h" +#include "minecraft/network/packet/SetScorePacket.h" +#include "minecraft/network/packet/SetSpawnPositionPacket.h" +#include "minecraft/network/packet/SetTimePacket.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/network/packet/TakeItemEntityPacket.h" +#include "minecraft/network/packet/TeleportEntityPacket.h" +#include "minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "minecraft/network/packet/TextureAndGeometryPacket.h" +#include "minecraft/network/packet/TextureChangePacket.h" +#include "minecraft/network/packet/TexturePacket.h" +#include "minecraft/network/packet/TileDestructionPacket.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/network/packet/TileEventPacket.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/network/packet/TradeItemPacket.h" +#include "minecraft/network/packet/UpdateAttributesPacket.h" +#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/network/packet/UpdateProgressPacket.h" +#include "minecraft/network/packet/UseItemPacket.h" +#include "minecraft/network/packet/XZPacket.h" void PacketListener::handleBlockRegionUpdate( std::shared_ptr packet) {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h b/minecraft/minecraft/network/packet/PacketListener.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h rename to minecraft/minecraft/network/packet/PacketListener.h index 78c5b1548..da7c2002b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h +++ b/minecraft/minecraft/network/packet/PacketListener.h @@ -3,7 +3,7 @@ #include #include "DisconnectPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" class Packet; class AddEntityPacket; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp b/minecraft/minecraft/network/packet/PlayerAbilitiesPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp rename to minecraft/minecraft/network/packet/PlayerAbilitiesPacket.cpp index 8e79d3c26..b57ea712b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp +++ b/minecraft/minecraft/network/packet/PlayerAbilitiesPacket.cpp @@ -3,8 +3,8 @@ #include "PlayerAbilitiesPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "minecraft/network/packet/PacketListener.h" +#include "minecraft/world/entity/player/Abilities.h" PlayerAbilitiesPacket::PlayerAbilitiesPacket() { invulnerable = false; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h b/minecraft/minecraft/network/packet/PlayerAbilitiesPacket.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h rename to minecraft/minecraft/network/packet/PlayerAbilitiesPacket.h index f73e73fe1..11d365da6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h +++ b/minecraft/minecraft/network/packet/PlayerAbilitiesPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Abilities; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp b/minecraft/minecraft/network/packet/PlayerActionPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp rename to minecraft/minecraft/network/packet/PlayerActionPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h b/minecraft/minecraft/network/packet/PlayerActionPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h rename to minecraft/minecraft/network/packet/PlayerActionPacket.h index aa80ce384..5b0d3fe48 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h +++ b/minecraft/minecraft/network/packet/PlayerActionPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class PlayerActionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp b/minecraft/minecraft/network/packet/PlayerCommandPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp rename to minecraft/minecraft/network/packet/PlayerCommandPacket.cpp index c91136637..833274183 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp +++ b/minecraft/minecraft/network/packet/PlayerCommandPacket.cpp @@ -2,7 +2,7 @@ #include "PlayerCommandPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" const int PlayerCommandPacket::START_SNEAKING = 1; const int PlayerCommandPacket::STOP_SNEAKING = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h b/minecraft/minecraft/network/packet/PlayerCommandPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h rename to minecraft/minecraft/network/packet/PlayerCommandPacket.h index a334aaa75..ac6ce5d9d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h +++ b/minecraft/minecraft/network/packet/PlayerCommandPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp b/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp rename to minecraft/minecraft/network/packet/PlayerInfoPacket.cpp index b3da9f2ba..1b4bcb58f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/minecraft/minecraft/network/packet/PlayerInfoPacket.cpp @@ -3,7 +3,7 @@ #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/PacketListener.h" #ifndef __linux__ #include #endif // __linux__ diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h b/minecraft/minecraft/network/packet/PlayerInfoPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h rename to minecraft/minecraft/network/packet/PlayerInfoPacket.h index 18d08c581..07d513b44 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h +++ b/minecraft/minecraft/network/packet/PlayerInfoPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ServerPlayer; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp b/minecraft/minecraft/network/packet/PlayerInputPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp rename to minecraft/minecraft/network/packet/PlayerInputPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h b/minecraft/minecraft/network/packet/PlayerInputPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h rename to minecraft/minecraft/network/packet/PlayerInputPacket.h index 3e933282b..d78a1979f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h +++ b/minecraft/minecraft/network/packet/PlayerInputPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class PlayerInputPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp b/minecraft/minecraft/network/packet/PreLoginPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp rename to minecraft/minecraft/network/packet/PreLoginPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h b/minecraft/minecraft/network/packet/PreLoginPacket.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h rename to minecraft/minecraft/network/packet/PreLoginPacket.h index 1ef98c56e..11f6a590d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h +++ b/minecraft/minecraft/network/packet/PreLoginPacket.h @@ -6,7 +6,7 @@ #include "Packet.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class PreLoginPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp b/minecraft/minecraft/network/packet/RemoveEntitiesPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp rename to minecraft/minecraft/network/packet/RemoveEntitiesPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h b/minecraft/minecraft/network/packet/RemoveEntitiesPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h rename to minecraft/minecraft/network/packet/RemoveEntitiesPacket.h index 6f3197606..5120292d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h +++ b/minecraft/minecraft/network/packet/RemoveEntitiesPacket.h @@ -6,7 +6,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class RemoveEntitiesPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp b/minecraft/minecraft/network/packet/RemoveMobEffectPacket.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp rename to minecraft/minecraft/network/packet/RemoveMobEffectPacket.cpp index a7ad5f637..46176d6c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp +++ b/minecraft/minecraft/network/packet/RemoveMobEffectPacket.cpp @@ -4,7 +4,7 @@ #include "RemoveMobEffectPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/effect/MobEffectInstance.h" RemoveMobEffectPacket::RemoveMobEffectPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h b/minecraft/minecraft/network/packet/RemoveMobEffectPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h rename to minecraft/minecraft/network/packet/RemoveMobEffectPacket.h index 8d864f193..969911fce 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h +++ b/minecraft/minecraft/network/packet/RemoveMobEffectPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class MobEffectInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp b/minecraft/minecraft/network/packet/RespawnPacket.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp rename to minecraft/minecraft/network/packet/RespawnPacket.cpp index 42cf969b5..cb183dd4c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp +++ b/minecraft/minecraft/network/packet/RespawnPacket.cpp @@ -2,12 +2,12 @@ #include "PacketListener.h" #include "RespawnPacket.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "minecraft/world/level/LevelType.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/chunk/ChunkSource.h" RespawnPacket::RespawnPacket() { this->dimension = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h b/minecraft/minecraft/network/packet/RespawnPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h rename to minecraft/minecraft/network/packet/RespawnPacket.h index 7f592a11a..dfc8bd9f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h +++ b/minecraft/minecraft/network/packet/RespawnPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class LevelType; class GameType; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp b/minecraft/minecraft/network/packet/RotateHeadPacket.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp rename to minecraft/minecraft/network/packet/RotateHeadPacket.cpp index 80aabcd4a..d84d28ccc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp +++ b/minecraft/minecraft/network/packet/RotateHeadPacket.cpp @@ -1,7 +1,7 @@ #include "RotateHeadPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/PacketListener.h" RotateHeadPacket::RotateHeadPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h b/minecraft/minecraft/network/packet/RotateHeadPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h rename to minecraft/minecraft/network/packet/RotateHeadPacket.h index 24f78d194..cc98bf709 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h +++ b/minecraft/minecraft/network/packet/RotateHeadPacket.h @@ -5,7 +5,7 @@ #include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class RotateHeadPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerAuthDataPacket.h b/minecraft/minecraft/network/packet/ServerAuthDataPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ServerAuthDataPacket.h rename to minecraft/minecraft/network/packet/ServerAuthDataPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp b/minecraft/minecraft/network/packet/ServerSettingsChangedPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp rename to minecraft/minecraft/network/packet/ServerSettingsChangedPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h b/minecraft/minecraft/network/packet/ServerSettingsChangedPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h rename to minecraft/minecraft/network/packet/ServerSettingsChangedPacket.h index 854f4e824..853523bc9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h +++ b/minecraft/minecraft/network/packet/ServerSettingsChangedPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ServerSettingsChangedPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp b/minecraft/minecraft/network/packet/SetCarriedItemPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp rename to minecraft/minecraft/network/packet/SetCarriedItemPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h b/minecraft/minecraft/network/packet/SetCarriedItemPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h rename to minecraft/minecraft/network/packet/SetCarriedItemPacket.h index 2ed53ef01..e4033b9eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h +++ b/minecraft/minecraft/network/packet/SetCarriedItemPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SetCarriedItemPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp b/minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp rename to minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.cpp index 76cd892d9..ff2f39837 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp +++ b/minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.cpp @@ -2,7 +2,7 @@ #include "SetCreativeModeSlotPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" SetCreativeModeSlotPacket::SetCreativeModeSlotPacket() { this->slotNum = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h b/minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h rename to minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.h index 3f87d9068..db656c83d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h +++ b/minecraft/minecraft/network/packet/SetCreativeModeSlotPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp b/minecraft/minecraft/network/packet/SetDisplayObjectivePacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp rename to minecraft/minecraft/network/packet/SetDisplayObjectivePacket.cpp index cd699a857..0356dde64 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp +++ b/minecraft/minecraft/network/packet/SetDisplayObjectivePacket.cpp @@ -2,7 +2,7 @@ #include "SetDisplayObjectivePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/scores/Objective.h" +#include "minecraft/world/scores/Objective.h" SetDisplayObjectivePacket::SetDisplayObjectivePacket() { slot = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h b/minecraft/minecraft/network/packet/SetDisplayObjectivePacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h rename to minecraft/minecraft/network/packet/SetDisplayObjectivePacket.h index 4e3edd4a1..a20f4ab65 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h +++ b/minecraft/minecraft/network/packet/SetDisplayObjectivePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Objective; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp b/minecraft/minecraft/network/packet/SetEntityDataPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp rename to minecraft/minecraft/network/packet/SetEntityDataPacket.cpp index 9be66aa67..dd40a6ca9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp +++ b/minecraft/minecraft/network/packet/SetEntityDataPacket.cpp @@ -4,7 +4,7 @@ #include "SetEntityDataPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/SyncedEntityData.h" SetEntityDataPacket::SetEntityDataPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h b/minecraft/minecraft/network/packet/SetEntityDataPacket.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h rename to minecraft/minecraft/network/packet/SetEntityDataPacket.h index 7652ee1bc..5adbe67eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h +++ b/minecraft/minecraft/network/packet/SetEntityDataPacket.h @@ -4,8 +4,8 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/network/packet/Packet.h" class SetEntityDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp b/minecraft/minecraft/network/packet/SetEntityLinkPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp rename to minecraft/minecraft/network/packet/SetEntityLinkPacket.cpp index 072587434..02e6037a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp +++ b/minecraft/minecraft/network/packet/SetEntityLinkPacket.cpp @@ -2,7 +2,7 @@ #include "SetEntityLinkPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" SetEntityLinkPacket::SetEntityLinkPacket() { sourceId = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h b/minecraft/minecraft/network/packet/SetEntityLinkPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h rename to minecraft/minecraft/network/packet/SetEntityLinkPacket.h index 68b39899e..f8b901ce0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h +++ b/minecraft/minecraft/network/packet/SetEntityLinkPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp b/minecraft/minecraft/network/packet/SetEntityMotionPacket.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp rename to minecraft/minecraft/network/packet/SetEntityMotionPacket.cpp index ef607aab2..0ba470a21 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp +++ b/minecraft/minecraft/network/packet/SetEntityMotionPacket.cpp @@ -2,7 +2,7 @@ #include "SetEntityMotionPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" void SetEntityMotionPacket::_init(int id, double xd, double yd, double zd) { this->id = id; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h b/minecraft/minecraft/network/packet/SetEntityMotionPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h rename to minecraft/minecraft/network/packet/SetEntityMotionPacket.h index a60bdaf50..076f8695f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h +++ b/minecraft/minecraft/network/packet/SetEntityMotionPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp b/minecraft/minecraft/network/packet/SetEquippedItemPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp rename to minecraft/minecraft/network/packet/SetEquippedItemPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h b/minecraft/minecraft/network/packet/SetEquippedItemPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h rename to minecraft/minecraft/network/packet/SetEquippedItemPacket.h index d7328b6a8..2ce66e12e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h +++ b/minecraft/minecraft/network/packet/SetEquippedItemPacket.h @@ -3,8 +3,8 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/item/ItemInstance.h" class SetEquippedItemPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp b/minecraft/minecraft/network/packet/SetExperiencePacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp rename to minecraft/minecraft/network/packet/SetExperiencePacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h b/minecraft/minecraft/network/packet/SetExperiencePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h rename to minecraft/minecraft/network/packet/SetExperiencePacket.h index f9da972b4..08eca4446 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h +++ b/minecraft/minecraft/network/packet/SetExperiencePacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SetExperiencePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp b/minecraft/minecraft/network/packet/SetHealthPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp rename to minecraft/minecraft/network/packet/SetHealthPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h b/minecraft/minecraft/network/packet/SetHealthPacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h rename to minecraft/minecraft/network/packet/SetHealthPacket.h index 4a288aaaa..6c75ebfb3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h +++ b/minecraft/minecraft/network/packet/SetHealthPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SetHealthPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp b/minecraft/minecraft/network/packet/SetObjectivePacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp rename to minecraft/minecraft/network/packet/SetObjectivePacket.cpp index affc220d9..8fb51333d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp +++ b/minecraft/minecraft/network/packet/SetObjectivePacket.cpp @@ -2,7 +2,7 @@ #include "SetObjectivePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/scores/Objective.h" +#include "minecraft/world/scores/Objective.h" SetObjectivePacket::SetObjectivePacket() { objectiveName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h b/minecraft/minecraft/network/packet/SetObjectivePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h rename to minecraft/minecraft/network/packet/SetObjectivePacket.h index cd182fa80..d419cfd02 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h +++ b/minecraft/minecraft/network/packet/SetObjectivePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Objective; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp b/minecraft/minecraft/network/packet/SetPlayerTeamPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp rename to minecraft/minecraft/network/packet/SetPlayerTeamPacket.cpp index 138ac9f68..2ad324207 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp +++ b/minecraft/minecraft/network/packet/SetPlayerTeamPacket.cpp @@ -6,9 +6,9 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/scores/Objective.h" -#include "Minecraft.World/net/minecraft/world/scores/PlayerTeam.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/scores/Objective.h" +#include "minecraft/world/scores/PlayerTeam.h" SetPlayerTeamPacket::SetPlayerTeamPacket() { name = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h b/minecraft/minecraft/network/packet/SetPlayerTeamPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h rename to minecraft/minecraft/network/packet/SetPlayerTeamPacket.h index 873d3b263..45b9323ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h +++ b/minecraft/minecraft/network/packet/SetPlayerTeamPacket.h @@ -6,7 +6,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class PlayerTeam; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp b/minecraft/minecraft/network/packet/SetScorePacket.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp rename to minecraft/minecraft/network/packet/SetScorePacket.cpp index 338f28adf..c759c8816 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp +++ b/minecraft/minecraft/network/packet/SetScorePacket.cpp @@ -2,9 +2,9 @@ #include "SetScorePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/scores/Objective.h" -#include "Minecraft.World/net/minecraft/world/scores/Score.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/scores/Objective.h" +#include "minecraft/world/scores/Score.h" SetScorePacket::SetScorePacket() { owner = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h b/minecraft/minecraft/network/packet/SetScorePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h rename to minecraft/minecraft/network/packet/SetScorePacket.h index 9f296a8ff..11c2649c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h +++ b/minecraft/minecraft/network/packet/SetScorePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Score; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp b/minecraft/minecraft/network/packet/SetSpawnPositionPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp rename to minecraft/minecraft/network/packet/SetSpawnPositionPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h b/minecraft/minecraft/network/packet/SetSpawnPositionPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h rename to minecraft/minecraft/network/packet/SetSpawnPositionPacket.h index fa0bb30c6..32e42e974 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h +++ b/minecraft/minecraft/network/packet/SetSpawnPositionPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SetSpawnPositionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp b/minecraft/minecraft/network/packet/SetTimePacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp rename to minecraft/minecraft/network/packet/SetTimePacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h b/minecraft/minecraft/network/packet/SetTimePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h rename to minecraft/minecraft/network/packet/SetTimePacket.h index e8a90c0fd..27b85e54a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h +++ b/minecraft/minecraft/network/packet/SetTimePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SetTimePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SharedKeyPacket.h b/minecraft/minecraft/network/packet/SharedKeyPacket.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SharedKeyPacket.h rename to minecraft/minecraft/network/packet/SharedKeyPacket.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp b/minecraft/minecraft/network/packet/SignUpdatePacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp rename to minecraft/minecraft/network/packet/SignUpdatePacket.cpp index 3b4716aec..a5bbe6e85 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp +++ b/minecraft/minecraft/network/packet/SignUpdatePacket.cpp @@ -4,7 +4,7 @@ #include "SignUpdatePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" SignUpdatePacket::SignUpdatePacket() { shouldDelay = true; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h b/minecraft/minecraft/network/packet/SignUpdatePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h rename to minecraft/minecraft/network/packet/SignUpdatePacket.h index 1312dff61..19ddd8a65 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h +++ b/minecraft/minecraft/network/packet/SignUpdatePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class SignUpdatePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp b/minecraft/minecraft/network/packet/TakeItemEntityPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp rename to minecraft/minecraft/network/packet/TakeItemEntityPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h b/minecraft/minecraft/network/packet/TakeItemEntityPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h rename to minecraft/minecraft/network/packet/TakeItemEntityPacket.h index 4ce4647a3..df187c508 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h +++ b/minecraft/minecraft/network/packet/TakeItemEntityPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TakeItemEntityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp b/minecraft/minecraft/network/packet/TeleportEntityPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp rename to minecraft/minecraft/network/packet/TeleportEntityPacket.cpp index d8b7f06e6..8e2e8a1a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp +++ b/minecraft/minecraft/network/packet/TeleportEntityPacket.cpp @@ -2,8 +2,8 @@ #include "TeleportEntityPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" TeleportEntityPacket::TeleportEntityPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h b/minecraft/minecraft/network/packet/TeleportEntityPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h rename to minecraft/minecraft/network/packet/TeleportEntityPacket.h index cf78b8efa..bb55143d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h +++ b/minecraft/minecraft/network/packet/TeleportEntityPacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp rename to minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.cpp index 4c05a7177..da40e0d5d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp +++ b/minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.cpp @@ -5,7 +5,7 @@ #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" TextureAndGeometryChangePacket::TextureAndGeometryChangePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h b/minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h rename to minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.h index 2d2b569c2..04157a3b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h +++ b/minecraft/minecraft/network/packet/TextureAndGeometryChangePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp b/minecraft/minecraft/network/packet/TextureAndGeometryPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp rename to minecraft/minecraft/network/packet/TextureAndGeometryPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h b/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h rename to minecraft/minecraft/network/packet/TextureAndGeometryPacket.h index 0690f4b05..7cd0c28fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/minecraft/minecraft/network/packet/TextureAndGeometryPacket.h @@ -7,7 +7,7 @@ #include "Packet.h" #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class DLCSkinFile; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp b/minecraft/minecraft/network/packet/TextureChangePacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp rename to minecraft/minecraft/network/packet/TextureChangePacket.cpp index 99902c83c..668a0dc62 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp +++ b/minecraft/minecraft/network/packet/TextureChangePacket.cpp @@ -2,7 +2,7 @@ #include "TextureChangePacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" TextureChangePacket::TextureChangePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h b/minecraft/minecraft/network/packet/TextureChangePacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h rename to minecraft/minecraft/network/packet/TextureChangePacket.h index 522cdbd37..33416bd56 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h +++ b/minecraft/minecraft/network/packet/TextureChangePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp b/minecraft/minecraft/network/packet/TexturePacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp rename to minecraft/minecraft/network/packet/TexturePacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h b/minecraft/minecraft/network/packet/TexturePacket.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h rename to minecraft/minecraft/network/packet/TexturePacket.h index a54c715d2..892b13bc1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h +++ b/minecraft/minecraft/network/packet/TexturePacket.h @@ -4,7 +4,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TexturePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp b/minecraft/minecraft/network/packet/TileDestructionPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp rename to minecraft/minecraft/network/packet/TileDestructionPacket.cpp index d9a5963d3..10de97f31 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp +++ b/minecraft/minecraft/network/packet/TileDestructionPacket.cpp @@ -1,7 +1,7 @@ #include "TileDestructionPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/PacketListener.h" TileDestructionPacket::TileDestructionPacket() { id = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h b/minecraft/minecraft/network/packet/TileDestructionPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h rename to minecraft/minecraft/network/packet/TileDestructionPacket.h index fdcf66880..8a023df23 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h +++ b/minecraft/minecraft/network/packet/TileDestructionPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TileDestructionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp b/minecraft/minecraft/network/packet/TileEditorOpenPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp rename to minecraft/minecraft/network/packet/TileEditorOpenPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h b/minecraft/minecraft/network/packet/TileEditorOpenPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h rename to minecraft/minecraft/network/packet/TileEditorOpenPacket.h index b47d452bd..d0785fc05 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h +++ b/minecraft/minecraft/network/packet/TileEditorOpenPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TileEditorOpenPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp b/minecraft/minecraft/network/packet/TileEntityDataPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp rename to minecraft/minecraft/network/packet/TileEntityDataPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h b/minecraft/minecraft/network/packet/TileEntityDataPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h rename to minecraft/minecraft/network/packet/TileEntityDataPacket.h index 19fb00010..fbf586cea 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h +++ b/minecraft/minecraft/network/packet/TileEntityDataPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp b/minecraft/minecraft/network/packet/TileEventPacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp rename to minecraft/minecraft/network/packet/TileEventPacket.cpp index b294b8ccc..82a8a3b04 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp +++ b/minecraft/minecraft/network/packet/TileEventPacket.cpp @@ -2,7 +2,7 @@ #include "TileEventPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" TileEventPacket::TileEventPacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h b/minecraft/minecraft/network/packet/TileEventPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h rename to minecraft/minecraft/network/packet/TileEventPacket.h index 49035ac29..f75c706b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h +++ b/minecraft/minecraft/network/packet/TileEventPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TileEventPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp b/minecraft/minecraft/network/packet/TileUpdatePacket.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp rename to minecraft/minecraft/network/packet/TileUpdatePacket.cpp index a97daf9fa..46b485a88 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp +++ b/minecraft/minecraft/network/packet/TileUpdatePacket.cpp @@ -2,10 +2,10 @@ #include "PacketListener.h" #include "TileUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" TileUpdatePacket::TileUpdatePacket() { shouldDelay = true; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h b/minecraft/minecraft/network/packet/TileUpdatePacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h rename to minecraft/minecraft/network/packet/TileUpdatePacket.h index 62d66558c..19c528956 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h +++ b/minecraft/minecraft/network/packet/TileUpdatePacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp b/minecraft/minecraft/network/packet/TradeItemPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp rename to minecraft/minecraft/network/packet/TradeItemPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h b/minecraft/minecraft/network/packet/TradeItemPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h rename to minecraft/minecraft/network/packet/TradeItemPacket.h index dd0070098..139ad1f10 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h +++ b/minecraft/minecraft/network/packet/TradeItemPacket.h @@ -7,7 +7,7 @@ #include "Packet.h" #include "PacketListener.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class TradeItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp b/minecraft/minecraft/network/packet/UpdateAttributesPacket.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp rename to minecraft/minecraft/network/packet/UpdateAttributesPacket.cpp index 792968ebd..d30ec5181 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp +++ b/minecraft/minecraft/network/packet/UpdateAttributesPacket.cpp @@ -4,8 +4,8 @@ #include "UpdateAttributesPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" UpdateAttributesPacket::UpdateAttributesPacket() { entityId = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h b/minecraft/minecraft/network/packet/UpdateAttributesPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h rename to minecraft/minecraft/network/packet/UpdateAttributesPacket.h index 735041ab4..2ede34797 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h +++ b/minecraft/minecraft/network/packet/UpdateAttributesPacket.h @@ -4,8 +4,8 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class AttributeModifier; class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp b/minecraft/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp rename to minecraft/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/minecraft/minecraft/network/packet/UpdateGameRuleProgressPacket.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h rename to minecraft/minecraft/network/packet/UpdateGameRuleProgressPacket.h index 41ac1ff71..f78733fc6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/minecraft/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -7,7 +7,7 @@ #include "Packet.h" #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class UpdateGameRuleProgressPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp b/minecraft/minecraft/network/packet/UpdateMobEffectPacket.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp rename to minecraft/minecraft/network/packet/UpdateMobEffectPacket.cpp index 5d49102e0..f541b780b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp +++ b/minecraft/minecraft/network/packet/UpdateMobEffectPacket.cpp @@ -4,7 +4,7 @@ #include "UpdateMobEffectPacket.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/effect/MobEffectInstance.h" UpdateMobEffectPacket::UpdateMobEffectPacket() { entityId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h b/minecraft/minecraft/network/packet/UpdateMobEffectPacket.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h rename to minecraft/minecraft/network/packet/UpdateMobEffectPacket.h index ee5b273b6..3654b2897 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h +++ b/minecraft/minecraft/network/packet/UpdateMobEffectPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class MobEffectInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp b/minecraft/minecraft/network/packet/UpdateProgressPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp rename to minecraft/minecraft/network/packet/UpdateProgressPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h b/minecraft/minecraft/network/packet/UpdateProgressPacket.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h rename to minecraft/minecraft/network/packet/UpdateProgressPacket.h index 39a5f4279..2b92090f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h +++ b/minecraft/minecraft/network/packet/UpdateProgressPacket.h @@ -3,7 +3,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" // 4J Added packet to update clients on the time for the host to finish doing // something diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp b/minecraft/minecraft/network/packet/UseItemPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp rename to minecraft/minecraft/network/packet/UseItemPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h b/minecraft/minecraft/network/packet/UseItemPacket.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h rename to minecraft/minecraft/network/packet/UseItemPacket.h index feeab592f..d3d108053 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h +++ b/minecraft/minecraft/network/packet/UseItemPacket.h @@ -3,8 +3,8 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/item/ItemInstance.h" class UseItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp b/minecraft/minecraft/network/packet/XZPacket.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp rename to minecraft/minecraft/network/packet/XZPacket.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h b/minecraft/minecraft/network/packet/XZPacket.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h rename to minecraft/minecraft/network/packet/XZPacket.h index dbd26f66a..26549a802 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h +++ b/minecraft/minecraft/network/packet/XZPacket.h @@ -5,7 +5,7 @@ #include #include "Packet.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" class XZPacket : public Packet, public std::enable_shared_from_this { public: diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h b/minecraft/minecraft/network/packet/net.minecraft.network.packet.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h rename to minecraft/minecraft/network/packet/net.minecraft.network.packet.h diff --git a/minecraft/Minecraft.World/net/minecraft/sounds/SoundTypes.h b/minecraft/minecraft/sounds/SoundTypes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/sounds/SoundTypes.h rename to minecraft/minecraft/sounds/SoundTypes.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp b/minecraft/minecraft/stats/Achievement.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp rename to minecraft/minecraft/stats/Achievement.cpp index 3df1f7d71..88bf96cca 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp +++ b/minecraft/minecraft/stats/Achievement.cpp @@ -3,9 +3,9 @@ #include "Achievements.h" #include "DescFormatter.h" #include "Achievement.h" -#include "Minecraft.World/net/minecraft/locale/I18n.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/locale/I18n.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/world/item/ItemInstance.h" class Item; class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.h b/minecraft/minecraft/stats/Achievement.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/Achievement.h rename to minecraft/minecraft/stats/Achievement.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp b/minecraft/minecraft/stats/Achievements.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp rename to minecraft/minecraft/stats/Achievements.cpp index ad8ac9c46..be1c4a71a 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp +++ b/minecraft/minecraft/stats/Achievements.cpp @@ -5,10 +5,10 @@ #include "Achievement.h" #include "Achievements.h" #include "Minecraft.Client/Common/src/Console_Awards_enum.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/level/tile/Tile.h" const int Achievements::ACHIEVEMENT_OFFSET = 0x500000; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.h b/minecraft/minecraft/stats/Achievements.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/Achievements.h rename to minecraft/minecraft/stats/Achievements.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp b/minecraft/minecraft/stats/CommonStats.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp rename to minecraft/minecraft/stats/CommonStats.cpp index 7b59b534a..1bad506e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp +++ b/minecraft/minecraft/stats/CommonStats.cpp @@ -1,11 +1,11 @@ #include #include "Achievements.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/Tile.h" #include "CommonStats.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/stats/Stats.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stats.h" Stat* CommonStats::get_stat(int i) { return Stats::get(i); } diff --git a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h b/minecraft/minecraft/stats/CommonStats.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h rename to minecraft/minecraft/stats/CommonStats.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/DescFormatter.h b/minecraft/minecraft/stats/DescFormatter.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/DescFormatter.h rename to minecraft/minecraft/stats/DescFormatter.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/DurangoStats.h b/minecraft/minecraft/stats/DurangoStats.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/DurangoStats.h rename to minecraft/minecraft/stats/DurangoStats.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp b/minecraft/minecraft/stats/GeneralStat.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp rename to minecraft/minecraft/stats/GeneralStat.cpp index a85e4d3b0..abb853207 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp +++ b/minecraft/minecraft/stats/GeneralStat.cpp @@ -1,8 +1,8 @@ #include #include "GeneralStat.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/stats/Stats.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/stats/Stats.h" class StatFormatter; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h b/minecraft/minecraft/stats/GeneralStat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h rename to minecraft/minecraft/stats/GeneralStat.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp b/minecraft/minecraft/stats/GenericStats.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp rename to minecraft/minecraft/stats/GenericStats.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h b/minecraft/minecraft/stats/GenericStats.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h rename to minecraft/minecraft/stats/GenericStats.h index 961f11862..7e718e9e5 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h +++ b/minecraft/minecraft/stats/GenericStats.h @@ -16,7 +16,7 @@ class Mob; class Player; class Stat; -// #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +// #include "minecraft/world/damageSource/DamageSource.h" // #include "Minecraft.Client/Common/src/Console_Awards_enum.h" diff --git a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp b/minecraft/minecraft/stats/ItemStat.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp rename to minecraft/minecraft/stats/ItemStat.cpp index ecc969373..5aef42ca4 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp +++ b/minecraft/minecraft/stats/ItemStat.cpp @@ -1,5 +1,5 @@ #include "ItemStat.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "minecraft/stats/Stat.h" ItemStat::ItemStat(int id, const std::wstring& name, int itemId) : Stat(id, name), itemId(itemId) {} diff --git a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h b/minecraft/minecraft/stats/ItemStat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h rename to minecraft/minecraft/stats/ItemStat.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h b/minecraft/minecraft/stats/NumberFormatters.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h rename to minecraft/minecraft/stats/NumberFormatters.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp b/minecraft/minecraft/stats/Stat.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp rename to minecraft/minecraft/stats/Stat.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stat.h b/minecraft/minecraft/stats/Stat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/Stat.h rename to minecraft/minecraft/stats/Stat.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/StatFormatter.h b/minecraft/minecraft/stats/StatFormatter.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/StatFormatter.h rename to minecraft/minecraft/stats/StatFormatter.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp b/minecraft/minecraft/stats/Stats.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp rename to minecraft/minecraft/stats/Stats.cpp index 876cb4c32..457c51bb4 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp +++ b/minecraft/minecraft/stats/Stats.cpp @@ -7,12 +7,12 @@ #include "Stats.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/stats/Stat.h" -#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/Stat.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/level/tile/GrassTile.h" +#include "minecraft/world/level/tile/Tile.h" class StatFormatter; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stats.h b/minecraft/minecraft/stats/Stats.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/Stats.h rename to minecraft/minecraft/stats/Stats.h diff --git a/minecraft/Minecraft.World/net/minecraft/stats/net.minecraft.stats.h b/minecraft/minecraft/stats/net.minecraft.stats.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/stats/net.minecraft.stats.h rename to minecraft/minecraft/stats/net.minecraft.stats.h diff --git a/minecraft/Minecraft.World/stdafx.h b/minecraft/minecraft/stdafx.h similarity index 100% rename from minecraft/Minecraft.World/stdafx.h rename to minecraft/minecraft/stdafx.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp b/minecraft/minecraft/util/Hasher.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp rename to minecraft/minecraft/util/Hasher.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/util/Hasher.h b/minecraft/minecraft/util/Hasher.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/Hasher.h rename to minecraft/minecraft/util/Hasher.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp b/minecraft/minecraft/util/HtmlString.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp rename to minecraft/minecraft/util/HtmlString.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.h b/minecraft/minecraft/util/HtmlString.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/HtmlString.h rename to minecraft/minecraft/util/HtmlString.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp b/minecraft/minecraft/util/Mth.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/util/Mth.cpp rename to minecraft/minecraft/util/Mth.cpp index d6c670f48..8f8967d83 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp +++ b/minecraft/minecraft/util/Mth.cpp @@ -7,8 +7,8 @@ #include #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" constexpr size_t SIN_TAB_CNT = 65536; constexpr float SIN_SCALE = SIN_TAB_CNT / (std::numbers::pi_v * 2.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/util/Mth.h b/minecraft/minecraft/util/Mth.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/Mth.h rename to minecraft/minecraft/util/Mth.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/ProgressListener.h b/minecraft/minecraft/util/ProgressListener.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/ProgressListener.h rename to minecraft/minecraft/util/ProgressListener.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp b/minecraft/minecraft/util/SmoothFloat.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp rename to minecraft/minecraft/util/SmoothFloat.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.h b/minecraft/minecraft/util/SmoothFloat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.h rename to minecraft/minecraft/util/SmoothFloat.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp b/minecraft/minecraft/util/WeighedRandom.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp rename to minecraft/minecraft/util/WeighedRandom.cpp index bcbf1b5ee..7c39e1efa 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp +++ b/minecraft/minecraft/util/WeighedRandom.cpp @@ -2,10 +2,10 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" int WeighedRandom::getTotalWeight(std::vector* items) { int totalWeight = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.h b/minecraft/minecraft/util/WeighedRandom.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.h rename to minecraft/minecraft/util/WeighedRandom.h diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp b/minecraft/minecraft/util/WeighedTreasure.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp rename to minecraft/minecraft/util/WeighedTreasure.cpp index b89f9a733..8fcbb7c9e 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp +++ b/minecraft/minecraft/util/WeighedTreasure.cpp @@ -1,8 +1,8 @@ #include "WeighedTreasure.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" WeighedTreasure::WeighedTreasure(int itemId, int auxValue, int minCount, int maxCount, int weight) diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h b/minecraft/minecraft/util/WeighedTreasure.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h rename to minecraft/minecraft/util/WeighedTreasure.h index a8cb7b45c..75e455ff4 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h +++ b/minecraft/minecraft/util/WeighedTreasure.h @@ -5,7 +5,7 @@ #include #include "WeighedRandom.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" class Container; class DispenserTileEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp b/minecraft/minecraft/world/CompoundContainer.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp rename to minecraft/minecraft/world/CompoundContainer.cpp index cc345a3fb..b16916983 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp +++ b/minecraft/minecraft/world/CompoundContainer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" #include "CompoundContainer.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h b/minecraft/minecraft/world/CompoundContainer.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h rename to minecraft/minecraft/world/CompoundContainer.h index b7f24cb66..7e1256741 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h +++ b/minecraft/minecraft/world/CompoundContainer.h @@ -4,7 +4,7 @@ #include #include "Container.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/Container.h b/minecraft/minecraft/world/Container.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/Container.h rename to minecraft/minecraft/world/Container.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/Difficulty.h b/minecraft/minecraft/world/Difficulty.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/Difficulty.h rename to minecraft/minecraft/world/Difficulty.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp b/minecraft/minecraft/world/FlippedIcon.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp rename to minecraft/minecraft/world/FlippedIcon.cpp index 945d11415..16948c9c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp +++ b/minecraft/minecraft/world/FlippedIcon.cpp @@ -1,6 +1,6 @@ #include "FlippedIcon.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/Icon.h" FlippedIcon::FlippedIcon(Icon* base, bool horizontal, bool vertical) : base(base), horizontal(horizontal), vertical(vertical) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h b/minecraft/minecraft/world/FlippedIcon.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h rename to minecraft/minecraft/world/FlippedIcon.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/Icon.h b/minecraft/minecraft/world/Icon.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/Icon.h rename to minecraft/minecraft/world/Icon.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/IconRegister.h b/minecraft/minecraft/world/IconRegister.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/IconRegister.h rename to minecraft/minecraft/world/IconRegister.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/MouseInventoryClickHandler.h b/minecraft/minecraft/world/MouseInventoryClickHandler.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/MouseInventoryClickHandler.h rename to minecraft/minecraft/world/MouseInventoryClickHandler.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp b/minecraft/minecraft/world/SimpleContainer.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp rename to minecraft/minecraft/world/SimpleContainer.cpp index f1f0ebc94..85a8b6bfd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp +++ b/minecraft/minecraft/world/SimpleContainer.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.ContainerListener.h" #include "SimpleContainer.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" SimpleContainer::SimpleContainer(int name, std::wstring stringName, bool customName, int size) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h b/minecraft/minecraft/world/SimpleContainer.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h rename to minecraft/minecraft/world/SimpleContainer.h index b219c81d1..9b1d91a0f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h +++ b/minecraft/minecraft/world/SimpleContainer.h @@ -6,7 +6,7 @@ #include "Container.h" #include "net.minecraft.world.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class ItemInstance; namespace net_minecraft_world { diff --git a/minecraft/Minecraft.World/net/minecraft/world/WorldlyContainer.h b/minecraft/minecraft/world/WorldlyContainer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/WorldlyContainer.h rename to minecraft/minecraft/world/WorldlyContainer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp b/minecraft/minecraft/world/damageSource/CombatEntry.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp rename to minecraft/minecraft/world/damageSource/CombatEntry.cpp index 3376a81b2..a30b284b5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp +++ b/minecraft/minecraft/world/damageSource/CombatEntry.cpp @@ -3,9 +3,9 @@ #include "CombatEntry.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/damageSource/CombatTracker.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" CombatEntry::CombatEntry(DamageSource* source, int time, float health, float damage, CombatTracker::eLOCATION location, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h b/minecraft/minecraft/world/damageSource/CombatEntry.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h rename to minecraft/minecraft/world/damageSource/CombatEntry.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp b/minecraft/minecraft/world/damageSource/CombatTracker.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp rename to minecraft/minecraft/world/damageSource/CombatTracker.cpp index d86673a3d..a67389c65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp +++ b/minecraft/minecraft/world/damageSource/CombatTracker.cpp @@ -2,17 +2,17 @@ #include "CombatTracker.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/CombatEntry.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" CombatTracker::CombatTracker(LivingEntity* mob) { this->mob = mob; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h b/minecraft/minecraft/world/damageSource/CombatTracker.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h rename to minecraft/minecraft/world/damageSource/CombatTracker.h index 6b5ab35b2..e087d904c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h +++ b/minecraft/minecraft/world/damageSource/CombatTracker.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" class CombatEntry; class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp b/minecraft/minecraft/world/damageSource/DamageSource.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp rename to minecraft/minecraft/world/damageSource/DamageSource.cpp index 63bc3bb27..cdbeb7e34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp +++ b/minecraft/minecraft/world/damageSource/DamageSource.cpp @@ -2,16 +2,16 @@ #include #include -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/level/Explosion.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/level/Explosion.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h b/minecraft/minecraft/world/damageSource/DamageSource.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h rename to minecraft/minecraft/world/damageSource/DamageSource.h index c2ca5af98..895a1442b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h +++ b/minecraft/minecraft/world/damageSource/DamageSource.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class LivingEntity; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp b/minecraft/minecraft/world/damageSource/EntityDamageSource.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp rename to minecraft/minecraft/world/damageSource/EntityDamageSource.cpp index cdf07795c..3c4259e10 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp +++ b/minecraft/minecraft/world/damageSource/EntityDamageSource.cpp @@ -5,14 +5,14 @@ #include #include "java/Class.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" EntityDamageSource::EntityDamageSource( ChatPacket::EChatPacketMessage msgId, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h b/minecraft/minecraft/world/damageSource/EntityDamageSource.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h rename to minecraft/minecraft/world/damageSource/EntityDamageSource.h index 29a607008..b9ae1c1e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h +++ b/minecraft/minecraft/world/damageSource/EntityDamageSource.h @@ -3,7 +3,7 @@ #include #include "DamageSource.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class Entity; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp rename to minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.cpp index 64b991ec1..60946b20e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp +++ b/minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.cpp @@ -6,13 +6,13 @@ #include #include "java/Class.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" IndirectEntityDamageSource::IndirectEntityDamageSource( ChatPacket::EChatPacketMessage msgId, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h b/minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h rename to minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.h index 39b332836..d411cce42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h +++ b/minecraft/minecraft/world/damageSource/IndirectEntityDamageSource.h @@ -3,7 +3,7 @@ #include #include "EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" class Entity; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h b/minecraft/minecraft/world/damageSource/net.minecraft.world.damagesource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h rename to minecraft/minecraft/world/damageSource/net.minecraft.world.damagesource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp b/minecraft/minecraft/world/effect/AbsoptionMobEffect.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp rename to minecraft/minecraft/world/effect/AbsoptionMobEffect.cpp index 8c152c872..9d9a8db5d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp +++ b/minecraft/minecraft/world/effect/AbsoptionMobEffect.cpp @@ -1,8 +1,8 @@ #include #include "AbsoptionMobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/LivingEntity.h" AbsoptionMobEffect::AbsoptionMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h b/minecraft/minecraft/world/effect/AbsoptionMobEffect.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h rename to minecraft/minecraft/world/effect/AbsoptionMobEffect.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp b/minecraft/minecraft/world/effect/AttackDamageMobEffect.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp rename to minecraft/minecraft/world/effect/AttackDamageMobEffect.cpp index 74d572b1b..8304b3c66 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp +++ b/minecraft/minecraft/world/effect/AttackDamageMobEffect.cpp @@ -1,5 +1,5 @@ #include "AttackDamageMobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffect.h" AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h b/minecraft/minecraft/world/effect/AttackDamageMobEffect.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h rename to minecraft/minecraft/world/effect/AttackDamageMobEffect.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp b/minecraft/minecraft/world/effect/HealthBoostMobEffect.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp rename to minecraft/minecraft/world/effect/HealthBoostMobEffect.cpp index a51ddc73c..86c4371ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp +++ b/minecraft/minecraft/world/effect/HealthBoostMobEffect.cpp @@ -1,8 +1,8 @@ #include #include "HealthBoostMobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/LivingEntity.h" HealthBoostMobEffect::HealthBoostMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h b/minecraft/minecraft/world/effect/HealthBoostMobEffect.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h rename to minecraft/minecraft/world/effect/HealthBoostMobEffect.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp b/minecraft/minecraft/world/effect/InstantaneousMobEffect.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp rename to minecraft/minecraft/world/effect/InstantaneousMobEffect.cpp index 85ff4a417..0701477ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp +++ b/minecraft/minecraft/world/effect/InstantaneousMobEffect.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/InstantaneousMobEffect.h" +#include "minecraft/world/effect/MobEffect.h" InstantenousMobEffect::InstantenousMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h b/minecraft/minecraft/world/effect/InstantaneousMobEffect.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h rename to minecraft/minecraft/world/effect/InstantaneousMobEffect.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp b/minecraft/minecraft/world/effect/MobEffect.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp rename to minecraft/minecraft/world/effect/MobEffect.cpp index 4efa299bf..ccf23deed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp +++ b/minecraft/minecraft/world/effect/MobEffect.cpp @@ -1,12 +1,12 @@ -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/food/net.minecraft.world.food.h" #include "net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" MobEffect* MobEffect::effects[NUM_EFFECTS]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h b/minecraft/minecraft/world/effect/MobEffect.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h rename to minecraft/minecraft/world/effect/MobEffect.h index 8b615e785..fef62150a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h +++ b/minecraft/minecraft/world/effect/MobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" #include "Minecraft.Client/Common/App_enums.h" #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp b/minecraft/minecraft/world/effect/MobEffectInstance.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp rename to minecraft/minecraft/world/effect/MobEffectInstance.cpp index 3e8c73696..c21091b25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp +++ b/minecraft/minecraft/world/effect/MobEffectInstance.cpp @@ -5,8 +5,8 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h b/minecraft/minecraft/world/effect/MobEffectInstance.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h rename to minecraft/minecraft/world/effect/MobEffectInstance.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h b/minecraft/minecraft/world/effect/net.minecraft.world.effect.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h rename to minecraft/minecraft/world/effect/net.minecraft.world.effect.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp b/minecraft/minecraft/world/entity/AgeableMob.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp rename to minecraft/minecraft/world/entity/AgeableMob.cpp index a76435e74..8ed46ac65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp +++ b/minecraft/minecraft/world/entity/AgeableMob.cpp @@ -4,16 +4,16 @@ #include "AgeableMob.h" #include "java/Class.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/SpawnEggItem.h" +#include "minecraft/world/level/Level.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h b/minecraft/minecraft/world/entity/AgeableMob.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h rename to minecraft/minecraft/world/entity/AgeableMob.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp b/minecraft/minecraft/world/entity/Creature.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp rename to minecraft/minecraft/world/entity/Creature.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.h b/minecraft/minecraft/world/entity/Creature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Creature.h rename to minecraft/minecraft/world/entity/Creature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp b/minecraft/minecraft/world/entity/DelayedRelease.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp rename to minecraft/minecraft/world/entity/DelayedRelease.cpp index 1cf02b890..5f87d7201 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp +++ b/minecraft/minecraft/world/entity/DelayedRelease.cpp @@ -1,5 +1,5 @@ #include "DelayedRelease.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" DelayedRelease::DelayedRelease(Level* level, std::shared_ptr toRelease, int delay) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h b/minecraft/minecraft/world/entity/DelayedRelease.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h rename to minecraft/minecraft/world/entity/DelayedRelease.h index ea5f9e6b2..86ae2cfe9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h +++ b/minecraft/minecraft/world/entity/DelayedRelease.h @@ -4,7 +4,7 @@ #include "Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class DamageSource; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/minecraft/world/entity/Entity.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp rename to minecraft/minecraft/world/entity/Entity.cpp index e0cce3fb0..1fec12bcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp +++ b/minecraft/minecraft/world/entity/Entity.cpp @@ -12,7 +12,7 @@ #include "SyncedEntityData.h" #include "EntityIO.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "EntityPos.h" #include "Entity.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" @@ -23,29 +23,29 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" #include "nbt/FloatTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Direction.h" +#include "minecraft/Pos.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/ProtectionEnchantment.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h b/minecraft/minecraft/world/entity/Entity.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h rename to minecraft/minecraft/world/entity/Entity.h index 516ee8e8d..8aac3a923 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h +++ b/minecraft/minecraft/world/entity/Entity.h @@ -9,9 +9,9 @@ #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class LivingEntity; class LightningBolt; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityEvent.h b/minecraft/minecraft/world/entity/EntityEvent.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntityEvent.h rename to minecraft/minecraft/world/entity/EntityEvent.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp b/minecraft/minecraft/world/entity/EntityIO.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp rename to minecraft/minecraft/world/entity/EntityIO.cpp index 58a5fa39d..0a488a799 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp +++ b/minecraft/minecraft/world/entity/EntityIO.cpp @@ -2,16 +2,16 @@ #include "Painting.h" #include "java/System.h" #include "Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "minecraft/world/entity/boss/wither/WitherBoss.h" +#include "minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" #include "net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "nbt/com.mojang.nbt.h" #include "EntityIO.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h b/minecraft/minecraft/world/entity/EntityIO.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h rename to minecraft/minecraft/world/entity/EntityIO.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp b/minecraft/minecraft/world/entity/EntityPos.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp rename to minecraft/minecraft/world/entity/EntityPos.cpp index 0c86bbfdb..cd89ab58f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp +++ b/minecraft/minecraft/world/entity/EntityPos.cpp @@ -1,6 +1,6 @@ #include "EntityPos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" EntityPos::EntityPos(double x, double y, double z, float yRot, float xRot) { this->x = x; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h b/minecraft/minecraft/world/entity/EntityPos.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h rename to minecraft/minecraft/world/entity/EntityPos.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp b/minecraft/minecraft/world/entity/EntitySelector.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp rename to minecraft/minecraft/world/entity/EntitySelector.cpp index dd8683653..7ca8f0cac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp +++ b/minecraft/minecraft/world/entity/EntitySelector.cpp @@ -1,9 +1,9 @@ #include "EntitySelector.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h b/minecraft/minecraft/world/entity/EntitySelector.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h rename to minecraft/minecraft/world/entity/EntitySelector.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp b/minecraft/minecraft/world/entity/ExperienceOrb.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp rename to minecraft/minecraft/world/entity/ExperienceOrb.cpp index 240a86c62..d4fa12962 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp +++ b/minecraft/minecraft/world/entity/ExperienceOrb.cpp @@ -4,18 +4,18 @@ #include "java/JavaMath.h" #include "ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" const int ExperienceOrb::LIFETIME = 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five minutes! diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h b/minecraft/minecraft/world/entity/ExperienceOrb.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h rename to minecraft/minecraft/world/entity/ExperienceOrb.h index 2c4fb604d..bfc53b5a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h +++ b/minecraft/minecraft/world/entity/ExperienceOrb.h @@ -4,7 +4,7 @@ #include "Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp b/minecraft/minecraft/world/entity/FlyingMob.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp rename to minecraft/minecraft/world/entity/FlyingMob.cpp index fff1b3e34..10e5e5885 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp +++ b/minecraft/minecraft/world/entity/FlyingMob.cpp @@ -1,10 +1,10 @@ #include #include "FlyingMob.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" FlyingMob::FlyingMob(Level* level) : Mob(level) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h b/minecraft/minecraft/world/entity/FlyingMob.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h rename to minecraft/minecraft/world/entity/FlyingMob.h index 6a3a41da8..b2b64b28e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h +++ b/minecraft/minecraft/world/entity/FlyingMob.h @@ -1,7 +1,7 @@ #pragma once #include "Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp b/minecraft/minecraft/world/entity/HangingEntity.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp rename to minecraft/minecraft/world/entity/HangingEntity.cpp index 5e8757638..4d1518f97 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp +++ b/minecraft/minecraft/world/entity/HangingEntity.cpp @@ -6,15 +6,15 @@ #include "HangingEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" void HangingEntity::_init(Level* level) { checkInterval = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h b/minecraft/minecraft/world/entity/HangingEntity.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h rename to minecraft/minecraft/world/entity/HangingEntity.h index 938000276..a58e51a54 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h +++ b/minecraft/minecraft/world/entity/HangingEntity.h @@ -5,7 +5,7 @@ #include "Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp b/minecraft/minecraft/world/entity/ItemFrame.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp rename to minecraft/minecraft/world/entity/ItemFrame.cpp index 4e72c10ec..1c3bbed6b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp +++ b/minecraft/minecraft/world/entity/ItemFrame.cpp @@ -2,19 +2,19 @@ #include #include "ItemFrame.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/ItemFrame.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" // 4J - added for common ctor code void ItemFrame::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h b/minecraft/minecraft/world/entity/ItemFrame.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h rename to minecraft/minecraft/world/entity/ItemFrame.h index 1a625c9e2..ef6ee3bab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h +++ b/minecraft/minecraft/world/entity/ItemFrame.h @@ -5,7 +5,7 @@ #include "Entity.h" #include "HangingEntity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Level; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp b/minecraft/minecraft/world/entity/LeashFenceKnotEntity.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp rename to minecraft/minecraft/world/entity/LeashFenceKnotEntity.cpp index a0f80e973..809fe6663 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp +++ b/minecraft/minecraft/world/entity/LeashFenceKnotEntity.cpp @@ -2,15 +2,15 @@ #include #include "LeashFenceKnotEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class CompoundTag; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h b/minecraft/minecraft/world/entity/LeashFenceKnotEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h rename to minecraft/minecraft/world/entity/LeashFenceKnotEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp b/minecraft/minecraft/world/entity/LivingEntity.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp rename to minecraft/minecraft/world/entity/LivingEntity.cpp index 1d829bfb3..7a71b45cb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/minecraft/world/entity/LivingEntity.cpp @@ -15,10 +15,10 @@ #include "LivingEntity.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/stats/GenericStats.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" @@ -26,45 +26,45 @@ #include "nbt/ListTag.h" #include "nbt/ShortTag.h" #include "nbt/Tag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" -#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" -#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/MobType.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/world/scores/Team.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/SetEquippedItemPacket.h" +#include "minecraft/network/packet/TakeItemEntityPacket.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/CombatTracker.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" +#include "minecraft/world/entity/animal/Wolf.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/scores/Team.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h b/minecraft/minecraft/world/entity/LivingEntity.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h rename to minecraft/minecraft/world/entity/LivingEntity.h index f66366f69..95db3fd04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h +++ b/minecraft/minecraft/world/entity/LivingEntity.h @@ -5,8 +5,8 @@ #include "Entity.h" #include "MobType.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/SharedConstants.h" class CombatTracker; class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/minecraft/world/entity/Mob.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp rename to minecraft/minecraft/world/entity/Mob.cpp index e19436d73..3cc3d49eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp +++ b/minecraft/minecraft/world/entity/Mob.cpp @@ -9,47 +9,47 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "net/minecraft/world/entity/item/ItemEntity.h" -#include "net/minecraft/world/entity/Mob.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/Mob.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/FloatTag.h" #include "nbt/ListTag.h" -#include "net/minecraft/network/packet/SetEntityLinkPacket.h" -#include "net/minecraft/util/Mth.h" -#include "net/minecraft/world/Difficulty.h" -#include "net/minecraft/world/entity/Entity.h" -#include "net/minecraft/world/entity/HangingEntity.h" -#include "net/minecraft/world/entity/LeashFenceKnotEntity.h" -#include "net/minecraft/world/entity/LivingEntity.h" -#include "net/minecraft/world/entity/Mob.h" -#include "net/minecraft/world/entity/SyncedEntityData.h" -#include "net/minecraft/world/entity/TamableAnimal.h" -#include "net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "net/minecraft/world/entity/ai/control/BodyControl.h" -#include "net/minecraft/world/entity/ai/control/JumpControl.h" -#include "net/minecraft/world/entity/ai/control/LookControl.h" -#include "net/minecraft/world/entity/ai/control/MoveControl.h" -#include "net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "net/minecraft/world/entity/player/Abilities.h" -#include "net/minecraft/world/entity/player/Inventory.h" -#include "net/minecraft/world/entity/player/Player.h" -#include "net/minecraft/world/item/ArmorItem.h" -#include "net/minecraft/world/item/Item.h" -#include "net/minecraft/world/item/ItemInstance.h" -#include "net/minecraft/world/item/WeaponItem.h" -#include "net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "net/minecraft/world/level/GameRules.h" -#include "net/minecraft/world/level/Level.h" -#include "net/minecraft/world/level/tile/Tile.h" -#include "net/minecraft/world/phys/AABB.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/entity/LeashFenceKnotEntity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/control/BodyControl.h" +#include "minecraft/world/entity/ai/control/JumpControl.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/control/MoveControl.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/WeaponItem.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h b/minecraft/minecraft/world/entity/Mob.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h rename to minecraft/minecraft/world/entity/Mob.h index 41b6375da..716976278 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h +++ b/minecraft/minecraft/world/entity/Mob.h @@ -2,7 +2,7 @@ #include "LivingEntity.h" #include "MobType.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" class HitResult; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp b/minecraft/minecraft/world/entity/MobCategory.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp rename to minecraft/minecraft/world/entity/MobCategory.cpp index ce02b9ac7..da2247a76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp +++ b/minecraft/minecraft/world/entity/MobCategory.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "MobCategory.h" MobCategory* MobCategory::monster = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h b/minecraft/minecraft/world/entity/MobCategory.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h rename to minecraft/minecraft/world/entity/MobCategory.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobGroupData.h b/minecraft/minecraft/world/entity/MobGroupData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/MobGroupData.h rename to minecraft/minecraft/world/entity/MobGroupData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobType.h b/minecraft/minecraft/world/entity/MobType.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/MobType.h rename to minecraft/minecraft/world/entity/MobType.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/OwnableEntity.h b/minecraft/minecraft/world/entity/OwnableEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/OwnableEntity.h rename to minecraft/minecraft/world/entity/OwnableEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp b/minecraft/minecraft/world/entity/Painting.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp rename to minecraft/minecraft/world/entity/Painting.cpp index 31830690d..a9a9c3244 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp +++ b/minecraft/minecraft/world/entity/Painting.cpp @@ -6,12 +6,12 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" typedef Painting::Motive _Motive; const _Motive* Painting::Motive::values[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h b/minecraft/minecraft/world/entity/Painting.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h rename to minecraft/minecraft/world/entity/Painting.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp b/minecraft/minecraft/world/entity/PathfinderMob.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp rename to minecraft/minecraft/world/entity/PathfinderMob.cpp index a296d67a2..d362d1bfb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp +++ b/minecraft/minecraft/world/entity/PathfinderMob.cpp @@ -3,21 +3,21 @@ #include "PathfinderMob.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Pos.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/goal/Goal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" AttributeModifier* PathfinderMob::SPEED_MODIFIER_FLEEING = (new AttributeModifier(eModifierId_MOB_FLEEING, 2.0f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h b/minecraft/minecraft/world/entity/PathfinderMob.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h rename to minecraft/minecraft/world/entity/PathfinderMob.h index 8423a4673..774e9b620 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h +++ b/minecraft/minecraft/world/entity/PathfinderMob.h @@ -3,8 +3,8 @@ #include #include "Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" class Level; class Path; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp b/minecraft/minecraft/world/entity/SyncedEntityData.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp rename to minecraft/minecraft/world/entity/SyncedEntityData.cpp index a388ee5f5..43b40f2d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp +++ b/minecraft/minecraft/world/entity/SyncedEntityData.cpp @@ -2,11 +2,11 @@ #include #include "SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/SyncedEntityData.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/Packet.h" SynchedEntityData::SynchedEntityData() { m_isDirty = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h b/minecraft/minecraft/world/entity/SyncedEntityData.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h rename to minecraft/minecraft/world/entity/SyncedEntityData.h index 334526bd7..eb240b14e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h +++ b/minecraft/minecraft/world/entity/SyncedEntityData.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Pos; class DataInputStream; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp b/minecraft/minecraft/world/entity/TamableAnimal.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp rename to minecraft/minecraft/world/entity/TamableAnimal.cpp index 0e354e4c0..598b17561 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp +++ b/minecraft/minecraft/world/entity/TamableAnimal.cpp @@ -1,15 +1,15 @@ #include "SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "TamableAnimal.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/goal/SitGoal.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/level/Level.h" TamableAnimal::TamableAnimal(Level* level) : Animal(level) { sitGoal = new SitGoal(this); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h b/minecraft/minecraft/world/entity/TamableAnimal.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h rename to minecraft/minecraft/world/entity/TamableAnimal.h index add4479da..b873e12a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h +++ b/minecraft/minecraft/world/entity/TamableAnimal.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/animal/Animal.h" #include "OwnableEntity.h" class SitGoal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp b/minecraft/minecraft/world/entity/ai/attributes/Attribute.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp rename to minecraft/minecraft/world/entity/ai/attributes/Attribute.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h b/minecraft/minecraft/world/entity/ai/attributes/Attribute.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h rename to minecraft/minecraft/world/entity/ai/attributes/Attribute.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h b/minecraft/minecraft/world/entity/ai/attributes/AttributeInstance.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h rename to minecraft/minecraft/world/entity/ai/attributes/AttributeInstance.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp rename to minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index 83cdf78dc..cf6e23e3a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -2,7 +2,7 @@ #include #include "AttributeModifier.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "minecraft/util/HtmlString.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h b/minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h rename to minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.h index 3f97855ba..1eefc6249 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h +++ b/minecraft/minecraft/world/entity/ai/attributes/AttributeModifier.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" /* 4J - Both modifier uuid and name have been replaced by an id enum. Note that we have special value "eModifierId_ANONYMOUS" for attribute modifiers that diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp b/minecraft/minecraft/world/entity/ai/attributes/BaseAttribute.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp rename to minecraft/minecraft/world/entity/ai/attributes/BaseAttribute.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h b/minecraft/minecraft/world/entity/ai/attributes/BaseAttribute.h similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h rename to minecraft/minecraft/world/entity/ai/attributes/BaseAttribute.h index 4d1f3a9bf..f22d50393 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h +++ b/minecraft/minecraft/world/entity/ai/attributes/BaseAttribute.h @@ -1,7 +1,7 @@ #pragma once #include "Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class BaseAttribute : public Attribute { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp b/minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp rename to minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp index c697308b0..818f3c8f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp +++ b/minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp @@ -2,9 +2,9 @@ #include #include "BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/item/ItemInstance.h" BaseAttributeMap::~BaseAttributeMap() { for (auto it = attributesById.begin(); it != attributesById.end(); ++it) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h b/minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h rename to minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.h index 5eb3c9ecb..f11b02c1f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h +++ b/minecraft/minecraft/world/entity/ai/attributes/BaseAttributeMap.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class ModifiableAttributeInstance; class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp b/minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp rename to minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp index 8f050ddcc..b99298587 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp +++ b/minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp @@ -2,8 +2,8 @@ #include #include "ModifiableAttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" ModifiableAttributeInstance::ModifiableAttributeInstance( BaseAttributeMap* attributeMap, Attribute* attribute) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h b/minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h rename to minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h index 34e102143..98312b276 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h +++ b/minecraft/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h @@ -4,7 +4,7 @@ #include #include "AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" class Attribute; class BaseAttributeMap; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp b/minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp rename to minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.cpp index 40ca3912f..47f4a0301 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp +++ b/minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.cpp @@ -1,5 +1,5 @@ #include "RangedAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" +#include "minecraft/world/entity/ai/attributes/BaseAttribute.h" RangedAttribute::RangedAttribute(eATTRIBUTE_ID id, double defaultValue, double minValue, double maxValue) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h b/minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h rename to minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.h index e3906ea28..b6bd3f2d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h +++ b/minecraft/minecraft/world/entity/ai/attributes/RangedAttribute.h @@ -1,7 +1,7 @@ #pragma once #include "BaseAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class RangedAttribute : public BaseAttribute { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp rename to minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp index 02b6f94c0..c4478cdcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp +++ b/minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp @@ -5,7 +5,7 @@ #include "AttributeInstance.h" #include "ModifiableAttributeInstance.h" #include "ServersideAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" AttributeInstance* ServersideAttributeMap::getInstance(Attribute* attribute) { return BaseAttributeMap::getInstance(attribute); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h b/minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h rename to minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h index fcbdf86f1..0c22cf265 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h +++ b/minecraft/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h @@ -3,7 +3,7 @@ #include #include "BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h b/minecraft/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h rename to minecraft/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp b/minecraft/minecraft/world/entity/ai/control/BodyControl.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp rename to minecraft/minecraft/world/entity/ai/control/BodyControl.cpp index 9c572536a..118835d60 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp +++ b/minecraft/minecraft/world/entity/ai/control/BodyControl.cpp @@ -2,9 +2,9 @@ #include #include "BodyControl.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/control/MoveControl.h" const float BodyControl::maxClampAngle = 75.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h b/minecraft/minecraft/world/entity/ai/control/BodyControl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h rename to minecraft/minecraft/world/entity/ai/control/BodyControl.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/Control.h b/minecraft/minecraft/world/entity/ai/control/Control.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/Control.h rename to minecraft/minecraft/world/entity/ai/control/Control.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp b/minecraft/minecraft/world/entity/ai/control/JumpControl.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp rename to minecraft/minecraft/world/entity/ai/control/JumpControl.cpp index 386e618a0..4fe9eb8de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp +++ b/minecraft/minecraft/world/entity/ai/control/JumpControl.cpp @@ -1,5 +1,5 @@ #include "JumpControl.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" JumpControl::JumpControl(Mob* mob) { _jump = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h b/minecraft/minecraft/world/entity/ai/control/JumpControl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h rename to minecraft/minecraft/world/entity/ai/control/JumpControl.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp b/minecraft/minecraft/world/entity/ai/control/LookControl.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp rename to minecraft/minecraft/world/entity/ai/control/LookControl.cpp index 32bcbccfa..083d26922 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp +++ b/minecraft/minecraft/world/entity/ai/control/LookControl.cpp @@ -3,12 +3,12 @@ #include "LookControl.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/phys/AABB.h" LookControl::LookControl(Mob* mob) { yMax = xMax = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h b/minecraft/minecraft/world/entity/ai/control/LookControl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h rename to minecraft/minecraft/world/entity/ai/control/LookControl.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp b/minecraft/minecraft/world/entity/ai/control/MoveControl.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp rename to minecraft/minecraft/world/entity/ai/control/MoveControl.cpp index 4487f36a7..2d6f8288d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp +++ b/minecraft/minecraft/world/entity/ai/control/MoveControl.cpp @@ -2,12 +2,12 @@ #include #include "MoveControl.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/control/JumpControl.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/phys/AABB.h" const float MoveControl::MIN_SPEED = 0.0005f; const float MoveControl::MIN_SPEED_SQR = MIN_SPEED * MIN_SPEED; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h b/minecraft/minecraft/world/entity/ai/control/MoveControl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h rename to minecraft/minecraft/world/entity/ai/control/MoveControl.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h b/minecraft/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h rename to minecraft/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp index 0d01451cf..0706bf060 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp @@ -3,19 +3,19 @@ #include #include "AvoidPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" AvoidPlayerGoalEntitySelector::AvoidPlayerGoalEntitySelector( AvoidPlayerGoal* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h b/minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h index 8b5da1fe5..4214a5165 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h @@ -4,7 +4,7 @@ #include #include "Goal.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/EntitySelector.h" class PathNavigation; class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/BegGoal.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/BegGoal.cpp index f18955620..b8fb3733c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/BegGoal.cpp @@ -1,13 +1,13 @@ #include "BegGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/animal/Wolf.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" BegGoal::BegGoal(Wolf* wolf, float lookDistance) { player = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h b/minecraft/minecraft/world/entity/ai/goal/BegGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h rename to minecraft/minecraft/world/entity/ai/goal/BegGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp index f7ce66ae5..3c0ab64bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp @@ -1,12 +1,12 @@ #include "BreakDoorGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" BreakDoorGoal::BreakDoorGoal(Mob* mob) : DoorInteractGoal(mob) { breakTime = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h b/minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.h similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h rename to minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.h index 0534a276b..e306420fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/BreakDoorGoal.h @@ -1,8 +1,8 @@ #pragma once #include "DoorInteractGoal.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/BreedGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/BreedGoal.cpp index a32a91556..a8c3d369a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -3,19 +3,19 @@ #include #include "BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h b/minecraft/minecraft/world/entity/ai/goal/BreedGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h rename to minecraft/minecraft/world/entity/ai/goal/BreedGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp index fd89c53ff..5f0922042 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp @@ -7,23 +7,23 @@ #include "ControlledByPlayerGoal.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/JumpControl.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/level/pathfinder/PathFinder.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" ControlledByPlayerGoal::ControlledByPlayerGoal(Mob* mob, float maxSpeed, float walkSpeed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h b/minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h index 96ded97f2..7b6258cf0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h @@ -1,8 +1,8 @@ #pragma once #include "Goal.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp index 62b89d5b7..5c52bd1d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp @@ -1,14 +1,14 @@ #include #include "DoorInteractGoal.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/Tile.h" DoorInteractGoal::DoorInteractGoal(Mob* mob) { doorX = doorY = doorZ = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h b/minecraft/minecraft/world/entity/ai/goal/DoorInteractGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h rename to minecraft/minecraft/world/entity/ai/goal/DoorInteractGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/EatTileGoal.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/EatTileGoal.cpp index dff2a377c..0c8b56acf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/EatTileGoal.cpp @@ -2,15 +2,15 @@ #include "EatTileGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" EatTileGoal::EatTileGoal(Mob* mob) { eatAnimationTick = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h b/minecraft/minecraft/world/entity/ai/goal/EatTileGoal.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h rename to minecraft/minecraft/world/entity/ai/goal/EatTileGoal.h index 35c632591..5286ad6bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/EatTileGoal.h @@ -1,8 +1,8 @@ #pragma once #include "Goal.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" class Level; class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.cpp index 4b03e604b..5225aefb6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.cpp @@ -2,12 +2,12 @@ #include "FleeSunGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" FleeSunGoal::FleeSunGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h b/minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h rename to minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.h index e253fb1d3..bc299b42d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/FleeSunGoal.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "Goal.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Level; class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/FloatGoal.cpp similarity index 56% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/FloatGoal.cpp index 6f5458d84..739cf4b70 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/FloatGoal.cpp @@ -1,9 +1,9 @@ #include "FloatGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/JumpControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" FloatGoal::FloatGoal(Mob* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h b/minecraft/minecraft/world/entity/ai/goal/FloatGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h rename to minecraft/minecraft/world/entity/ai/goal/FloatGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp index 606e674c2..cef0cc755 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp @@ -1,13 +1,13 @@ #include "FollowOwnerGoal.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" FollowOwnerGoal::FollowOwnerGoal(TamableAnimal* tamable, double speedModifier, float startDistance, float stopDistance) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h b/minecraft/minecraft/world/entity/ai/goal/FollowOwnerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/FollowOwnerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/FollowParentGoal.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/FollowParentGoal.cpp index f2b9b8116..61e6378e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/FollowParentGoal.cpp @@ -3,10 +3,10 @@ #include #include "FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h b/minecraft/minecraft/world/entity/ai/goal/FollowParentGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h rename to minecraft/minecraft/world/entity/ai/goal/FollowParentGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp b/minecraft/minecraft/world/entity/ai/goal/Goal.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp rename to minecraft/minecraft/world/entity/ai/goal/Goal.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h b/minecraft/minecraft/world/entity/ai/goal/Goal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h rename to minecraft/minecraft/world/entity/ai/goal/Goal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp b/minecraft/minecraft/world/entity/ai/goal/GoalSelector.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp rename to minecraft/minecraft/world/entity/ai/goal/GoalSelector.cpp index e453f1e61..184c39f30 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/GoalSelector.cpp @@ -3,8 +3,8 @@ #include #include "Goal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h b/minecraft/minecraft/world/entity/ai/goal/GoalSelector.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h rename to minecraft/minecraft/world/entity/ai/goal/GoalSelector.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/InteractGoal.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/InteractGoal.cpp index dc7b8824b..00ee9ba50 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/InteractGoal.cpp @@ -1,6 +1,6 @@ #include "InteractGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h b/minecraft/minecraft/world/entity/ai/goal/InteractGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h rename to minecraft/minecraft/world/entity/ai/goal/InteractGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp index 47450e067..799795f7a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp @@ -2,9 +2,9 @@ #include "LeapAtTargetGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" LeapAtTargetGoal::LeapAtTargetGoal(Mob* mob, float yd) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp index 011a390a4..298301ef1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp @@ -1,12 +1,12 @@ #include "LookAtPlayerGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" LookAtPlayerGoal::LookAtPlayerGoal(Mob* mob, const std::type_info& lookAtType, float lookDistance) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h b/minecraft/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp index 67dd88de6..8a58795f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp @@ -1,9 +1,9 @@ #include #include "LookAtTradingPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/entity/player/Player.h" class Entity; class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h b/minecraft/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp index 939c7a783..c47a1295a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp @@ -1,17 +1,17 @@ #include "MakeLoveGoal.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" MakeLoveGoal::MakeLoveGoal(Villager* villager) { village = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h b/minecraft/minecraft/world/entity/ai/goal/MakeLoveGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MakeLoveGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp index 9b15421a3..775d31a1f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp @@ -1,16 +1,16 @@ #include -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/level/pathfinder/Path.h" #include "MeleeAttackGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/phys/AABB.h" void MeleeAttackGoal::_init(PathfinderMob* mob, double speedModifier, bool trackTarget) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h b/minecraft/minecraft/world/entity/ai/goal/MeleeAttackGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MeleeAttackGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp index 4da52888b..3439e35da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp @@ -2,17 +2,17 @@ #include "MoveIndoorsGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/phys/Vec3.h" MoveIndoorsGoal::MoveIndoorsGoal(PathfinderMob* mob) { insideX = insideZ = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h b/minecraft/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp index b52835f8f..9fd607539 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp @@ -3,17 +3,17 @@ #include #include "MoveThroughVillageGoal.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/Vec3.h" MoveThroughVillageGoal::MoveThroughVillageGoal(PathfinderMob* mob, double speedModifier, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h b/minecraft/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp index 8d2110c49..30ed64660 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp @@ -2,12 +2,12 @@ #include #include "MoveTowardsRestrictionGoal.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Pos.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/phys/Vec3.h" MoveTowardsRestrictionGoal::MoveTowardsRestrictionGoal(PathfinderMob* mob, double speedModifier) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp index 0eb4cefab..165874df2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp @@ -1,13 +1,13 @@ #include #include "MoveTowardsTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/phys/Vec3.h" MoveTowardsTargetGoal::MoveTowardsTargetGoal(PathfinderMob* mob, double speedModifier, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp index 53c53ba80..9c7f2cbf3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp @@ -1,13 +1,13 @@ #include #include "OcelotAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/phys/AABB.h" OcelotAttackGoal::OcelotAttackGoal(Mob* mob) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h b/minecraft/minecraft/world/entity/ai/goal/OcelotAttackGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h rename to minecraft/minecraft/world/entity/ai/goal/OcelotAttackGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp index 7c5f478e3..f693a2f16 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp @@ -3,15 +3,15 @@ #include "OcelotSitOnTileGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/goal/SitGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/BedTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" const int OcelotSitOnTileGoal::GIVE_UP_TICKS = 3 * SharedConstants::TICKS_PER_SECOND; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h b/minecraft/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h rename to minecraft/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp index 954b77131..cd78cbe04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp @@ -1,11 +1,11 @@ #include "OfferFlowerGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" OfferFlowerGoal::OfferFlowerGoal(VillagerGolem* golem) { this->golem = golem; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h b/minecraft/minecraft/world/entity/ai/goal/OfferFlowerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/OfferFlowerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp index 769d79d2b..4233ad595 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp @@ -1,7 +1,7 @@ #include "OpenDoorGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" +#include "minecraft/world/level/tile/DoorTile.h" OpenDoorGoal::OpenDoorGoal(Mob* mob, bool closeDoorAfter) : DoorInteractGoal(mob) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h b/minecraft/minecraft/world/entity/ai/goal/OpenDoorGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h rename to minecraft/minecraft/world/entity/ai/goal/OpenDoorGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/PanicGoal.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/PanicGoal.cpp index c3315ff49..c4d653225 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/PanicGoal.cpp @@ -3,11 +3,11 @@ #include "PanicGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/phys/Vec3.h" PanicGoal::PanicGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h b/minecraft/minecraft/world/entity/ai/goal/PanicGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h rename to minecraft/minecraft/world/entity/ai/goal/PanicGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/PlayGoal.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/PlayGoal.cpp index e49b9a263..59c6928db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/PlayGoal.cpp @@ -5,16 +5,16 @@ #include "PlayGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" PlayGoal::PlayGoal(Villager* mob, double speedModifier) { followFriend = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h b/minecraft/minecraft/world/entity/ai/goal/PlayGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h rename to minecraft/minecraft/world/entity/ai/goal/PlayGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp index 09210488c..2bbfef031 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp @@ -3,9 +3,9 @@ #include "RandomLookAroundGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" RandomLookAroundGoal::RandomLookAroundGoal(Mob* mob) { relX = relZ = 0.0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h b/minecraft/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp index a7ae19df3..fc0068a83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp @@ -3,12 +3,12 @@ #include "RandomStrollGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/phys/Vec3.h" RandomStrollGoal::RandomStrollGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h b/minecraft/minecraft/world/entity/ai/goal/RandomStrollGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RandomStrollGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp index ad80f4787..fd818ac06 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp @@ -1,13 +1,13 @@ #include "RangedAttackGoal.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/entity/monster/RangedAttackMob.h" +#include "minecraft/world/phys/AABB.h" void RangedAttackGoal::_init(RangedAttackMob* rangedMob, Mob* mob, double speedModifier, int attackIntervalMin, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h b/minecraft/minecraft/world/entity/ai/goal/RangedAttackGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RangedAttackGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp index f9198babb..e6785d76f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp @@ -1,11 +1,11 @@ #include "RestrictOpenDoorGoal.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/level/Level.h" RestrictOpenDoorGoal::RestrictOpenDoorGoal(PathfinderMob* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h b/minecraft/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp similarity index 59% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp index 00a449014..dc2233e74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp @@ -1,7 +1,7 @@ #include "RestrictSunGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/level/Level.h" RestrictSunGoal::RestrictSunGoal(PathfinderMob* mob) { this->mob = mob; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h b/minecraft/minecraft/world/entity/ai/goal/RestrictSunGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RestrictSunGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp similarity index 71% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp index 4c335433f..f9cce0f29 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp @@ -1,20 +1,20 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "minecraft/world/entity/ai/util/RandomPos.h" #include "RunAroundLikeCrazyGoal.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/Vec3.h" RunAroundLikeCrazyGoal::RunAroundLikeCrazyGoal(EntityHorse* mob, double speedModifier) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h b/minecraft/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h rename to minecraft/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/SitGoal.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/SitGoal.cpp index 75d9e3fb7..85dd0ddac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/SitGoal.cpp @@ -1,11 +1,11 @@ #include #include "SitGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" SitGoal::SitGoal(TamableAnimal* mob) { _wantToSit = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h b/minecraft/minecraft/world/entity/ai/goal/SitGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h rename to minecraft/minecraft/world/entity/ai/goal/SitGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/SwellGoal.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/SwellGoal.cpp index 3841c5e9e..c7ec6b6d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/SwellGoal.cpp @@ -1,9 +1,9 @@ #include "SwellGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Creeper.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/entity/monster/Creeper.h" SwellGoal::SwellGoal(Creeper* creeper) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h b/minecraft/minecraft/world/entity/ai/goal/SwellGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h rename to minecraft/minecraft/world/entity/ai/goal/SwellGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp index b39e6fdfc..3852c3393 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp @@ -3,14 +3,14 @@ #include "TakeFlowerGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/goal/OfferFlowerGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h b/minecraft/minecraft/world/entity/ai/goal/TakeFlowerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/TakeFlowerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/TemptGoal.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/TemptGoal.cpp index 25ea75ae0..f339bd5be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/TemptGoal.cpp @@ -1,13 +1,13 @@ #include #include "TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/control/LookControl.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" TemptGoal::TemptGoal(PathfinderMob* mob, double speedModifier, int itemId, bool canScare) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h b/minecraft/minecraft/world/entity/ai/goal/TemptGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h rename to minecraft/minecraft/world/entity/ai/goal/TemptGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp index 182051500..843c45580 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp @@ -1,10 +1,10 @@ #include #include "TradeWithPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/ai/control/Control.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/entity/player/Player.h" TradeWithPlayerGoal::TradeWithPlayerGoal(Villager* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h b/minecraft/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h rename to minecraft/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h b/minecraft/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h rename to minecraft/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp index a9ab0a3c9..73b9f63b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp @@ -1,10 +1,10 @@ #include "DefendVillageTargetGoal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" DefendVillageTargetGoal::DefendVillageTargetGoal(VillagerGolem* golem) : TargetGoal(golem, false, true) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp index 6d0967422..499ce985f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp @@ -3,10 +3,10 @@ #include #include "HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp index d61198e0b..d632d979e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp @@ -5,13 +5,13 @@ #include "NearestAttackableTargetGoal.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" SubselectEntitySelector::SubselectEntitySelector( NearestAttackableTargetGoal* parent, EntitySelector* subselector) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h index b3421bd4b..5b88d3d5c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h @@ -4,7 +4,7 @@ #include #include "TargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/EntitySelector.h" class NearestAttackableTargetGoal; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp similarity index 70% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp index 7bd8ecdc2..077cfa049 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp @@ -1,6 +1,6 @@ #include "NonTameRandomTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" NonTameRandomTargetGoal::NonTameRandomTargetGoal( TamableAnimal* mob, const std::type_info& targetType, int randomInterval, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp index 2733d4988..ab2f4aaaf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp @@ -1,8 +1,8 @@ #include "OwnerHurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" OwnerHurtByTargetGoal::OwnerHurtByTargetGoal(TamableAnimal* tameAnimal) : TargetGoal(tameAnimal, 32, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp index f02d44667..6783251d5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp @@ -1,8 +1,8 @@ #include "OwnerHurtTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" OwnerHurtTargetGoal::OwnerHurtTargetGoal(TamableAnimal* tameAnimal) : TargetGoal(tameAnimal, 32, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp b/minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp rename to minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.cpp index 64b878b37..158d9e903 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp +++ b/minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.cpp @@ -3,18 +3,18 @@ #include "TargetGoal.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/OwnableEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/OwnableEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/sensing/Sensing.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/level/pathfinder/Path.h" void TargetGoal::_init(PathfinderMob* mob, bool mustSee, bool mustReach) { reachCache = EmptyReachCache; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h b/minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h rename to minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.h index d2bbaceab..aa6b62b5c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h +++ b/minecraft/minecraft/world/entity/ai/goal/target/TargetGoal.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h" +#include "minecraft/world/entity/ai/goal/Goal.h" class PathfinderMob; class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h b/minecraft/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h rename to minecraft/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp b/minecraft/minecraft/world/entity/ai/navigation/PathNavigation.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp rename to minecraft/minecraft/world/entity/ai/navigation/PathNavigation.cpp index 0f5f2ee84..c29cccfd6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp +++ b/minecraft/minecraft/world/entity/ai/navigation/PathNavigation.cpp @@ -2,17 +2,17 @@ #include #include "PathNavigation.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/control/MoveControl.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h b/minecraft/minecraft/world/entity/ai/navigation/PathNavigation.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h rename to minecraft/minecraft/world/entity/ai/navigation/PathNavigation.h index fcce7543b..6573db582 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h +++ b/minecraft/minecraft/world/entity/ai/navigation/PathNavigation.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Mob; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h b/minecraft/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h rename to minecraft/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp b/minecraft/minecraft/world/entity/ai/sensing/Sensing.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp rename to minecraft/minecraft/world/entity/ai/sensing/Sensing.cpp index bef4b54bd..8c20894eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp +++ b/minecraft/minecraft/world/entity/ai/sensing/Sensing.cpp @@ -1,5 +1,5 @@ #include "Sensing.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h b/minecraft/minecraft/world/entity/ai/sensing/Sensing.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h rename to minecraft/minecraft/world/entity/ai/sensing/Sensing.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h b/minecraft/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h rename to minecraft/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp b/minecraft/minecraft/world/entity/ai/util/RandomPos.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp rename to minecraft/minecraft/world/entity/ai/util/RandomPos.cpp index b4d71eecd..7ddac1b56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp +++ b/minecraft/minecraft/world/entity/ai/util/RandomPos.cpp @@ -2,9 +2,9 @@ #include "RandomPos.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "minecraft/Pos.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" Vec3 RandomPos::tempDir = Vec3(0, 0, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h b/minecraft/minecraft/world/entity/ai/util/RandomPos.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h rename to minecraft/minecraft/world/entity/ai/util/RandomPos.h index 0a77e7b70..ec018d2ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h +++ b/minecraft/minecraft/world/entity/ai/util/RandomPos.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h b/minecraft/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h rename to minecraft/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp b/minecraft/minecraft/world/entity/ai/village/DoorInfo.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp rename to minecraft/minecraft/world/entity/ai/village/DoorInfo.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h b/minecraft/minecraft/world/entity/ai/village/DoorInfo.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h rename to minecraft/minecraft/world/entity/ai/village/DoorInfo.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp b/minecraft/minecraft/world/entity/ai/village/Village.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp rename to minecraft/minecraft/world/entity/ai/village/Village.cpp index db9724190..e3a667355 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp +++ b/minecraft/minecraft/world/entity/ai/village/Village.cpp @@ -9,15 +9,15 @@ #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Pos.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h b/minecraft/minecraft/world/entity/ai/village/Village.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h rename to minecraft/minecraft/world/entity/ai/village/Village.h index c8d2becae..c2a915a86 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h +++ b/minecraft/minecraft/world/entity/ai/village/Village.h @@ -7,10 +7,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/phys/Vec3.h" class CompoundTag; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp b/minecraft/minecraft/world/entity/ai/village/VillageSiege.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp rename to minecraft/minecraft/world/entity/ai/village/VillageSiege.cpp index 86930bb76..371f90ece 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp +++ b/minecraft/minecraft/world/entity/ai/village/VillageSiege.cpp @@ -6,14 +6,14 @@ #include "VillageSiege.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" +#include "minecraft/Pos.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/MobSpawner.h" VillageSiege::VillageSiege(Level* level) { hasSetupSiege = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h b/minecraft/minecraft/world/entity/ai/village/VillageSiege.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h rename to minecraft/minecraft/world/entity/ai/village/VillageSiege.h index a8d75cc2a..cacfdf104 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h +++ b/minecraft/minecraft/world/entity/ai/village/VillageSiege.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Level; class Village; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp b/minecraft/minecraft/world/entity/ai/village/Villages.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp rename to minecraft/minecraft/world/entity/ai/village/Villages.cpp index b579fc5c8..a2a96a3a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp +++ b/minecraft/minecraft/world/entity/ai/village/Villages.cpp @@ -4,10 +4,10 @@ #include "Villages.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Pos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/Tile.h" const std::wstring Villages::VILLAGE_FILE_ID = L"villages"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h b/minecraft/minecraft/world/entity/ai/village/Villages.h similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h rename to minecraft/minecraft/world/entity/ai/village/Villages.h index 0e5d95e5c..99ea19170 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h +++ b/minecraft/minecraft/world/entity/ai/village/Villages.h @@ -6,10 +6,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/level/saveddata/SavedData.h" class Level; class Pos; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h b/minecraft/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h rename to minecraft/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp b/minecraft/minecraft/world/entity/ambient/AmbientCreature.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp rename to minecraft/minecraft/world/entity/ambient/AmbientCreature.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h b/minecraft/minecraft/world/entity/ambient/AmbientCreature.h similarity index 56% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h rename to minecraft/minecraft/world/entity/ambient/AmbientCreature.h index 220edfea5..cb96b2f39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h +++ b/minecraft/minecraft/world/entity/ambient/AmbientCreature.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/Mob.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp b/minecraft/minecraft/world/entity/ambient/Bat.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp rename to minecraft/minecraft/world/entity/ambient/Bat.cpp index 33516d144..d48eaecd2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp +++ b/minecraft/minecraft/world/entity/ambient/Bat.cpp @@ -4,19 +4,19 @@ #include #include "Bat.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/level/Calendar.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Pos.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ambient/AmbientCreature.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/level/Calendar.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" Bat::Bat(Level* level) : AmbientCreature(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h b/minecraft/minecraft/world/entity/ambient/Bat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h rename to minecraft/minecraft/world/entity/ambient/Bat.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h b/minecraft/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h rename to minecraft/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp b/minecraft/minecraft/world/entity/animal/Animal.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp rename to minecraft/minecraft/world/entity/animal/Animal.cpp index 15d3489ef..0895f3ef5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp +++ b/minecraft/minecraft/world/entity/animal/Animal.cpp @@ -1,18 +1,18 @@ #include #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/util/Mth.h" #include "java/Random.h" #include "Animal.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h b/minecraft/minecraft/world/entity/animal/Animal.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h rename to minecraft/minecraft/world/entity/animal/Animal.h index 617004bcb..8c38af10b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h +++ b/minecraft/minecraft/world/entity/animal/Animal.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/Creature.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp b/minecraft/minecraft/world/entity/animal/Chicken.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp rename to minecraft/minecraft/world/entity/animal/Chicken.cpp index 8932bcafb..e55abd79d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp +++ b/minecraft/minecraft/world/entity/animal/Chicken.cpp @@ -1,24 +1,24 @@ #include #include "Chicken.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/PanicGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/TemptGoal.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" void Chicken::_init() { sheared = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h b/minecraft/minecraft/world/entity/animal/Chicken.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h rename to minecraft/minecraft/world/entity/animal/Chicken.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp b/minecraft/minecraft/world/entity/animal/Cow.cpp similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp rename to minecraft/minecraft/world/entity/animal/Cow.cpp index fe08d7c8c..12a8febcf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp +++ b/minecraft/minecraft/world/entity/animal/Cow.cpp @@ -1,28 +1,28 @@ #include #include "Cow.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/PanicGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/TemptGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" Cow::Cow(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h b/minecraft/minecraft/world/entity/animal/Cow.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h rename to minecraft/minecraft/world/entity/animal/Cow.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/minecraft/world/entity/animal/EntityHorse.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp rename to minecraft/minecraft/world/entity/animal/EntityHorse.cpp index 7b944bd2c..b3da45c4e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/minecraft/world/entity/animal/EntityHorse.cpp @@ -7,47 +7,47 @@ #include "EntityHorse.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/inventory/AnimalChest.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/MobGroupData.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/BaseAttribute.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/PanicGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/AnimalChest.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class EntitySelector; class Path; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h b/minecraft/minecraft/world/entity/animal/EntityHorse.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h rename to minecraft/minecraft/world/entity/animal/EntityHorse.h index 9daa71db1..6df586232 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h +++ b/minecraft/minecraft/world/entity/animal/EntityHorse.h @@ -7,11 +7,11 @@ #include #include "Animal.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/net.minecraft.world.ContainerListener.h" +#include "minecraft/world/entity/MobGroupData.h" +#include "minecraft/world/entity/EntitySelector.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" class Attribute; class AnimalChest; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp b/minecraft/minecraft/world/entity/animal/Golem.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp rename to minecraft/minecraft/world/entity/animal/Golem.cpp index e4ec41612..35bf80068 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp +++ b/minecraft/minecraft/world/entity/animal/Golem.cpp @@ -1,5 +1,5 @@ #include "Golem.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/PathfinderMob.h" Golem::Golem(Level* level) : PathfinderMob(level) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h b/minecraft/minecraft/world/entity/animal/Golem.h similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h rename to minecraft/minecraft/world/entity/animal/Golem.h index f0ca9ef67..ed7b71d33 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h +++ b/minecraft/minecraft/world/entity/animal/Golem.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/Creature.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp b/minecraft/minecraft/world/entity/animal/MushroomCow.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp rename to minecraft/minecraft/world/entity/animal/MushroomCow.cpp index 57b3f00bd..5ff1b4f05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp +++ b/minecraft/minecraft/world/entity/animal/MushroomCow.cpp @@ -1,20 +1,20 @@ #include #include "MushroomCow.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Cow.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/animal/Cow.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" MushroomCow::MushroomCow(Level* level) : Cow(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h b/minecraft/minecraft/world/entity/animal/MushroomCow.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h rename to minecraft/minecraft/world/entity/animal/MushroomCow.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/minecraft/world/entity/animal/Ocelot.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp rename to minecraft/minecraft/world/entity/animal/Ocelot.cpp index e6e2a6393..65b85b22e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp +++ b/minecraft/minecraft/world/entity/animal/Ocelot.cpp @@ -2,50 +2,50 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#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.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "Ocelot.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/control/MoveControl.h" +#include "minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/OcelotAttackGoal.h" +#include "minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/SitGoal.h" +#include "minecraft/world/entity/ai/goal/TemptGoal.h" +#include "minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/animal/Chicken.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" #include "platform/PlatformServices.h" const double Ocelot::SNEAK_SPEED_MOD = 0.6; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h b/minecraft/minecraft/world/entity/animal/Ocelot.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h rename to minecraft/minecraft/world/entity/animal/Ocelot.h index 27173c8b9..cd5f787c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h +++ b/minecraft/minecraft/world/entity/animal/Ocelot.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/TamableAnimal.h" #include "java/Class.h" class TemptGoal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp b/minecraft/minecraft/world/entity/animal/Pig.cpp similarity index 73% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp rename to minecraft/minecraft/world/entity/animal/Pig.cpp index 1874431fa..64399da8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp +++ b/minecraft/minecraft/world/entity/animal/Pig.cpp @@ -3,31 +3,31 @@ #include #include "Pig.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/PanicGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/TemptGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/monster/PigZombie.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" Pig::Pig(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h b/minecraft/minecraft/world/entity/animal/Pig.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h rename to minecraft/minecraft/world/entity/animal/Pig.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp b/minecraft/minecraft/world/entity/animal/Sheep.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp rename to minecraft/minecraft/world/entity/animal/Sheep.cpp index 6817d496b..c4b61b5b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp +++ b/minecraft/minecraft/world/entity/animal/Sheep.cpp @@ -4,38 +4,38 @@ #include #include "Sheep.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/EatTileGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/PanicGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/TemptGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ShearsItem.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" const float Sheep::COLOR[Sheep::COLOR_LENGTH][3] = { {1.0f, 1.0f, 1.0f}, // white diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h b/minecraft/minecraft/world/entity/animal/Sheep.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h rename to minecraft/minecraft/world/entity/animal/Sheep.h index c0d834def..8909a5802 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h +++ b/minecraft/minecraft/world/entity/animal/Sheep.h @@ -4,10 +4,10 @@ #include #include "Animal.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" class Random; class EatTileGoal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp b/minecraft/minecraft/world/entity/animal/SnowMan.cpp similarity index 63% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp rename to minecraft/minecraft/world/entity/animal/SnowMan.cpp index 6cc028fa3..4aac6a515 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp +++ b/minecraft/minecraft/world/entity/animal/SnowMan.cpp @@ -1,30 +1,30 @@ #include #include "SnowMan.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Golem.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Golem.h" +#include "minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Snowball.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/tile/Tile.h" SnowMan::SnowMan(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h b/minecraft/minecraft/world/entity/animal/SnowMan.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h rename to minecraft/minecraft/world/entity/animal/SnowMan.h index 1a1e83072..1d75ba856 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h +++ b/minecraft/minecraft/world/entity/animal/SnowMan.h @@ -1,7 +1,7 @@ #pragma once #include "Golem.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" +#include "minecraft/world/entity/monster/RangedAttackMob.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp b/minecraft/minecraft/world/entity/animal/Squid.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp rename to minecraft/minecraft/world/entity/animal/Squid.cpp index 6f6a9ea1e..faf5920a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp +++ b/minecraft/minecraft/world/entity/animal/Squid.cpp @@ -4,17 +4,17 @@ #include "Squid.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/animal/WaterAnimal.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" void Squid::_init() { xBodyRot = xBodyRotO = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h b/minecraft/minecraft/world/entity/animal/Squid.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h rename to minecraft/minecraft/world/entity/animal/Squid.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp b/minecraft/minecraft/world/entity/animal/VillagerGolem.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp rename to minecraft/minecraft/world/entity/animal/VillagerGolem.cpp index 3b9d779a0..2a8a75755 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/minecraft/minecraft/world/entity/animal/VillagerGolem.cpp @@ -1,43 +1,43 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/SyncedEntityData.h" #include "VillagerGolem.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Golem.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Pos.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/control/MoveControl.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" +#include "minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h" +#include "minecraft/world/entity/ai/goal/OfferFlowerGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/animal/Golem.h" +#include "minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" VillagerGolem::VillagerGolem(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h b/minecraft/minecraft/world/entity/animal/VillagerGolem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h rename to minecraft/minecraft/world/entity/animal/VillagerGolem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp b/minecraft/minecraft/world/entity/animal/WaterAnimal.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp rename to minecraft/minecraft/world/entity/animal/WaterAnimal.cpp index 9e7242c18..20f802f7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp +++ b/minecraft/minecraft/world/entity/animal/WaterAnimal.cpp @@ -2,9 +2,9 @@ #include "WaterAnimal.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/level/Level.h" WaterAnimal::WaterAnimal(Level* level) : PathfinderMob(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h b/minecraft/minecraft/world/entity/animal/WaterAnimal.h similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h rename to minecraft/minecraft/world/entity/animal/WaterAnimal.h index 7524c42eb..71850e0f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h +++ b/minecraft/minecraft/world/entity/animal/WaterAnimal.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/Creature.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/minecraft/world/entity/animal/Wolf.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp rename to minecraft/minecraft/world/entity/animal/Wolf.cpp index 1ad2d0bb8..1d98e0a76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp +++ b/minecraft/minecraft/world/entity/animal/Wolf.cpp @@ -5,49 +5,49 @@ #include "Sheep.h" #include "Wolf.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/BegGoal.h" +#include "minecraft/world/entity/ai/goal/BreedGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/SitGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/phys/AABB.h" Wolf::Wolf(Level* level) : TamableAnimal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h b/minecraft/minecraft/world/entity/animal/Wolf.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h rename to minecraft/minecraft/world/entity/animal/Wolf.h index 0508a1140..ea9a9642d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h +++ b/minecraft/minecraft/world/entity/animal/Wolf.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "minecraft/world/entity/TamableAnimal.h" #include "java/Class.h" class DamageSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h b/minecraft/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h rename to minecraft/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/BossMob.h b/minecraft/minecraft/world/entity/boss/BossMob.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/BossMob.h rename to minecraft/minecraft/world/entity/boss/BossMob.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h b/minecraft/minecraft/world/entity/boss/MultiEntityMob.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h rename to minecraft/minecraft/world/entity/boss/MultiEntityMob.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/minecraft/minecraft/world/entity/boss/MultiEntityMobPart.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp rename to minecraft/minecraft/world/entity/boss/MultiEntityMobPart.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h b/minecraft/minecraft/world/entity/boss/MultiEntityMobPart.h similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h rename to minecraft/minecraft/world/entity/boss/MultiEntityMobPart.h index 75f488ea2..c28db7cff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h +++ b/minecraft/minecraft/world/entity/boss/MultiEntityMobPart.h @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; class MultiEntityMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp rename to minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp index 385c37330..de475d0a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp +++ b/minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.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/net.minecraft.world.entity.h" #include "net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystal.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/util/Mth.h" void EnderCrystal::_init(Level* level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h b/minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h rename to minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.h index eb0860d83..1c357807a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h +++ b/minecraft/minecraft/world/entity/boss/enderdragon/EnderCrystal.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class EnderCrystal : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp rename to minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index eacba92dc..020088697 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -1,19 +1,19 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.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/net.minecraft.world.entity.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/boss/net.minecraft.world.entity.boss.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#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 "net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" #include "EnderDragon.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h rename to minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 813b600b1..4397f13ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/minecraft/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -1,10 +1,10 @@ #pragma once -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/boss/BossMob.h" +#include "minecraft/world/entity/boss/MultiEntityMob.h" +#include "minecraft/world/entity/monster/Enemy.h" class MultiEntityMobPart; class EnderCrystal; diff --git a/minecraft/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h b/minecraft/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h new file mode 100644 index 000000000..89ca950f8 --- /dev/null +++ b/minecraft/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h @@ -0,0 +1,5 @@ +#pragma once + +#include "EnderCrystal.h" +#include "EnderDragon.h" +#include "minecraft/world/level/levelgen/feature/NetherSphereFeature.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h b/minecraft/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h rename to minecraft/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp b/minecraft/minecraft/world/entity/boss/wither/WitherBoss.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp rename to minecraft/minecraft/world/entity/boss/wither/WitherBoss.cpp index fee056c81..9c452fea7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/minecraft/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -1,19 +1,19 @@ -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" +#include "minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" +#include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/net.minecraft.world.entity.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/world/phys/net.minecraft.world.phys.h" +#include "minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "WitherBoss.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h b/minecraft/minecraft/world/entity/boss/wither/WitherBoss.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h rename to minecraft/minecraft/world/entity/boss/wither/WitherBoss.h index 47bcf309c..28e9fe88e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/minecraft/minecraft/world/entity/boss/wither/WitherBoss.h @@ -1,10 +1,10 @@ #pragma once -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/RangedAttackMob.h" +#include "minecraft/world/entity/boss/BossMob.h" class LivingEntitySelector : public EntitySelector { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp b/minecraft/minecraft/world/entity/global/GlobalEntity.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp rename to minecraft/minecraft/world/entity/global/GlobalEntity.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h b/minecraft/minecraft/world/entity/global/GlobalEntity.h similarity index 56% rename from minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h rename to minecraft/minecraft/world/entity/global/GlobalEntity.h index 6720390fb..685d56546 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h +++ b/minecraft/minecraft/world/entity/global/GlobalEntity.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp b/minecraft/minecraft/world/entity/global/LightningBolt.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp rename to minecraft/minecraft/world/entity/global/LightningBolt.cpp index f46533e77..568a09c9d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp +++ b/minecraft/minecraft/world/entity/global/LightningBolt.cpp @@ -6,17 +6,17 @@ #include "LightningBolt.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/global/GlobalEntity.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" LightningBolt::LightningBolt(Level* level, double x, double y, double z) : life(0), seed(0), flashes(0), GlobalEntity(level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h b/minecraft/minecraft/world/entity/global/LightningBolt.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h rename to minecraft/minecraft/world/entity/global/LightningBolt.h index abcd8704b..7933a0c24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h +++ b/minecraft/minecraft/world/entity/global/LightningBolt.h @@ -3,7 +3,7 @@ #include #include "GlobalEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "java/Class.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h b/minecraft/minecraft/world/entity/global/net.minecraft.world.entity.global.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h rename to minecraft/minecraft/world/entity/global/net.minecraft.world.entity.global.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp b/minecraft/minecraft/world/entity/item/Boat.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp rename to minecraft/minecraft/world/entity/item/Boat.cpp index 1208f2826..b11a6bd1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp +++ b/minecraft/minecraft/world/entity/item/Boat.cpp @@ -5,20 +5,20 @@ #include #include "Boat.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" const double Boat::MAX_SPEED = 0.35; const double Boat::MAX_COLLISION_SPEED = MAX_SPEED * 0.75; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h b/minecraft/minecraft/world/entity/item/Boat.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h rename to minecraft/minecraft/world/entity/item/Boat.h index 6c39a0ae7..0cd5c03e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h +++ b/minecraft/minecraft/world/entity/item/Boat.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp b/minecraft/minecraft/world/entity/item/FallingTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp rename to minecraft/minecraft/world/entity/item/FallingTile.cpp index e3feaa76f..136c921fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp +++ b/minecraft/minecraft/world/entity/item/FallingTile.cpp @@ -9,13 +9,13 @@ #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/Tag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" // 4J - added for common ctor code void FallingTile::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h b/minecraft/minecraft/world/entity/item/FallingTile.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h rename to minecraft/minecraft/world/entity/item/FallingTile.h index 7ec55f333..03d7fdd58 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h +++ b/minecraft/minecraft/world/entity/item/FallingTile.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp b/minecraft/minecraft/world/entity/item/ItemEntity.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp rename to minecraft/minecraft/world/entity/item/ItemEntity.cpp index 77a3a375d..b33e9cd1c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp +++ b/minecraft/minecraft/world/entity/item/ItemEntity.cpp @@ -7,20 +7,20 @@ #include "java/JavaMath.h" #include "ItemEntity.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" void ItemEntity::_init() { age = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h b/minecraft/minecraft/world/entity/item/ItemEntity.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h rename to minecraft/minecraft/world/entity/item/ItemEntity.h index a71d27cb2..3fc84da90 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h +++ b/minecraft/minecraft/world/entity/item/ItemEntity.h @@ -2,12 +2,12 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/SharedConstants.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/ItemInstance.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp b/minecraft/minecraft/world/entity/item/Minecart.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp rename to minecraft/minecraft/world/entity/item/Minecart.cpp index 1c693a92e..80c954b91 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp +++ b/minecraft/minecraft/world/entity/item/Minecart.cpp @@ -14,29 +14,29 @@ #include "Minecart.h" #include "java/Class.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/MinecartChest.h" +#include "minecraft/world/entity/item/MinecartFurnace.h" +#include "minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/item/MinecartRideable.h" +#include "minecraft/world/entity/item/MinecartSpawner.h" +#include "minecraft/world/entity/item/MinecartTNT.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" const int Minecart::EXITS[][2][3] = { // diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h b/minecraft/minecraft/world/entity/item/Minecart.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h rename to minecraft/minecraft/world/entity/item/Minecart.h index a4c1664b6..e27baa0e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h +++ b/minecraft/minecraft/world/entity/item/Minecart.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class DamageSource; class Tickable; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp b/minecraft/minecraft/world/entity/item/MinecartChest.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp rename to minecraft/minecraft/world/entity/item/MinecartChest.cpp index de3125716..33b46ca5b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartChest.cpp @@ -1,7 +1,7 @@ #include "MinecartChest.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/Tile.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h b/minecraft/minecraft/world/entity/item/MinecartChest.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h rename to minecraft/minecraft/world/entity/item/MinecartChest.h index cc3080034..9a52db8f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h +++ b/minecraft/minecraft/world/entity/item/MinecartChest.h @@ -2,7 +2,7 @@ #include "MinecartContainer.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h" +#include "minecraft/world/entity/item/MinecartContainer.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp b/minecraft/minecraft/world/entity/item/MinecartContainer.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp rename to minecraft/minecraft/world/entity/item/MinecartContainer.cpp index 4e21a45f0..1f4ea2eca 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartContainer.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" #include "MinecartContainer.h" void MinecartContainer::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h b/minecraft/minecraft/world/entity/item/MinecartContainer.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h rename to minecraft/minecraft/world/entity/item/MinecartContainer.h index 332c090d4..73321cb91 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h +++ b/minecraft/minecraft/world/entity/item/MinecartContainer.h @@ -1,7 +1,7 @@ #pragma once #include "Minecart.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class MinecartContainer : public Minecart, public virtual Container { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp b/minecraft/minecraft/world/entity/item/MinecartFurnace.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp rename to minecraft/minecraft/world/entity/item/MinecartFurnace.cpp index b39d89223..a72d792b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartFurnace.cpp @@ -3,21 +3,21 @@ #include #include "MinecartFurnace.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" MinecartFurnace::MinecartFurnace(Level* level) : Minecart(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h b/minecraft/minecraft/world/entity/item/MinecartFurnace.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h rename to minecraft/minecraft/world/entity/item/MinecartFurnace.h index 482c0594d..f15894dc0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h +++ b/minecraft/minecraft/world/entity/item/MinecartFurnace.h @@ -2,7 +2,7 @@ #include "Minecart.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/Minecart.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp b/minecraft/minecraft/world/entity/item/MinecartHopper.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp rename to minecraft/minecraft/world/entity/item/MinecartHopper.cpp index eb2b5cbe3..0e398baec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartHopper.cpp @@ -4,18 +4,18 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/item/MinecartHopper.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/MinecartContainer.h" +#include "minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h b/minecraft/minecraft/world/entity/item/MinecartHopper.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h rename to minecraft/minecraft/world/entity/item/MinecartHopper.h index b8ba83780..c00b1d216 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h +++ b/minecraft/minecraft/world/entity/item/MinecartHopper.h @@ -1,7 +1,7 @@ #pragma once #include "MinecartContainer.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h" +#include "minecraft/world/level/tile/entity/Hopper.h" class MinecartHopper : public MinecartContainer, public Hopper { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp b/minecraft/minecraft/world/entity/item/MinecartRideable.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp rename to minecraft/minecraft/world/entity/item/MinecartRideable.cpp index fa9c475e3..e8f8c9de1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartRideable.cpp @@ -1,9 +1,9 @@ #include #include "MinecartRideable.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" MinecartRideable::MinecartRideable(Level* level) : Minecart(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h b/minecraft/minecraft/world/entity/item/MinecartRideable.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h rename to minecraft/minecraft/world/entity/item/MinecartRideable.h index 8633a0cd9..5c561412a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h +++ b/minecraft/minecraft/world/entity/item/MinecartRideable.h @@ -2,7 +2,7 @@ #include "Minecart.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/Minecart.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp b/minecraft/minecraft/world/entity/item/MinecartSpawner.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp rename to minecraft/minecraft/world/entity/item/MinecartSpawner.cpp index c89eea73e..34f45031a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartSpawner.cpp @@ -1,8 +1,8 @@ #include "MinecartSpawner.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" MinecartSpawner::MinecartMobSpawner::MinecartMobSpawner( MinecartSpawner* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h b/minecraft/minecraft/world/entity/item/MinecartSpawner.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h rename to minecraft/minecraft/world/entity/item/MinecartSpawner.h index d13143c61..7bb97c1c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h +++ b/minecraft/minecraft/world/entity/item/MinecartSpawner.h @@ -3,9 +3,9 @@ #include #include "Minecart.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/BaseMobSpawner.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/Minecart.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp b/minecraft/minecraft/world/entity/item/MinecartTNT.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp rename to minecraft/minecraft/world/entity/item/MinecartTNT.cpp index cc4235bc0..2643676ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp +++ b/minecraft/minecraft/world/entity/item/MinecartTNT.cpp @@ -3,15 +3,15 @@ #include #include "MinecartTNT.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/Tile.h" void MinecartTNT::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h b/minecraft/minecraft/world/entity/item/MinecartTNT.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h rename to minecraft/minecraft/world/entity/item/MinecartTNT.h index 8905e3207..82064edc3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h +++ b/minecraft/minecraft/world/entity/item/MinecartTNT.h @@ -4,7 +4,7 @@ #include "Minecart.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/Minecart.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp b/minecraft/minecraft/world/entity/item/PrimedTnt.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp rename to minecraft/minecraft/world/entity/item/PrimedTnt.cpp index bdfdb1eaf..8d0f36f64 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp +++ b/minecraft/minecraft/world/entity/item/PrimedTnt.cpp @@ -5,9 +5,9 @@ #include "java/JavaMath.h" #include "PrimedTnt.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" void PrimedTnt::_init() { life = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h b/minecraft/minecraft/world/entity/item/PrimedTnt.h similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h rename to minecraft/minecraft/world/entity/item/PrimedTnt.h index ddfd653af..7aad365bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h +++ b/minecraft/minecraft/world/entity/item/PrimedTnt.h @@ -1,10 +1,10 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h b/minecraft/minecraft/world/entity/item/net.minecraft.world.entity.item.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h rename to minecraft/minecraft/world/entity/item/net.minecraft.world.entity.item.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp b/minecraft/minecraft/world/entity/monster/Blaze.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp rename to minecraft/minecraft/world/entity/monster/Blaze.cpp index 3dc5efa3e..d87439f90 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp +++ b/minecraft/minecraft/world/entity/monster/Blaze.cpp @@ -4,22 +4,22 @@ #include #include "Blaze.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/projectile/SmallFireball.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" Blaze::Blaze(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h b/minecraft/minecraft/world/entity/monster/Blaze.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h rename to minecraft/minecraft/world/entity/monster/Blaze.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp b/minecraft/minecraft/world/entity/monster/CaveSpider.cpp similarity index 67% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp rename to minecraft/minecraft/world/entity/monster/CaveSpider.cpp index 35a494752..0018cdc9b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp +++ b/minecraft/minecraft/world/entity/monster/CaveSpider.cpp @@ -1,16 +1,16 @@ #include #include "CaveSpider.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Spider.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/monster/Spider.h" +#include "minecraft/world/level/Level.h" CaveSpider::CaveSpider(Level* level) : Spider(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h b/minecraft/minecraft/world/entity/monster/CaveSpider.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h rename to minecraft/minecraft/world/entity/monster/CaveSpider.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp b/minecraft/minecraft/world/entity/monster/Creeper.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp rename to minecraft/minecraft/world/entity/monster/Creeper.cpp index 414b6aa5b..98b997b28 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp +++ b/minecraft/minecraft/world/entity/monster/Creeper.cpp @@ -3,31 +3,31 @@ #include #include "Creeper.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/SwellGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" void Creeper::_init() { swell = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h b/minecraft/minecraft/world/entity/monster/Creeper.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h rename to minecraft/minecraft/world/entity/monster/Creeper.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp b/minecraft/minecraft/world/entity/monster/EnderMan.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp rename to minecraft/minecraft/world/entity/monster/EnderMan.cpp index 645872af9..579d0fae8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp +++ b/minecraft/minecraft/world/entity/monster/EnderMan.cpp @@ -6,30 +6,30 @@ #include "EnderMan.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" AttributeModifier* EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h b/minecraft/minecraft/world/entity/monster/EnderMan.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h rename to minecraft/minecraft/world/entity/monster/EnderMan.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp b/minecraft/minecraft/world/entity/monster/Enemy.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp rename to minecraft/minecraft/world/entity/monster/Enemy.cpp index c97bfdf37..45dfc19f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp +++ b/minecraft/minecraft/world/entity/monster/Enemy.cpp @@ -2,7 +2,7 @@ #include "Enemy.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class EntitySelector; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h b/minecraft/minecraft/world/entity/monster/Enemy.h similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h rename to minecraft/minecraft/world/entity/monster/Enemy.h index a8cb0a445..c1b805577 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h +++ b/minecraft/minecraft/world/entity/monster/Enemy.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/EntitySelector.h" class Enemy : public Creature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp b/minecraft/minecraft/world/entity/monster/Ghast.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp rename to minecraft/minecraft/world/entity/monster/Ghast.cpp index ad5ef0c43..fb355f32f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp +++ b/minecraft/minecraft/world/entity/monster/Ghast.cpp @@ -5,27 +5,27 @@ #include #include "Ghast.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/FlyingMob.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/FlyingMob.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/LargeFireball.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" void Ghast::_init() { explosionPower = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h b/minecraft/minecraft/world/entity/monster/Ghast.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h rename to minecraft/minecraft/world/entity/monster/Ghast.h index 334c019d6..5c9784039 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h +++ b/minecraft/minecraft/world/entity/monster/Ghast.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/FlyingMob.h" +#include "minecraft/world/entity/FlyingMob.h" #include "Enemy.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp b/minecraft/minecraft/world/entity/monster/Giant.cpp similarity index 70% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp rename to minecraft/minecraft/world/entity/monster/Giant.cpp index 06563c93a..ac3c55e69 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp +++ b/minecraft/minecraft/world/entity/monster/Giant.cpp @@ -1,8 +1,8 @@ #include "Giant.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/level/Level.h" Giant::Giant(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h b/minecraft/minecraft/world/entity/monster/Giant.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h rename to minecraft/minecraft/world/entity/monster/Giant.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp b/minecraft/minecraft/world/entity/monster/LavaSlime.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp rename to minecraft/minecraft/world/entity/monster/LavaSlime.cpp index a011652dc..40cea8fa2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp +++ b/minecraft/minecraft/world/entity/monster/LavaSlime.cpp @@ -2,14 +2,14 @@ #include #include "LavaSlime.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Slime.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/monster/Slime.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" LavaSlime::LavaSlime(Level* level) : Slime(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h b/minecraft/minecraft/world/entity/monster/LavaSlime.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h rename to minecraft/minecraft/world/entity/monster/LavaSlime.h index 2e10de8c5..d3c7df24f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h +++ b/minecraft/minecraft/world/entity/monster/LavaSlime.h @@ -1,7 +1,7 @@ #pragma once #include "Slime.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp b/minecraft/minecraft/world/entity/monster/Monster.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp rename to minecraft/minecraft/world/entity/monster/Monster.cpp index 012b6a69f..3c33a4eed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp +++ b/minecraft/minecraft/world/entity/monster/Monster.cpp @@ -6,22 +6,22 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/phys/AABB.h" Monster::Monster(Level* level) : PathfinderMob(level) { xpReward = Enemy::XP_REWARD_MEDIUM; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h b/minecraft/minecraft/world/entity/monster/Monster.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h rename to minecraft/minecraft/world/entity/monster/Monster.h index 2e9653b90..64de32c60 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h +++ b/minecraft/minecraft/world/entity/monster/Monster.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/PathfinderMob.h" #include "Enemy.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp b/minecraft/minecraft/world/entity/monster/PigZombie.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp rename to minecraft/minecraft/world/entity/monster/PigZombie.cpp index 501777322..58b5772e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp +++ b/minecraft/minecraft/world/entity/monster/PigZombie.cpp @@ -4,21 +4,21 @@ #include "PigZombie.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" AttributeModifier* PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h b/minecraft/minecraft/world/entity/monster/PigZombie.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h rename to minecraft/minecraft/world/entity/monster/PigZombie.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h b/minecraft/minecraft/world/entity/monster/RangedAttackMob.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h rename to minecraft/minecraft/world/entity/monster/RangedAttackMob.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/minecraft/minecraft/world/entity/monster/SharedMonsterAttributes.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp rename to minecraft/minecraft/world/entity/monster/SharedMonsterAttributes.cpp index 56329509e..a9afb04a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp +++ b/minecraft/minecraft/world/entity/monster/SharedMonsterAttributes.cpp @@ -7,12 +7,12 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/BaseAttribute.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/RangedAttribute.h" Attribute* SharedMonsterAttributes::MAX_HEALTH = (new RangedAttribute(eAttributeId_GENERIC_MAXHEALTH, 20, 0, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h b/minecraft/minecraft/world/entity/monster/SharedMonsterAttributes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h rename to minecraft/minecraft/world/entity/monster/SharedMonsterAttributes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp b/minecraft/minecraft/world/entity/monster/Silverfish.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp rename to minecraft/minecraft/world/entity/monster/Silverfish.cpp index 1322a01fb..0843e750a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp +++ b/minecraft/minecraft/world/entity/monster/Silverfish.cpp @@ -2,22 +2,22 @@ #include "Silverfish.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/StoneMonsterTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" Silverfish::Silverfish(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h b/minecraft/minecraft/world/entity/monster/Silverfish.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h rename to minecraft/minecraft/world/entity/monster/Silverfish.h index 239b31d12..d759e8f4c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h +++ b/minecraft/minecraft/world/entity/monster/Silverfish.h @@ -2,7 +2,7 @@ #include "Monster.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/MobType.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp b/minecraft/minecraft/world/entity/monster/Skeleton.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp rename to minecraft/minecraft/world/entity/monster/Skeleton.cpp index 79b6a0718..2ea4ced9f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp +++ b/minecraft/minecraft/world/entity/monster/Skeleton.cpp @@ -5,46 +5,46 @@ #include #include "Skeleton.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/Calendar.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/FleeSunGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "minecraft/world/entity/ai/goal/RestrictSunGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/Calendar.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/HellDimension.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" Skeleton::Skeleton(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h b/minecraft/minecraft/world/entity/monster/Skeleton.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h rename to minecraft/minecraft/world/entity/monster/Skeleton.h index 5f55fcb76..a5756b5d4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h +++ b/minecraft/minecraft/world/entity/monster/Skeleton.h @@ -3,7 +3,7 @@ #include "Monster.h" #include "RangedAttackMob.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/MobType.h" class RangedAttackGoal; class MeleeAttackGoal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp b/minecraft/minecraft/world/entity/monster/Slime.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp rename to minecraft/minecraft/world/entity/monster/Slime.cpp index a72c63dc5..0b9f6f4f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp +++ b/minecraft/minecraft/world/entity/monster/Slime.cpp @@ -4,24 +4,24 @@ #include #include "Slime.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/phys/AABB.h" void Slime::_init() { jumpDelay = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h b/minecraft/minecraft/world/entity/monster/Slime.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h rename to minecraft/minecraft/world/entity/monster/Slime.h index 30176840b..04dd62b14 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h +++ b/minecraft/minecraft/world/entity/monster/Slime.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" #include "Enemy.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Mob.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp b/minecraft/minecraft/world/entity/monster/Spider.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp rename to minecraft/minecraft/world/entity/monster/Spider.cpp index f65974f0a..23ae49e10 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp +++ b/minecraft/minecraft/world/entity/monster/Spider.cpp @@ -5,21 +5,21 @@ #include "Spider.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/MobGroupData.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" Spider::Spider(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h b/minecraft/minecraft/world/entity/monster/Spider.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h rename to minecraft/minecraft/world/entity/monster/Spider.h index 0ef6e0038..94e675c25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h +++ b/minecraft/minecraft/world/entity/monster/Spider.h @@ -1,9 +1,9 @@ #pragma once #include "Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "minecraft/world/entity/MobGroupData.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/MobType.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp b/minecraft/minecraft/world/entity/monster/Witch.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp rename to minecraft/minecraft/world/entity/monster/Witch.cpp index b3ba2923e..320e65cef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp +++ b/minecraft/minecraft/world/entity/monster/Witch.cpp @@ -3,37 +3,37 @@ #include #include "Witch.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" AttributeModifier* Witch::SPEED_MODIFIER_DRINKING = (new AttributeModifier(eModifierId_MOB_WITCH_DRINKSPEED, -0.25f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h b/minecraft/minecraft/world/entity/monster/Witch.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h rename to minecraft/minecraft/world/entity/monster/Witch.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp b/minecraft/minecraft/world/entity/monster/Zombie.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp rename to minecraft/minecraft/world/entity/monster/Zombie.cpp index 7eb01128b..0cae9c650 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp +++ b/minecraft/minecraft/world/entity/monster/Zombie.cpp @@ -5,49 +5,49 @@ #include #include "Zombie.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Calendar.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/MobGroupData.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "minecraft/world/entity/ai/goal/BreakDoorGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" +#include "minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Calendar.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" Attribute* Zombie::SPAWN_REINFORCEMENTS_CHANCE = (new RangedAttribute(eAttributeId_ZOMBIE_SPAWNREINFORCEMENTS, 0, 0, 1)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h b/minecraft/minecraft/world/entity/monster/Zombie.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h rename to minecraft/minecraft/world/entity/monster/Zombie.h index 0f104dbec..f6dd67676 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h +++ b/minecraft/minecraft/world/entity/monster/Zombie.h @@ -3,11 +3,11 @@ #include #include "Monster.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/MobGroupData.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/MobType.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/MobType.h" class Attribute; class AttributeModifier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h b/minecraft/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h rename to minecraft/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h b/minecraft/minecraft/world/entity/net.minecraft.world.entity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h rename to minecraft/minecraft/world/entity/net.minecraft.world.entity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp b/minecraft/minecraft/world/entity/npc/ClientSideMerchant.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp rename to minecraft/minecraft/world/entity/npc/ClientSideMerchant.cpp index be881324d..3a225ddcc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp +++ b/minecraft/minecraft/world/entity/npc/ClientSideMerchant.cpp @@ -1,7 +1,7 @@ #include "ClientSideMerchant.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/inventory/MerchantContainer.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" class Container; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h b/minecraft/minecraft/world/entity/npc/ClientSideMerchant.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h rename to minecraft/minecraft/world/entity/npc/ClientSideMerchant.h index d3f97320b..5cfe7a088 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h +++ b/minecraft/minecraft/world/entity/npc/ClientSideMerchant.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/Merchant.h" class MerchantContainer; class MerchantRecipeList; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp b/minecraft/minecraft/world/entity/npc/Npc.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp rename to minecraft/minecraft/world/entity/npc/Npc.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h b/minecraft/minecraft/world/entity/npc/Npc.h similarity index 55% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h rename to minecraft/minecraft/world/entity/npc/Npc.h index 3c969b35a..7bca33e15 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h +++ b/minecraft/minecraft/world/entity/npc/Npc.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/Creature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/minecraft/world/entity/npc/Villager.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp rename to minecraft/minecraft/world/entity/npc/Villager.cpp index f521c4f32..3d5b5e7de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/minecraft/world/entity/npc/Villager.cpp @@ -1,21 +1,21 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" +#include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" +#include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#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 "Villager.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h b/minecraft/minecraft/world/entity/npc/Villager.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h rename to minecraft/minecraft/world/entity/npc/Villager.h index 1f1b8f5d7..2d506cf27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h +++ b/minecraft/minecraft/world/entity/npc/Villager.h @@ -1,9 +1,9 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/AgeableMob.h" #include "Npc.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/core/particles/ParticleTypes.h" class Level; class Village; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h b/minecraft/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h rename to minecraft/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp b/minecraft/minecraft/world/entity/player/Abilities.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp rename to minecraft/minecraft/world/entity/player/Abilities.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.h b/minecraft/minecraft/world/entity/player/Abilities.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.h rename to minecraft/minecraft/world/entity/player/Abilities.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp b/minecraft/minecraft/world/entity/player/Inventory.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp rename to minecraft/minecraft/world/entity/player/Inventory.cpp index 7025e3fdf..d7bfa9828 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp +++ b/minecraft/minecraft/world/entity/player/Inventory.cpp @@ -1,9 +1,9 @@ #include "nbt/com.mojang.nbt.h" #include "net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/level/material/Material.h" #include "Inventory.h" const int Inventory::POP_TIME_DURATION = 5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h b/minecraft/minecraft/world/entity/player/Inventory.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h rename to minecraft/minecraft/world/entity/player/Inventory.h index fa0fa91a4..2edd75e11 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h +++ b/minecraft/minecraft/world/entity/player/Inventory.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Player; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/minecraft/world/entity/player/Player.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp rename to minecraft/minecraft/world/entity/player/Player.cpp index 7141f4284..9cbf34c93 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp +++ b/minecraft/minecraft/world/entity/player/Player.cpp @@ -20,68 +20,68 @@ #include "java/JavaMath.h" #include "Inventory.h" #include "Player.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.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 "net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "net/minecraft/Direction.h" -#include "net/minecraft/Pos.h" -#include "net/minecraft/SharedConstants.h" -#include "net/minecraft/stats/GenericStats.h" -#include "net/minecraft/util/Mth.h" -#include "net/minecraft/world/Difficulty.h" -#include "net/minecraft/world/damageSource/CombatTracker.h" -#include "net/minecraft/world/damageSource/DamageSource.h" -#include "net/minecraft/world/effect/MobEffect.h" -#include "net/minecraft/world/effect/MobEffectInstance.h" -#include "net/minecraft/world/entity/EntityEvent.h" -#include "net/minecraft/world/entity/SyncedEntityData.h" -#include "net/minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "net/minecraft/world/entity/animal/Pig.h" -#include "net/minecraft/world/entity/boss/MultiEntityMob.h" -#include "net/minecraft/world/entity/boss/MultiEntityMobPart.h" -#include "net/minecraft/world/entity/item/ItemEntity.h" -#include "net/minecraft/world/entity/item/Minecart.h" -#include "net/minecraft/world/entity/monster/Monster.h" -#include "net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "net/minecraft/world/entity/player/Abilities.h" -#include "net/minecraft/world/entity/projectile/Arrow.h" -#include "net/minecraft/world/food/FoodConstants.h" -#include "net/minecraft/world/food/FoodData.h" -#include "net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "net/minecraft/world/inventory/InventoryMenu.h" -#include "net/minecraft/world/inventory/PlayerEnderChestContainer.h" -#include "net/minecraft/world/item/BowItem.h" -#include "net/minecraft/world/item/FishingRodItem.h" -#include "net/minecraft/world/item/Item.h" -#include "net/minecraft/world/item/UseAnim.h" -#include "net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "net/minecraft/world/item/enchantment/ThornsEnchantment.h" -#include "net/minecraft/world/level/GameRules.h" -#include "net/minecraft/world/level/Level.h" -#include "net/minecraft/world/level/chunk/ChunkSource.h" -#include "net/minecraft/world/level/dimension/Dimension.h" -#include "net/minecraft/world/level/material/Material.h" -#include "net/minecraft/world/level/tile/BedTile.h" -#include "net/minecraft/world/level/tile/Tile.h" -#include "net/minecraft/world/phys/AABB.h" -#include "net/minecraft/world/phys/Vec3.h" -#include "net/minecraft/world/scores/PlayerTeam.h" -#include "net/minecraft/world/scores/Score.h" -#include "net/minecraft/world/scores/Scoreboard.h" -#include "net/minecraft/world/scores/Team.h" -#include "net/minecraft/world/scores/criteria/ObjectiveCriteria.h" +#include "minecraft/Direction.h" +#include "minecraft/Pos.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/CombatTracker.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/world/entity/boss/MultiEntityMob.h" +#include "minecraft/world/entity/boss/MultiEntityMobPart.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BedTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/scores/PlayerTeam.h" +#include "minecraft/world/scores/Score.h" +#include "minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/Team.h" +#include "minecraft/world/scores/criteria/ObjectiveCriteria.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h b/minecraft/minecraft/world/entity/player/Player.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h rename to minecraft/minecraft/world/entity/player/Player.h index 625889693..81a90b1e4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h +++ b/minecraft/minecraft/world/entity/player/Player.h @@ -5,20 +5,20 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/LivingEntity.h" #include "console_helpers/Definitions.h" #include "Abilities.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" -#include "Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" -#include "Minecraft.World/net/minecraft/world/scores/ScoreHolder.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "minecraft/commands/CommandSender.h" +#include "minecraft/world/scores/ScoreHolder.h" #include "4J.Common/4J_Compat.h" #include "console_helpers/Definitions.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/ItemInstance.h" class AbstractContainerMenu; class Stats; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h b/minecraft/minecraft/world/entity/player/net.minecraft.world.entity.player.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h rename to minecraft/minecraft/world/entity/player/net.minecraft.world.entity.player.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp b/minecraft/minecraft/world/entity/projectile/Arrow.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp rename to minecraft/minecraft/world/entity/projectile/Arrow.cpp index dc2ca540f..ae0af47cb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp +++ b/minecraft/minecraft/world/entity/projectile/Arrow.cpp @@ -10,27 +10,27 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Arrow.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" // base damage, multiplied with velocity const double Arrow::ARROW_BASE_DAMAGE = 2.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h b/minecraft/minecraft/world/entity/projectile/Arrow.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h rename to minecraft/minecraft/world/entity/projectile/Arrow.h index ded4df027..d7e5ffb02 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h +++ b/minecraft/minecraft/world/entity/projectile/Arrow.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "Projectile.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp b/minecraft/minecraft/world/entity/projectile/DragonFireball.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp rename to minecraft/minecraft/world/entity/projectile/DragonFireball.cpp index 10ddd7698..4f8f23951 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp +++ b/minecraft/minecraft/world/entity/projectile/DragonFireball.cpp @@ -4,13 +4,13 @@ #include "java/JavaMath.h" #include "DragonFireball.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h b/minecraft/minecraft/world/entity/projectile/DragonFireball.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h rename to minecraft/minecraft/world/entity/projectile/DragonFireball.h index c6fa1ae39..a64e382a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h +++ b/minecraft/minecraft/world/entity/projectile/DragonFireball.h @@ -3,7 +3,7 @@ #include #include "Fireball.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" class HitResult; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp rename to minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index 1105c22a7..ed71ed72d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -4,15 +4,15 @@ #include "java/JavaMath.h" #include "EyeOfEnderSignal.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" void EyeOfEnderSignal::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h b/minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h rename to minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.h index 10479781b..ec528fe5d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h +++ b/minecraft/minecraft/world/entity/projectile/EyeOfEnderSignal.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp b/minecraft/minecraft/world/entity/projectile/Fireball.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp rename to minecraft/minecraft/world/entity/projectile/Fireball.cpp index e9efcc0c6..d6717d507 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp +++ b/minecraft/minecraft/world/entity/projectile/Fireball.cpp @@ -9,19 +9,19 @@ #include "Fireball.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" // 4J - added common ctor code. void Fireball::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h b/minecraft/minecraft/world/entity/projectile/Fireball.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h rename to minecraft/minecraft/world/entity/projectile/Fireball.h index 47811329a..a75cd542f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h +++ b/minecraft/minecraft/world/entity/projectile/Fireball.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class HitResult; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp rename to minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index ef9fda0ad..a644fa451 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -3,17 +3,17 @@ #include #include "FireworksRocketEntity.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/item/FireworksItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" FireworksRocketEntity::FireworksRocketEntity(Level* level) : Entity(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h b/minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h rename to minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.h index 9af9fb0b6..9203c553e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h +++ b/minecraft/minecraft/world/entity/projectile/FireworksRocketEntity.h @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class ItemInstance; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp b/minecraft/minecraft/world/entity/projectile/FishingHook.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp rename to minecraft/minecraft/world/entity/projectile/FishingHook.cpp index a8b6d7252..160095eef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp +++ b/minecraft/minecraft/world/entity/projectile/FishingHook.cpp @@ -6,23 +6,23 @@ #include #include "FishingHook.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" // 4J - added common ctor code. void FishingHook::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h b/minecraft/minecraft/world/entity/projectile/FishingHook.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h rename to minecraft/minecraft/world/entity/projectile/FishingHook.h index 1360190ea..f32dcc877 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h +++ b/minecraft/minecraft/world/entity/projectile/FishingHook.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp b/minecraft/minecraft/world/entity/projectile/LargeFireball.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp rename to minecraft/minecraft/world/entity/projectile/LargeFireball.cpp index 7b550a9b9..8b64875cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp +++ b/minecraft/minecraft/world/entity/projectile/LargeFireball.cpp @@ -2,13 +2,13 @@ #include "LargeFireball.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/HitResult.h" LargeFireball::LargeFireball(Level* level) : Fireball(level) { explosionPower = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h b/minecraft/minecraft/world/entity/projectile/LargeFireball.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h rename to minecraft/minecraft/world/entity/projectile/LargeFireball.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Projectile.h b/minecraft/minecraft/world/entity/projectile/Projectile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Projectile.h rename to minecraft/minecraft/world/entity/projectile/Projectile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp b/minecraft/minecraft/world/entity/projectile/SmallFireball.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp rename to minecraft/minecraft/world/entity/projectile/SmallFireball.cpp index 5f3683573..c19a8b801 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp +++ b/minecraft/minecraft/world/entity/projectile/SmallFireball.cpp @@ -1,12 +1,12 @@ #include "SmallFireball.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/Facing.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" SmallFireball::SmallFireball(Level* level) : Fireball(level) { setSize(5 / 16.0f, 5 / 16.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h b/minecraft/minecraft/world/entity/projectile/SmallFireball.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h rename to minecraft/minecraft/world/entity/projectile/SmallFireball.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp b/minecraft/minecraft/world/entity/projectile/Snowball.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp rename to minecraft/minecraft/world/entity/projectile/Snowball.cpp index c7ebecf27..cb6df0a9f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp +++ b/minecraft/minecraft/world/entity/projectile/Snowball.cpp @@ -1,10 +1,10 @@ #include "Snowball.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/projectile/Throwable.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/HitResult.h" class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h b/minecraft/minecraft/world/entity/projectile/Snowball.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h rename to minecraft/minecraft/world/entity/projectile/Snowball.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp b/minecraft/minecraft/world/entity/projectile/Throwable.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp rename to minecraft/minecraft/world/entity/projectile/Throwable.cpp index 62d9f9255..4b2fa1304 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp +++ b/minecraft/minecraft/world/entity/projectile/Throwable.cpp @@ -5,16 +5,16 @@ #include #include "Throwable.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" void Throwable::_throwableInit() { xTile = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h b/minecraft/minecraft/world/entity/projectile/Throwable.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h rename to minecraft/minecraft/world/entity/projectile/Throwable.h index 7a2ac7612..e331636c7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h +++ b/minecraft/minecraft/world/entity/projectile/Throwable.h @@ -3,10 +3,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "Projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" class Mob; class HitResult; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp b/minecraft/minecraft/world/entity/projectile/ThrownEgg.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp rename to minecraft/minecraft/world/entity/projectile/ThrownEgg.cpp index 8cf5367b2..38a4f3f70 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/minecraft/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -1,13 +1,13 @@ #include "ThrownEgg.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Chicken.h" +#include "minecraft/world/entity/projectile/Throwable.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/HitResult.h" void ThrownEgg::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h b/minecraft/minecraft/world/entity/projectile/ThrownEgg.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h rename to minecraft/minecraft/world/entity/projectile/ThrownEgg.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp rename to minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index dce67e2ed..ca5ad00d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -1,14 +1,14 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "ThrownEnderpearl.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/projectile/Throwable.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/HitResult.h" ThrownEnderpearl::ThrownEnderpearl(Level* level) : Throwable(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h b/minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h rename to minecraft/minecraft/world/entity/projectile/ThrownEnderpearl.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp b/minecraft/minecraft/world/entity/projectile/ThrownExpBottle.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp rename to minecraft/minecraft/world/entity/projectile/ThrownExpBottle.cpp index 56f1534f8..435b5a6cf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp +++ b/minecraft/minecraft/world/entity/projectile/ThrownExpBottle.cpp @@ -1,10 +1,10 @@ #include "java/JavaMath.h" #include "ThrownExpBottle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/projectile/Throwable.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h b/minecraft/minecraft/world/entity/projectile/ThrownExpBottle.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h rename to minecraft/minecraft/world/entity/projectile/ThrownExpBottle.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp b/minecraft/minecraft/world/entity/projectile/ThrownPotion.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp rename to minecraft/minecraft/world/entity/projectile/ThrownPotion.cpp index 4fa35f922..93cb1c4b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/minecraft/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -6,18 +6,18 @@ #include "java/JavaMath.h" #include "ThrownPotion.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/projectile/Throwable.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h b/minecraft/minecraft/world/entity/projectile/ThrownPotion.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h rename to minecraft/minecraft/world/entity/projectile/ThrownPotion.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp b/minecraft/minecraft/world/entity/projectile/WitherSkull.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp rename to minecraft/minecraft/world/entity/projectile/WitherSkull.cpp index 52ce588b9..771fbb141 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp +++ b/minecraft/minecraft/world/entity/projectile/WitherSkull.cpp @@ -2,19 +2,19 @@ #include #include "WitherSkull.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/projectile/Fireball.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" WitherSkull::WitherSkull(Level* level) : Fireball(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h b/minecraft/minecraft/world/entity/projectile/WitherSkull.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h rename to minecraft/minecraft/world/entity/projectile/WitherSkull.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h b/minecraft/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h rename to minecraft/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp b/minecraft/minecraft/world/food/FoodConstants.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp rename to minecraft/minecraft/world/food/FoodConstants.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.h b/minecraft/minecraft/world/food/FoodConstants.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.h rename to minecraft/minecraft/world/food/FoodConstants.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp b/minecraft/minecraft/world/food/FoodData.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp rename to minecraft/minecraft/world/food/FoodData.cpp index addaaef13..733521d8f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp +++ b/minecraft/minecraft/world/food/FoodData.cpp @@ -3,14 +3,14 @@ #include "FoodConstants.h" #include "FoodData.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "minecraft/world/food/FoodData.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" FoodData::FoodData() { exhaustionLevel = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h b/minecraft/minecraft/world/food/FoodData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h rename to minecraft/minecraft/world/food/FoodData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h b/minecraft/minecraft/world/food/net.minecraft.world.food.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h rename to minecraft/minecraft/world/food/net.minecraft.world.food.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp b/minecraft/minecraft/world/inventory/AbstractContainerMenu.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp rename to minecraft/minecraft/world/inventory/AbstractContainerMenu.cpp index 8d2533be0..cfe9e5186 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp +++ b/minecraft/minecraft/world/inventory/AbstractContainerMenu.cpp @@ -2,14 +2,14 @@ #include "Slot.h" #include "AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/redstone/Redstone.h" // 4J Stu - The java does not have ctor here (being an abstract) but we need one // to initialise the member variables diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h b/minecraft/minecraft/world/inventory/AbstractContainerMenu.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h rename to minecraft/minecraft/world/inventory/AbstractContainerMenu.h index ca1c3edbf..577724eda 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h +++ b/minecraft/minecraft/world/inventory/AbstractContainerMenu.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" #include "net.minecraft.world.inventory.ContainerListener.h" namespace net_minecraft_world_inventory { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp b/minecraft/minecraft/world/inventory/AnimalChest.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp rename to minecraft/minecraft/world/inventory/AnimalChest.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h b/minecraft/minecraft/world/inventory/AnimalChest.h similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h rename to minecraft/minecraft/world/inventory/AnimalChest.h index 7c86e31da..82edddae5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h +++ b/minecraft/minecraft/world/inventory/AnimalChest.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/world/SimpleContainer.h" class AnimalChest : public SimpleContainer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/minecraft/world/inventory/AnvilMenu.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp rename to minecraft/minecraft/world/inventory/AnvilMenu.cpp index 0b2daa9f7..3cd4ecc74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp +++ b/minecraft/minecraft/world/inventory/AnvilMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" #include "console_helpers/StringHelpers.h" #include "AnvilMenu.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h b/minecraft/minecraft/world/inventory/AnvilMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h rename to minecraft/minecraft/world/inventory/AnvilMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp b/minecraft/minecraft/world/inventory/ArmorSlot.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp rename to minecraft/minecraft/world/inventory/ArmorSlot.cpp index 901cb9df9..6fa91cf94 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp +++ b/minecraft/minecraft/world/inventory/ArmorSlot.cpp @@ -1,9 +1,9 @@ #include "ArmorSlot.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" ArmorSlot::ArmorSlot(int slotNum, std::shared_ptr container, int id, int x, int y) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h b/minecraft/minecraft/world/inventory/ArmorSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h rename to minecraft/minecraft/world/inventory/ArmorSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp b/minecraft/minecraft/world/inventory/BeaconMenu.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp rename to minecraft/minecraft/world/inventory/BeaconMenu.cpp index 74e7f9096..0571cb349 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp +++ b/minecraft/minecraft/world/inventory/BeaconMenu.cpp @@ -1,12 +1,12 @@ #include #include "BeaconMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h b/minecraft/minecraft/world/inventory/BeaconMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h rename to minecraft/minecraft/world/inventory/BeaconMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp b/minecraft/minecraft/world/inventory/BrewingStandMenu.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp rename to minecraft/minecraft/world/inventory/BrewingStandMenu.cpp index f664b13e9..7d432eb1a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp +++ b/minecraft/minecraft/world/inventory/BrewingStandMenu.cpp @@ -1,16 +1,16 @@ #include #include "BrewingStandMenu.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" BrewingStandMenu::BrewingStandMenu( std::shared_ptr inventory, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h b/minecraft/minecraft/world/inventory/BrewingStandMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h rename to minecraft/minecraft/world/inventory/BrewingStandMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp b/minecraft/minecraft/world/inventory/ContainerMenu.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp rename to minecraft/minecraft/world/inventory/ContainerMenu.cpp index fb31cbb7b..94b09de7f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp +++ b/minecraft/minecraft/world/inventory/ContainerMenu.cpp @@ -1,16 +1,16 @@ #include #include "Slot.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.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 "ContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" ContainerMenu::ContainerMenu(std::shared_ptr inventory, std::shared_ptr container) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h b/minecraft/minecraft/world/inventory/ContainerMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h rename to minecraft/minecraft/world/inventory/ContainerMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp b/minecraft/minecraft/world/inventory/CraftingContainer.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp rename to minecraft/minecraft/world/inventory/CraftingContainer.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h b/minecraft/minecraft/world/inventory/CraftingContainer.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h rename to minecraft/minecraft/world/inventory/CraftingContainer.h index a0efe0f38..432a7d928 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h +++ b/minecraft/minecraft/world/inventory/CraftingContainer.h @@ -4,9 +4,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/item/ItemInstance.h" class AbstractContainerMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp b/minecraft/minecraft/world/inventory/CraftingMenu.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp rename to minecraft/minecraft/world/inventory/CraftingMenu.cpp index 69e65c5b5..552c205cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp +++ b/minecraft/minecraft/world/inventory/CraftingMenu.cpp @@ -4,15 +4,15 @@ #include "ResultContainer.h" #include "ResultSlot.h" #include "CraftingMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" const int CraftingMenu::RESULT_SLOT = 0; const int CraftingMenu::CRAFT_SLOT_START = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h b/minecraft/minecraft/world/inventory/CraftingMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h rename to minecraft/minecraft/world/inventory/CraftingMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp b/minecraft/minecraft/world/inventory/EnchantmentContainer.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp rename to minecraft/minecraft/world/inventory/EnchantmentContainer.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h b/minecraft/minecraft/world/inventory/EnchantmentContainer.h similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h rename to minecraft/minecraft/world/inventory/EnchantmentContainer.h index 9cdb40648..fc83fd32b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h +++ b/minecraft/minecraft/world/inventory/EnchantmentContainer.h @@ -3,7 +3,7 @@ // In EnchantmentMenu.java they create an anoymous class while creating the // container. I have moved the content of that anonymous class to here -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/world/SimpleContainer.h" class EnchantmentMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp b/minecraft/minecraft/world/inventory/EnchantmentMenu.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp rename to minecraft/minecraft/world/inventory/EnchantmentMenu.cpp index 2e6503ca3..19fb92efd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp +++ b/minecraft/minecraft/world/inventory/EnchantmentMenu.cpp @@ -2,22 +2,22 @@ #include #include "EnchantmentMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h" -#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentSlot.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/EnchantmentContainer.h" +#include "minecraft/world/inventory/EnchantmentSlot.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" EnchantmentMenu::EnchantmentMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h b/minecraft/minecraft/world/inventory/EnchantmentMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h rename to minecraft/minecraft/world/inventory/EnchantmentMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentSlot.h b/minecraft/minecraft/world/inventory/EnchantmentSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentSlot.h rename to minecraft/minecraft/world/inventory/EnchantmentSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp b/minecraft/minecraft/world/inventory/FireworksMenu.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp rename to minecraft/minecraft/world/inventory/FireworksMenu.cpp index 690570233..728b780ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp +++ b/minecraft/minecraft/world/inventory/FireworksMenu.cpp @@ -4,15 +4,15 @@ #include "ResultContainer.h" #include "ResultSlot.h" #include "FireworksMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/FireworksRecipe.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/level/Level.h" FireworksMenu::FireworksMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h b/minecraft/minecraft/world/inventory/FireworksMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h rename to minecraft/minecraft/world/inventory/FireworksMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp b/minecraft/minecraft/world/inventory/FurnaceMenu.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp rename to minecraft/minecraft/world/inventory/FurnaceMenu.cpp index f87db82aa..5b0f22e55 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp +++ b/minecraft/minecraft/world/inventory/FurnaceMenu.cpp @@ -2,17 +2,17 @@ #include "FurnaceResultSlot.h" #include "Slot.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "FurnaceMenu.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/item/crafting/FurnaceRecipes.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" FurnaceMenu::FurnaceMenu(std::shared_ptr inventory, std::shared_ptr furnace) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h b/minecraft/minecraft/world/inventory/FurnaceMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h rename to minecraft/minecraft/world/inventory/FurnaceMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp b/minecraft/minecraft/world/inventory/FurnaceResultSlot.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp rename to minecraft/minecraft/world/inventory/FurnaceResultSlot.cpp index 6a1418b3f..ef82f4925 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp +++ b/minecraft/minecraft/world/inventory/FurnaceResultSlot.cpp @@ -3,14 +3,14 @@ #include "java/JavaMath.h" #include "FurnaceResultSlot.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/FurnaceRecipes.h" +#include "minecraft/world/level/Level.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h b/minecraft/minecraft/world/inventory/FurnaceResultSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h rename to minecraft/minecraft/world/inventory/FurnaceResultSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp b/minecraft/minecraft/world/inventory/HopperMenu.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp rename to minecraft/minecraft/world/inventory/HopperMenu.cpp index 1307eca8c..4b61018f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp +++ b/minecraft/minecraft/world/inventory/HopperMenu.cpp @@ -1,9 +1,9 @@ #include #include "HopperMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" HopperMenu::HopperMenu(std::shared_ptr inventory, std::shared_ptr hopper) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h b/minecraft/minecraft/world/inventory/HopperMenu.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h rename to minecraft/minecraft/world/inventory/HopperMenu.h index c05681e32..8f0a6533d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h +++ b/minecraft/minecraft/world/inventory/HopperMenu.h @@ -3,7 +3,7 @@ #include #include "AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class HopperMenu : public AbstractContainerMenu { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp b/minecraft/minecraft/world/inventory/HorseInventoryMenu.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp rename to minecraft/minecraft/world/inventory/HorseInventoryMenu.cpp index 3c9f9fdea..b700404a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp +++ b/minecraft/minecraft/world/inventory/HorseInventoryMenu.cpp @@ -1,12 +1,12 @@ #include #include "HorseInventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" HorseSaddleSlot::HorseSaddleSlot(std::shared_ptr horseInventory) : Slot(horseInventory, EntityHorse::INV_SLOT_SADDLE, 8, 18) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h b/minecraft/minecraft/world/inventory/HorseInventoryMenu.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h rename to minecraft/minecraft/world/inventory/HorseInventoryMenu.h index b1ffb60da..9cb902c0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h +++ b/minecraft/minecraft/world/inventory/HorseInventoryMenu.h @@ -4,7 +4,7 @@ #include "AbstractContainerMenu.h" #include "Slot.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class HorseInventoryMenu; class EntityHorse; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp b/minecraft/minecraft/world/inventory/InventoryMenu.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp rename to minecraft/minecraft/world/inventory/InventoryMenu.cpp index 0af0fc48c..573d39c1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp +++ b/minecraft/minecraft/world/inventory/InventoryMenu.cpp @@ -5,16 +5,16 @@ #include "CraftingContainer.h" #include "ResultContainer.h" #include "InventoryMenu.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/ArmorRecipes.h" +#include "minecraft/world/item/crafting/Recipes.h" const int InventoryMenu::RESULT_SLOT = 0; const int InventoryMenu::CRAFT_SLOT_START = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h b/minecraft/minecraft/world/inventory/InventoryMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h rename to minecraft/minecraft/world/inventory/InventoryMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp b/minecraft/minecraft/world/inventory/MenuBackup.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp rename to minecraft/minecraft/world/inventory/MenuBackup.cpp index 92c730f5d..374e44c5e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp +++ b/minecraft/minecraft/world/inventory/MenuBackup.cpp @@ -3,8 +3,8 @@ #include "AbstractContainerMenu.h" #include "Slot.h" #include "MenuBackup.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/item/ItemInstance.h" MenuBackup::MenuBackup(std::shared_ptr inventory, AbstractContainerMenu* menu) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h b/minecraft/minecraft/world/inventory/MenuBackup.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h rename to minecraft/minecraft/world/inventory/MenuBackup.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp b/minecraft/minecraft/world/inventory/MerchantContainer.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp rename to minecraft/minecraft/world/inventory/MerchantContainer.cpp index 38ded1c7d..79427a08e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp +++ b/minecraft/minecraft/world/inventory/MerchantContainer.cpp @@ -1,9 +1,9 @@ #include "MerchantMenu.h" #include "MerchantContainer.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" MerchantContainer::~MerchantContainer() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h b/minecraft/minecraft/world/inventory/MerchantContainer.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h rename to minecraft/minecraft/world/inventory/MerchantContainer.h index 58996f6af..a9e9f03d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h +++ b/minecraft/minecraft/world/inventory/MerchantContainer.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/Container.h" class Merchant; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp b/minecraft/minecraft/world/inventory/MerchantMenu.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp rename to minecraft/minecraft/world/inventory/MerchantMenu.cpp index 4e7c5cec2..a1f7654f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp +++ b/minecraft/minecraft/world/inventory/MerchantMenu.cpp @@ -1,14 +1,14 @@ #include #include "MerchantMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/MerchantContainer.h" +#include "minecraft/world/inventory/MerchantResultSlot.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" MerchantMenu::MerchantMenu(std::shared_ptr inventory, std::shared_ptr merchant, Level* level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h b/minecraft/minecraft/world/inventory/MerchantMenu.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h rename to minecraft/minecraft/world/inventory/MerchantMenu.h index 233d7dfa5..508f862ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h +++ b/minecraft/minecraft/world/inventory/MerchantMenu.h @@ -3,7 +3,7 @@ #include #include "AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/Merchant.h" class MerchantContainer; class Inventory; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp b/minecraft/minecraft/world/inventory/MerchantResultSlot.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp rename to minecraft/minecraft/world/inventory/MerchantResultSlot.cpp index 60b81482a..1042a3444 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp +++ b/minecraft/minecraft/world/inventory/MerchantResultSlot.cpp @@ -1,13 +1,13 @@ #include #include "MerchantResultSlot.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/MerchantContainer.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" MerchantResultSlot::MerchantResultSlot(Player* player, std::shared_ptr merchant, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h b/minecraft/minecraft/world/inventory/MerchantResultSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h rename to minecraft/minecraft/world/inventory/MerchantResultSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp b/minecraft/minecraft/world/inventory/PlayerEnderChestContainer.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp rename to minecraft/minecraft/world/inventory/PlayerEnderChestContainer.cpp index a0130c5c1..01176c36f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp +++ b/minecraft/minecraft/world/inventory/PlayerEnderChestContainer.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" #include "PlayerEnderChestContainer.h" PlayerEnderChestContainer::PlayerEnderChestContainer() diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h b/minecraft/minecraft/world/inventory/PlayerEnderChestContainer.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h rename to minecraft/minecraft/world/inventory/PlayerEnderChestContainer.h index c8d98cd21..630e375a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h +++ b/minecraft/minecraft/world/inventory/PlayerEnderChestContainer.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/world/SimpleContainer.h" class EnderChestTileEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp b/minecraft/minecraft/world/inventory/RepairContainer.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp rename to minecraft/minecraft/world/inventory/RepairContainer.cpp index 5b73dc0f1..a0a722280 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp +++ b/minecraft/minecraft/world/inventory/RepairContainer.cpp @@ -2,7 +2,7 @@ #include "AnvilMenu.h" #include "RepairContainer.h" -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/world/SimpleContainer.h" RepairContainer::RepairContainer(AnvilMenu* menu, int name, bool customName, int size) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h b/minecraft/minecraft/world/inventory/RepairContainer.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h rename to minecraft/minecraft/world/inventory/RepairContainer.h index cc35792d6..7e3cdc65b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h +++ b/minecraft/minecraft/world/inventory/RepairContainer.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" +#include "minecraft/world/SimpleContainer.h" class AnvilMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp b/minecraft/minecraft/world/inventory/RepairResultSlot.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp rename to minecraft/minecraft/world/inventory/RepairResultSlot.cpp index beea3abc2..926752cc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp +++ b/minecraft/minecraft/world/inventory/RepairResultSlot.cpp @@ -1,14 +1,14 @@ #include "RepairResultSlot.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" RepairResultSlot::RepairResultSlot(AnvilMenu* menu, int xt, int yt, int zt, std::shared_ptr container, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h b/minecraft/minecraft/world/inventory/RepairResultSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h rename to minecraft/minecraft/world/inventory/RepairResultSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp b/minecraft/minecraft/world/inventory/ResultContainer.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp rename to minecraft/minecraft/world/inventory/ResultContainer.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h b/minecraft/minecraft/world/inventory/ResultContainer.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h rename to minecraft/minecraft/world/inventory/ResultContainer.h index 78a8fe4cc..7ddfd941a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h +++ b/minecraft/minecraft/world/inventory/ResultContainer.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/Container.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp b/minecraft/minecraft/world/inventory/ResultSlot.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp rename to minecraft/minecraft/world/inventory/ResultSlot.cpp index 58ceb426c..ee7a5addb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp +++ b/minecraft/minecraft/world/inventory/ResultSlot.cpp @@ -1,14 +1,14 @@ #include #include "ResultSlot.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" ResultSlot::ResultSlot(Player* player, std::shared_ptr craftSlots, std::shared_ptr container, int id, int x, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h b/minecraft/minecraft/world/inventory/ResultSlot.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h rename to minecraft/minecraft/world/inventory/ResultSlot.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp b/minecraft/minecraft/world/inventory/Slot.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp rename to minecraft/minecraft/world/inventory/Slot.cpp index 5c22a47b8..4ffb5e4fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp +++ b/minecraft/minecraft/world/inventory/Slot.cpp @@ -1,12 +1,12 @@ #include #include "Slot.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/crafting/ArmorDyeRecipe.h" +#include "minecraft/world/item/crafting/Recipes.h" class Icon; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h b/minecraft/minecraft/world/inventory/Slot.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h rename to minecraft/minecraft/world/inventory/Slot.h index fdb764c88..35dd6047b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h +++ b/minecraft/minecraft/world/inventory/Slot.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Container; class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp b/minecraft/minecraft/world/inventory/TrapMenu.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp rename to minecraft/minecraft/world/inventory/TrapMenu.cpp index e1e23fde4..53c50ea97 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp +++ b/minecraft/minecraft/world/inventory/TrapMenu.cpp @@ -2,8 +2,8 @@ #include "Slot.h" #include "TrapMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h b/minecraft/minecraft/world/inventory/TrapMenu.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h rename to minecraft/minecraft/world/inventory/TrapMenu.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h b/minecraft/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h rename to minecraft/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h b/minecraft/minecraft/world/inventory/net.minecraft.world.inventory.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h rename to minecraft/minecraft/world/inventory/net.minecraft.world.inventory.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp b/minecraft/minecraft/world/item/AnvilTileItem.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp rename to minecraft/minecraft/world/item/AnvilTileItem.cpp index 6714a6aa4..9c4feadf2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp +++ b/minecraft/minecraft/world/item/AnvilTileItem.cpp @@ -1,7 +1,7 @@ #include "AnvilTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/MultiTextureTileItem.h" +#include "minecraft/world/level/tile/AnvilTile.h" +#include "minecraft/world/level/tile/Tile.h" AnvilTileItem::AnvilTileItem(Tile* tile) : MultiTextureTileItem(tile->id - 256, tile, (int*)AnvilTile::ANVIL_NAMES, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h b/minecraft/minecraft/world/item/AnvilTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h rename to minecraft/minecraft/world/item/AnvilTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp b/minecraft/minecraft/world/item/ArmorItem.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp rename to minecraft/minecraft/world/item/ArmorItem.cpp index beffbffbd..04b8ffbf7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp +++ b/minecraft/minecraft/world/item/ArmorItem.cpp @@ -8,19 +8,19 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Class.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/core/BehaviorRegistry.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/phys/AABB.h" class Entity; class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h b/minecraft/minecraft/world/item/ArmorItem.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h rename to minecraft/minecraft/world/item/ArmorItem.h index 37e34ddf3..89653be17 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h +++ b/minecraft/minecraft/world/item/ArmorItem.h @@ -4,7 +4,7 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" #include "Minecraft.Client/Common/App_enums.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp b/minecraft/minecraft/world/item/AuxDataTileItem.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp rename to minecraft/minecraft/world/item/AuxDataTileItem.cpp index 3de942463..b2ee0c82a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp +++ b/minecraft/minecraft/world/item/AuxDataTileItem.cpp @@ -1,6 +1,6 @@ #include "AuxDataTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/tile/Tile.h" AuxDataTileItem::AuxDataTileItem(int id, Tile* parentTile) : TileItem(id) { this->parentTile = parentTile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.h b/minecraft/minecraft/world/item/AuxDataTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.h rename to minecraft/minecraft/world/item/AuxDataTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp b/minecraft/minecraft/world/item/BedItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp rename to minecraft/minecraft/world/item/BedItem.cpp index 6b9e6b55d..1d7f6d84a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp +++ b/minecraft/minecraft/world/item/BedItem.cpp @@ -1,16 +1,16 @@ #include -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/Facing.h" +#include "minecraft/stats/GenericStats.h" #include "BedItem.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Direction.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/BedTile.h" +#include "minecraft/world/level/tile/Tile.h" BedItem::BedItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.h b/minecraft/minecraft/world/item/BedItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BedItem.h rename to minecraft/minecraft/world/item/BedItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp b/minecraft/minecraft/world/item/BoatItem.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp rename to minecraft/minecraft/world/item/BoatItem.cpp index f641003ae..0dfcfa02d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp +++ b/minecraft/minecraft/world/item/BoatItem.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/util/Mth.h" #include "ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" #include "BoatItem.h" BoatItem::BoatItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.h b/minecraft/minecraft/world/item/BoatItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.h rename to minecraft/minecraft/world/item/BoatItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp b/minecraft/minecraft/world/item/BookItem.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp rename to minecraft/minecraft/world/item/BookItem.cpp index e1a2a13ad..7c93eb50d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp +++ b/minecraft/minecraft/world/item/BookItem.cpp @@ -1,8 +1,8 @@ #include #include "BookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" BookItem::BookItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.h b/minecraft/minecraft/world/item/BookItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BookItem.h rename to minecraft/minecraft/world/item/BookItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp b/minecraft/minecraft/world/item/BottleItem.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp rename to minecraft/minecraft/world/item/BottleItem.cpp index bd95c7625..d03289ec9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp +++ b/minecraft/minecraft/world/item/BottleItem.cpp @@ -1,14 +1,14 @@ #include #include "BottleItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/HitResult.h" BottleItem::BottleItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.h b/minecraft/minecraft/world/item/BottleItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.h rename to minecraft/minecraft/world/item/BottleItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp b/minecraft/minecraft/world/item/BowItem.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp rename to minecraft/minecraft/world/item/BowItem.cpp index 0aacc109e..081d53cb0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp +++ b/minecraft/minecraft/world/item/BowItem.cpp @@ -1,18 +1,18 @@ #include #include "BowItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/Level.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h b/minecraft/minecraft/world/item/BowItem.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h rename to minecraft/minecraft/world/item/BowItem.h index 9f575ed0e..7612f73f8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h +++ b/minecraft/minecraft/world/item/BowItem.h @@ -3,7 +3,7 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp b/minecraft/minecraft/world/item/BowlFoodItem.cpp similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp rename to minecraft/minecraft/world/item/BowlFoodItem.cpp index 16505ee15..8184153ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp +++ b/minecraft/minecraft/world/item/BowlFoodItem.cpp @@ -1,9 +1,9 @@ #include #include "BowlFoodItem.h" -#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" BowlFoodItem::BowlFoodItem(int id, int nutrition) : FoodItem(id, nutrition, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.h b/minecraft/minecraft/world/item/BowlFoodItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.h rename to minecraft/minecraft/world/item/BowlFoodItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp b/minecraft/minecraft/world/item/BucketItem.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp rename to minecraft/minecraft/world/item/BucketItem.cpp index 9567b6848..00b9b74a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp +++ b/minecraft/minecraft/world/item/BucketItem.cpp @@ -2,27 +2,27 @@ #include #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.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.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChatPacket.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" BucketItem::BucketItem(int id, int content) : Item(id) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.h b/minecraft/minecraft/world/item/BucketItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.h rename to minecraft/minecraft/world/item/BucketItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp b/minecraft/minecraft/world/item/CarrotOnAStickItem.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp rename to minecraft/minecraft/world/item/CarrotOnAStickItem.cpp index 3902ce8be..ad5f3a0a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp +++ b/minecraft/minecraft/world/item/CarrotOnAStickItem.cpp @@ -1,13 +1,13 @@ #include #include "CarrotOnAStickItem.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" +#include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" CarrotOnAStickItem::CarrotOnAStickItem(int id) : Item(id) { setMaxStackSize(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.h b/minecraft/minecraft/world/item/CarrotOnAStickItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.h rename to minecraft/minecraft/world/item/CarrotOnAStickItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp b/minecraft/minecraft/world/item/ClockItem.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp rename to minecraft/minecraft/world/item/ClockItem.cpp index 06e262810..ec9414497 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp +++ b/minecraft/minecraft/world/item/ClockItem.cpp @@ -3,8 +3,8 @@ #include "ClockItem.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h b/minecraft/minecraft/world/item/ClockItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h rename to minecraft/minecraft/world/item/ClockItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp b/minecraft/minecraft/world/item/CoalItem.cpp similarity index 71% rename from minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp rename to minecraft/minecraft/world/item/CoalItem.cpp index 668327ee7..ab89f189c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp +++ b/minecraft/minecraft/world/item/CoalItem.cpp @@ -1,7 +1,7 @@ #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/net.minecraft.world.h" #include "CoalItem.h" CoalItem::CoalItem(int id) : Item(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.h b/minecraft/minecraft/world/item/CoalItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.h rename to minecraft/minecraft/world/item/CoalItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp b/minecraft/minecraft/world/item/ColoredTileItem.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp rename to minecraft/minecraft/world/item/ColoredTileItem.cpp index c6d5acf2e..084b6d790 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp +++ b/minecraft/minecraft/world/item/ColoredTileItem.cpp @@ -1,9 +1,9 @@ #include #include "ColoredTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/tile/Tile.h" ColoredTileItem::ColoredTileItem(int id, bool stackedByData) : TileItem(id) { this->colorTile = Tile::tiles[getTileId()]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h b/minecraft/minecraft/world/item/ColoredTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h rename to minecraft/minecraft/world/item/ColoredTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp b/minecraft/minecraft/world/item/CompassItem.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp rename to minecraft/minecraft/world/item/CompassItem.cpp index 91cbf2431..cbda76cce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp +++ b/minecraft/minecraft/world/item/CompassItem.cpp @@ -3,8 +3,8 @@ #include "CompassItem.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h b/minecraft/minecraft/world/item/CompassItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h rename to minecraft/minecraft/world/item/CompassItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp b/minecraft/minecraft/world/item/ComplexItem.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp rename to minecraft/minecraft/world/item/ComplexItem.cpp index f8dc808ec..e683a2958 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp +++ b/minecraft/minecraft/world/item/ComplexItem.cpp @@ -1,5 +1,5 @@ #include "ComplexItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/item/Item.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h b/minecraft/minecraft/world/item/ComplexItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h rename to minecraft/minecraft/world/item/ComplexItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp b/minecraft/minecraft/world/item/DiggerItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp rename to minecraft/minecraft/world/item/DiggerItem.cpp index 3257c05af..689897b8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp +++ b/minecraft/minecraft/world/item/DiggerItem.cpp @@ -2,11 +2,11 @@ #include #include "DiggerItem.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" DiggerItem::DiggerItem(int id, float attackDamage, const Tier* tier, std::vector* tiles) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h b/minecraft/minecraft/world/item/DiggerItem.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h rename to minecraft/minecraft/world/item/DiggerItem.h index af8778110..2c255355e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h +++ b/minecraft/minecraft/world/item/DiggerItem.h @@ -3,7 +3,7 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class Mob; class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp b/minecraft/minecraft/world/item/DoorItem.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp rename to minecraft/minecraft/world/item/DoorItem.cpp index bd43ea846..b666857df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp +++ b/minecraft/minecraft/world/item/DoorItem.cpp @@ -1,16 +1,16 @@ #include -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/stats/GenericStats.h" #include "DoorItem.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" DoorItem::DoorItem(int id, Material* material) : Item(id) { this->material = material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h b/minecraft/minecraft/world/item/DoorItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h rename to minecraft/minecraft/world/item/DoorItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp b/minecraft/minecraft/world/item/DyePowderItem.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp rename to minecraft/minecraft/world/item/DyePowderItem.cpp index 03519d2f4..3cabffa08 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp +++ b/minecraft/minecraft/world/item/DyePowderItem.cpp @@ -1,17 +1,17 @@ #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/material/Material.h" #include "DyePowderItem.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" DyePowderItem::DyePowderItem(int id) : Item(id) { setStackedByData(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.h b/minecraft/minecraft/world/item/DyePowderItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.h rename to minecraft/minecraft/world/item/DyePowderItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp b/minecraft/minecraft/world/item/EggItem.cpp similarity index 56% rename from minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp rename to minecraft/minecraft/world/item/EggItem.cpp index 95847a5c2..fd0c24c1a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp +++ b/minecraft/minecraft/world/item/EggItem.cpp @@ -2,14 +2,14 @@ #include #include "EggItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/ThrownEgg.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" EggItem::EggItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.h b/minecraft/minecraft/world/item/EggItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/EggItem.h rename to minecraft/minecraft/world/item/EggItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp b/minecraft/minecraft/world/item/EmptyMapItem.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp rename to minecraft/minecraft/world/item/EmptyMapItem.cpp index 8a7c2dcac..aeed6d572 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp +++ b/minecraft/minecraft/world/item/EmptyMapItem.cpp @@ -1,12 +1,12 @@ #include #include "EmptyMapItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ComplexItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ComplexItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" EmptyMapItem::EmptyMapItem(int id) : ComplexItem(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.h b/minecraft/minecraft/world/item/EmptyMapItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.h rename to minecraft/minecraft/world/item/EmptyMapItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp b/minecraft/minecraft/world/item/EnchantedBookItem.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp rename to minecraft/minecraft/world/item/EnchantedBookItem.cpp index 3a16f9fee..6dd5b51c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp +++ b/minecraft/minecraft/world/item/EnchantedBookItem.cpp @@ -1,15 +1,15 @@ #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "EnchantedBookItem.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/Rarity.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" const std::wstring EnchantedBookItem::TAG_STORED_ENCHANTMENTS = L"StoredEnchantments"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h b/minecraft/minecraft/world/item/EnchantedBookItem.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h rename to minecraft/minecraft/world/item/EnchantedBookItem.h index 7ca060193..d5e9a1071 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h +++ b/minecraft/minecraft/world/item/EnchantedBookItem.h @@ -5,7 +5,7 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class EnchantmentInstance; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp b/minecraft/minecraft/world/item/EnderEyeItem.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp rename to minecraft/minecraft/world/item/EnderEyeItem.cpp index b7476e845..2b34ef17c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp +++ b/minecraft/minecraft/world/item/EnderEyeItem.cpp @@ -1,23 +1,23 @@ #include #include "EnderEyeItem.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/Direction.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/EyeOfEnderSignal.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" EnderEyeItem::EnderEyeItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.h b/minecraft/minecraft/world/item/EnderEyeItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.h rename to minecraft/minecraft/world/item/EnderEyeItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp b/minecraft/minecraft/world/item/EnderpearlItem.cpp similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp rename to minecraft/minecraft/world/item/EnderpearlItem.cpp index b3215cfd1..76b4ef682 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp +++ b/minecraft/minecraft/world/item/EnderpearlItem.cpp @@ -1,14 +1,14 @@ #include #include "EnderpearlItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/ThrownEnderpearl.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" EnderpearlItem::EnderpearlItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.h b/minecraft/minecraft/world/item/EnderpearlItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.h rename to minecraft/minecraft/world/item/EnderpearlItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp b/minecraft/minecraft/world/item/ExperienceItem.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp rename to minecraft/minecraft/world/item/ExperienceItem.cpp index 0ac0d34e1..98cf9a550 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp +++ b/minecraft/minecraft/world/item/ExperienceItem.cpp @@ -1,14 +1,14 @@ #include #include "ExperienceItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" ExperienceItem::ExperienceItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.h b/minecraft/minecraft/world/item/ExperienceItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.h rename to minecraft/minecraft/world/item/ExperienceItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp b/minecraft/minecraft/world/item/FireChargeItem.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp rename to minecraft/minecraft/world/item/FireChargeItem.cpp index d466ce0f5..ba8847b79 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp +++ b/minecraft/minecraft/world/item/FireChargeItem.cpp @@ -2,15 +2,15 @@ #include #include "FireChargeItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" FireChargeItem::FireChargeItem(int id) : Item(id) { m_dragonFireballIcon = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h b/minecraft/minecraft/world/item/FireChargeItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h rename to minecraft/minecraft/world/item/FireChargeItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp b/minecraft/minecraft/world/item/FireworksChargeItem.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp rename to minecraft/minecraft/world/item/FireworksChargeItem.cpp index 6729c4888..fe9fa7a52 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp +++ b/minecraft/minecraft/world/item/FireworksChargeItem.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/net.minecraft.world.h" #include "FireworksChargeItem.h" FireworksChargeItem::FireworksChargeItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.h b/minecraft/minecraft/world/item/FireworksChargeItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.h rename to minecraft/minecraft/world/item/FireworksChargeItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/minecraft/world/item/FireworksItem.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp rename to minecraft/minecraft/world/item/FireworksItem.cpp index 60f02f5fe..49c97bd42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/minecraft/world/item/FireworksItem.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "FireworksItem.h" #include "console_helpers/StringHelpers.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.h b/minecraft/minecraft/world/item/FireworksItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.h rename to minecraft/minecraft/world/item/FireworksItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp b/minecraft/minecraft/world/item/FishingRodItem.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp rename to minecraft/minecraft/world/item/FishingRodItem.cpp index fa6f32bb7..f3c58c64b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp +++ b/minecraft/minecraft/world/item/FishingRodItem.cpp @@ -2,14 +2,14 @@ #include #include "FishingRodItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/FishingHook.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h b/minecraft/minecraft/world/item/FishingRodItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h rename to minecraft/minecraft/world/item/FishingRodItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp b/minecraft/minecraft/world/item/FlintAndSteelItem.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp rename to minecraft/minecraft/world/item/FlintAndSteelItem.cpp index f6dd061fb..fdcf993e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp +++ b/minecraft/minecraft/world/item/FlintAndSteelItem.cpp @@ -1,15 +1,15 @@ #include #include "FlintAndSteelItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PortalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/PortalTile.h" +#include "minecraft/world/level/tile/Tile.h" FlintAndSteelItem::FlintAndSteelItem(int id) : Item(id) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.h b/minecraft/minecraft/world/item/FlintAndSteelItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.h rename to minecraft/minecraft/world/item/FlintAndSteelItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp b/minecraft/minecraft/world/item/FoodItem.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp rename to minecraft/minecraft/world/item/FoodItem.cpp index 1638aee8f..c8b5fbcee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp +++ b/minecraft/minecraft/world/item/FoodItem.cpp @@ -1,14 +1,14 @@ #include "FoodItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" void FoodItem::_init() { // 4J Initialisers diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h b/minecraft/minecraft/world/item/FoodItem.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h rename to minecraft/minecraft/world/item/FoodItem.h index 35087e3ea..1fe2f174c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h +++ b/minecraft/minecraft/world/item/FoodItem.h @@ -3,7 +3,7 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp b/minecraft/minecraft/world/item/GoldenAppleItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp rename to minecraft/minecraft/world/item/GoldenAppleItem.cpp index ff58da27f..8fdc63aaf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp +++ b/minecraft/minecraft/world/item/GoldenAppleItem.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/SharedConstants.h" #include "GoldenAppleItem.h" GoldenAppleItem::GoldenAppleItem(int id, int nutrition, float saturationMod, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.h b/minecraft/minecraft/world/item/GoldenAppleItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.h rename to minecraft/minecraft/world/item/GoldenAppleItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp b/minecraft/minecraft/world/item/HangingEntityItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp rename to minecraft/minecraft/world/item/HangingEntityItem.cpp index 3074e1698..74878d284 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp +++ b/minecraft/minecraft/world/item/HangingEntityItem.cpp @@ -1,14 +1,14 @@ -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "HangingEntityItem.h" -#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Painting.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/entity/Painting.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/ItemFrame.h" HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType) : Item(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.h b/minecraft/minecraft/world/item/HangingEntityItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.h rename to minecraft/minecraft/world/item/HangingEntityItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp b/minecraft/minecraft/world/item/HatchetItem.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp rename to minecraft/minecraft/world/item/HatchetItem.cpp index e1ba8d0e9..eb613bb6e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp +++ b/minecraft/minecraft/world/item/HatchetItem.cpp @@ -2,11 +2,11 @@ #include #include "HatchetItem.h" -#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector* HatchetItem::diggables = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h b/minecraft/minecraft/world/item/HatchetItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h rename to minecraft/minecraft/world/item/HatchetItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp b/minecraft/minecraft/world/item/HoeItem.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp rename to minecraft/minecraft/world/item/HoeItem.cpp index 2b11d58f9..84e1fec47 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp +++ b/minecraft/minecraft/world/item/HoeItem.cpp @@ -1,11 +1,11 @@ #include #include "HoeItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" HoeItem::HoeItem(int id, const Tier* tier) : Item(id) { this->tier = tier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.h b/minecraft/minecraft/world/item/HoeItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.h rename to minecraft/minecraft/world/item/HoeItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp b/minecraft/minecraft/world/item/Item.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp rename to minecraft/minecraft/world/item/Item.cpp index a92f42d37..06a29a5dd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp +++ b/minecraft/minecraft/world/item/Item.cpp @@ -1,21 +1,21 @@ -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/locale/net.minecraft.locale.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "minecraft/world/food/net.minecraft.world.food.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/stats/net.minecraft.stats.h" #include "MapItem.h" #include "Item.h" #include "HangingEntityItem.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" typedef Item::Tier _Tier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Item.h b/minecraft/minecraft/world/item/Item.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/item/Item.h rename to minecraft/minecraft/world/item/Item.h index 978ccf842..b27f15430 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Item.h +++ b/minecraft/minecraft/world/item/Item.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" #include "UseAnim.h" #include "Rarity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/minecraft/world/item/ItemInstance.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp rename to minecraft/minecraft/world/item/ItemInstance.cpp index b7ba2f481..a36b2ad42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp +++ b/minecraft/minecraft/world/item/ItemInstance.cpp @@ -9,28 +9,28 @@ #include #include "Item.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/item/ItemInstance.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" +#include "minecraft/world/item/alchemy/PotionMacros.h" #include "nbt/CompoundTag.h" #include "nbt/IntTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/enchantment/DigDurabilityEnchantment.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/tile/Tile.h" class Tag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h b/minecraft/minecraft/world/item/ItemInstance.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h rename to minecraft/minecraft/world/item/ItemInstance.h index e03e0602d..604ff8a35 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h +++ b/minecraft/minecraft/world/item/ItemInstance.h @@ -2,7 +2,7 @@ #include "UseAnim.h" #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp b/minecraft/minecraft/world/item/LeafTileItem.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp rename to minecraft/minecraft/world/item/LeafTileItem.cpp index aa179cf1c..6fc53c28c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp +++ b/minecraft/minecraft/world/item/LeafTileItem.cpp @@ -1,11 +1,11 @@ #include #include "LeafTileItem.h" -#include "Minecraft.World/net/minecraft/world/level/FoliageColor.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/FoliageColor.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/Tile.h" LeafTileItem::LeafTileItem(int id) : TileItem(id) { setMaxDamage(0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.h b/minecraft/minecraft/world/item/LeafTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.h rename to minecraft/minecraft/world/item/LeafTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp b/minecraft/minecraft/world/item/LeashItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp rename to minecraft/minecraft/world/item/LeashItem.cpp index 19943eb46..389008b9b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp +++ b/minecraft/minecraft/world/item/LeashItem.cpp @@ -2,13 +2,13 @@ #include #include "LeashItem.h" -#include "Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/LeashFenceKnotEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h b/minecraft/minecraft/world/item/LeashItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h rename to minecraft/minecraft/world/item/LeashItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp b/minecraft/minecraft/world/item/MapItem.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp rename to minecraft/minecraft/world/item/MapItem.cpp index 909e777cc..375659e57 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp +++ b/minecraft/minecraft/world/item/MapItem.cpp @@ -8,22 +8,22 @@ #include "java/JavaMath.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ComplexItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/network/packet/ComplexItemDataPacket.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ComplexItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/MaterialColor.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/Tile.h" class SavedData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h b/minecraft/minecraft/world/item/MapItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h rename to minecraft/minecraft/world/item/MapItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp b/minecraft/minecraft/world/item/MilkBucketItem.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp rename to minecraft/minecraft/world/item/MilkBucketItem.cpp index b2fe59f31..c21fbefdc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp +++ b/minecraft/minecraft/world/item/MilkBucketItem.cpp @@ -1,11 +1,11 @@ #include #include "MilkBucketItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" MilkBucketItem::MilkBucketItem(int id) : Item(id) { setMaxStackSize(1); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h b/minecraft/minecraft/world/item/MilkBucketItem.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h rename to minecraft/minecraft/world/item/MilkBucketItem.h index a664c7f04..0a6445386 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h +++ b/minecraft/minecraft/world/item/MilkBucketItem.h @@ -1,7 +1,7 @@ #pragma once #include "Item.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class MilkBucketItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp b/minecraft/minecraft/world/item/MinecartItem.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp rename to minecraft/minecraft/world/item/MinecartItem.cpp index cefe038bf..2693eacc1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp +++ b/minecraft/minecraft/world/item/MinecartItem.cpp @@ -3,17 +3,17 @@ #include "MinecartItem.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/core/BehaviorRegistry.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" std::shared_ptr MinecartItem::MinecartDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h b/minecraft/minecraft/world/item/MinecartItem.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h rename to minecraft/minecraft/world/item/MinecartItem.h index d26691ce9..f0e1f48fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h +++ b/minecraft/minecraft/world/item/MinecartItem.h @@ -1,7 +1,7 @@ #pragma once #include "Item.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" class BlockSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp b/minecraft/minecraft/world/item/MultiTextureTileItem.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp rename to minecraft/minecraft/world/item/MultiTextureTileItem.cpp index 2f6e160f1..b3883a469 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp +++ b/minecraft/minecraft/world/item/MultiTextureTileItem.cpp @@ -1,10 +1,10 @@ #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" #include "MultiTextureTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/item/crafting/Recipes.h" MultiTextureTileItem::MultiTextureTileItem(int id, Tile* parentTile, int* nameExtensions, int iLength, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.h b/minecraft/minecraft/world/item/MultiTextureTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.h rename to minecraft/minecraft/world/item/MultiTextureTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp b/minecraft/minecraft/world/item/NameTagItem.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp rename to minecraft/minecraft/world/item/NameTagItem.cpp index 5400a579e..2eb02397f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp +++ b/minecraft/minecraft/world/item/NameTagItem.cpp @@ -3,10 +3,10 @@ #include "NameTagItem.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" NameTagItem::NameTagItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.h b/minecraft/minecraft/world/item/NameTagItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.h rename to minecraft/minecraft/world/item/NameTagItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp b/minecraft/minecraft/world/item/PickaxeItem.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp rename to minecraft/minecraft/world/item/PickaxeItem.cpp index 142d15cea..2abfa6fcc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp +++ b/minecraft/minecraft/world/item/PickaxeItem.cpp @@ -2,10 +2,10 @@ #include #include "PickaxeItem.h" -#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector PickaxeItem::diggables; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h b/minecraft/minecraft/world/item/PickaxeItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h rename to minecraft/minecraft/world/item/PickaxeItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp b/minecraft/minecraft/world/item/PistonTileItem.cpp similarity index 64% rename from minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp rename to minecraft/minecraft/world/item/PistonTileItem.cpp index 12b610ce7..27cc2378a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp +++ b/minecraft/minecraft/world/item/PistonTileItem.cpp @@ -1,6 +1,6 @@ #include "PistonTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" PistonTileItem::PistonTileItem(int id) : TileItem(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.h b/minecraft/minecraft/world/item/PistonTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.h rename to minecraft/minecraft/world/item/PistonTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp b/minecraft/minecraft/world/item/PlanterTileItem.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp rename to minecraft/minecraft/world/item/PlanterTileItem.cpp index c6c2b2f83..fa6a69c9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp +++ b/minecraft/minecraft/world/item/PlanterTileItem.cpp @@ -1,16 +1,16 @@ #include #include "PlanterTileItem.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TopSnowTile.h" TilePlanterItem::TilePlanterItem(int id, Tile* tile) : Item(id) { this->tileId = tile->id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h b/minecraft/minecraft/world/item/PlanterTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h rename to minecraft/minecraft/world/item/PlanterTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/minecraft/world/item/PotionItem.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp rename to minecraft/minecraft/world/item/PotionItem.cpp index f16c7afca..6e4c81566 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp +++ b/minecraft/minecraft/world/item/PotionItem.cpp @@ -1,19 +1,19 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/effect/MobEffectInstance.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "PotionItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/item/alchemy/PotionMacros.h" const std::wstring PotionItem::DEFAULT_ICON = L"potion"; const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.h b/minecraft/minecraft/world/item/PotionItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.h rename to minecraft/minecraft/world/item/PotionItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp b/minecraft/minecraft/world/item/Rarity.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp rename to minecraft/minecraft/world/item/Rarity.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h b/minecraft/minecraft/world/item/Rarity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h rename to minecraft/minecraft/world/item/Rarity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp b/minecraft/minecraft/world/item/RecordingItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp rename to minecraft/minecraft/world/item/RecordingItem.cpp index b4a636e8b..821205bc9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp +++ b/minecraft/minecraft/world/item/RecordingItem.cpp @@ -4,18 +4,18 @@ #include #include "RecordingItem.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/Rarity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/JukeboxTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" std::unordered_map RecordingItem::BY_NAME; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h b/minecraft/minecraft/world/item/RecordingItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h rename to minecraft/minecraft/world/item/RecordingItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp b/minecraft/minecraft/world/item/RedStoneItem.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp rename to minecraft/minecraft/world/item/RedStoneItem.cpp index f9b19e326..6890c3a0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp +++ b/minecraft/minecraft/world/item/RedStoneItem.cpp @@ -1,13 +1,13 @@ #include -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "minecraft/stats/GenericStats.h" #include "RedStoneItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/RedStoneDustTile.h" +#include "minecraft/world/level/tile/Tile.h" RedStoneItem::RedStoneItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.h b/minecraft/minecraft/world/item/RedStoneItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.h rename to minecraft/minecraft/world/item/RedStoneItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp b/minecraft/minecraft/world/item/SaddleItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp rename to minecraft/minecraft/world/item/SaddleItem.cpp index 85b14d4e5..983537b96 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp +++ b/minecraft/minecraft/world/item/SaddleItem.cpp @@ -2,10 +2,10 @@ #include "SaddleItem.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" SaddleItem::SaddleItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.h b/minecraft/minecraft/world/item/SaddleItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.h rename to minecraft/minecraft/world/item/SaddleItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp b/minecraft/minecraft/world/item/SaplingTileItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp rename to minecraft/minecraft/world/item/SaplingTileItem.cpp index ddce53397..8cf44d3ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp +++ b/minecraft/minecraft/world/item/SaplingTileItem.cpp @@ -2,9 +2,9 @@ #include "TileItem.h" #include "SaplingTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" SaplingTileItem::SaplingTileItem(int id) : TileItem(id) { setMaxDamage(0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.h b/minecraft/minecraft/world/item/SaplingTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.h rename to minecraft/minecraft/world/item/SaplingTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp b/minecraft/minecraft/world/item/SeedFoodItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp rename to minecraft/minecraft/world/item/SeedFoodItem.cpp index 410585413..67450d3d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp +++ b/minecraft/minecraft/world/item/SeedFoodItem.cpp @@ -1,11 +1,11 @@ #include #include "SeedFoodItem.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" SeedFoodItem::SeedFoodItem(int id, int nutrition, float saturationMod, int resultId, int targetLand) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.h b/minecraft/minecraft/world/item/SeedFoodItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.h rename to minecraft/minecraft/world/item/SeedFoodItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp b/minecraft/minecraft/world/item/SeedItem.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp rename to minecraft/minecraft/world/item/SeedItem.cpp index 5cdade361..9a2033825 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp +++ b/minecraft/minecraft/world/item/SeedItem.cpp @@ -3,9 +3,9 @@ #include "Item.h" #include "SeedItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" SeedItem::SeedItem(int id, int resultId, int targetLand) : Item(id) { this->resultId = resultId; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.h b/minecraft/minecraft/world/item/SeedItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.h rename to minecraft/minecraft/world/item/SeedItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp b/minecraft/minecraft/world/item/ShearsItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp rename to minecraft/minecraft/world/item/ShearsItem.cpp index 5b527c50b..9fbd2c2fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp +++ b/minecraft/minecraft/world/item/ShearsItem.cpp @@ -1,9 +1,9 @@ #include #include "ShearsItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" ShearsItem::ShearsItem(int itemId) : Item(itemId) { setMaxStackSize(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.h b/minecraft/minecraft/world/item/ShearsItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.h rename to minecraft/minecraft/world/item/ShearsItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp b/minecraft/minecraft/world/item/ShovelItem.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp rename to minecraft/minecraft/world/item/ShovelItem.cpp index e75334b3e..328965b55 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp +++ b/minecraft/minecraft/world/item/ShovelItem.cpp @@ -1,10 +1,10 @@ #include #include "ShovelItem.h" -#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/MycelTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" +#include "minecraft/world/level/tile/GrassTile.h" +#include "minecraft/world/level/tile/MycelTile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector* ShovelItem::diggables = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h b/minecraft/minecraft/world/item/ShovelItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h rename to minecraft/minecraft/world/item/ShovelItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp b/minecraft/minecraft/world/item/SignItem.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp rename to minecraft/minecraft/world/item/SignItem.cpp index afc3dc251..157e082bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp +++ b/minecraft/minecraft/world/item/SignItem.cpp @@ -1,15 +1,15 @@ #include #include "SignItem.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" SignItem::SignItem(int id) : Item(id) { // 4J-PB - Changed for TU9 diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.h b/minecraft/minecraft/world/item/SignItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SignItem.h rename to minecraft/minecraft/world/item/SignItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp b/minecraft/minecraft/world/item/SimpleFoiledItem.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp rename to minecraft/minecraft/world/item/SimpleFoiledItem.cpp index f5f47b0b4..295eb9458 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp +++ b/minecraft/minecraft/world/item/SimpleFoiledItem.cpp @@ -1,7 +1,7 @@ #include #include "SimpleFoiledItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/item/Item.h" SimpleFoiledItem::SimpleFoiledItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.h b/minecraft/minecraft/world/item/SimpleFoiledItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.h rename to minecraft/minecraft/world/item/SimpleFoiledItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp b/minecraft/minecraft/world/item/SkullItem.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp rename to minecraft/minecraft/world/item/SkullItem.cpp index ae2ef1f4b..1460a8290 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp +++ b/minecraft/minecraft/world/item/SkullItem.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.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" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/net.minecraft.world.h" #include "SkullItem.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" const unsigned int SkullItem::NAMES[SKULL_COUNT] = { IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_WITHER, IDS_ITEM_SKULL_ZOMBIE, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.h b/minecraft/minecraft/world/item/SkullItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.h rename to minecraft/minecraft/world/item/SkullItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp b/minecraft/minecraft/world/item/SnowItem.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp rename to minecraft/minecraft/world/item/SnowItem.cpp index ad92a621f..f8b889105 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp +++ b/minecraft/minecraft/world/item/SnowItem.cpp @@ -2,12 +2,12 @@ #include #include "SnowItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/AuxDataTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/AuxDataTileItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TopSnowTile.h" SnowItem::SnowItem(int id, Tile* parentTile) : AuxDataTileItem(id, parentTile) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h b/minecraft/minecraft/world/item/SnowItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h rename to minecraft/minecraft/world/item/SnowItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp b/minecraft/minecraft/world/item/SnowballItem.cpp similarity index 60% rename from minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp rename to minecraft/minecraft/world/item/SnowballItem.cpp index f115a63dc..876132839 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp +++ b/minecraft/minecraft/world/item/SnowballItem.cpp @@ -1,14 +1,14 @@ #include #include "SnowballItem.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Snowball.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.h b/minecraft/minecraft/world/item/SnowballItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.h rename to minecraft/minecraft/world/item/SnowballItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/minecraft/world/item/SpawnEggItem.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp rename to minecraft/minecraft/world/item/SpawnEggItem.cpp index 3291d72fb..f1631db93 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/minecraft/world/item/SpawnEggItem.cpp @@ -1,17 +1,17 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.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" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/phys/HitResult.h" #include "SpawnEggItem.h" -#include "Minecraft.World/net/minecraft/world/Difficulty.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/util/Mth.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "console_helpers/StringHelpers.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.h b/minecraft/minecraft/world/item/SpawnEggItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.h rename to minecraft/minecraft/world/item/SpawnEggItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp b/minecraft/minecraft/world/item/StoneSlabTileItem.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp rename to minecraft/minecraft/world/item/StoneSlabTileItem.cpp index e33c97844..5a9f7dcc1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp +++ b/minecraft/minecraft/world/item/StoneSlabTileItem.cpp @@ -1,13 +1,13 @@ #include #include "StoneSlabTileItem.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" StoneSlabTileItem::StoneSlabTileItem(int id, HalfSlabTile* halfTile, HalfSlabTile* fullTile, bool full) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h b/minecraft/minecraft/world/item/StoneSlabTileItem.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h rename to minecraft/minecraft/world/item/StoneSlabTileItem.h index 1568af187..f1928483f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h +++ b/minecraft/minecraft/world/item/StoneSlabTileItem.h @@ -3,7 +3,7 @@ #include #include "TileItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" class HalfSlabTile; class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp b/minecraft/minecraft/world/item/TileItem.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp rename to minecraft/minecraft/world/item/TileItem.cpp index 35d458db2..3f4a33cb9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp +++ b/minecraft/minecraft/world/item/TileItem.cpp @@ -3,20 +3,20 @@ #include #include "TileItem.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/Icon.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TopSnowTile.h" TileItem::TileItem(int id) : Item(id) { this->tileId = id + 256; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h b/minecraft/minecraft/world/item/TileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h rename to minecraft/minecraft/world/item/TileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/UseAnim.h b/minecraft/minecraft/world/item/UseAnim.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/UseAnim.h rename to minecraft/minecraft/world/item/UseAnim.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp b/minecraft/minecraft/world/item/WaterLilyTileItem.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp rename to minecraft/minecraft/world/item/WaterLilyTileItem.cpp index 41bbda124..9798376cb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp +++ b/minecraft/minecraft/world/item/WaterLilyTileItem.cpp @@ -1,14 +1,14 @@ #include #include "WaterLilyTileItem.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ColoredTileItem.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ColoredTileItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" WaterLilyTileItem::WaterLilyTileItem(int id) : ColoredTileItem(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.h b/minecraft/minecraft/world/item/WaterLilyTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.h rename to minecraft/minecraft/world/item/WaterLilyTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp b/minecraft/minecraft/world/item/WeaponItem.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp rename to minecraft/minecraft/world/item/WeaponItem.cpp index 6692d1fab..2ee6e36eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp +++ b/minecraft/minecraft/world/item/WeaponItem.cpp @@ -1,13 +1,13 @@ #include #include "WeaponItem.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" WeaponItem::WeaponItem(int id, const Tier* tier) : Item(id), tier(tier) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h b/minecraft/minecraft/world/item/WeaponItem.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h rename to minecraft/minecraft/world/item/WeaponItem.h index 9b23922d8..bdebb9cd6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h +++ b/minecraft/minecraft/world/item/WeaponItem.h @@ -1,8 +1,8 @@ #pragma once #include "Item.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" -#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/item/UseAnim.h" class WeaponItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp b/minecraft/minecraft/world/item/WoolTileItem.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp rename to minecraft/minecraft/world/item/WoolTileItem.cpp index 032be1ac2..b4f31e389 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp +++ b/minecraft/minecraft/world/item/WoolTileItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "ItemInstance.h" #include "DyePowderItem.h" #include "WoolTileItem.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.h b/minecraft/minecraft/world/item/WoolTileItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.h rename to minecraft/minecraft/world/item/WoolTileItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WrittenBookItem.h b/minecraft/minecraft/world/item/WrittenBookItem.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/WrittenBookItem.h rename to minecraft/minecraft/world/item/WrittenBookItem.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp b/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp rename to minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp index e8ee4f4b4..ba8f43115 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/minecraft/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "minecraft/world/effect/net.minecraft.world.effect.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/SharedConstants.h" #include "PotionBrewing.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h b/minecraft/minecraft/world/item/alchemy/PotionBrewing.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h rename to minecraft/minecraft/world/item/alchemy/PotionBrewing.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h b/minecraft/minecraft/world/item/alchemy/PotionMacros.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h rename to minecraft/minecraft/world/item/alchemy/PotionMacros.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h b/minecraft/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h rename to minecraft/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp rename to minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.cpp index 8cea01b71..78faf552d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp +++ b/minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.cpp @@ -5,14 +5,14 @@ #include "ArmorDyeRecipe.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/ShapedRecipy.h" +#include "minecraft/world/level/tile/ColoredTile.h" bool ArmorDyeRecipe::matches(std::shared_ptr craftSlots, Level* level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h b/minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h rename to minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.h index 6bef8a76d..d4f96ae3c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h +++ b/minecraft/minecraft/world/item/crafting/ArmorDyeRecipe.h @@ -3,7 +3,7 @@ #include #include "Recipy.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class CraftingContainer; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp b/minecraft/minecraft/world/item/crafting/ArmorRecipes.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp rename to minecraft/minecraft/world/item/crafting/ArmorRecipes.cpp index 87dcc4b98..45577f439 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/ArmorRecipes.cpp @@ -5,9 +5,9 @@ #include "Recipes.h" #include "ArmorRecipes.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring ArmorRecipes::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h b/minecraft/minecraft/world/item/crafting/ArmorRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h rename to minecraft/minecraft/world/item/crafting/ArmorRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp b/minecraft/minecraft/world/item/crafting/ClothDyeRecipes.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp rename to minecraft/minecraft/world/item/crafting/ClothDyeRecipes.cpp index 93a9ef3df..8c3097787 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/ClothDyeRecipes.cpp @@ -2,11 +2,11 @@ #include "Recipes.h" #include "ClothDyeRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/level/tile/Tile.h" void ClothDyeRecipes::addRecipes(Recipes* r) { // recipes for converting cloth to colored cloth using dye diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h b/minecraft/minecraft/world/item/crafting/ClothDyeRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h rename to minecraft/minecraft/world/item/crafting/ClothDyeRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp b/minecraft/minecraft/world/item/crafting/FireworksRecipe.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp rename to minecraft/minecraft/world/item/crafting/FireworksRecipe.cpp index 8b2f8fe5f..fbac70caa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp +++ b/minecraft/minecraft/world/item/crafting/FireworksRecipe.cpp @@ -4,11 +4,11 @@ #include "FireworksRecipe.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/FireworksItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" thread_local FireworksRecipe::ThreadStorage* FireworksRecipe::m_tlsStorage = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h b/minecraft/minecraft/world/item/crafting/FireworksRecipe.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h rename to minecraft/minecraft/world/item/crafting/FireworksRecipe.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp b/minecraft/minecraft/world/item/crafting/FoodRecipes.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp rename to minecraft/minecraft/world/item/crafting/FoodRecipes.cpp index 414a139ed..15f5cd62b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/FoodRecipes.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "FoodRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" void FoodRecipies::addRecipes(Recipes* r) { // 4J-JEV: Bumped up in the list to avoid a colision with the title. diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h b/minecraft/minecraft/world/item/crafting/FoodRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h rename to minecraft/minecraft/world/item/crafting/FoodRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp b/minecraft/minecraft/world/item/crafting/FurnaceRecipes.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp rename to minecraft/minecraft/world/item/crafting/FurnaceRecipes.cpp index e90a32cd2..02626adea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/FurnaceRecipes.cpp @@ -1,11 +1,11 @@ #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" #include "FurnaceRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" FurnaceRecipes* FurnaceRecipes::instance = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h b/minecraft/minecraft/world/item/crafting/FurnaceRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h rename to minecraft/minecraft/world/item/crafting/FurnaceRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/MapCloningRecipe.h b/minecraft/minecraft/world/item/crafting/MapCloningRecipe.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/MapCloningRecipe.h rename to minecraft/minecraft/world/item/crafting/MapCloningRecipe.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/MapExtendingRecipe.h b/minecraft/minecraft/world/item/crafting/MapExtendingRecipe.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/MapExtendingRecipe.h rename to minecraft/minecraft/world/item/crafting/MapExtendingRecipe.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp b/minecraft/minecraft/world/item/crafting/OreRecipes.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp rename to minecraft/minecraft/world/item/crafting/OreRecipes.cpp index 5b43be201..4823cdeb5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/OreRecipes.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "OreRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" void OreRecipies::_init() { ADD_OBJECT(map[0], Tile::goldBlock); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h b/minecraft/minecraft/world/item/crafting/OreRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h rename to minecraft/minecraft/world/item/crafting/OreRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp b/minecraft/minecraft/world/item/crafting/Recipes.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp rename to minecraft/minecraft/world/item/crafting/Recipes.cpp index 570092773..cef9f8917 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp +++ b/minecraft/minecraft/world/item/crafting/Recipes.cpp @@ -6,32 +6,32 @@ #include #include -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/Item.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/WallTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/ArmorRecipes.h" +#include "minecraft/world/item/crafting/ClothDyeRecipes.h" +#include "minecraft/world/item/crafting/FireworksRecipe.h" +#include "minecraft/world/item/crafting/FoodRecipes.h" +#include "minecraft/world/item/crafting/OreRecipes.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/ShapedRecipy.h" +#include "minecraft/world/item/crafting/ShapelessRecipy.h" +#include "minecraft/world/item/crafting/StructureRecipes.h" +#include "minecraft/world/item/crafting/ToolRecipes.h" +#include "minecraft/world/item/crafting/WeaponRecipes.h" +#include "minecraft/world/level/tile/DaylightDetectorTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/TripWireSourceTile.h" +#include "minecraft/world/level/tile/WallTile.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h b/minecraft/minecraft/world/item/crafting/Recipes.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h rename to minecraft/minecraft/world/item/crafting/Recipes.h index 3bd89dc72..6ea368017 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h +++ b/minecraft/minecraft/world/item/crafting/Recipes.h @@ -21,7 +21,7 @@ import net.minecraft.world.level.tile.Tile; #include "Recipy.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Item; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h b/minecraft/minecraft/world/item/crafting/Recipy.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h rename to minecraft/minecraft/world/item/crafting/Recipy.h index ff952b792..b352fcdf9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h +++ b/minecraft/minecraft/world/item/crafting/Recipy.h @@ -5,7 +5,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/inventory/CraftingContainer.h" #include "4J.Common/4J_Compat.h" #define RECIPE_TYPE_2x2 0 diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp b/minecraft/minecraft/world/item/crafting/ShapedRecipy.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp rename to minecraft/minecraft/world/item/crafting/ShapedRecipy.cpp index 61babd9d6..61a034f39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/minecraft/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -12,8 +12,8 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/ItemInstance.h" // 4J-PB - for new crafting - Adding group to define type of item that the // recipe produces diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h b/minecraft/minecraft/world/item/crafting/ShapedRecipy.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h rename to minecraft/minecraft/world/item/crafting/ShapedRecipy.h index 5680cde26..30675af39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h +++ b/minecraft/minecraft/world/item/crafting/ShapedRecipy.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/Recipy.h" class CraftingContainer; class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp b/minecraft/minecraft/world/item/crafting/ShapelessRecipy.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp rename to minecraft/minecraft/world/item/crafting/ShapelessRecipy.cpp index 2d13c13c6..4500a59dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp +++ b/minecraft/minecraft/world/item/crafting/ShapelessRecipy.cpp @@ -14,8 +14,8 @@ #include "ShapelessRecipy.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/CraftingContainer.h" +#include "minecraft/world/item/ItemInstance.h" ShapelessRecipy::ShapelessRecipy(ItemInstance* result, std::vector* ingredients, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h b/minecraft/minecraft/world/item/crafting/ShapelessRecipy.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h rename to minecraft/minecraft/world/item/crafting/ShapelessRecipy.h index 93e0ef45b..deefb5ca7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h +++ b/minecraft/minecraft/world/item/crafting/ShapelessRecipy.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/item/crafting/Recipy.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp b/minecraft/minecraft/world/item/crafting/StructureRecipes.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp rename to minecraft/minecraft/world/item/crafting/StructureRecipes.cpp index 1a6c19a01..f9a8a3791 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/StructureRecipes.cpp @@ -1,14 +1,14 @@ #include "Recipes.h" #include "StructureRecipes.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/BeaconTile.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/QuartzBlockTile.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" void StructureRecipies::addRecipes(Recipes* r) { r->addShapedRecipy(new ItemInstance(Tile::sandStone), // diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h b/minecraft/minecraft/world/item/crafting/StructureRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h rename to minecraft/minecraft/world/item/crafting/StructureRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp b/minecraft/minecraft/world/item/crafting/ToolRecipes.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp rename to minecraft/minecraft/world/item/crafting/ToolRecipes.cpp index fde06ca15..551019d8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/ToolRecipes.cpp @@ -1,12 +1,12 @@ #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "ToolRecipes.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ShearsItem.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring ToolRecipies::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h b/minecraft/minecraft/world/item/crafting/ToolRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h rename to minecraft/minecraft/world/item/crafting/ToolRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp b/minecraft/minecraft/world/item/crafting/WeaponRecipes.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp rename to minecraft/minecraft/world/item/crafting/WeaponRecipes.cpp index 399ba042a..9b0cd52ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp +++ b/minecraft/minecraft/world/item/crafting/WeaponRecipes.cpp @@ -1,11 +1,11 @@ #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "WeaponRecipes.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring WeaponRecipies::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h b/minecraft/minecraft/world/item/crafting/WeaponRecipes.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h rename to minecraft/minecraft/world/item/crafting/WeaponRecipes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h b/minecraft/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h rename to minecraft/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.h b/minecraft/minecraft/world/item/enchantment/ArrowDamageEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ArrowDamageEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.h b/minecraft/minecraft/world/item/enchantment/ArrowFireEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ArrowFireEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h b/minecraft/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h b/minecraft/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/DamageEnchantment.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/DamageEnchantment.cpp index f5ed79d21..19fe70844 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/DamageEnchantment.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "DamageEnchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.h b/minecraft/minecraft/world/item/enchantment/DamageEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.h rename to minecraft/minecraft/world/item/enchantment/DamageEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp index 6b8f03c5e..93c636705 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "DigDurabilityEnchantment.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.h b/minecraft/minecraft/world/item/enchantment/DigDurabilityEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.h rename to minecraft/minecraft/world/item/enchantment/DigDurabilityEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/DiggingEnchantment.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/DiggingEnchantment.cpp index a731e740d..6c6987d0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/DiggingEnchantment.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "DiggingEnchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.h b/minecraft/minecraft/world/item/enchantment/DiggingEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.h rename to minecraft/minecraft/world/item/enchantment/DiggingEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp b/minecraft/minecraft/world/item/enchantment/Enchantment.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp rename to minecraft/minecraft/world/item/enchantment/Enchantment.cpp index 96531ef68..d93730d62 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/Enchantment.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "Enchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h b/minecraft/minecraft/world/item/enchantment/Enchantment.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h rename to minecraft/minecraft/world/item/enchantment/Enchantment.h index cdd85e62c..00af596bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h +++ b/minecraft/minecraft/world/item/enchantment/Enchantment.h @@ -5,7 +5,7 @@ #include #include "EnchantmentCategory.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "minecraft/util/HtmlString.h" class DamageSource; class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp b/minecraft/minecraft/world/item/enchantment/EnchantmentCategory.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp rename to minecraft/minecraft/world/item/enchantment/EnchantmentCategory.cpp index f4f943ea0..f7fde8058 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp +++ b/minecraft/minecraft/world/item/enchantment/EnchantmentCategory.cpp @@ -1,9 +1,9 @@ #include "EnchantmentCategory.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/BowItem.h" -#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/DiggerItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/WeaponItem.h" const EnchantmentCategory* EnchantmentCategory::all = new EnchantmentCategory(); const EnchantmentCategory* EnchantmentCategory::armor = diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h b/minecraft/minecraft/world/item/enchantment/EnchantmentCategory.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h rename to minecraft/minecraft/world/item/enchantment/EnchantmentCategory.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp b/minecraft/minecraft/world/item/enchantment/EnchantmentHelper.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp rename to minecraft/minecraft/world/item/enchantment/EnchantmentHelper.cpp index d4031aa97..3f79dd28e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp +++ b/minecraft/minecraft/world/item/enchantment/EnchantmentHelper.cpp @@ -7,14 +7,14 @@ #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" Random EnchantmentHelper::random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h b/minecraft/minecraft/world/item/enchantment/EnchantmentHelper.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h rename to minecraft/minecraft/world/item/enchantment/EnchantmentHelper.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/minecraft/minecraft/world/item/enchantment/EnchantmentInstance.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp rename to minecraft/minecraft/world/item/enchantment/EnchantmentInstance.cpp index 9b621c2f1..6d76a3917 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp +++ b/minecraft/minecraft/world/item/enchantment/EnchantmentInstance.cpp @@ -1,7 +1,7 @@ #include #include "EnchantmentInstance.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/Enchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h b/minecraft/minecraft/world/item/enchantment/EnchantmentInstance.h similarity index 71% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h rename to minecraft/minecraft/world/item/enchantment/EnchantmentInstance.h index 215734217..6403f0785 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h +++ b/minecraft/minecraft/world/item/enchantment/EnchantmentInstance.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" class Enchantment; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/FireAspectEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/FireAspectEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.h b/minecraft/minecraft/world/item/enchantment/FireAspectEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.h rename to minecraft/minecraft/world/item/enchantment/FireAspectEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/KnockbackEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/KnockbackEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.h b/minecraft/minecraft/world/item/enchantment/KnockbackEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.h rename to minecraft/minecraft/world/item/enchantment/KnockbackEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/LootBonusEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/LootBonusEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.h b/minecraft/minecraft/world/item/enchantment/LootBonusEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.h rename to minecraft/minecraft/world/item/enchantment/LootBonusEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/OxygenEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/OxygenEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.h b/minecraft/minecraft/world/item/enchantment/OxygenEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.h rename to minecraft/minecraft/world/item/enchantment/OxygenEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ProtectionEnchantment.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ProtectionEnchantment.cpp index 75b036617..add1224e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/ProtectionEnchantment.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/util/Mth.h" #include "ProtectionEnchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h b/minecraft/minecraft/world/item/enchantment/ProtectionEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ProtectionEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/ThornsEnchantment.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/ThornsEnchantment.cpp index 42cebc2bf..00b41727f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/ThornsEnchantment.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "ThornsEnchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h b/minecraft/minecraft/world/item/enchantment/ThornsEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h rename to minecraft/minecraft/world/item/enchantment/ThornsEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/UntouchingEnchantment.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/UntouchingEnchantment.cpp index 1e6c3721d..51f15d133 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp +++ b/minecraft/minecraft/world/item/enchantment/UntouchingEnchantment.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "UntouchingEnchantment.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.h b/minecraft/minecraft/world/item/enchantment/UntouchingEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.h rename to minecraft/minecraft/world/item/enchantment/UntouchingEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp b/minecraft/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp rename to minecraft/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.h b/minecraft/minecraft/world/item/enchantment/WaterWorkerEnchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.h rename to minecraft/minecraft/world/item/enchantment/WaterWorkerEnchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h b/minecraft/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h rename to minecraft/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h b/minecraft/minecraft/world/item/net.minecraft.world.item.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h rename to minecraft/minecraft/world/item/net.minecraft.world.item.h index e259247fa..a674ec586 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h +++ b/minecraft/minecraft/world/item/net.minecraft.world.item.h @@ -58,7 +58,7 @@ // TU9 #include "FireChargeItem.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/ItemFrame.h" #include "SpawnEggItem.h" #include "MultiTextureTileItem.h" @@ -84,4 +84,4 @@ // 4J Added #include "ClockItem.h" #include "CompassItem.h" -#include "Minecraft.World/net/minecraft/util/HtmlString.h" \ No newline at end of file +#include "minecraft/util/HtmlString.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h b/minecraft/minecraft/world/item/trading/Merchant.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h rename to minecraft/minecraft/world/item/trading/Merchant.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp b/minecraft/minecraft/world/item/trading/MerchantRecipe.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp rename to minecraft/minecraft/world/item/trading/MerchantRecipe.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h b/minecraft/minecraft/world/item/trading/MerchantRecipe.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h rename to minecraft/minecraft/world/item/trading/MerchantRecipe.h index 5e8c398b6..ac15e063f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h +++ b/minecraft/minecraft/world/item/trading/MerchantRecipe.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class CompoundTag; class Item; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp b/minecraft/minecraft/world/item/trading/MerchantRecipeList.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp rename to minecraft/minecraft/world/item/trading/MerchantRecipeList.cpp index 338679163..4e0127543 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp +++ b/minecraft/minecraft/world/item/trading/MerchantRecipeList.cpp @@ -6,9 +6,9 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/network/packet/Packet.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" MerchantRecipeList::MerchantRecipeList() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h b/minecraft/minecraft/world/item/trading/MerchantRecipeList.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h rename to minecraft/minecraft/world/item/trading/MerchantRecipeList.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h b/minecraft/minecraft/world/item/trading/net.minecraft.world.item.trading.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h rename to minecraft/minecraft/world/item/trading/net.minecraft.world.item.trading.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp b/minecraft/minecraft/world/level/BaseMobSpawner.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp rename to minecraft/minecraft/world/level/BaseMobSpawner.cpp index 7f7ea97fa..01eb0e793 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp +++ b/minecraft/minecraft/world/level/BaseMobSpawner.cpp @@ -1,20 +1,20 @@ #include #include "BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/Tag.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/phys/AABB.h" BaseMobSpawner::BaseMobSpawner() { spawnPotentials = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h b/minecraft/minecraft/world/level/BaseMobSpawner.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h rename to minecraft/minecraft/world/level/BaseMobSpawner.h index 492f43be3..5741f0119 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h +++ b/minecraft/minecraft/world/level/BaseMobSpawner.h @@ -4,9 +4,9 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/world/entity/Entity.h" class CompoundTag; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp b/minecraft/minecraft/world/level/BlockDestructionProgress.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp rename to minecraft/minecraft/world/level/BlockDestructionProgress.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.h b/minecraft/minecraft/world/level/BlockDestructionProgress.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.h rename to minecraft/minecraft/world/level/BlockDestructionProgress.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp b/minecraft/minecraft/world/level/Calendar.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp rename to minecraft/minecraft/world/level/Calendar.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.h b/minecraft/minecraft/world/level/Calendar.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/Calendar.h rename to minecraft/minecraft/world/level/Calendar.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp b/minecraft/minecraft/world/level/ChunkPos.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp rename to minecraft/minecraft/world/level/ChunkPos.cpp index 89c4a9f31..223f613c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp +++ b/minecraft/minecraft/world/level/ChunkPos.cpp @@ -3,11 +3,11 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/ChunkPos.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/TilePos.h" ChunkPos::ChunkPos(int x, int z) : x(x), z(z) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.h b/minecraft/minecraft/world/level/ChunkPos.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.h rename to minecraft/minecraft/world/level/ChunkPos.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Coord.h b/minecraft/minecraft/world/level/Coord.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/Coord.h rename to minecraft/minecraft/world/level/Coord.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp b/minecraft/minecraft/world/level/Explosion.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp rename to minecraft/minecraft/world/level/Explosion.cpp index 92a6e09fd..86ea9e629 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp +++ b/minecraft/minecraft/world/level/Explosion.cpp @@ -5,19 +5,19 @@ #include "Explosion.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/enchantment/ProtectionEnchantment.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h b/minecraft/minecraft/world/level/Explosion.h similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h rename to minecraft/minecraft/world/level/Explosion.h index 7d0dfad1a..b356235e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h +++ b/minecraft/minecraft/world/level/Explosion.h @@ -5,10 +5,10 @@ #include #include "TilePos.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/phys/Vec3.h" class Random; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp b/minecraft/minecraft/world/level/FoliageColor.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp rename to minecraft/minecraft/world/level/FoliageColor.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.h b/minecraft/minecraft/world/level/FoliageColor.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.h rename to minecraft/minecraft/world/level/FoliageColor.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp b/minecraft/minecraft/world/level/GameRules.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp rename to minecraft/minecraft/world/level/GameRules.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h b/minecraft/minecraft/world/level/GameRules.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h rename to minecraft/minecraft/world/level/GameRules.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp b/minecraft/minecraft/world/level/GrassColor.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp rename to minecraft/minecraft/world/level/GrassColor.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.h b/minecraft/minecraft/world/level/GrassColor.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.h rename to minecraft/minecraft/world/level/GrassColor.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/minecraft/world/level/Level.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp rename to minecraft/minecraft/world/level/Level.cpp index 346766f9b..8f8066ca4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp +++ b/minecraft/minecraft/world/level/Level.cpp @@ -11,7 +11,7 @@ #include "Explosion.h" #include "LevelListener.h" #include "Level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.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/include/FrameProfiler.h" @@ -21,49 +21,49 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "net/minecraft/Direction.h" -#include "net/minecraft/Facing.h" -#include "net/minecraft/Pos.h" -#include "net/minecraft/SharedConstants.h" -#include "net/minecraft/stats/GenericStats.h" -#include "net/minecraft/util/Mth.h" -#include "net/minecraft/world/Difficulty.h" -#include "net/minecraft/world/entity/Entity.h" -#include "net/minecraft/world/entity/MobCategory.h" -#include "net/minecraft/world/entity/ai/village/VillageSiege.h" -#include "net/minecraft/world/entity/ai/village/Villages.h" -#include "net/minecraft/world/entity/player/Abilities.h" -#include "net/minecraft/world/entity/player/Player.h" -#include "net/minecraft/world/level/LevelType.h" -#include "net/minecraft/world/level/Region.h" -#include "net/minecraft/world/level/biome/Biome.h" -#include "net/minecraft/world/level/biome/BiomeSource.h" -#include "net/minecraft/world/level/chunk/ChunkSource.h" -#include "net/minecraft/world/level/chunk/LevelChunk.h" -#include "net/minecraft/world/level/dimension/Dimension.h" -#include "net/minecraft/world/level/material/Material.h" -#include "net/minecraft/world/level/pathfinder/PathFinder.h" -#include "net/minecraft/world/level/redstone/Redstone.h" -#include "net/minecraft/world/level/storage/LevelData.h" -#include "net/minecraft/world/level/storage/LevelStorage.h" -#include "net/minecraft/world/level/storage/SavedDataStorage.h" -#include "net/minecraft/world/level/tile/ComparatorTile.h" -#include "net/minecraft/world/level/tile/FireTile.h" -#include "net/minecraft/world/level/tile/HalfSlabTile.h" -#include "net/minecraft/world/level/tile/HopperTile.h" -#include "net/minecraft/world/level/tile/LevelEvent.h" -#include "net/minecraft/world/level/tile/LiquidTile.h" -#include "net/minecraft/world/level/tile/NotGateTile.h" -#include "net/minecraft/world/level/tile/StairTile.h" -#include "net/minecraft/world/level/tile/Tile.h" -#include "net/minecraft/world/level/tile/TopSnowTile.h" -#include "net/minecraft/world/level/tile/entity/TileEntity.h" -#include "net/minecraft/world/phys/HitResult.h" -#include "net/minecraft/world/phys/Vec3.h" -#include "net/minecraft/world/scores/Scoreboard.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/Pos.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/entity/ai/village/VillageSiege.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/Region.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/pathfinder/PathFinder.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/world/level/tile/ComparatorTile.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/NotGateTile.h" +#include "minecraft/world/level/tile/StairTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/scores/Scoreboard.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/minecraft/world/level/Level.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/Level.h rename to minecraft/minecraft/world/level/Level.h index 1b84a29a7..7bd0f60e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h +++ b/minecraft/minecraft/world/level/Level.h @@ -13,17 +13,17 @@ #include "LightLayer.h" #include "ChunkPos.h" #include "TickNextTickData.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/biome/Biome.h" #include "console_helpers/C4JThread.h" #include "4J.Common/4J_Compat.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/phys/AABB.h" class CompoundTag; class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp b/minecraft/minecraft/world/level/LevelConflictException.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp rename to minecraft/minecraft/world/level/LevelConflictException.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.h b/minecraft/minecraft/world/level/LevelConflictException.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.h rename to minecraft/minecraft/world/level/LevelConflictException.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h b/minecraft/minecraft/world/level/LevelListener.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h rename to minecraft/minecraft/world/level/LevelListener.h index 297c80e78..ad22d92a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h +++ b/minecraft/minecraft/world/level/LevelListener.h @@ -1,8 +1,8 @@ #pragma once class TileEntity; -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/core/particles/ParticleTypes.h" class LevelListener { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelObjectInputStream.h b/minecraft/minecraft/world/level/LevelObjectInputStream.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelObjectInputStream.h rename to minecraft/minecraft/world/level/LevelObjectInputStream.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp b/minecraft/minecraft/world/level/LevelSettings.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp rename to minecraft/minecraft/world/level/LevelSettings.cpp index e518be00b..74714bb85 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp +++ b/minecraft/minecraft/world/level/LevelSettings.cpp @@ -1,6 +1,6 @@ #include "LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/level/storage/LevelData.h" GameType* GameType::NOT_SET = nullptr; GameType* GameType::SURVIVAL = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h b/minecraft/minecraft/world/level/LevelSettings.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h rename to minecraft/minecraft/world/level/LevelSettings.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSource.h b/minecraft/minecraft/world/level/LevelSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelSource.h rename to minecraft/minecraft/world/level/LevelSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp b/minecraft/minecraft/world/level/LevelType.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp rename to minecraft/minecraft/world/level/LevelType.cpp index 0127bd421..8cc10f380 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp +++ b/minecraft/minecraft/world/level/LevelType.cpp @@ -12,7 +12,7 @@ #include -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "minecraft/world/level/LevelType.h" LevelType* LevelType::levelTypes[16]; // = new LevelType[16]; LevelType* LevelType::lvl_normal = diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h b/minecraft/minecraft/world/level/LevelType.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h rename to minecraft/minecraft/world/level/LevelType.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LightLayer.h b/minecraft/minecraft/world/level/LightLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/LightLayer.h rename to minecraft/minecraft/world/level/LightLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp b/minecraft/minecraft/world/level/MobSpawner.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp rename to minecraft/minecraft/world/level/MobSpawner.cpp index 9897e42da..bfe3afb01 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp +++ b/minecraft/minecraft/world/level/MobSpawner.cpp @@ -1,24 +1,24 @@ #include #include -#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "minecraft/world/Difficulty.h" #include "Level.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "MobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/Dimension.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Pos.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" class MobGroupData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h b/minecraft/minecraft/world/level/MobSpawner.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h rename to minecraft/minecraft/world/level/MobSpawner.h index c63061dc3..5f70a0f8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h +++ b/minecraft/minecraft/world/level/MobSpawner.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/level/TilePos.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp b/minecraft/minecraft/world/level/PortalForcer.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp rename to minecraft/minecraft/world/level/PortalForcer.cpp index 65489c1b6..11415ad68 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp +++ b/minecraft/minecraft/world/level/PortalForcer.cpp @@ -4,14 +4,14 @@ #include "PortalForcer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Direction.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, int64_t time) : Pos(x, y, z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h b/minecraft/minecraft/world/level/PortalForcer.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h rename to minecraft/minecraft/world/level/PortalForcer.h index f1e2b0c73..e55236542 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h +++ b/minecraft/minecraft/world/level/PortalForcer.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/Pos.h" class Random; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp b/minecraft/minecraft/world/level/Region.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp rename to minecraft/minecraft/world/level/Region.cpp index 9fbf9c2f8..b18fdf9f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp +++ b/minecraft/minecraft/world/level/Region.cpp @@ -3,13 +3,13 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "Level.h" #include "Region.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" Region::~Region() { delete chunks; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Region.h b/minecraft/minecraft/world/level/Region.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/Region.h rename to minecraft/minecraft/world/level/Region.h index 477a8992a..17937deb2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Region.h +++ b/minecraft/minecraft/world/level/Region.h @@ -3,8 +3,8 @@ #include #include "LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/LightLayer.h" class Material; class TileEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp b/minecraft/minecraft/world/level/TickNextTickData.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp rename to minecraft/minecraft/world/level/TickNextTickData.cpp index 5a28b2ae7..2bf395d64 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp +++ b/minecraft/minecraft/world/level/TickNextTickData.cpp @@ -1,7 +1,7 @@ #include #include "TickNextTickData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" int64_t TickNextTickData::C = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h b/minecraft/minecraft/world/level/TickNextTickData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h rename to minecraft/minecraft/world/level/TickNextTickData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp b/minecraft/minecraft/world/level/TileEventData.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp rename to minecraft/minecraft/world/level/TileEventData.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.h b/minecraft/minecraft/world/level/TileEventData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.h rename to minecraft/minecraft/world/level/TileEventData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp b/minecraft/minecraft/world/level/TilePos.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp rename to minecraft/minecraft/world/level/TilePos.cpp index 213539b91..b144b2661 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp +++ b/minecraft/minecraft/world/level/TilePos.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/phys/Vec3.h" TilePos::TilePos(int x, int y, int z) { this->x = x; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.h b/minecraft/minecraft/world/level/TilePos.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/TilePos.h rename to minecraft/minecraft/world/level/TilePos.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp b/minecraft/minecraft/world/level/WaterColor.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp rename to minecraft/minecraft/world/level/WaterColor.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.h b/minecraft/minecraft/world/level/WaterColor.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.h rename to minecraft/minecraft/world/level/WaterColor.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp b/minecraft/minecraft/world/level/biome/BeachBiome.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp rename to minecraft/minecraft/world/level/biome/BeachBiome.cpp index 1387105d8..01ab3c48c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp +++ b/minecraft/minecraft/world/level/biome/BeachBiome.cpp @@ -3,7 +3,7 @@ #include "BiomeDecorator.h" #include "BeachBiome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" BeachBiome::BeachBiome(int id) : Biome(id) { // remove default mob spawn settings diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h b/minecraft/minecraft/world/level/biome/BeachBiome.h similarity index 60% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h rename to minecraft/minecraft/world/level/biome/BeachBiome.h index 2147abdbb..5b83db26e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h +++ b/minecraft/minecraft/world/level/biome/BeachBiome.h @@ -1,7 +1,7 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class BeachBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp b/minecraft/minecraft/world/level/biome/Biome.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp rename to minecraft/minecraft/world/level/biome/Biome.cpp index 11f023442..d8b8ab5c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp +++ b/minecraft/minecraft/world/level/biome/Biome.cpp @@ -4,33 +4,33 @@ #include #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/HellBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/IceBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/OceanBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/RiverBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/level/biome/BeachBiome.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/biome/DesertBiome.h" +#include "minecraft/world/level/biome/ExtremeHillsBiome.h" +#include "minecraft/world/level/biome/ForestBiome.h" +#include "minecraft/world/level/biome/HellBiome.h" +#include "minecraft/world/level/biome/IceBiome.h" +#include "minecraft/world/level/biome/JungleBiome.h" +#include "minecraft/world/level/biome/MushroomIslandBiome.h" +#include "minecraft/world/level/biome/OceanBiome.h" +#include "minecraft/world/level/biome/PlainsBiome.h" +#include "minecraft/world/level/biome/RiverBiome.h" +#include "minecraft/world/level/biome/SwampBiome.h" +#include "minecraft/world/level/biome/TaigaBiome.h" +#include "minecraft/world/level/biome/TheEndBiome.h" +#include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/TallGrassFeature.h" +#include "minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h b/minecraft/minecraft/world/level/biome/Biome.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h rename to minecraft/minecraft/world/level/biome/Biome.h index 0ba7d8c95..f95fe9b0d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h +++ b/minecraft/minecraft/world/level/biome/Biome.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/util/WeighedRandom.h" #include "Minecraft.Client/Common/App_enums.h" class Feature; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp b/minecraft/minecraft/world/level/biome/BiomeCache.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp rename to minecraft/minecraft/world/level/biome/BiomeCache.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h b/minecraft/minecraft/world/level/biome/BiomeCache.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h rename to minecraft/minecraft/world/level/biome/BiomeCache.h index df843a957..0aebbd92d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h +++ b/minecraft/minecraft/world/level/biome/BiomeCache.h @@ -6,7 +6,7 @@ #include #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class BiomeSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp b/minecraft/minecraft/world/level/biome/BiomeDecorator.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp rename to minecraft/minecraft/world/level/biome/BiomeDecorator.cpp index 9354bc7c0..51702279a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/minecraft/minecraft/world/level/biome/BiomeDecorator.cpp @@ -2,22 +2,22 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/biome/WaterlilyFeature.h" +#include "minecraft/world/level/levelgen/feature/CactusFeature.h" +#include "minecraft/world/level/levelgen/feature/ClayFeature.h" +#include "minecraft/world/level/levelgen/feature/DeadBushFeature.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" +#include "minecraft/world/level/levelgen/feature/OreFeature.h" +#include "minecraft/world/level/levelgen/feature/PumpkinFeature.h" +#include "minecraft/world/level/levelgen/feature/ReedsFeature.h" +#include "minecraft/world/level/levelgen/feature/SandFeature.h" +#include "minecraft/world/level/levelgen/feature/SpringFeature.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h b/minecraft/minecraft/world/level/biome/BiomeDecorator.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h rename to minecraft/minecraft/world/level/biome/BiomeDecorator.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp b/minecraft/minecraft/world/level/biome/BiomeSource.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp rename to minecraft/minecraft/world/level/biome/BiomeSource.cpp index af0c1b82d..bf6b1b691 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp +++ b/minecraft/minecraft/world/level/biome/BiomeSource.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h" +#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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h b/minecraft/minecraft/world/level/biome/BiomeSource.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h rename to minecraft/minecraft/world/level/biome/BiomeSource.h index 8f953e6d0..cf9b30baf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h +++ b/minecraft/minecraft/world/level/biome/BiomeSource.h @@ -2,7 +2,7 @@ #include "Biome.h" #include "BiomeSource.h" #include "BiomeCache.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h" +#include "minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h" class ChunkPos; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp b/minecraft/minecraft/world/level/biome/DesertBiome.cpp similarity index 64% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp rename to minecraft/minecraft/world/level/biome/DesertBiome.cpp index 8f0cce41d..23de097dd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp +++ b/minecraft/minecraft/world/level/biome/DesertBiome.cpp @@ -3,13 +3,13 @@ #include #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/biome/DesertBiome.h" +#include "minecraft/world/level/levelgen/feature/DesertWellFeature.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/Tile.h" DesertBiome::DesertBiome(int id) : Biome(id) { // remove default mob spawn settings diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h b/minecraft/minecraft/world/level/biome/DesertBiome.h similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h rename to minecraft/minecraft/world/level/biome/DesertBiome.h index d1a7f5362..faa9c40c4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h +++ b/minecraft/minecraft/world/level/biome/DesertBiome.h @@ -1,7 +1,7 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class DesertBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp b/minecraft/minecraft/world/level/biome/ExtremeHillsBiome.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp rename to minecraft/minecraft/world/level/biome/ExtremeHillsBiome.cpp index 618c6bdb4..29b75ac51 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp +++ b/minecraft/minecraft/world/level/biome/ExtremeHillsBiome.cpp @@ -2,10 +2,10 @@ #include "ExtremeHillsBiome.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/OreFeature.h" +#include "minecraft/world/level/tile/Tile.h" ExtremeHillsBiome::ExtremeHillsBiome(int id) : Biome(id) { silverfishFeature = new OreFeature(Tile::monsterStoneEgg_Id, 8); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h b/minecraft/minecraft/world/level/biome/ExtremeHillsBiome.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h rename to minecraft/minecraft/world/level/biome/ExtremeHillsBiome.h index bfbd896ee..835de622d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h +++ b/minecraft/minecraft/world/level/biome/ExtremeHillsBiome.h @@ -1,7 +1,7 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class Feature; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp b/minecraft/minecraft/world/level/biome/FixedBiomeSource.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp rename to minecraft/minecraft/world/level/biome/FixedBiomeSource.cpp index 3da76b78d..c78c9cec9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp +++ b/minecraft/minecraft/world/level/biome/FixedBiomeSource.cpp @@ -4,8 +4,8 @@ #include "java/Arrays.h" #include "FixedBiomeSource.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/biome/Biome.h" FixedBiomeSource::FixedBiomeSource(Biome* fixed, float temperature, float downfall) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h b/minecraft/minecraft/world/level/biome/FixedBiomeSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h rename to minecraft/minecraft/world/level/biome/FixedBiomeSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp b/minecraft/minecraft/world/level/biome/ForestBiome.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp rename to minecraft/minecraft/world/level/biome/ForestBiome.cpp index e025b4579..d0e8e7e36 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp +++ b/minecraft/minecraft/world/level/biome/ForestBiome.cpp @@ -3,10 +3,10 @@ #include "ForestBiome.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/BirchFeature.h" +#include "minecraft/world/level/levelgen/feature/TreeFeature.h" ForestBiome::ForestBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h b/minecraft/minecraft/world/level/biome/ForestBiome.h similarity index 70% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h rename to minecraft/minecraft/world/level/biome/ForestBiome.h index f36fa8fcb..2cda03dd4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h +++ b/minecraft/minecraft/world/level/biome/ForestBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class ForestBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp b/minecraft/minecraft/world/level/biome/HellBiome.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp rename to minecraft/minecraft/world/level/biome/HellBiome.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h b/minecraft/minecraft/world/level/biome/HellBiome.h similarity index 59% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h rename to minecraft/minecraft/world/level/biome/HellBiome.h index 41f152a45..0ba3616bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h +++ b/minecraft/minecraft/world/level/biome/HellBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class HellBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp b/minecraft/minecraft/world/level/biome/IceBiome.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp rename to minecraft/minecraft/world/level/biome/IceBiome.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h b/minecraft/minecraft/world/level/biome/IceBiome.h similarity index 59% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h rename to minecraft/minecraft/world/level/biome/IceBiome.h index 2f5739c2d..1f8f79e10 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h +++ b/minecraft/minecraft/world/level/biome/IceBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class IceBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp b/minecraft/minecraft/world/level/biome/JungleBiome.cpp similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp rename to minecraft/minecraft/world/level/biome/JungleBiome.cpp index 318097df3..026a459a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp +++ b/minecraft/minecraft/world/level/biome/JungleBiome.cpp @@ -3,18 +3,18 @@ #include "JungleBiome.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/GroundBushFeature.h" +#include "minecraft/world/level/levelgen/feature/MegaTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/TallGrassFeature.h" +#include "minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/levelgen/feature/VinesFeature.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h b/minecraft/minecraft/world/level/biome/JungleBiome.h similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h rename to minecraft/minecraft/world/level/biome/JungleBiome.h index eb9ba107f..7266861b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h +++ b/minecraft/minecraft/world/level/biome/JungleBiome.h @@ -1,7 +1,7 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class JungleBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp b/minecraft/minecraft/world/level/biome/MushroomIslandBiome.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp rename to minecraft/minecraft/world/level/biome/MushroomIslandBiome.cpp index d84e85bec..6b671eb30 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp +++ b/minecraft/minecraft/world/level/biome/MushroomIslandBiome.cpp @@ -4,7 +4,7 @@ #include "MushroomIslandBiome.h" #include "BiomeDecorator.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" MushroomIslandBiome::MushroomIslandBiome(int id) : Biome(id) { decorator->treeCount = -100; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h b/minecraft/minecraft/world/level/biome/MushroomIslandBiome.h similarity index 63% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h rename to minecraft/minecraft/world/level/biome/MushroomIslandBiome.h index da94357ed..626a2632b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h +++ b/minecraft/minecraft/world/level/biome/MushroomIslandBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class MushroomIslandBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/OceanBiome.h b/minecraft/minecraft/world/level/biome/OceanBiome.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/OceanBiome.h rename to minecraft/minecraft/world/level/biome/OceanBiome.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp b/minecraft/minecraft/world/level/biome/PlainsBiome.cpp similarity index 54% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp rename to minecraft/minecraft/world/level/biome/PlainsBiome.cpp index 99c14771f..e3805bcd3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp +++ b/minecraft/minecraft/world/level/biome/PlainsBiome.cpp @@ -2,9 +2,9 @@ #include #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/biome/PlainsBiome.h" PlainsBiome::PlainsBiome(int id) : Biome(id) { friendlies.push_back(new MobSpawnerData(eTYPE_HORSE, 5, 2, 6)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h b/minecraft/minecraft/world/level/biome/PlainsBiome.h similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h rename to minecraft/minecraft/world/level/biome/PlainsBiome.h index df670789b..4772929d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h +++ b/minecraft/minecraft/world/level/biome/PlainsBiome.h @@ -1,7 +1,7 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class PlainsBiome : public Biome { friend class Biome; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp b/minecraft/minecraft/world/level/biome/RainforestBiome.cpp similarity index 62% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp rename to minecraft/minecraft/world/level/biome/RainforestBiome.cpp index 6c0567edd..db07e9cee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp +++ b/minecraft/minecraft/world/level/biome/RainforestBiome.cpp @@ -1,7 +1,7 @@ #include "RainforestBiome.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/TreeFeature.h" RainforestBiome::RainforestBiome(int id) : Biome(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h b/minecraft/minecraft/world/level/biome/RainforestBiome.h similarity index 70% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h rename to minecraft/minecraft/world/level/biome/RainforestBiome.h index d6aacae99..f3b12b73c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h +++ b/minecraft/minecraft/world/level/biome/RainforestBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class RainforestBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RiverBiome.h b/minecraft/minecraft/world/level/biome/RiverBiome.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/RiverBiome.h rename to minecraft/minecraft/world/level/biome/RiverBiome.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp b/minecraft/minecraft/world/level/biome/SwampBiome.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp rename to minecraft/minecraft/world/level/biome/SwampBiome.cpp index d937c158d..ec38a4e42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp +++ b/minecraft/minecraft/world/level/biome/SwampBiome.cpp @@ -1,10 +1,10 @@ #include -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/SwampTreeFeature.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/biome/SwampBiome.h" SwampBiome::SwampBiome(int id) : Biome(id) { decorator->treeCount = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h b/minecraft/minecraft/world/level/biome/SwampBiome.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h rename to minecraft/minecraft/world/level/biome/SwampBiome.h index 88b114604..42e28536e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h +++ b/minecraft/minecraft/world/level/biome/SwampBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class LevelSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp b/minecraft/minecraft/world/level/biome/TaigaBiome.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp rename to minecraft/minecraft/world/level/biome/TaigaBiome.cpp index ec00b5b9a..91bcc69f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp +++ b/minecraft/minecraft/world/level/biome/TaigaBiome.cpp @@ -3,9 +3,9 @@ #include "TaigaBiome.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/levelgen/feature/PineFeature.h" +#include "minecraft/world/level/levelgen/feature/SpruceFeature.h" TaigaBiome::TaigaBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h b/minecraft/minecraft/world/level/biome/TaigaBiome.h similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h rename to minecraft/minecraft/world/level/biome/TaigaBiome.h index 4bce01833..58159019f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h +++ b/minecraft/minecraft/world/level/biome/TaigaBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class TaigaBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp b/minecraft/minecraft/world/level/biome/TheEndBiome.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp rename to minecraft/minecraft/world/level/biome/TheEndBiome.cpp index 7b9c8e5f3..11d097b34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp +++ b/minecraft/minecraft/world/level/biome/TheEndBiome.cpp @@ -4,7 +4,7 @@ #include "TheEndBiome.h" #include "TheEndBiomeDecorator.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" TheEndBiome::TheEndBiome(int id) : Biome(id) { enemies.clear(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h b/minecraft/minecraft/world/level/biome/TheEndBiome.h similarity index 73% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h rename to minecraft/minecraft/world/level/biome/TheEndBiome.h index 939999990..a4072294a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h +++ b/minecraft/minecraft/world/level/biome/TheEndBiome.h @@ -1,6 +1,6 @@ #pragma once #include "Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class TheEndBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/minecraft/minecraft/world/level/biome/TheEndBiomeDecorator.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp rename to minecraft/minecraft/world/level/biome/TheEndBiomeDecorator.cpp index 42a96f6c1..18c2c46e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp +++ b/minecraft/minecraft/world/level/biome/TheEndBiomeDecorator.cpp @@ -1,8 +1,8 @@ #include "TheEndBiomeDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.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/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" // Spike centre positions, calculated using // for(int i=0;i<8;i++) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.h b/minecraft/minecraft/world/level/biome/TheEndBiomeDecorator.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.h rename to minecraft/minecraft/world/level/biome/TheEndBiomeDecorator.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp b/minecraft/minecraft/world/level/biome/WaterlilyFeature.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp rename to minecraft/minecraft/world/level/biome/WaterlilyFeature.cpp index cd2247e48..de40d4720 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp +++ b/minecraft/minecraft/world/level/biome/WaterlilyFeature.cpp @@ -1,7 +1,7 @@ #include "WaterlilyFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool WaterlilyFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h b/minecraft/minecraft/world/level/biome/WaterlilyFeature.h similarity index 62% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h rename to minecraft/minecraft/world/level/biome/WaterlilyFeature.h index 48643ed26..3db04ea39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h +++ b/minecraft/minecraft/world/level/biome/WaterlilyFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" class WaterlilyFeature : public Feature { virtual bool place(Level* level, Random* random, int x, int y, int z); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h b/minecraft/minecraft/world/level/biome/net.minecraft.world.level.biome.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h rename to minecraft/minecraft/world/level/biome/net.minecraft.world.level.biome.h index 248c0c2bb..58151eb9b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h +++ b/minecraft/minecraft/world/level/biome/net.minecraft.world.level.biome.h @@ -11,7 +11,7 @@ #include "WaterlilyFeature.h" #include "SwampBiome.h" #include "TaigaBiome.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/LevelSource.h" #include "BiomeSource.h" #include "FixedBiomeSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp b/minecraft/minecraft/world/level/chunk/BlockReplacements.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp rename to minecraft/minecraft/world/level/chunk/BlockReplacements.cpp index ecf4a7ba3..31fd7d1c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp +++ b/minecraft/minecraft/world/level/chunk/BlockReplacements.cpp @@ -1,7 +1,7 @@ #include #include "BlockReplacements.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector BlockReplacements::replacements = std::vector(256); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h b/minecraft/minecraft/world/level/chunk/BlockReplacements.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h rename to minecraft/minecraft/world/level/chunk/BlockReplacements.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h b/minecraft/minecraft/world/level/chunk/ChunkSource.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h rename to minecraft/minecraft/world/level/chunk/ChunkSource.h index 5356cebaf..b09594148 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h +++ b/minecraft/minecraft/world/level/chunk/ChunkSource.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" class ProgressListener; class TilePos; class LevelChunk; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp b/minecraft/minecraft/world/level/chunk/CompressedTileStorage.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp rename to minecraft/minecraft/world/level/chunk/CompressedTileStorage.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h b/minecraft/minecraft/world/level/chunk/CompressedTileStorage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h rename to minecraft/minecraft/world/level/chunk/CompressedTileStorage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp b/minecraft/minecraft/world/level/chunk/DataLayer.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp rename to minecraft/minecraft/world/level/chunk/DataLayer.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h b/minecraft/minecraft/world/level/chunk/DataLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h rename to minecraft/minecraft/world/level/chunk/DataLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp b/minecraft/minecraft/world/level/chunk/EmptyLevelChunk.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp rename to minecraft/minecraft/world/level/chunk/EmptyLevelChunk.cpp index 780832622..bac715976 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp +++ b/minecraft/minecraft/world/level/chunk/EmptyLevelChunk.cpp @@ -1,9 +1,9 @@ #include "java/Arrays.h" #include "EmptyLevelChunk.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/phys/AABB.h" class Entity; class EntitySelector; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h b/minecraft/minecraft/world/level/chunk/EmptyLevelChunk.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h rename to minecraft/minecraft/world/level/chunk/EmptyLevelChunk.h index 435664ca2..24f55157b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h +++ b/minecraft/minecraft/world/level/chunk/EmptyLevelChunk.h @@ -6,7 +6,7 @@ #include "LevelChunk.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/LightLayer.h" class Level; class AABB; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp b/minecraft/minecraft/world/level/chunk/LevelChunk.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp rename to minecraft/minecraft/world/level/chunk/LevelChunk.cpp index de071c1e0..918e6949c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp +++ b/minecraft/minecraft/world/level/chunk/LevelChunk.cpp @@ -12,37 +12,37 @@ #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.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/ItemEntity.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/Mob.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/EntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/chunk/SparseDataStorage.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/EntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h b/minecraft/minecraft/world/level/chunk/LevelChunk.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h rename to minecraft/minecraft/world/level/chunk/LevelChunk.h index ad697ed4f..78314ef73 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h +++ b/minecraft/minecraft/world/level/chunk/LevelChunk.h @@ -11,11 +11,11 @@ #include "SparseLightStorage.h" #include "CompressedTileStorage.h" #include "SparseDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/TilePos.h" class DataLayer; class TileEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp rename to minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp index bbefc2547..ac6a7524e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp +++ b/minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp @@ -1,8 +1,8 @@ #include "ReadOnlyChunkCache.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/EmptyLevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/storage/ChunkStorage.h" ReadOnlyChunkCache::ReadOnlyChunkCache(Level* level, ChunkStorage* storage) { chunks = std::vector(LEN * LEN); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.h similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h rename to minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.h index ac0a51564..91de2820f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h +++ b/minecraft/minecraft/world/level/chunk/ReadOnlyChunkCache.h @@ -6,9 +6,9 @@ #include "ChunkSource.h" #include "LevelChunk.h" #include "EmptyLevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class ChunkStorage; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp b/minecraft/minecraft/world/level/chunk/SparseDataStorage.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp rename to minecraft/minecraft/world/level/chunk/SparseDataStorage.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h b/minecraft/minecraft/world/level/chunk/SparseDataStorage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h rename to minecraft/minecraft/world/level/chunk/SparseDataStorage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp b/minecraft/minecraft/world/level/chunk/SparseLightStorage.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp rename to minecraft/minecraft/world/level/chunk/SparseLightStorage.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h b/minecraft/minecraft/world/level/chunk/SparseLightStorage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h rename to minecraft/minecraft/world/level/chunk/SparseLightStorage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp b/minecraft/minecraft/world/level/chunk/WaterLevelChunk.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp rename to minecraft/minecraft/world/level/chunk/WaterLevelChunk.cpp index 53745ac69..aab0e6790 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp +++ b/minecraft/minecraft/world/level/chunk/WaterLevelChunk.cpp @@ -1,8 +1,8 @@ #include "WaterLevelChunk.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h b/minecraft/minecraft/world/level/chunk/WaterLevelChunk.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h rename to minecraft/minecraft/world/level/chunk/WaterLevelChunk.h index 3e97d316c..e3868972f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h +++ b/minecraft/minecraft/world/level/chunk/WaterLevelChunk.h @@ -6,7 +6,7 @@ #include "LevelChunk.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/LightLayer.h" class Level; class AABB; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h b/minecraft/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h rename to minecraft/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h b/minecraft/minecraft/world/level/chunk/storage/ChunkStorage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h rename to minecraft/minecraft/world/level/chunk/storage/ChunkStorage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/minecraft/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp rename to minecraft/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp index 04a686cbd..bfd4bcf73 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp @@ -3,7 +3,7 @@ #include "java/System.h" #include "ChunkStorageProfileDecorator.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "minecraft/world/level/chunk/storage/ChunkStorage.h" ChunkStorageProfilerDecorator::ChunkStorageProfilerDecorator( ChunkStorage* capsulated) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h b/minecraft/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h rename to minecraft/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp rename to minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 8f48d9d5d..5aed2f7e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -6,14 +6,14 @@ #include #include "console_helpers/ThreadName.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelData.h" #include "McRegionChunkStorage.h" #include "console_helpers/C4JThread.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/compression.h" @@ -24,10 +24,10 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "nbt/CompoundTag.h" #include "nbt/NbtIo.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/chunk/storage/RegionFileCache.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h rename to minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index a5cce185a..f50c667c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/minecraft/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -9,7 +9,7 @@ #include #include "ChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" #include "RegionFileCache.h" #include "nbt/com.mojang.nbt.h" #include "OldChunkStorage.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp b/minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp similarity index 73% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp rename to minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp index 19691f5ea..6fb6cc77a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "MemoryChunkStorage.h" LevelChunk* MemoryChunkStorage::load(Level* level, int x, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h b/minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.h similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h rename to minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.h index 867ef85d8..8eb192027 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h +++ b/minecraft/minecraft/world/level/chunk/storage/MemoryChunkStorage.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class MemoryChunkStorage : public ChunkStorage { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp b/minecraft/minecraft/world/level/chunk/storage/NbtSlotFile.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp rename to minecraft/minecraft/world/level/chunk/storage/NbtSlotFile.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.h b/minecraft/minecraft/world/level/chunk/storage/NbtSlotFile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.h rename to minecraft/minecraft/world/level/chunk/storage/NbtSlotFile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp rename to minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index a0a80c383..026caa47d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -9,7 +9,7 @@ #include "java/File.h" #include "OldChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/Definitions.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" @@ -20,14 +20,14 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/NbtIo.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/TickNextTickData.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TickNextTickData.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h b/minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h rename to minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.h index 18b4da9d7..2e77d8f8a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h +++ b/minecraft/minecraft/world/level/chunk/storage/OldChunkStorage.h @@ -3,7 +3,7 @@ #include #include "ChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" #include "java/File.h" #include "nbt/CompoundTag.h" #include "nbt/com.mojang.nbt.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/minecraft/world/level/chunk/storage/RegionFile.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp rename to minecraft/minecraft/world/level/chunk/storage/RegionFile.cpp index 25ae635e9..a373b45f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -6,8 +6,8 @@ #include "java/System.h" #include "java/File.h" #include "RegionFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h b/minecraft/minecraft/world/level/chunk/storage/RegionFile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h rename to minecraft/minecraft/world/level/chunk/storage/RegionFile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/minecraft/minecraft/world/level/chunk/storage/RegionFileCache.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp rename to minecraft/minecraft/world/level/chunk/storage/RegionFileCache.cpp index d93df099b..420a2228b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -2,9 +2,9 @@ #include "java/File.h" #include "RegionFileCache.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" +#include "minecraft/world/level/chunk/storage/RegionFile.h" class DataInputStream; class DataOutputStream; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h b/minecraft/minecraft/world/level/chunk/storage/RegionFileCache.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h rename to minecraft/minecraft/world/level/chunk/storage/RegionFileCache.h index eab2a6670..249b8b950 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h +++ b/minecraft/minecraft/world/level/chunk/storage/RegionFileCache.h @@ -5,7 +5,7 @@ #include "RegionFile.h" #include "java/Reference.h" #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" class ConsoleSaveFile; class DataInputStream; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp b/minecraft/minecraft/world/level/chunk/storage/ZoneFile.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp rename to minecraft/minecraft/world/level/chunk/storage/ZoneFile.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.h b/minecraft/minecraft/world/level/chunk/storage/ZoneFile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.h rename to minecraft/minecraft/world/level/chunk/storage/ZoneFile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp b/minecraft/minecraft/world/level/chunk/storage/ZoneIo.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp rename to minecraft/minecraft/world/level/chunk/storage/ZoneIo.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.h b/minecraft/minecraft/world/level/chunk/storage/ZoneIo.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.h rename to minecraft/minecraft/world/level/chunk/storage/ZoneIo.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp rename to minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp index 13ad92e4e..dc9122beb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp +++ b/minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp @@ -1,10 +1,10 @@ #include #include "java/File.h" #include "java/ByteBuffer.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "ZonedChunkStorage.h" #include "ZoneFile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h b/minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h rename to minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.h index dc09a00b4..82d51a98a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h +++ b/minecraft/minecraft/world/level/chunk/storage/ZonedChunkStorage.h @@ -1,7 +1,7 @@ #pragma once #include "java/File.h" #include "ChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/chunk/LevelChunk.h" // 4J Stu - There are changes to this class for 1.8.2, but since we never use it // anyway lets not worry about it diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h b/minecraft/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h rename to minecraft/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp b/minecraft/minecraft/world/level/dimension/Dimension.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp rename to minecraft/minecraft/world/level/dimension/Dimension.cpp index 346471f69..3e6b9ea1d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp +++ b/minecraft/minecraft/world/level/dimension/Dimension.cpp @@ -2,9 +2,9 @@ #include #include "Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/biome/FixedBiomeSource.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "HellDimension.h" #include "NormalDimension.h" #include "TheEndDimension.h" @@ -13,15 +13,15 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/CustomLevelSource.h" +#include "minecraft/world/level/levelgen/FlatLevelSource.h" +#include "minecraft/world/level/levelgen/RandomLevelSource.h" +#include "minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/Tile.h" #include "platform/PlatformServices.h" class Pos; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h b/minecraft/minecraft/world/level/dimension/Dimension.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h rename to minecraft/minecraft/world/level/dimension/Dimension.h index ac3739951..249d1801f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h +++ b/minecraft/minecraft/world/level/dimension/Dimension.h @@ -2,11 +2,11 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/Pos.h" #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class BiomeSource; class ChunkSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp b/minecraft/minecraft/world/level/dimension/HellDimension.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp rename to minecraft/minecraft/world/level/dimension/HellDimension.cpp index 29ca1ae87..50c2e0c05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp +++ b/minecraft/minecraft/world/level/dimension/HellDimension.cpp @@ -6,14 +6,14 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/FixedBiomeSource.h" +#include "minecraft/world/level/levelgen/HellFlatLevelSource.h" +#include "minecraft/world/level/levelgen/HellRandomLevelSource.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/phys/Vec3.h" #include "platform/PlatformServices.h" void HellDimension::init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h b/minecraft/minecraft/world/level/dimension/HellDimension.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h rename to minecraft/minecraft/world/level/dimension/HellDimension.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/NormalDimension.h b/minecraft/minecraft/world/level/dimension/NormalDimension.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/NormalDimension.h rename to minecraft/minecraft/world/level/dimension/NormalDimension.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp b/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp rename to minecraft/minecraft/world/level/dimension/TheEndDimension.cpp index ac03c6f99..3f132ae9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/minecraft/minecraft/world/level/dimension/TheEndDimension.cpp @@ -2,17 +2,17 @@ #include #include "TheEndDimension.h" -#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" +#include "minecraft/world/level/biome/FixedBiomeSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Pos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/Vec3.h" void TheEndDimension::init() { biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h b/minecraft/minecraft/world/level/dimension/TheEndDimension.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h rename to minecraft/minecraft/world/level/dimension/TheEndDimension.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h b/minecraft/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h rename to minecraft/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp b/minecraft/minecraft/world/level/levelgen/CanyonFeature.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp rename to minecraft/minecraft/world/level/levelgen/CanyonFeature.cpp index af5b5e039..4de148dda 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/CanyonFeature.cpp @@ -5,10 +5,10 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/tile/Tile.h" void CanyonFeature::addTunnel(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xCave, double yCave, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h b/minecraft/minecraft/world/level/levelgen/CanyonFeature.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h rename to minecraft/minecraft/world/level/levelgen/CanyonFeature.h index bedb5ee9a..6d4457466 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h +++ b/minecraft/minecraft/world/level/levelgen/CanyonFeature.h @@ -3,7 +3,7 @@ #include #include "LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/CustomLevelSource.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/CustomLevelSource.cpp index 8a2e8f7a4..8e8bd707b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -10,23 +10,23 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #endif #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/MobSpawner.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/CanyonFeature.h" +#include "minecraft/world/level/levelgen/LargeCaveFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" +#include "minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h b/minecraft/minecraft/world/level/levelgen/CustomLevelSource.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h rename to minecraft/minecraft/world/level/levelgen/CustomLevelSource.h index 281d2d08f..eb7a364a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/CustomLevelSource.h @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class Level; class PerlinNoise; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp b/minecraft/minecraft/world/level/levelgen/DungeonFeature.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp rename to minecraft/minecraft/world/level/levelgen/DungeonFeature.cpp index 2e2736e68..44c8fbf67 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/DungeonFeature.cpp @@ -3,9 +3,9 @@ #include "DungeonFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" void DungeonFeature::addRoom(int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, double zRoom) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h b/minecraft/minecraft/world/level/levelgen/DungeonFeature.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h rename to minecraft/minecraft/world/level/levelgen/DungeonFeature.h index eb5440575..076a066d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h +++ b/minecraft/minecraft/world/level/levelgen/DungeonFeature.h @@ -3,7 +3,7 @@ #include #include "LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/FlatLevelSource.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/FlatLevelSource.cpp index 90d88d153..0c11228e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -4,11 +4,11 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h b/minecraft/minecraft/world/level/levelgen/FlatLevelSource.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h rename to minecraft/minecraft/world/level/levelgen/FlatLevelSource.h index 3ebdaec56..3bf0afe34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/FlatLevelSource.h @@ -4,9 +4,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class LargeFeature; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index d5ca11436..798a66fb4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -5,13 +5,13 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h b/minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.h similarity index 64% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h rename to minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.h index 89a31b5ef..1781ad9db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/HellFlatLevelSource.h @@ -3,18 +3,18 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "LargeFeature.h" #include "LargeHellCaveFeature.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index d61378c44..049b2be47 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -6,22 +6,22 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeHellCaveFeature.h" +#include "minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "minecraft/world/level/levelgen/feature/OreFeature.h" +#include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h b/minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.h similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h rename to minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.h index d71180291..e86eca29f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/HellRandomLevelSource.h @@ -4,19 +4,19 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "LargeFeature.h" #include "LargeHellCaveFeature.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class LargeFeature; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp b/minecraft/minecraft/world/level/levelgen/LargeCaveFeature.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp rename to minecraft/minecraft/world/level/levelgen/LargeCaveFeature.cpp index 2cea3bdff..4f79670f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/LargeCaveFeature.cpp @@ -3,10 +3,10 @@ #include "LargeCaveFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/tile/Tile.h" void LargeCaveFeature::addRoom(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h b/minecraft/minecraft/world/level/levelgen/LargeCaveFeature.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h rename to minecraft/minecraft/world/level/levelgen/LargeCaveFeature.h index 4373aea7c..47d48aba9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h +++ b/minecraft/minecraft/world/level/levelgen/LargeCaveFeature.h @@ -4,7 +4,7 @@ #include #include "LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" class LargeCaveFeature : public LargeFeature { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp b/minecraft/minecraft/world/level/levelgen/LargeFeature.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/LargeFeature.cpp index 77a45b6d2..35b025526 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/LargeFeature.cpp @@ -5,8 +5,8 @@ #include "LargeFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" class ChunkSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h b/minecraft/minecraft/world/level/levelgen/LargeFeature.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h rename to minecraft/minecraft/world/level/levelgen/LargeFeature.h index 8af3cfa0e..d90e58d34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h +++ b/minecraft/minecraft/world/level/levelgen/LargeFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp b/minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp rename to minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp index 8b6874932..c349c3377 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp @@ -3,9 +3,9 @@ #include "LargeHellCaveFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" void LargeHellCaveFeature::addRoom(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h b/minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h rename to minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.h index 6f3822103..91e272b2e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h +++ b/minecraft/minecraft/world/level/levelgen/LargeHellCaveFeature.h @@ -4,7 +4,7 @@ #include #include "LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" class LargeHellCaveFeature : public LargeFeature { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/RandomLevelSource.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/RandomLevelSource.cpp index 60290d9ed..dcf5483cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -4,26 +4,26 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/PlatformTime.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/MobCategory.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/MobSpawner.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/CanyonFeature.h" +#include "minecraft/world/level/levelgen/LargeCaveFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/feature/LakeFeature.h" +#include "minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" +#include "minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/Vec3.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h b/minecraft/minecraft/world/level/levelgen/RandomLevelSource.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h rename to minecraft/minecraft/world/level/levelgen/RandomLevelSource.h index 45ed61b92..fb358ac15 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/RandomLevelSource.h @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class LargeFeature; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp rename to minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index fe9f6a097..8826f7e8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -4,12 +4,12 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h b/minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h rename to minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h index 39a22ec93..770eda279 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h +++ b/minecraft/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" class PerlinNoise; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TownFeature.h b/minecraft/minecraft/world/level/levelgen/TownFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TownFeature.h rename to minecraft/minecraft/world/level/levelgen/TownFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index 8c9c4d0c0..f0be6d7e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -6,11 +6,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/BasicTreeFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/BasicTreeFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/BirchFeature.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/BirchFeature.cpp index e5dc0bd59..bcb213534 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -4,11 +4,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" BirchFeature::BirchFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.h b/minecraft/minecraft/world/level/levelgen/feature/BirchFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/BirchFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp index c868749c8..a02032429 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp @@ -1,11 +1,11 @@ #include #include "BonusChestFeature.h" -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" BonusChestFeature::BonusChestFeature(std::vector& treasureList, int numRolls) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h b/minecraft/minecraft/world/level/levelgen/feature/BonusChestFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/BonusChestFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/CactusFeature.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/CactusFeature.cpp index 3a74f0f2a..d7798ed6f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/CactusFeature.cpp @@ -1,7 +1,7 @@ #include "CactusFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool CactusFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 10; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.h b/minecraft/minecraft/world/level/levelgen/feature/CactusFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/CactusFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/CaveFeature.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/CaveFeature.cpp index 17e74257b..e29f29603 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -6,11 +6,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" bool CaveFeature::place(Level* level, Random* random, int x, int y, int z) { float dir = random->nextFloat() * std::numbers::pi; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h b/minecraft/minecraft/world/level/levelgen/feature/CaveFeature.h similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/CaveFeature.h index 1dbd78923..d3a51e62d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/CaveFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/ClayFeature.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/ClayFeature.cpp index b8f52b5fe..764b1cf81 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/ClayFeature.cpp @@ -1,8 +1,8 @@ #include "ClayFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" ClayFeature::ClayFeature(int radius) { this->tile = Tile::clay_Id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h b/minecraft/minecraft/world/level/levelgen/feature/ClayFeature.h similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/ClayFeature.h index 230e3c6b5..72ca856be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/ClayFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp index 2c3d427d8..9d53e9f0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp @@ -1,7 +1,7 @@ #include "DeadBushFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" DeadBushFeature::DeadBushFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.h b/minecraft/minecraft/world/level/levelgen/feature/DeadBushFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/DeadBushFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp index 158acfbe0..c8cc26a8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp @@ -1,7 +1,7 @@ #include "DesertWellFeature.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" bool DesertWellFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.h b/minecraft/minecraft/world/level/levelgen/feature/DesertWellFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/DesertWellFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp index 68d67f04b..9df45b88c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp @@ -1,8 +1,8 @@ #include -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "EndPodiumFeature.h" EndPodiumFeature::EndPodiumFeature(int tile) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.h b/minecraft/minecraft/world/level/levelgen/feature/EndPodiumFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/EndPodiumFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp b/minecraft/minecraft/world/level/levelgen/feature/Feature.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/Feature.cpp index 1dd0cdd70..fc347eacb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/Feature.cpp @@ -1,6 +1,6 @@ #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h b/minecraft/minecraft/world/level/levelgen/feature/Feature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h rename to minecraft/minecraft/world/level/levelgen/feature/Feature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/FlowerFeature.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index 1641d1268..034ec4850 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -2,9 +2,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/Tile.h" FlowerFeature::FlowerFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h b/minecraft/minecraft/world/level/levelgen/feature/FlowerFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/FlowerFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp index 411154411..6f04bd26e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp @@ -2,8 +2,8 @@ #include "GroundBushFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.h b/minecraft/minecraft/world/level/levelgen/feature/GroundBushFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/GroundBushFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/HellFireFeature.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/HellFireFeature.cpp index 1b04eef99..897376ee7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/HellFireFeature.cpp @@ -1,7 +1,7 @@ #include "HellFireFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool HellFireFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 64; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h b/minecraft/minecraft/world/level/levelgen/feature/HellFireFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/HellFireFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp index 5629db618..407bdf3c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp @@ -1,7 +1,7 @@ #include "HellPortalFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool HellPortalFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h b/minecraft/minecraft/world/level/levelgen/feature/HellPortalFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/HellPortalFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp index f1ac14ee7..92820816f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp @@ -1,6 +1,6 @@ #include "HellSpringFeature.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" HellSpringFeature::HellSpringFeature(int tile, bool insideRock) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h b/minecraft/minecraft/world/level/levelgen/feature/HellSpringFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/HellSpringFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/HouseFeature.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/HouseFeature.cpp index 1b6c41837..5aa3c273b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/HouseFeature.cpp @@ -2,11 +2,11 @@ #include "HouseFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h" -#include "Minecraft.World/net/minecraft/world/item/DoorItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/monster/PigZombie.h" +#include "minecraft/world/item/DoorItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" bool HouseFeature::place(Level* level, Random* random, int x, int y, int z) { while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion()) y--; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h b/minecraft/minecraft/world/level/levelgen/feature/HouseFeature.h similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/HouseFeature.h index b491ff057..2fa1427ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/HouseFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class HouseFeature : public Feature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp index 0be72a93f..eda6fe8ab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp @@ -1,8 +1,8 @@ #include "HugeMushroomFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/Tile.h" HugeMushroomFeature::HugeMushroomFeature(int forcedType) : Feature(true) { this->forcedType = forcedType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h b/minecraft/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/LakeFeature.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/LakeFeature.cpp index bf81d66e1..1de1c377c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -2,11 +2,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" LakeFeature::LakeFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/LakeFeature.h similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/LakeFeature.h index 70c8d7b73..bd6f3231b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/LakeFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class LakeFeature : public Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/LightGemFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/LightGemFeature.cpp index 60e1cb60f..5a7b380f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/LightGemFeature.cpp @@ -1,7 +1,7 @@ #include "LightGemFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool LightGemFeature::place(Level* level, Random* random, int x, int y, int z) { if (!level->isEmptyTile(x, y, z)) return false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h b/minecraft/minecraft/world/level/levelgen/feature/LightGemFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/LightGemFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index af0bb339b..6f7c23621 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -4,11 +4,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/VineTile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/MegaTreeFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/MegaTreeFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp index d8bb45af4..8a0ab8b81 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp @@ -1,17 +1,17 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "MonsterRoomFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" WeighedTreasure* MonsterRoomFeature::monsterRoomTreasure [MonsterRoomFeature::TREASURE_ITEMS_COUNT] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h b/minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h index d008dec0e..7627e8eba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h @@ -2,7 +2,7 @@ #include #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class WeighedTreasure; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h b/minecraft/minecraft/world/level/levelgen/feature/NetherSphereFeature.h similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/NetherSphereFeature.h index c052c48b1..65b709257 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/NetherSphereFeature.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/OreFeature.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/OreFeature.cpp index 7855688df..fa5e3d1a5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -4,9 +4,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h b/minecraft/minecraft/world/level/levelgen/feature/OreFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/OreFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/PineFeature.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/PineFeature.cpp index 126d241f0..28c8ad13b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -4,10 +4,10 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" bool PineFeature::place(Level* level, Random* random, int x, int y, int z) { // pines can be quite tall diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.h b/minecraft/minecraft/world/level/levelgen/feature/PineFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/PineFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp index a40930d00..221791a12 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp @@ -1,7 +1,7 @@ #include "PumpkinFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" bool PumpkinFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 64; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.h b/minecraft/minecraft/world/level/levelgen/feature/PumpkinFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/PumpkinFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index 7bd6cc843..65581e22a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -2,9 +2,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" bool ReedsFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 20; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h b/minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.h similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.h index 8cbe45545..b9342a4ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h +++ b/minecraft/minecraft/world/level/levelgen/feature/ReedsFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class ReedsFeature : public Feature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/SandFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/SandFeature.cpp index af8556e4d..b2eb9c3a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -2,9 +2,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" SandFeature::SandFeature(int radius, int tile) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h b/minecraft/minecraft/world/level/levelgen/feature/SandFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/SandFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/SpikeFeature.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index 6cc8abd4a..3b082cf40 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "SpikeFeature.h" SpikeFeature::SpikeFeature(int tile) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/SpikeFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/SpikeFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/SpringFeature.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/SpringFeature.cpp index dda7c5b09..64d1faa97 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,8 +1,8 @@ #include "SpringFeature.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" SpringFeature::SpringFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h b/minecraft/minecraft/world/level/levelgen/feature/SpringFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/SpringFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/SpruceFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 8c019f5fc..42beea5d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -4,11 +4,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" SpruceFeature::SpruceFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.h b/minecraft/minecraft/world/level/levelgen/feature/SpruceFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/SpruceFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index f776757bc..bae680e4a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -4,10 +4,10 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/VineTile.h" bool SwampTreeFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/SwampTreeFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/SwampTreeFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp index c25d13b12..5599abe74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp @@ -1,7 +1,7 @@ #include "TallGrassFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" TallGrassFeature::TallGrassFeature(int tile, int type) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h b/minecraft/minecraft/world/level/levelgen/feature/TallGrassFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/TallGrassFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/TreeFeature.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/TreeFeature.cpp index eacb931c5..3c9a15f63 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -4,11 +4,11 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "minecraft/Direction.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/VineTile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h b/minecraft/minecraft/world/level/levelgen/feature/TreeFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/TreeFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp b/minecraft/minecraft/world/level/levelgen/feature/VinesFeature.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp rename to minecraft/minecraft/world/level/levelgen/feature/VinesFeature.cpp index 6b0d52b87..532f5dfdd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/feature/VinesFeature.cpp @@ -1,9 +1,9 @@ #include "VinesFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" VinesFeature::VinesFeature() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.h b/minecraft/minecraft/world/level/levelgen/feature/VinesFeature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.h rename to minecraft/minecraft/world/level/levelgen/feature/VinesFeature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h b/minecraft/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h rename to minecraft/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/minecraft/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp rename to minecraft/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp index 75a719ed8..e0d8ef242 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp +++ b/minecraft/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp @@ -1,8 +1,8 @@ #include "FlatGeneratorInfo.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/flat/FlatLayerInfo.h" +#include "minecraft/world/level/tile/Tile.h" const std::wstring FlatGeneratorInfo::STRUCTURE_VILLAGE = L"village"; const std::wstring FlatGeneratorInfo::STRUCTURE_BIOME_SPECIFIC = L"biome_1"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h b/minecraft/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h rename to minecraft/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/minecraft/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp rename to minecraft/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h b/minecraft/minecraft/world/level/levelgen/flat/FlatLayerInfo.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h rename to minecraft/minecraft/world/level/levelgen/flat/FlatLayerInfo.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h b/minecraft/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h rename to minecraft/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h b/minecraft/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h rename to minecraft/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp b/minecraft/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp rename to minecraft/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp index a8919505c..79c4696fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp @@ -1,9 +1,9 @@ #include #include "BlockGenMethods.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/Direction.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" void BlockGenMethods::generateBox(Level* level, std::vector& blocks, int sx, int sy, int sz, int ex, int ey, int ez, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h b/minecraft/minecraft/world/level/levelgen/structure/BlockGenMethods.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h rename to minecraft/minecraft/world/level/levelgen/structure/BlockGenMethods.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/minecraft/minecraft/world/level/levelgen/structure/BoundingBox.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp rename to minecraft/minecraft/world/level/levelgen/structure/BoundingBox.cpp index 3c100a944..271704158 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -4,11 +4,11 @@ #include #include "BoundingBox.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/Direction.h" #include "java/JavaMath.h" #include "console_helpers/StringHelpers.h" #include "nbt/IntArrayTag.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" BoundingBox::BoundingBox() { // 4J added initialisers diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h b/minecraft/minecraft/world/level/levelgen/structure/BoundingBox.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h rename to minecraft/minecraft/world/level/levelgen/structure/BoundingBox.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index f8d7945ac..ab1488823 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -9,9 +9,9 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "minecraft/world/level/levelgen/structure/MineShaftStart.h" const std::wstring MineShaftFeature::OPTION_CHANCE = L"chance"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h b/minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.h similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.h index 6a1f73402..6c0eb1d76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftFeature.h @@ -4,7 +4,7 @@ #include #include "StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" class MineShaftFeature : public StructureFeature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index 69351e0fc..94e9cc336 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -4,25 +4,25 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "MineShaftPieces.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/IntArrayTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/Direction.h" +#include "minecraft/world/entity/item/MinecartChest.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/RailTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" std::vector MineShaftPieces::smallTreasureItems; ; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h b/minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.h index a607d1f35..e462c0199 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftPieces.h @@ -4,8 +4,8 @@ #include #include "StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "nbt/CompoundTag.h" class BoundingBox; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp b/minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.cpp similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.cpp index 4947aa4fe..a5429fbeb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "minecraft/world/level/levelgen/structure/MineShaftStart.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" class Level; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h b/minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.h similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h rename to minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.h index 1a2907535..f6ef445d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h +++ b/minecraft/minecraft/world/level/levelgen/structure/MineShaftStart.h @@ -1,7 +1,7 @@ #pragma once #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index d06140c05..e59e4ea0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -7,11 +7,11 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" NetherBridgeFeature::NetherBridgeFeature() : StructureFeature() { bridgeEnemies.push_back(new Biome::MobSpawnerData(eTYPE_BLAZE, 10, 2, 3)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h index 0169eadf9..abbfe2b13 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h @@ -5,10 +5,10 @@ #include "StructureFeature.h" #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Random; class ChunkPos; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp rename to minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp index 45e8d16f3..a4a45a74e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp @@ -3,18 +3,18 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "NetherBridgePieces.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/Direction.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" void NetherBridgePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_BridgeCrossing, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h rename to minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.h index fd71b507d..e9e96fd80 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h +++ b/minecraft/minecraft/world/level/levelgen/structure/NetherBridgePieces.h @@ -3,8 +3,8 @@ #include #include "StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" class BoundingBox; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 3f3d378c2..9c7346e90 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -7,11 +7,11 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring RandomScatteredLargeFeature::OPTION_SPACING = L"distance"; std::vector RandomScatteredLargeFeature::allowedBiomes; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h b/minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h index d9469279d..27c87ac06 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h @@ -7,9 +7,9 @@ #include "StructureFeature.h" #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp rename to minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index cd7e9b1b6..88f0d5693 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -3,32 +3,32 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "ScatteredFeaturePieces.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/Witch.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LeverTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/monster/Witch.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/tile/FlowerPotTile.h" +#include "minecraft/world/level/tile/LeverTile.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "minecraft/world/level/tile/StairTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/TripWireSourceTile.h" +#include "minecraft/world/level/tile/TripWireTile.h" void ScatteredFeaturePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_DesertPyramidPiece, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h b/minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h rename to minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h index 4b5bca9e0..3ee20f12b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h +++ b/minecraft/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h @@ -1,8 +1,8 @@ #pragma once #include "StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" class BoundingBox; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp b/minecraft/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp rename to minecraft/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp index 04a93b579..fd63809f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp @@ -1,8 +1,8 @@ #include "SkyIslandDimension.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h" void SkyIslandDimension::init() { biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index 88dee681e..bc1534a24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -13,16 +13,16 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring StrongholdFeature::OPTION_DISTANCE = L"distance"; const std::wstring StrongholdFeature::OPTION_COUNT = L"count"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h b/minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.h index daada0f79..03c77334c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StrongholdFeature.h @@ -6,9 +6,9 @@ #include "StructureFeature.h" #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Biome; class ChunkPos; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 20d7b54e3..8a1c2a8a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -4,29 +4,29 @@ #include #include "StrongholdPieces.h" -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/util/WeighedTreasure.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" -#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/Direction.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "minecraft/world/level/tile/StoneMonsterTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" int StrongholdPieces::totalWeight = 0; std::list StrongholdPieces::currentPieces; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h b/minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h rename to minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.h index 2715baaf9..c656ee464 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StrongholdPieces.h @@ -3,8 +3,8 @@ #include #include "StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" class BoundingBox; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/StructureFeature.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeature.cpp index e3e9902cf..fcd9f005c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureFeature.cpp @@ -7,16 +7,16 @@ #include #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" StructureFeature::StructureFeature() { #ifdef ENABLE_STRUCTURE_SAVING diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h b/minecraft/minecraft/world/level/levelgen/structure/StructureFeature.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeature.h index 8e6245163..11ba11225 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" #include "StructureFeatureSavedData.h" class StructureStart; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index cc44e25c9..b774100a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -5,19 +5,19 @@ #include "StructureFeatureIO.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h" +#include "minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "minecraft/world/level/levelgen/structure/MineShaftStart.h" +#include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "minecraft/world/level/levelgen/structure/NetherBridgePieces.h" +#include "minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h" +#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "minecraft/world/level/levelgen/structure/StrongholdPieces.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "minecraft/world/level/levelgen/structure/VillagePieces.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureIO.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeatureIO.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp index 43a35bd59..5a0179a6b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp @@ -3,8 +3,8 @@ #include "StructureFeatureSavedData.h" #include "console_helpers/StringHelpers.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" std::wstring StructureFeatureSavedData::TAG_FEATURES = L"Features"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h rename to minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h index cf645fa0b..06d451f34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" class StructureFeatureSavedData : public SavedData { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/minecraft/minecraft/world/level/levelgen/structure/StructurePiece.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StructurePiece.cpp index 83196ec77..09faf08c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StructurePiece.cpp @@ -3,28 +3,28 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/util/WeighedTreasure.h" +#include "minecraft/Direction.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/item/DoorItem.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/Facing.h" +#include "minecraft/world/item/DoorItem.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/IntArrayTag.h" -#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" /** * diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h b/minecraft/minecraft/world/level/levelgen/structure/StructurePiece.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h rename to minecraft/minecraft/world/level/levelgen/structure/StructurePiece.h index e04f613b9..2d6a2ec52 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StructurePiece.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "minecraft/util/WeighedRandom.h" #include "BoundingBox.h" #include "StructureFeatureIO.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp b/minecraft/minecraft/world/level/levelgen/structure/StructureStart.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp rename to minecraft/minecraft/world/level/levelgen/structure/StructureStart.cpp index 60b670338..a8ad9e5f8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureStart.cpp @@ -5,9 +5,9 @@ #include "nbt/CompoundTag.h" #include "nbt/IntArrayTag.h" #include "nbt/ListTag.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" StructureStart::StructureStart() { chunkX = chunkZ = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h b/minecraft/minecraft/world/level/levelgen/structure/StructureStart.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h rename to minecraft/minecraft/world/level/levelgen/structure/StructureStart.h index dbf002908..80c02a524 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h +++ b/minecraft/minecraft/world/level/levelgen/structure/StructureStart.h @@ -2,7 +2,7 @@ #include #include "StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class StructurePiece; class BoundingBox; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/minecraft/minecraft/world/level/levelgen/structure/VillageFeature.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp rename to minecraft/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 921476f3a..3b1ab0399 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -9,14 +9,14 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring VillageFeature::OPTION_SIZE_MODIFIER = L"size"; const std::wstring VillageFeature::OPTION_SPACING = L"distance"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h b/minecraft/minecraft/world/level/levelgen/structure/VillageFeature.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h rename to minecraft/minecraft/world/level/levelgen/structure/VillageFeature.h index fb99efaf4..69649044e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h +++ b/minecraft/minecraft/world/level/levelgen/structure/VillageFeature.h @@ -5,8 +5,8 @@ #include "StructureFeature.h" #include "StructureStart.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Biome; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/minecraft/minecraft/world/level/levelgen/structure/VillagePieces.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp rename to minecraft/minecraft/world/level/levelgen/structure/VillagePieces.cpp index ad0906eb2..649e4173a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp +++ b/minecraft/minecraft/world/level/levelgen/structure/VillagePieces.cpp @@ -2,24 +2,24 @@ #include #include -#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "minecraft/util/WeighedTreasure.h" #include "VillagePieces.h" #include "VillageFeature.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/Direction.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/biome/BiomeSource.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/Tile.h" std::vector VillagePieces::Smithy::treasureItems; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h b/minecraft/minecraft/world/level/levelgen/structure/VillagePieces.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h rename to minecraft/minecraft/world/level/levelgen/structure/VillagePieces.h index a2e7ac883..9db125a56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h +++ b/minecraft/minecraft/world/level/levelgen/structure/VillagePieces.h @@ -4,8 +4,8 @@ #include #include "StructurePiece.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" class BiomeSource; class BoundingBox; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h b/minecraft/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h rename to minecraft/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp b/minecraft/minecraft/world/level/levelgen/synth/Distort.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp rename to minecraft/minecraft/world/level/levelgen/synth/Distort.cpp index 75fa3ddd7..f3ae2392f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/Distort.cpp @@ -1,5 +1,5 @@ #include "Distort.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" +#include "minecraft/world/level/levelgen/synth/Synth.h" Distort::Distort(Synth* source, Synth* distort) { this->source = source; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.h b/minecraft/minecraft/world/level/levelgen/synth/Distort.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.h rename to minecraft/minecraft/world/level/levelgen/synth/Distort.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp b/minecraft/minecraft/world/level/levelgen/synth/Emboss.cpp similarity index 71% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp rename to minecraft/minecraft/world/level/levelgen/synth/Emboss.cpp index de4153011..2a8b375cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/Emboss.cpp @@ -1,5 +1,5 @@ #include "Emboss.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" +#include "minecraft/world/level/levelgen/synth/Synth.h" Emboss::Emboss(Synth* synth) { this->synth = synth; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.h b/minecraft/minecraft/world/level/levelgen/synth/Emboss.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.h rename to minecraft/minecraft/world/level/levelgen/synth/Emboss.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp b/minecraft/minecraft/world/level/levelgen/synth/FastNoise.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp rename to minecraft/minecraft/world/level/levelgen/synth/FastNoise.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h b/minecraft/minecraft/world/level/levelgen/synth/FastNoise.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h rename to minecraft/minecraft/world/level/levelgen/synth/FastNoise.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp b/minecraft/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp rename to minecraft/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h b/minecraft/minecraft/world/level/levelgen/synth/ImprovedNoise.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h rename to minecraft/minecraft/world/level/levelgen/synth/ImprovedNoise.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp b/minecraft/minecraft/world/level/levelgen/synth/PerlinNoise.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp rename to minecraft/minecraft/world/level/levelgen/synth/PerlinNoise.cpp index d946c5687..cdc446a26 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/PerlinNoise.cpp @@ -2,8 +2,8 @@ #include "PerlinNoise.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/levelgen/synth/ImprovedNoise.h" PerlinNoise::PerlinNoise(int levels) { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h b/minecraft/minecraft/world/level/levelgen/synth/PerlinNoise.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h rename to minecraft/minecraft/world/level/levelgen/synth/PerlinNoise.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp b/minecraft/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp rename to minecraft/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp index e12f7d2ff..250d472d5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp @@ -1,6 +1,6 @@ #include "PerlinSimplexNoise.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h" +#include "minecraft/world/level/levelgen/synth/SimplexNoise.h" PerlinSimplexNoise::PerlinSimplexNoise(int levels) { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h b/minecraft/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h rename to minecraft/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp b/minecraft/minecraft/world/level/levelgen/synth/Rotate.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp rename to minecraft/minecraft/world/level/levelgen/synth/Rotate.cpp index 8cb869c7d..57f576828 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/Rotate.cpp @@ -1,7 +1,7 @@ #include #include "Rotate.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" +#include "minecraft/world/level/levelgen/synth/Synth.h" Rotate::Rotate(Synth* synth, float angle) { this->synth = synth; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.h b/minecraft/minecraft/world/level/levelgen/synth/Rotate.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.h rename to minecraft/minecraft/world/level/levelgen/synth/Rotate.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp b/minecraft/minecraft/world/level/levelgen/synth/Scale.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp rename to minecraft/minecraft/world/level/levelgen/synth/Scale.cpp index d23006794..a69fcb47d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp +++ b/minecraft/minecraft/world/level/levelgen/synth/Scale.cpp @@ -1,5 +1,5 @@ #include "Scale.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" +#include "minecraft/world/level/levelgen/synth/Synth.h" Scale::Scale(Synth* synth, double xScale, double yScale) { this->synth = synth; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.h b/minecraft/minecraft/world/level/levelgen/synth/Scale.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.h rename to minecraft/minecraft/world/level/levelgen/synth/Scale.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp b/minecraft/minecraft/world/level/levelgen/synth/SimplexNoise.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp rename to minecraft/minecraft/world/level/levelgen/synth/SimplexNoise.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h b/minecraft/minecraft/world/level/levelgen/synth/SimplexNoise.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h rename to minecraft/minecraft/world/level/levelgen/synth/SimplexNoise.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp b/minecraft/minecraft/world/level/levelgen/synth/Synth.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp rename to minecraft/minecraft/world/level/levelgen/synth/Synth.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h b/minecraft/minecraft/world/level/levelgen/synth/Synth.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h rename to minecraft/minecraft/world/level/levelgen/synth/Synth.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h b/minecraft/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h rename to minecraft/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/DecorationMaterial.h b/minecraft/minecraft/world/level/material/DecorationMaterial.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/DecorationMaterial.h rename to minecraft/minecraft/world/level/material/DecorationMaterial.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/GasMaterial.h b/minecraft/minecraft/world/level/material/GasMaterial.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/GasMaterial.h rename to minecraft/minecraft/world/level/material/GasMaterial.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/LiquidMaterial.h b/minecraft/minecraft/world/level/material/LiquidMaterial.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/LiquidMaterial.h rename to minecraft/minecraft/world/level/material/LiquidMaterial.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp b/minecraft/minecraft/world/level/material/Material.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp rename to minecraft/minecraft/world/level/material/Material.cpp index a8a928339..622bbdc25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp +++ b/minecraft/minecraft/world/level/material/Material.cpp @@ -4,7 +4,7 @@ #include "LiquidMaterial.h" #include "PortalMaterial.h" #include "WebMaterial.h" // 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing -#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" +#include "minecraft/world/level/material/MaterialColor.h" Material* Material::air = nullptr; Material* Material::grass = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h b/minecraft/minecraft/world/level/material/Material.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h rename to minecraft/minecraft/world/level/material/Material.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp b/minecraft/minecraft/world/level/material/MaterialColor.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp rename to minecraft/minecraft/world/level/material/MaterialColor.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h b/minecraft/minecraft/world/level/material/MaterialColor.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h rename to minecraft/minecraft/world/level/material/MaterialColor.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/PortalMaterial.h b/minecraft/minecraft/world/level/material/PortalMaterial.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/PortalMaterial.h rename to minecraft/minecraft/world/level/material/PortalMaterial.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/WebMaterial.h b/minecraft/minecraft/world/level/material/WebMaterial.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/WebMaterial.h rename to minecraft/minecraft/world/level/material/WebMaterial.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h b/minecraft/minecraft/world/level/material/net.minecraft.world.level.material.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h rename to minecraft/minecraft/world/level/material/net.minecraft.world.level.material.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h b/minecraft/minecraft/world/level/net.minecraft.world.level.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h rename to minecraft/minecraft/world/level/net.minecraft.world.level.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp index 802e56efc..dd328df9d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" AddIslandLayer::AddIslandLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h b/minecraft/minecraft/world/level/newbiome/layer/AddIslandLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/AddIslandLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp index 2ced9668d..711a88ffe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" AddMushroomIslandLayer::AddMushroomIslandLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h b/minecraft/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp index 435c12ed1..81fa82242 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/AddSnowLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" AddSnowLayer::AddSnowLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h b/minecraft/minecraft/world/level/newbiome/layer/AddSnowLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/AddSnowLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp index a310687df..ea39d202b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp @@ -1,7 +1,7 @@ #include "BiomeInitLayer.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" BiomeInitLayer::~BiomeInitLayer() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h b/minecraft/minecraft/world/level/newbiome/layer/BiomeInitLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/BiomeInitLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index b1d4a372f..b88a67dac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -8,8 +8,8 @@ #if defined(__linux__) #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #endif -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { m_biomeOverride = std::vector(width * height); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h b/minecraft/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/DownfallLayer.cpp similarity index 65% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/DownfallLayer.cpp index 37fe31d36..3658b5f8c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/DownfallLayer.cpp @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/DownfallLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" DownfallLayer::DownfallLayer(std::shared_ptr parent) : Layer(0) { this->parent = parent; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h b/minecraft/minecraft/world/level/newbiome/layer/DownfallLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/DownfallLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp index 63d45c519..a6129b81a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/DownfallMixerLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" DownfallMixerLayer::DownfallMixerLayer(std::shared_ptr downfall, std::shared_ptr parent, int layer) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h b/minecraft/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/FlatLayer.cpp similarity index 68% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/FlatLayer.cpp index 485e24bd2..10d99bf25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/FlatLayer.cpp @@ -1,8 +1,8 @@ #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/FlatLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" FlatLayer::FlatLayer(int val) : Layer(0) { this->val = val; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.h b/minecraft/minecraft/world/level/newbiome/layer/FlatLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/FlatLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp index f81a29123..1ba6ed9a5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" FuzzyZoomLayer::FuzzyZoomLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h b/minecraft/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp index 1032ce701..9293b606c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" GrowMushroomIslandLayer::GrowMushroomIslandLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h b/minecraft/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/IslandLayer.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/IslandLayer.cpp index 006c8671f..3ae9a456d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/IslandLayer.cpp @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/IslandLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" IslandLayer::IslandLayer(int64_t seedMixup) : Layer(seedMixup) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h b/minecraft/minecraft/world/level/newbiome/layer/IslandLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/IslandLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp b/minecraft/minecraft/world/level/newbiome/layer/Layer.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/Layer.cpp index a07d28e1d..7f8ab337c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/Layer.cpp @@ -5,24 +5,24 @@ #include "BiomeOverrideLayer.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/AddSnowLayer.h" +#include "minecraft/world/level/newbiome/layer/BiomeInitLayer.h" +#include "minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" +#include "minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" +#include "minecraft/world/level/newbiome/layer/IslandLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/RegionHillsLayer.h" +#include "minecraft/world/level/newbiome/layer/RiverInitLayer.h" +#include "minecraft/world/level/newbiome/layer/RiverLayer.h" +#include "minecraft/world/level/newbiome/layer/RiverMixerLayer.h" +#include "minecraft/world/level/newbiome/layer/ShoreLayer.h" +#include "minecraft/world/level/newbiome/layer/SmoothLayer.h" +#include "minecraft/world/level/newbiome/layer/SwampRiversLayer.h" +#include "minecraft/world/level/newbiome/layer/VoronoiZoom.h" +#include "minecraft/world/level/newbiome/layer/ZoomLayer.h" #include "platform/PlatformServices.h" std::vector> Layer::getDefaultLayers(int64_t seed, LevelType* levelType) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h b/minecraft/minecraft/world/level/newbiome/layer/Layer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h rename to minecraft/minecraft/world/level/newbiome/layer/Layer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp index 3471de52c..b0aa9022d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp @@ -1,8 +1,8 @@ #include #include "RegionHillsLayer.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" RegionHillsLayer::RegionHillsLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h b/minecraft/minecraft/world/level/newbiome/layer/RegionHillsLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/RegionHillsLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp index 15043bfc5..6281c0976 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/RiverInitLayer.h" RiverInitLayer::RiverInitLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h b/minecraft/minecraft/world/level/newbiome/layer/RiverInitLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/RiverInitLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/RiverLayer.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/RiverLayer.cpp index d81aac2ea..fca1a361f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/RiverLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/RiverLayer.h" RiverLayer::RiverLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h b/minecraft/minecraft/world/level/newbiome/layer/RiverLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/RiverLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp index 0b4edb586..1c6df298b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/RiverMixerLayer.h" RiverMixerLayer::RiverMixerLayer(int64_t seed, std::shared_ptr biomes, std::shared_ptr rivers) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h b/minecraft/minecraft/world/level/newbiome/layer/RiverMixerLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/RiverMixerLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/ShoreLayer.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/ShoreLayer.cpp index 7f06e22c4..7f041e768 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/ShoreLayer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/ShoreLayer.h" ShoreLayer::ShoreLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h b/minecraft/minecraft/world/level/newbiome/layer/ShoreLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/ShoreLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/SmoothLayer.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/SmoothLayer.cpp index 8463eba85..4fe23d7c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/SmoothLayer.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/SmoothLayer.h" SmoothLayer::SmoothLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h b/minecraft/minecraft/world/level/newbiome/layer/SmoothLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/SmoothLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp index 58c1e9058..ff15c8042 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/SmoothZoomLayer.h" SmoothZoomLayer::SmoothZoomLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h b/minecraft/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp index b1ff030e5..111d486f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp @@ -1,8 +1,8 @@ #include #include "SwampRiversLayer.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" SwampRiversLayer::SwampRiversLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h b/minecraft/minecraft/world/level/newbiome/layer/SwampRiversLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/SwampRiversLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp similarity index 66% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp index 6dd064f78..fd396b9c4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/TemperatureLayer.h" TemperatureLayer::TemperatureLayer(std::shared_ptr parent) : Layer(0) { this->parent = parent; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h b/minecraft/minecraft/world/level/newbiome/layer/TemperatureLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/TemperatureLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp index 1a3726545..325bc7735 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h" TemperatureMixerLayer::TemperatureMixerLayer(std::shared_ptr temp, std::shared_ptr parent, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h b/minecraft/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp b/minecraft/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp rename to minecraft/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp index 8401d8961..05f2dbec6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/VoronoiZoom.h" VoronoiZoom::VoronoiZoom(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h b/minecraft/minecraft/world/level/newbiome/layer/VoronoiZoom.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h rename to minecraft/minecraft/world/level/newbiome/layer/VoronoiZoom.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp b/minecraft/minecraft/world/level/newbiome/layer/ZoomLayer.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp rename to minecraft/minecraft/world/level/newbiome/layer/ZoomLayer.cpp index 2ecf6da44..22e835a04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp +++ b/minecraft/minecraft/world/level/newbiome/layer/ZoomLayer.cpp @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" -#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/newbiome/layer/ZoomLayer.h" ZoomLayer::ZoomLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h b/minecraft/minecraft/world/level/newbiome/layer/ZoomLayer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h rename to minecraft/minecraft/world/level/newbiome/layer/ZoomLayer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h b/minecraft/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h rename to minecraft/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp b/minecraft/minecraft/world/level/pathfinder/BinaryHeap.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp rename to minecraft/minecraft/world/level/pathfinder/BinaryHeap.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h b/minecraft/minecraft/world/level/pathfinder/BinaryHeap.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h rename to minecraft/minecraft/world/level/pathfinder/BinaryHeap.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp b/minecraft/minecraft/world/level/pathfinder/Node.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp rename to minecraft/minecraft/world/level/pathfinder/Node.cpp index a6d4e5f01..24c8a2b47 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp +++ b/minecraft/minecraft/world/level/pathfinder/Node.cpp @@ -5,8 +5,8 @@ #include #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/level/pathfinder/Node.h" void Node::_init() { heapIdx = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h b/minecraft/minecraft/world/level/pathfinder/Node.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h rename to minecraft/minecraft/world/level/pathfinder/Node.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp b/minecraft/minecraft/world/level/pathfinder/Path.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp rename to minecraft/minecraft/world/level/pathfinder/Path.cpp index 82a279d3d..d5718ef51 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp +++ b/minecraft/minecraft/world/level/pathfinder/Path.cpp @@ -1,7 +1,7 @@ #include #include "Path.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" Path::~Path() { for (size_t i = 0; i < nodes.size(); i++) delete nodes[i]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h b/minecraft/minecraft/world/level/pathfinder/Path.h similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h rename to minecraft/minecraft/world/level/pathfinder/Path.h index 261ba6d5b..9c472824f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h +++ b/minecraft/minecraft/world/level/pathfinder/Path.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/phys/Vec3.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp b/minecraft/minecraft/world/level/pathfinder/PathFinder.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp rename to minecraft/minecraft/world/level/pathfinder/PathFinder.cpp index 0dd6c9a33..342f65c1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp +++ b/minecraft/minecraft/world/level/pathfinder/PathFinder.cpp @@ -6,13 +6,13 @@ #include "Node.h" #include "Path.h" #include "PathFinder.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" PathFinder::PathFinder(LevelSource* level, bool canPassDoors, bool canOpenDoors, bool avoidWater, bool canFloat) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h b/minecraft/minecraft/world/level/pathfinder/PathFinder.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h rename to minecraft/minecraft/world/level/pathfinder/PathFinder.h index f2cde8633..2f6cd631a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h +++ b/minecraft/minecraft/world/level/pathfinder/PathFinder.h @@ -3,7 +3,7 @@ #include #include "java/JavaIntHash.h" -#include "Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h" +#include "minecraft/world/level/pathfinder/BinaryHeap.h" class LevelSource; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h b/minecraft/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h rename to minecraft/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp b/minecraft/minecraft/world/level/redstone/Redstone.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp rename to minecraft/minecraft/world/level/redstone/Redstone.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.h b/minecraft/minecraft/world/level/redstone/Redstone.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.h rename to minecraft/minecraft/world/level/redstone/Redstone.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h b/minecraft/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h rename to minecraft/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp rename to minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp index 3b2d13c18..50cd7ecfb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -7,12 +7,12 @@ #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/storage/LevelData.h" const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h rename to minecraft/minecraft/world/level/saveddata/MapItemSavedData.h index fe1d6087f..1dde7d195 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h +++ b/minecraft/minecraft/world/level/saveddata/MapItemSavedData.h @@ -7,9 +7,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" #include "SavedData.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" class ItemInstance; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp b/minecraft/minecraft/world/level/saveddata/SavedData.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp rename to minecraft/minecraft/world/level/saveddata/SavedData.cpp index bab4ec669..fea8af2d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp +++ b/minecraft/minecraft/world/level/saveddata/SavedData.cpp @@ -2,7 +2,7 @@ #include #include "SavedData.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" SavedData::SavedData(const std::wstring& id) : id(id) { dirty = false; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h b/minecraft/minecraft/world/level/saveddata/SavedData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h rename to minecraft/minecraft/world/level/saveddata/SavedData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h b/minecraft/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h rename to minecraft/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h index 871740ff7..a0fbd9624 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h @@ -3,8 +3,8 @@ #include #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" enum class SaveFileSeekOrigin { Begin, Current, End }; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 7c92b022c..ed1a57fa3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h" -#include "Minecraft.World/net/minecraft/util/ProgressListener.h" +#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h" +#include "minecraft/util/ProgressListener.h" #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h diff --git a/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h new file mode 100644 index 000000000..66e84ebf1 --- /dev/null +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h @@ -0,0 +1,7 @@ +#pragma once + +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp index 07b2df05f..8eb76e536 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" class ConsoleSavePath; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h index 9cde5f475..37fac3221 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h @@ -5,7 +5,7 @@ #include #include "java/InputOutputStream/InputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" class ConsoleSaveFile; class FileEntry; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 6a9802359..1255f3281 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -10,17 +10,17 @@ #include #include "console_helpers/PortableFileIO.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.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.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" #include "platform/IPlatformStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Linux/Linux_App.h" @@ -29,7 +29,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" +#include "minecraft/world/level/chunk/storage/RegionFile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index 3cc02ee43..e5b03c66c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -2,10 +2,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/Definitions.h" class ConsoleSaveFileOriginal : public ConsoleSaveFile { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp index 75bd7cfc6..de97eb70f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" class ConsoleSavePath; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h index 7c5269c7f..4d3f849d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h @@ -5,7 +5,7 @@ #include #include "java/InputOutputStream/OutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" class ConsoleSaveFile; class FileEntry; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 1d444c7a0..757f8a725 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -10,18 +10,18 @@ #include #include "console_helpers/PortableFileIO.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h" +#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.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" #include "platform/IPlatformStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" @@ -34,7 +34,7 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" #include "java/File.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" +#include "minecraft/world/level/chunk/storage/RegionFile.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index 656651318..fa86de053 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -5,10 +5,10 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/Definitions.h" class ProgressRenderer; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index c3768bbfb..c2dac053c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -10,8 +10,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/Definitions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h rename to minecraft/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp b/minecraft/minecraft/world/level/storage/DerivedLevelData.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp rename to minecraft/minecraft/world/level/storage/DerivedLevelData.cpp index 2a5d1566f..bcb32d485 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp +++ b/minecraft/minecraft/world/level/storage/DerivedLevelData.cpp @@ -1,5 +1,5 @@ #include "DerivedLevelData.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelData.h" class CompoundTag; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h b/minecraft/minecraft/world/level/storage/DerivedLevelData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h rename to minecraft/minecraft/world/level/storage/DerivedLevelData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/minecraft/minecraft/world/level/storage/DirectoryLevelStorage.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp rename to minecraft/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 4d28ea504..c75a54818 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/minecraft/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -12,11 +12,11 @@ #include "LevelData.h" #include "DirectoryLevelStorage.h" #include "platform/IPlatformStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "console_helpers/StringHelpers.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" @@ -30,13 +30,13 @@ #include "nbt/DoubleTag.h" #include "nbt/ListTag.h" #include "nbt/NbtIo.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/HellDimension.h" +#include "minecraft/world/level/dimension/TheEndDimension.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/PlayerIO.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h b/minecraft/minecraft/world/level/storage/DirectoryLevelStorage.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h rename to minecraft/minecraft/world/level/storage/DirectoryLevelStorage.h index feced3664..2ccbfd301 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/minecraft/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -35,7 +35,7 @@ #include "LevelStorage.h" #include "PlayerIO.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "4J.Common/4J_Compat.h" class ConsoleSaveFile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/minecraft/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp rename to minecraft/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp index b14debb83..012282869 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp +++ b/minecraft/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp @@ -5,11 +5,11 @@ #include "LevelData.h" #include "DirectoryLevelStorage.h" #include "DirectoryLevelStorageSource.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "nbt/CompoundTag.h" #include "nbt/NbtIo.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h b/minecraft/minecraft/world/level/storage/DirectoryLevelStorageSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h rename to minecraft/minecraft/world/level/storage/DirectoryLevelStorageSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp b/minecraft/minecraft/world/level/storage/LevelData.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp rename to minecraft/minecraft/world/level/storage/LevelData.cpp index f70cc1bc5..083168948 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp +++ b/minecraft/minecraft/world/level/storage/LevelData.cpp @@ -4,14 +4,14 @@ #include "java/System.h" #include "LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/LevelSettings.h" #include "Minecraft.Client/Common/App_Defines.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/chunk/ChunkSource.h" LevelData::LevelData() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h b/minecraft/minecraft/world/level/storage/LevelData.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h rename to minecraft/minecraft/world/level/storage/LevelData.h index 94aaf0eb4..ce0f51abd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h +++ b/minecraft/minecraft/world/level/storage/LevelData.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "minecraft/world/level/GameRules.h" class Player; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp b/minecraft/minecraft/world/level/storage/LevelStorage.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp rename to minecraft/minecraft/world/level/storage/LevelStorage.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h b/minecraft/minecraft/world/level/storage/LevelStorage.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h rename to minecraft/minecraft/world/level/storage/LevelStorage.h index 4eb6a476c..bb4fc9658 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h +++ b/minecraft/minecraft/world/level/storage/LevelStorage.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "4J.Common/4J_Compat.h" class PlayerIO; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/minecraft/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp rename to minecraft/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp index 94476edaf..3415ea43d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp +++ b/minecraft/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp @@ -1,7 +1,7 @@ #include "LevelStorageProfilerDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h" +#include "minecraft/world/level/storage/LevelStorage.h" LevelStorageProfilerDecorator::LevelStorageProfilerDecorator( LevelStorage* capsulated) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h b/minecraft/minecraft/world/level/storage/LevelStorageProfilerDecorator.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h rename to minecraft/minecraft/world/level/storage/LevelStorageProfilerDecorator.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h b/minecraft/minecraft/world/level/storage/LevelStorageSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h rename to minecraft/minecraft/world/level/storage/LevelStorageSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp b/minecraft/minecraft/world/level/storage/LevelSummary.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp rename to minecraft/minecraft/world/level/storage/LevelSummary.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h b/minecraft/minecraft/world/level/storage/LevelSummary.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h rename to minecraft/minecraft/world/level/storage/LevelSummary.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp b/minecraft/minecraft/world/level/storage/McRegionLevelStorage.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp rename to minecraft/minecraft/world/level/storage/McRegionLevelStorage.cpp index a6f1c3078..7ce84cc7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/minecraft/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -5,16 +5,16 @@ #include "LevelData.h" #include "java/File.h" #include "McRegionLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/chunk/storage/McRegionChunkStorage.h" +#include "minecraft/world/level/chunk/storage/RegionFileCache.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/dimension/HellDimension.h" +#include "minecraft/world/level/dimension/TheEndDimension.h" +#include "minecraft/world/level/storage/DirectoryLevelStorage.h" +#include "minecraft/world/level/storage/LevelStorage.h" McRegionLevelStorage::McRegionLevelStorage(ConsoleSaveFile* saveFile, File dir, const std::wstring& levelName, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h b/minecraft/minecraft/world/level/storage/McRegionLevelStorage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h rename to minecraft/minecraft/world/level/storage/McRegionLevelStorage.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/minecraft/minecraft/world/level/storage/McRegionLevelStorageSource.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp rename to minecraft/minecraft/world/level/storage/McRegionLevelStorageSource.cpp index 809e57464..028940fc7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp +++ b/minecraft/minecraft/world/level/storage/McRegionLevelStorageSource.cpp @@ -2,12 +2,12 @@ #include #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/util/ProgressListener.h" +#include "minecraft/util/ProgressListener.h" #include "McRegionLevelStorage.h" #include "java/File.h" #include "LevelData.h" #include "McRegionLevelStorageSource.h" -#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h" +#include "minecraft/world/level/storage/DirectoryLevelStorageSource.h" McRegionLevelStorageSource::McRegionLevelStorageSource(File dir) : DirectoryLevelStorageSource(dir) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h b/minecraft/minecraft/world/level/storage/McRegionLevelStorageSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h rename to minecraft/minecraft/world/level/storage/McRegionLevelStorageSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp b/minecraft/minecraft/world/level/storage/MemoryLevelStorage.cpp similarity index 67% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp rename to minecraft/minecraft/world/level/storage/MemoryLevelStorage.cpp index 3f3fedd23..aeb5ecab0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp +++ b/minecraft/minecraft/world/level/storage/MemoryLevelStorage.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "nbt/com.mojang.nbt.h" #include "MemoryLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" MemoryLevelStorage::MemoryLevelStorage() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h b/minecraft/minecraft/world/level/storage/MemoryLevelStorage.h similarity index 63% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h rename to minecraft/minecraft/world/level/storage/MemoryLevelStorage.h index 90594f051..54a0cd375 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h +++ b/minecraft/minecraft/world/level/storage/MemoryLevelStorage.h @@ -3,13 +3,13 @@ #include "LevelStorage.h" #include "PlayerIO.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" class MemoryLevelStorage : public LevelStorage, public PlayerIO { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp b/minecraft/minecraft/world/level/storage/MemoryLevelStorageSource.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp rename to minecraft/minecraft/world/level/storage/MemoryLevelStorageSource.cpp index 054210249..559ab14e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp +++ b/minecraft/minecraft/world/level/storage/MemoryLevelStorageSource.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" #include "MemoryLevelStorage.h" #include "LevelSummary.h" #include "MemoryLevelStorageSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.h b/minecraft/minecraft/world/level/storage/MemoryLevelStorageSource.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.h rename to minecraft/minecraft/world/level/storage/MemoryLevelStorageSource.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp b/minecraft/minecraft/world/level/storage/MockedLevelStorage.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp rename to minecraft/minecraft/world/level/storage/MockedLevelStorage.cpp index 6e66507fe..e90c3f9ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp +++ b/minecraft/minecraft/world/level/storage/MockedLevelStorage.cpp @@ -1,5 +1,5 @@ #include "MockedLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" LevelData* MockedLevelStorage::prepareLevel() { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h b/minecraft/minecraft/world/level/storage/MockedLevelStorage.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h rename to minecraft/minecraft/world/level/storage/MockedLevelStorage.h index 18f5a1761..d176a9236 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h +++ b/minecraft/minecraft/world/level/storage/MockedLevelStorage.h @@ -3,7 +3,7 @@ #include #include "LevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" class MockedLevelStorage : public LevelStorage { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h b/minecraft/minecraft/world/level/storage/PlayerIO.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h rename to minecraft/minecraft/world/level/storage/PlayerIO.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp b/minecraft/minecraft/world/level/storage/SavedDataStorage.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp rename to minecraft/minecraft/world/level/storage/SavedDataStorage.cpp index dbacad519..c46325e78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/minecraft/minecraft/world/level/storage/SavedDataStorage.cpp @@ -3,10 +3,10 @@ #include #include "SavedDataStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -14,11 +14,11 @@ #include "nbt/NbtIo.h" #include "nbt/ShortTag.h" #include "nbt/Tag.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" -#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/level/storage/DirectoryLevelStorage.h" +#include "minecraft/world/level/storage/LevelStorage.h" SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) { /* diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h b/minecraft/minecraft/world/level/storage/SavedDataStorage.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h rename to minecraft/minecraft/world/level/storage/SavedDataStorage.h index 6a9569af1..26b36953e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h +++ b/minecraft/minecraft/world/level/storage/SavedDataStorage.h @@ -6,9 +6,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "minecraft/world/level/saveddata/SavedData.h" class ConsoleSaveFile; class LevelStorage; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h b/minecraft/minecraft/world/level/storage/net.minecraft.world.level.storage.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h rename to minecraft/minecraft/world/level/storage/net.minecraft.world.level.storage.h diff --git a/minecraft/minecraft/world/level/tile/AirTile.cpp b/minecraft/minecraft/world/level/tile/AirTile.cpp new file mode 100644 index 000000000..0fe3c96a2 --- /dev/null +++ b/minecraft/minecraft/world/level/tile/AirTile.cpp @@ -0,0 +1,5 @@ +#include "AirTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +AirTile::AirTile(int id) : Tile(id, Material::air) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h b/minecraft/minecraft/world/level/tile/AirTile.h similarity index 62% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h rename to minecraft/minecraft/world/level/tile/AirTile.h index 4c44b95a0..8d281ae3e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h +++ b/minecraft/minecraft/world/level/tile/AirTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class AirTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp b/minecraft/minecraft/world/level/tile/AnvilTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp rename to minecraft/minecraft/world/level/tile/AnvilTile.cpp index 56f83aa7c..f9d99e823 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp +++ b/minecraft/minecraft/world/level/tile/AnvilTile.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/net.minecraft.h" #include "AnvilTile.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h b/minecraft/minecraft/world/level/tile/AnvilTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h rename to minecraft/minecraft/world/level/tile/AnvilTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp b/minecraft/minecraft/world/level/tile/BaseEntityTile.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp rename to minecraft/minecraft/world/level/tile/BaseEntityTile.cpp index 6ae9fc338..67e96896c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp +++ b/minecraft/minecraft/world/level/tile/BaseEntityTile.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h b/minecraft/minecraft/world/level/tile/BaseEntityTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h rename to minecraft/minecraft/world/level/tile/BaseEntityTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp b/minecraft/minecraft/world/level/tile/BasePressurePlateTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp rename to minecraft/minecraft/world/level/tile/BasePressurePlateTile.cpp index 86ab9388b..f99b838db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/minecraft/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -1,16 +1,16 @@ #include #include "BasePressurePlateTile.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/FenceTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/Facing.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/FenceTile.h" +#include "minecraft/world/level/tile/Tile.h" BasePressurePlateTile::BasePressurePlateTile(int id, const std::wstring& tex, Material* material) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h b/minecraft/minecraft/world/level/tile/BasePressurePlateTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h rename to minecraft/minecraft/world/level/tile/BasePressurePlateTile.h index 4688462fe..405868b69 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h +++ b/minecraft/minecraft/world/level/tile/BasePressurePlateTile.h @@ -4,7 +4,7 @@ #include #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" class Level; class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp b/minecraft/minecraft/world/level/tile/BaseRailTile.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp rename to minecraft/minecraft/world/level/tile/BaseRailTile.cpp index dc4221764..f0c6d52d3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp +++ b/minecraft/minecraft/world/level/tile/BaseRailTile.cpp @@ -2,12 +2,12 @@ #include "BaseRailTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" BaseRailTile::Rail::Rail(Level* level, int x, int y, int z) { this->level = level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h b/minecraft/minecraft/world/level/tile/BaseRailTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h rename to minecraft/minecraft/world/level/tile/BaseRailTile.h index c10bd6a06..8f6ea384c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h +++ b/minecraft/minecraft/world/level/tile/BaseRailTile.h @@ -3,7 +3,7 @@ #include #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/level/TilePos.h" #include "console_helpers/Definitions.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp b/minecraft/minecraft/world/level/tile/BeaconTile.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp rename to minecraft/minecraft/world/level/tile/BeaconTile.cpp index 8158a294c..4391281e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp +++ b/minecraft/minecraft/world/level/tile/BeaconTile.cpp @@ -2,12 +2,12 @@ #include #include "BeaconTile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" BeaconTile::BeaconTile(int id) : BaseEntityTile(id, Material::glass, false) { setDestroyTime(3.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h b/minecraft/minecraft/world/level/tile/BeaconTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h rename to minecraft/minecraft/world/level/tile/BeaconTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp b/minecraft/minecraft/world/level/tile/BedTile.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp rename to minecraft/minecraft/world/level/tile/BedTile.cpp index 4401e5ea3..01a1d98c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp +++ b/minecraft/minecraft/world/level/tile/BedTile.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/net.minecraft.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/net.minecraft.world.h" #include "BedTile.h" int BedTile::HEAD_DIRECTION_OFFSETS[4][2] = {{0, 1}, {-1, 0}, {0, -1}, {1, 0}}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.h b/minecraft/minecraft/world/level/tile/BedTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.h rename to minecraft/minecraft/world/level/tile/BedTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp b/minecraft/minecraft/world/level/tile/BookshelfTile.cpp similarity index 65% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp rename to minecraft/minecraft/world/level/tile/BookshelfTile.cpp index 016ed46b7..a1b266905 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp +++ b/minecraft/minecraft/world/level/tile/BookshelfTile.cpp @@ -1,8 +1,8 @@ #include "BookshelfTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" BookshelfTile::BookshelfTile(int id) : Tile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h b/minecraft/minecraft/world/level/tile/BookshelfTile.h similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h rename to minecraft/minecraft/world/level/tile/BookshelfTile.h index 5091864f4..0dcee6d30 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h +++ b/minecraft/minecraft/world/level/tile/BookshelfTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp b/minecraft/minecraft/world/level/tile/BrewingStandTile.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp rename to minecraft/minecraft/world/level/tile/BrewingStandTile.cpp index 84ba8791c..5c0cc7f9b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/minecraft/minecraft/world/level/tile/BrewingStandTile.cpp @@ -2,21 +2,21 @@ #include #include "BrewingStandTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h b/minecraft/minecraft/world/level/tile/BrewingStandTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h rename to minecraft/minecraft/world/level/tile/BrewingStandTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp b/minecraft/minecraft/world/level/tile/ButtonTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp rename to minecraft/minecraft/world/level/tile/ButtonTile.cpp index 144cb113b..d21048303 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp +++ b/minecraft/minecraft/world/level/tile/ButtonTile.cpp @@ -3,15 +3,15 @@ #include #include "ButtonTile.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h b/minecraft/minecraft/world/level/tile/ButtonTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h rename to minecraft/minecraft/world/level/tile/ButtonTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp b/minecraft/minecraft/world/level/tile/CactusTile.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp rename to minecraft/minecraft/world/level/tile/CactusTile.cpp index a2110f011..960ce7ebe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp +++ b/minecraft/minecraft/world/level/tile/CactusTile.cpp @@ -3,14 +3,14 @@ #include #include "CactusTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" CactusTile::CactusTile(int id) : Tile(id, Material::cactus, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h b/minecraft/minecraft/world/level/tile/CactusTile.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h rename to minecraft/minecraft/world/level/tile/CactusTile.h index 9c380732b..5ad8e21eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h +++ b/minecraft/minecraft/world/level/tile/CactusTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "console_helpers/Definitions.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp b/minecraft/minecraft/world/level/tile/CakeTile.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp rename to minecraft/minecraft/world/level/tile/CakeTile.cpp index 47a4b0905..aa9a68a60 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp +++ b/minecraft/minecraft/world/level/tile/CakeTile.cpp @@ -2,17 +2,17 @@ #include #include "CakeTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/food/FoodData.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" CakeTile::CakeTile(int id) : Tile(id, Material::cake, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h b/minecraft/minecraft/world/level/tile/CakeTile.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h rename to minecraft/minecraft/world/level/tile/CakeTile.h index 3f9d37e7c..cac16b781 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h +++ b/minecraft/minecraft/world/level/tile/CakeTile.h @@ -2,7 +2,7 @@ #include #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "console_helpers/Definitions.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp b/minecraft/minecraft/world/level/tile/CarrotTile.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp rename to minecraft/minecraft/world/level/tile/CarrotTile.cpp index bd417c6c5..c38667696 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp +++ b/minecraft/minecraft/world/level/tile/CarrotTile.cpp @@ -2,9 +2,9 @@ #include "CarrotTile.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/CropTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/CropTile.h" CarrotTile::CarrotTile(int id) : CropTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h b/minecraft/minecraft/world/level/tile/CarrotTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h rename to minecraft/minecraft/world/level/tile/CarrotTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp b/minecraft/minecraft/world/level/tile/CauldronTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp rename to minecraft/minecraft/world/level/tile/CauldronTile.cpp index e204fa473..0dcad3930 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp +++ b/minecraft/minecraft/world/level/tile/CauldronTile.cpp @@ -1,22 +1,22 @@ #include #include "CauldronTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h b/minecraft/minecraft/world/level/tile/CauldronTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h rename to minecraft/minecraft/world/level/tile/CauldronTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp b/minecraft/minecraft/world/level/tile/ChestTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp rename to minecraft/minecraft/world/level/tile/ChestTile.cpp index 9543f13b4..32c518b7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp +++ b/minecraft/minecraft/world/level/tile/ChestTile.cpp @@ -1,15 +1,15 @@ -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.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/redstone/net.minecraft.world.level.redstone.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" ChestTile::ChestTile(int id, int type) : BaseEntityTile(id, Material::wood, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h b/minecraft/minecraft/world/level/tile/ChestTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h rename to minecraft/minecraft/world/level/tile/ChestTile.h index 970787770..2902be325 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h +++ b/minecraft/minecraft/world/level/tile/ChestTile.h @@ -1,6 +1,6 @@ #pragma once #include "BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Player; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp b/minecraft/minecraft/world/level/tile/ClayTile.cpp similarity index 55% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp rename to minecraft/minecraft/world/level/tile/ClayTile.cpp index a98ab9a4a..760be076d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp +++ b/minecraft/minecraft/world/level/tile/ClayTile.cpp @@ -1,7 +1,7 @@ #include "ClayTile.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" ClayTile::ClayTile(int id) : Tile(id, Material::clay) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h b/minecraft/minecraft/world/level/tile/ClayTile.h similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h rename to minecraft/minecraft/world/level/tile/ClayTile.h index 21646d567..34e375a80 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h +++ b/minecraft/minecraft/world/level/tile/ClayTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp b/minecraft/minecraft/world/level/tile/CocoaTile.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp rename to minecraft/minecraft/world/level/tile/CocoaTile.cpp index 148fcc3b3..598db457b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp +++ b/minecraft/minecraft/world/level/tile/CocoaTile.cpp @@ -2,20 +2,20 @@ #include "CocoaTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h b/minecraft/minecraft/world/level/tile/CocoaTile.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h rename to minecraft/minecraft/world/level/tile/CocoaTile.h index e6665261d..856ff79f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h +++ b/minecraft/minecraft/world/level/tile/CocoaTile.h @@ -4,7 +4,7 @@ #include #include "DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp b/minecraft/minecraft/world/level/tile/ColoredTile.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp rename to minecraft/minecraft/world/level/tile/ColoredTile.cpp index 18b875712..d1ad65e2f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp +++ b/minecraft/minecraft/world/level/tile/ColoredTile.cpp @@ -1,9 +1,9 @@ #include #include "ColoredTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h b/minecraft/minecraft/world/level/tile/ColoredTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h rename to minecraft/minecraft/world/level/tile/ColoredTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp b/minecraft/minecraft/world/level/tile/CommandBlock.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp rename to minecraft/minecraft/world/level/tile/CommandBlock.cpp index 4e63107ac..9e8d40d42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp +++ b/minecraft/minecraft/world/level/tile/CommandBlock.cpp @@ -2,15 +2,15 @@ #include #include "CommandBlock.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" CommandBlock::CommandBlock(int id) : BaseEntityTile(id, Material::metal, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.h b/minecraft/minecraft/world/level/tile/CommandBlock.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.h rename to minecraft/minecraft/world/level/tile/CommandBlock.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp b/minecraft/minecraft/world/level/tile/ComparatorTile.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp rename to minecraft/minecraft/world/level/tile/ComparatorTile.cpp index 7e2488624..bbc9487c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp +++ b/minecraft/minecraft/world/level/tile/ComparatorTile.cpp @@ -1,18 +1,18 @@ #include #include "ComparatorTile.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/DiodeTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ComparatorTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h b/minecraft/minecraft/world/level/tile/ComparatorTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h rename to minecraft/minecraft/world/level/tile/ComparatorTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp b/minecraft/minecraft/world/level/tile/CoralTile.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp rename to minecraft/minecraft/world/level/tile/CoralTile.cpp index 9a9c935be..44810ad31 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp +++ b/minecraft/minecraft/world/level/tile/CoralTile.cpp @@ -1,8 +1,8 @@ #include #include "CoralTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfTransparentTile.h" CoralTile::CoralTile(int id) : HalfTransparentTile(id, L"coral", Material::coral, true) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h b/minecraft/minecraft/world/level/tile/CoralTile.h similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h rename to minecraft/minecraft/world/level/tile/CoralTile.h index 8aea08ee0..5d64b079b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h +++ b/minecraft/minecraft/world/level/tile/CoralTile.h @@ -1,6 +1,6 @@ #pragma once #include "HalfTransparentTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class CoralTile : public HalfTransparentTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp b/minecraft/minecraft/world/level/tile/CropTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp rename to minecraft/minecraft/world/level/tile/CropTile.cpp index fbaa74db6..59035ec95 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp +++ b/minecraft/minecraft/world/level/tile/CropTile.cpp @@ -4,12 +4,12 @@ #include "CropTile.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h b/minecraft/minecraft/world/level/tile/CropTile.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h rename to minecraft/minecraft/world/level/tile/CropTile.h index 831ac6bc5..41d03c5f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h +++ b/minecraft/minecraft/world/level/tile/CropTile.h @@ -1,6 +1,6 @@ #pragma once #include "PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" class Random; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp b/minecraft/minecraft/world/level/tile/DaylightDetectorTile.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp rename to minecraft/minecraft/world/level/tile/DaylightDetectorTile.cpp index 545cf5700..f3152295a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp +++ b/minecraft/minecraft/world/level/tile/DaylightDetectorTile.cpp @@ -4,16 +4,16 @@ #include "java/JavaMath.h" #include "DaylightDetectorTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" DaylightDetectorTile::DaylightDetectorTile(int id) : BaseEntityTile(id, Material::wood, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h b/minecraft/minecraft/world/level/tile/DaylightDetectorTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h rename to minecraft/minecraft/world/level/tile/DaylightDetectorTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp b/minecraft/minecraft/world/level/tile/DeadBushTile.cpp similarity index 69% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp rename to minecraft/minecraft/world/level/tile/DeadBushTile.cpp index 859ab3795..8631d5ffb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp +++ b/minecraft/minecraft/world/level/tile/DeadBushTile.cpp @@ -1,14 +1,14 @@ #include #include "DeadBushTile.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" DeadBushTile::DeadBushTile(int id) : Bush(id, Material::replaceable_plant) { updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h b/minecraft/minecraft/world/level/tile/DeadBushTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h rename to minecraft/minecraft/world/level/tile/DeadBushTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp b/minecraft/minecraft/world/level/tile/DetectorRailTile.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp rename to minecraft/minecraft/world/level/tile/DetectorRailTile.cpp index 632b1a0c1..4e34e5cd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp +++ b/minecraft/minecraft/world/level/tile/DetectorRailTile.cpp @@ -4,19 +4,19 @@ #include #include "DetectorRailTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h b/minecraft/minecraft/world/level/tile/DetectorRailTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h rename to minecraft/minecraft/world/level/tile/DetectorRailTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp b/minecraft/minecraft/world/level/tile/DiodeTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp rename to minecraft/minecraft/world/level/tile/DiodeTile.cpp index fa2f6baa6..e5244df95 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp +++ b/minecraft/minecraft/world/level/tile/DiodeTile.cpp @@ -2,19 +2,19 @@ #include #include "DiodeTile.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/ComparatorTile.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/Tile.h" DiodeTile::DiodeTile(int id, bool on) : DirectionalTile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h b/minecraft/minecraft/world/level/tile/DiodeTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h rename to minecraft/minecraft/world/level/tile/DiodeTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp b/minecraft/minecraft/world/level/tile/DirectionalTile.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp rename to minecraft/minecraft/world/level/tile/DirectionalTile.cpp index 1115ba8ef..29f1f2ad0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp +++ b/minecraft/minecraft/world/level/tile/DirectionalTile.cpp @@ -1,5 +1,5 @@ #include "DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h b/minecraft/minecraft/world/level/tile/DirectionalTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h rename to minecraft/minecraft/world/level/tile/DirectionalTile.h diff --git a/minecraft/minecraft/world/level/tile/DirtTile.cpp b/minecraft/minecraft/world/level/tile/DirtTile.cpp new file mode 100644 index 000000000..8a7d2942a --- /dev/null +++ b/minecraft/minecraft/world/level/tile/DirtTile.cpp @@ -0,0 +1,5 @@ +#include "DirtTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +DirtTile::DirtTile(int id) : Tile(id, Material::dirt) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.h b/minecraft/minecraft/world/level/tile/DirtTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.h rename to minecraft/minecraft/world/level/tile/DirtTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp b/minecraft/minecraft/world/level/tile/DispenserTile.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp rename to minecraft/minecraft/world/level/tile/DispenserTile.cpp index 1a40aa527..5e63f3f46 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp +++ b/minecraft/minecraft/world/level/tile/DispenserTile.cpp @@ -3,27 +3,27 @@ #include "DispenserTile.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" -#include "Minecraft.World/net/minecraft/core/BlockSource.h" -#include "Minecraft.World/net/minecraft/core/BlockSourceImpl.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/FacingEnum.h" -#include "Minecraft.World/net/minecraft/core/PositionImpl.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/Facing.h" +#include "minecraft/core/BehaviorRegistry.h" +#include "minecraft/core/BlockSource.h" +#include "minecraft/core/BlockSourceImpl.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/DispenseItemBehavior.h" +#include "minecraft/core/FacingEnum.h" +#include "minecraft/core/PositionImpl.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" class Position; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h b/minecraft/minecraft/world/level/tile/DispenserTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h rename to minecraft/minecraft/world/level/tile/DispenserTile.h index 2e63e5441..2b9624522 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h +++ b/minecraft/minecraft/world/level/tile/DispenserTile.h @@ -2,7 +2,7 @@ #include #include "BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/core/net.minecraft.core.h" +#include "minecraft/core/net.minecraft.core.h" class Player; class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp b/minecraft/minecraft/world/level/tile/DoorTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp rename to minecraft/minecraft/world/level/tile/DoorTile.cpp index acda11ed1..f0e797874 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp +++ b/minecraft/minecraft/world/level/tile/DoorTile.cpp @@ -2,17 +2,17 @@ #include "DoorTile.h" #include "LevelEvent.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/FlippedIcon.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/FlippedIcon.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" const std::wstring DoorTile::TEXTURES[] = { L"doorWood_lower", L"doorWood_upper", L"doorIron_lower", L"doorIron_upper"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h b/minecraft/minecraft/world/level/tile/DoorTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h rename to minecraft/minecraft/world/level/tile/DoorTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp b/minecraft/minecraft/world/level/tile/DropperTile.cpp similarity index 73% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp rename to minecraft/minecraft/world/level/tile/DropperTile.cpp index 24a665171..ddfaa0531 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp +++ b/minecraft/minecraft/world/level/tile/DropperTile.cpp @@ -2,18 +2,18 @@ #include #include "DropperTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/core/BlockSourceImpl.h" -#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/core/BlockSourceImpl.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" +#include "minecraft/core/DispenseItemBehavior.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/tile/entity/DropperTileEntity.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h b/minecraft/minecraft/world/level/tile/DropperTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h rename to minecraft/minecraft/world/level/tile/DropperTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp b/minecraft/minecraft/world/level/tile/EggTile.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp rename to minecraft/minecraft/world/level/tile/EggTile.cpp index dbc7cc88e..e3e47289f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp +++ b/minecraft/minecraft/world/level/tile/EggTile.cpp @@ -1,14 +1,14 @@ #include #include "EggTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" EggTile::EggTile(int id) : Tile(id, Material::egg, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h b/minecraft/minecraft/world/level/tile/EggTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h rename to minecraft/minecraft/world/level/tile/EggTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp b/minecraft/minecraft/world/level/tile/EnchantmentTableTile.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp rename to minecraft/minecraft/world/level/tile/EnchantmentTableTile.cpp index 5e5b448b1..0e9b4deba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/minecraft/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -1,17 +1,17 @@ #include #include "EnchantmentTableTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" const std::wstring EnchantmentTableTile::TEXTURE_SIDE = L"enchantment_side"; const std::wstring EnchantmentTableTile::TEXTURE_TOP = L"enchantment_top"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h b/minecraft/minecraft/world/level/tile/EnchantmentTableTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h rename to minecraft/minecraft/world/level/tile/EnchantmentTableTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp b/minecraft/minecraft/world/level/tile/EnderChestTile.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp rename to minecraft/minecraft/world/level/tile/EnderChestTile.cpp index 5fc294e56..188c083fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp +++ b/minecraft/minecraft/world/level/tile/EnderChestTile.cpp @@ -2,19 +2,19 @@ #include #include "EnderChestTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" EnderChestTile::EnderChestTile(int id) : BaseEntityTile(id, Material::stone, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.h b/minecraft/minecraft/world/level/tile/EnderChestTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.h rename to minecraft/minecraft/world/level/tile/EnderChestTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h b/minecraft/minecraft/world/level/tile/EntityTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h rename to minecraft/minecraft/world/level/tile/EntityTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp b/minecraft/minecraft/world/level/tile/FarmTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp rename to minecraft/minecraft/world/level/tile/FarmTile.cpp index 844c354f5..c6fc39ecf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp +++ b/minecraft/minecraft/world/level/tile/FarmTile.cpp @@ -5,15 +5,15 @@ #include "FarmTile.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" FarmTile::FarmTile(int id) : Tile(id, Material::dirt, false) { iconWet = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h b/minecraft/minecraft/world/level/tile/FarmTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h rename to minecraft/minecraft/world/level/tile/FarmTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp b/minecraft/minecraft/world/level/tile/FenceGateTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp rename to minecraft/minecraft/world/level/tile/FenceGateTile.cpp index 66f89b9e3..74ee50b6a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp +++ b/minecraft/minecraft/world/level/tile/FenceGateTile.cpp @@ -2,16 +2,16 @@ #include "FenceGateTile.h" #include "LevelEvent.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" FenceGateTile::FenceGateTile(int id) : DirectionalTile(id, Material::wood, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h b/minecraft/minecraft/world/level/tile/FenceGateTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h rename to minecraft/minecraft/world/level/tile/FenceGateTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp b/minecraft/minecraft/world/level/tile/FenceTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp rename to minecraft/minecraft/world/level/tile/FenceTile.cpp index 020f7aae5..150985b76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp +++ b/minecraft/minecraft/world/level/tile/FenceTile.cpp @@ -1,10 +1,10 @@ #include "FenceTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/LeashItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/LeashItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" FenceTile::FenceTile(int id, const std::wstring& texture, Material* material) : Tile(id, material, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h b/minecraft/minecraft/world/level/tile/FenceTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h rename to minecraft/minecraft/world/level/tile/FenceTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp b/minecraft/minecraft/world/level/tile/FireTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp rename to minecraft/minecraft/world/level/tile/FireTile.cpp index 515c61743..ee296e42a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp +++ b/minecraft/minecraft/world/level/tile/FireTile.cpp @@ -6,19 +6,19 @@ #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/GameRules.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PortalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TntTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/PortalTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TntTile.h" +#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h b/minecraft/minecraft/world/level/tile/FireTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h rename to minecraft/minecraft/world/level/tile/FireTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp b/minecraft/minecraft/world/level/tile/FlowerPotTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp rename to minecraft/minecraft/world/level/tile/FlowerPotTile.cpp index 49afec40b..74774ff96 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp +++ b/minecraft/minecraft/world/level/tile/FlowerPotTile.cpp @@ -1,15 +1,15 @@ #include "FlowerPotTile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DeadBushTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" FlowerPotTile::FlowerPotTile(int id) : Tile(id, Material::decoration, false) { updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h b/minecraft/minecraft/world/level/tile/FlowerPotTile.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h rename to minecraft/minecraft/world/level/tile/FlowerPotTile.h index ed73c0b5e..3ea897437 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h +++ b/minecraft/minecraft/world/level/tile/FlowerPotTile.h @@ -3,7 +3,7 @@ #include #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class FlowerPotTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp b/minecraft/minecraft/world/level/tile/FurnaceTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp rename to minecraft/minecraft/world/level/tile/FurnaceTile.cpp index 268f9a2f4..8eb21f125 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp +++ b/minecraft/minecraft/world/level/tile/FurnaceTile.cpp @@ -3,25 +3,25 @@ #include #include "FurnaceTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "FurnaceTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" bool FurnaceTile::noDrop = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h b/minecraft/minecraft/world/level/tile/FurnaceTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h rename to minecraft/minecraft/world/level/tile/FurnaceTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp b/minecraft/minecraft/world/level/tile/GlassTile.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp rename to minecraft/minecraft/world/level/tile/GlassTile.cpp index fd8403970..a56ed490f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp +++ b/minecraft/minecraft/world/level/tile/GlassTile.cpp @@ -1,7 +1,7 @@ #include #include "GlassTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" +#include "minecraft/world/level/tile/HalfTransparentTile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h b/minecraft/minecraft/world/level/tile/GlassTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h rename to minecraft/minecraft/world/level/tile/GlassTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp b/minecraft/minecraft/world/level/tile/GlowstoneTile.cpp similarity index 77% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp rename to minecraft/minecraft/world/level/tile/GlowstoneTile.cpp index 151c1742f..726ef815a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp +++ b/minecraft/minecraft/world/level/tile/GlowstoneTile.cpp @@ -1,8 +1,8 @@ #include "GlowstoneTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h b/minecraft/minecraft/world/level/tile/GlowstoneTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h rename to minecraft/minecraft/world/level/tile/GlowstoneTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp b/minecraft/minecraft/world/level/tile/GrassTile.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp rename to minecraft/minecraft/world/level/tile/GrassTile.cpp index 481b2774c..acd1a323d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp +++ b/minecraft/minecraft/world/level/tile/GrassTile.cpp @@ -5,13 +5,13 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h b/minecraft/minecraft/world/level/tile/GrassTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h rename to minecraft/minecraft/world/level/tile/GrassTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp b/minecraft/minecraft/world/level/tile/GravelTile.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp rename to minecraft/minecraft/world/level/tile/GravelTile.cpp index 212116f9c..84dbf1df5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp +++ b/minecraft/minecraft/world/level/tile/GravelTile.cpp @@ -1,7 +1,7 @@ #include "GravelTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/tile/HeavyTile.h" GravelTile::GravelTile(int type) : HeavyTile(type) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.h b/minecraft/minecraft/world/level/tile/GravelTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.h rename to minecraft/minecraft/world/level/tile/GravelTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp b/minecraft/minecraft/world/level/tile/HalfSlabTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp rename to minecraft/minecraft/world/level/tile/HalfSlabTile.cpp index 45e2e963c..c4f8355dd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp +++ b/minecraft/minecraft/world/level/tile/HalfSlabTile.cpp @@ -1,8 +1,8 @@ #include "HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h b/minecraft/minecraft/world/level/tile/HalfSlabTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h rename to minecraft/minecraft/world/level/tile/HalfSlabTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp b/minecraft/minecraft/world/level/tile/HalfTransparentTile.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp rename to minecraft/minecraft/world/level/tile/HalfTransparentTile.cpp index bce4f2746..d4439a2da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp +++ b/minecraft/minecraft/world/level/tile/HalfTransparentTile.cpp @@ -1,7 +1,7 @@ #include "HalfTransparentTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h b/minecraft/minecraft/world/level/tile/HalfTransparentTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h rename to minecraft/minecraft/world/level/tile/HalfTransparentTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp b/minecraft/minecraft/world/level/tile/HayBlockTile.cpp similarity index 67% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp rename to minecraft/minecraft/world/level/tile/HayBlockTile.cpp index 6be05ee8e..e1dddec0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp +++ b/minecraft/minecraft/world/level/tile/HayBlockTile.cpp @@ -1,9 +1,9 @@ #include #include "HayBlockTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/RotatedPillarTile.h" HayBlockTile::HayBlockTile(int id) : RotatedPillarTile(id, Material::grass) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.h b/minecraft/minecraft/world/level/tile/HayBlockTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.h rename to minecraft/minecraft/world/level/tile/HayBlockTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp b/minecraft/minecraft/world/level/tile/HeavyTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp rename to minecraft/minecraft/world/level/tile/HeavyTile.cpp index 7f770d189..83714c7f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp +++ b/minecraft/minecraft/world/level/tile/HeavyTile.cpp @@ -1,8 +1,8 @@ #include "HeavyTile.h" -#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" bool HeavyTile::instaFall = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h b/minecraft/minecraft/world/level/tile/HeavyTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h rename to minecraft/minecraft/world/level/tile/HeavyTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp b/minecraft/minecraft/world/level/tile/HopperTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp rename to minecraft/minecraft/world/level/tile/HopperTile.cpp index d35bbaa7a..e607860a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp +++ b/minecraft/minecraft/world/level/tile/HopperTile.cpp @@ -1,18 +1,18 @@ #include "HopperTile.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h b/minecraft/minecraft/world/level/tile/HopperTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h rename to minecraft/minecraft/world/level/tile/HopperTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp b/minecraft/minecraft/world/level/tile/HugeMushroomTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp rename to minecraft/minecraft/world/level/tile/HugeMushroomTile.cpp index 54ec7557d..4e15fc404 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp +++ b/minecraft/minecraft/world/level/tile/HugeMushroomTile.cpp @@ -1,7 +1,7 @@ #include "HugeMushroomTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h b/minecraft/minecraft/world/level/tile/HugeMushroomTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h rename to minecraft/minecraft/world/level/tile/HugeMushroomTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp b/minecraft/minecraft/world/level/tile/IceTile.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp rename to minecraft/minecraft/world/level/tile/IceTile.cpp index e258ecc24..9b07a37eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp +++ b/minecraft/minecraft/world/level/tile/IceTile.cpp @@ -2,16 +2,16 @@ #include #include "IceTile.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfTransparentTile.h" +#include "minecraft/world/level/tile/Tile.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.h b/minecraft/minecraft/world/level/tile/IceTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.h rename to minecraft/minecraft/world/level/tile/IceTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp b/minecraft/minecraft/world/level/tile/JukeboxTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp rename to minecraft/minecraft/world/level/tile/JukeboxTile.cpp index 9b5a8b2a3..c39af5c9c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp +++ b/minecraft/minecraft/world/level/tile/JukeboxTile.cpp @@ -4,16 +4,16 @@ #include "LevelEvent.h" #include "java/Random.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" JukeboxTile::Entity::Entity() : TileEntity() { record = nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h b/minecraft/minecraft/world/level/tile/JukeboxTile.h similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h rename to minecraft/minecraft/world/level/tile/JukeboxTile.h index 33b212951..902a77d45 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h +++ b/minecraft/minecraft/world/level/tile/JukeboxTile.h @@ -4,9 +4,9 @@ #include "BaseEntityTile.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class CompoundTag; class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp b/minecraft/minecraft/world/level/tile/LadderTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp rename to minecraft/minecraft/world/level/tile/LadderTile.cpp index c63a5a752..5b184ae13 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp +++ b/minecraft/minecraft/world/level/tile/LadderTile.cpp @@ -1,11 +1,11 @@ #include #include "LadderTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" LadderTile::LadderTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h b/minecraft/minecraft/world/level/tile/LadderTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h rename to minecraft/minecraft/world/level/tile/LadderTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp b/minecraft/minecraft/world/level/tile/LeafTile.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp rename to minecraft/minecraft/world/level/tile/LeafTile.cpp index ba76a6dd7..1a2a5d236 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/minecraft/world/level/tile/LeafTile.cpp @@ -1,10 +1,10 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "LeafTile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/net.minecraft.world.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.h b/minecraft/minecraft/world/level/tile/LeafTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.h rename to minecraft/minecraft/world/level/tile/LeafTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h b/minecraft/minecraft/world/level/tile/LevelEvent.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h rename to minecraft/minecraft/world/level/tile/LevelEvent.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp b/minecraft/minecraft/world/level/tile/LeverTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp rename to minecraft/minecraft/world/level/tile/LeverTile.cpp index 60792ab72..3b1748314 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp +++ b/minecraft/minecraft/world/level/tile/LeverTile.cpp @@ -1,16 +1,16 @@ #include #include "LeverTile.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" LeverTile::LeverTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h b/minecraft/minecraft/world/level/tile/LeverTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h rename to minecraft/minecraft/world/level/tile/LeverTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp b/minecraft/minecraft/world/level/tile/LiquidTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp rename to minecraft/minecraft/world/level/tile/LiquidTile.cpp index 997baebea..5b9fea5d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp +++ b/minecraft/minecraft/world/level/tile/LiquidTile.cpp @@ -5,18 +5,18 @@ #include "java/JavaMath.h" #include "LiquidTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h b/minecraft/minecraft/world/level/tile/LiquidTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h rename to minecraft/minecraft/world/level/tile/LiquidTile.h index 7ecc3c654..ebf3eb67c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h +++ b/minecraft/minecraft/world/level/tile/LiquidTile.h @@ -4,7 +4,7 @@ #include "Tile.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Random; class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp b/minecraft/minecraft/world/level/tile/LiquidTileDynamic.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp rename to minecraft/minecraft/world/level/tile/LiquidTileDynamic.cpp index 26b1bed54..dd0476f71 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp +++ b/minecraft/minecraft/world/level/tile/LiquidTileDynamic.cpp @@ -1,10 +1,10 @@ #include "LiquidTileDynamic.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/Tile.h" LiquidTileDynamic::LiquidTileDynamic(int id, Material* material) : LiquidTile(id, material) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h b/minecraft/minecraft/world/level/tile/LiquidTileDynamic.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h rename to minecraft/minecraft/world/level/tile/LiquidTileDynamic.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp b/minecraft/minecraft/world/level/tile/LiquidTileStatic.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp rename to minecraft/minecraft/world/level/tile/LiquidTileStatic.cpp index 55bc59778..9fc408391 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp +++ b/minecraft/minecraft/world/level/tile/LiquidTileStatic.cpp @@ -1,9 +1,9 @@ #include "LiquidTileStatic.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/Tile.h" LiquidTileStatic::LiquidTileStatic(int id, Material* material) : LiquidTile(id, material) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h b/minecraft/minecraft/world/level/tile/LiquidTileStatic.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h rename to minecraft/minecraft/world/level/tile/LiquidTileStatic.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp b/minecraft/minecraft/world/level/tile/LockedChestTile.cpp similarity index 65% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp rename to minecraft/minecraft/world/level/tile/LockedChestTile.cpp index 330f024a0..1a46ea9e7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp +++ b/minecraft/minecraft/world/level/tile/LockedChestTile.cpp @@ -1,7 +1,7 @@ #include "LockedChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" LockedChestTile::LockedChestTile(int id) : Tile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.h b/minecraft/minecraft/world/level/tile/LockedChestTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.h rename to minecraft/minecraft/world/level/tile/LockedChestTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp b/minecraft/minecraft/world/level/tile/MelonTile.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp rename to minecraft/minecraft/world/level/tile/MelonTile.cpp index e209b8470..6d42a53b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp +++ b/minecraft/minecraft/world/level/tile/MelonTile.cpp @@ -1,12 +1,12 @@ #include #include "MelonTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" MelonTile::MelonTile(int id) : Tile(id, Material::vegetable) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h b/minecraft/minecraft/world/level/tile/MelonTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h rename to minecraft/minecraft/world/level/tile/MelonTile.h diff --git a/minecraft/minecraft/world/level/tile/MetalTile.cpp b/minecraft/minecraft/world/level/tile/MetalTile.cpp new file mode 100644 index 000000000..109989882 --- /dev/null +++ b/minecraft/minecraft/world/level/tile/MetalTile.cpp @@ -0,0 +1,5 @@ +#include "MetalTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +MetalTile::MetalTile(int id) : Tile(id, Material::metal) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.h b/minecraft/minecraft/world/level/tile/MetalTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.h rename to minecraft/minecraft/world/level/tile/MetalTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp b/minecraft/minecraft/world/level/tile/MobSpawnerTile.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp rename to minecraft/minecraft/world/level/tile/MobSpawnerTile.cpp index 613449309..2c3b713f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp +++ b/minecraft/minecraft/world/level/tile/MobSpawnerTile.cpp @@ -2,11 +2,11 @@ #include "MobSpawnerTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" MobSpawnerTile::MobSpawnerTile(int id) : BaseEntityTile(id, Material::stone, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.h b/minecraft/minecraft/world/level/tile/MobSpawnerTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.h rename to minecraft/minecraft/world/level/tile/MobSpawnerTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp b/minecraft/minecraft/world/level/tile/MushroomPlantTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp rename to minecraft/minecraft/world/level/tile/MushroomPlantTile.cpp index 24074b799..6a75e1e00 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp +++ b/minecraft/minecraft/world/level/tile/MushroomPlantTile.cpp @@ -1,10 +1,10 @@ #include "MushroomPlantTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" Mushroom::Mushroom(int id) : Bush(id) { this->updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h b/minecraft/minecraft/world/level/tile/MushroomPlantTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h rename to minecraft/minecraft/world/level/tile/MushroomPlantTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp b/minecraft/minecraft/world/level/tile/MycelTile.cpp similarity index 84% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp rename to minecraft/minecraft/world/level/tile/MycelTile.cpp index 2584b5eb8..1acd4125a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp +++ b/minecraft/minecraft/world/level/tile/MycelTile.cpp @@ -1,14 +1,14 @@ #include #include "MycelTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" MycelTile::MycelTile(int id) : Tile(id, Material::grass) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h b/minecraft/minecraft/world/level/tile/MycelTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h rename to minecraft/minecraft/world/level/tile/MycelTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp b/minecraft/minecraft/world/level/tile/NetherWartTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp rename to minecraft/minecraft/world/level/tile/NetherWartTile.cpp index 635fcf69a..ca0463380 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp +++ b/minecraft/minecraft/world/level/tile/NetherWartTile.cpp @@ -4,12 +4,12 @@ #include "NetherWartTile.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" NetherWartTile::NetherWartTile(int id) : Bush(id) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h b/minecraft/minecraft/world/level/tile/NetherWartTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h rename to minecraft/minecraft/world/level/tile/NetherWartTile.h diff --git a/minecraft/minecraft/world/level/tile/NetherrackTile.cpp b/minecraft/minecraft/world/level/tile/NetherrackTile.cpp new file mode 100644 index 000000000..a0f333f0d --- /dev/null +++ b/minecraft/minecraft/world/level/tile/NetherrackTile.cpp @@ -0,0 +1,5 @@ +#include "NetherrackTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +NetherrackTile::NetherrackTile(int id) : Tile(id, Material::stone) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.h b/minecraft/minecraft/world/level/tile/NetherrackTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.h rename to minecraft/minecraft/world/level/tile/NetherrackTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp b/minecraft/minecraft/world/level/tile/NotGateTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp rename to minecraft/minecraft/world/level/tile/NotGateTile.cpp index 70a121095..c6059b964 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp +++ b/minecraft/minecraft/world/level/tile/NotGateTile.cpp @@ -1,13 +1,13 @@ #include "NotGateTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TorchTile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TorchTile.h" std::unordered_map*> NotGateTile::recentToggles = diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h b/minecraft/minecraft/world/level/tile/NotGateTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h rename to minecraft/minecraft/world/level/tile/NotGateTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp b/minecraft/minecraft/world/level/tile/NoteBlockTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp rename to minecraft/minecraft/world/level/tile/NoteBlockTile.cpp index 34e0a27c6..40cc668f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/minecraft/minecraft/world/level/tile/NoteBlockTile.cpp @@ -3,12 +3,12 @@ #include "NoteBlockTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/entity/MusicTileEntity.h" NoteBlockTile::NoteBlockTile(int id) : BaseEntityTile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.h b/minecraft/minecraft/world/level/tile/NoteBlockTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.h rename to minecraft/minecraft/world/level/tile/NoteBlockTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp b/minecraft/minecraft/world/level/tile/ObsidianTile.cpp similarity index 65% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp rename to minecraft/minecraft/world/level/tile/ObsidianTile.cpp index dce545f93..847960f96 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp +++ b/minecraft/minecraft/world/level/tile/ObsidianTile.cpp @@ -1,6 +1,6 @@ #include "ObsidianTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StoneTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/StoneTile.h" +#include "minecraft/world/level/tile/Tile.h" ObsidianTile::ObsidianTile(int id) : StoneTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.h b/minecraft/minecraft/world/level/tile/ObsidianTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.h rename to minecraft/minecraft/world/level/tile/ObsidianTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp b/minecraft/minecraft/world/level/tile/OreTile.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp rename to minecraft/minecraft/world/level/tile/OreTile.cpp index 10f45b46e..b9b395771 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp +++ b/minecraft/minecraft/world/level/tile/OreTile.cpp @@ -1,10 +1,10 @@ #include "OreTile.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" OreTile::OreTile(int id) : Tile(id, Material::stone) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.h b/minecraft/minecraft/world/level/tile/OreTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.h rename to minecraft/minecraft/world/level/tile/OreTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp b/minecraft/minecraft/world/level/tile/PlantTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp rename to minecraft/minecraft/world/level/tile/PlantTile.cpp index 86c0287c0..de3877886 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp +++ b/minecraft/minecraft/world/level/tile/PlantTile.cpp @@ -1,10 +1,10 @@ #include #include "PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" void Bush::_init() { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h b/minecraft/minecraft/world/level/tile/PlantTile.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h rename to minecraft/minecraft/world/level/tile/PlantTile.h index 446f1f9ca..efe0e36e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h +++ b/minecraft/minecraft/world/level/tile/PlantTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "console_helpers/Definitions.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp b/minecraft/minecraft/world/level/tile/PortalTile.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp rename to minecraft/minecraft/world/level/tile/PortalTile.cpp index 9c12e1b27..ff4a0bb97 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp +++ b/minecraft/minecraft/world/level/tile/PortalTile.cpp @@ -2,19 +2,19 @@ #include #include "PortalTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/SpawnEggItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfTransparentTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" PortalTile::PortalTile(int id) : HalfTransparentTile(id, L"portal", Material::portal, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h b/minecraft/minecraft/world/level/tile/PortalTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h rename to minecraft/minecraft/world/level/tile/PortalTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp b/minecraft/minecraft/world/level/tile/PotatoTile.cpp similarity index 80% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp rename to minecraft/minecraft/world/level/tile/PotatoTile.cpp index 7af8cd87e..0b75fe830 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp +++ b/minecraft/minecraft/world/level/tile/PotatoTile.cpp @@ -4,11 +4,11 @@ #include "PotatoTile.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/CropTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/CropTile.h" PotatoTile::PotatoTile(int id) : CropTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h b/minecraft/minecraft/world/level/tile/PotatoTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h rename to minecraft/minecraft/world/level/tile/PotatoTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp b/minecraft/minecraft/world/level/tile/PoweredMetalTile.cpp similarity index 67% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp rename to minecraft/minecraft/world/level/tile/PoweredMetalTile.cpp index 0eaf7604a..0949fb485 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp +++ b/minecraft/minecraft/world/level/tile/PoweredMetalTile.cpp @@ -1,6 +1,6 @@ #include "PoweredMetalTile.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/MetalTile.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/MetalTile.h" PoweredMetalTile::PoweredMetalTile(int id) : MetalTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.h b/minecraft/minecraft/world/level/tile/PoweredMetalTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.h rename to minecraft/minecraft/world/level/tile/PoweredMetalTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp b/minecraft/minecraft/world/level/tile/PoweredRailTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp rename to minecraft/minecraft/world/level/tile/PoweredRailTile.cpp index 766e425a0..971d69dd8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp +++ b/minecraft/minecraft/world/level/tile/PoweredRailTile.cpp @@ -1,10 +1,10 @@ #include #include "PoweredRailTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/Tile.h" PoweredRailTile::PoweredRailTile(int id) : BaseRailTile(id, true) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h b/minecraft/minecraft/world/level/tile/PoweredRailTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h rename to minecraft/minecraft/world/level/tile/PoweredRailTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp b/minecraft/minecraft/world/level/tile/PressurePlateTile.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp rename to minecraft/minecraft/world/level/tile/PressurePlateTile.cpp index 59e1d09de..0df136400 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/minecraft/minecraft/world/level/tile/PressurePlateTile.cpp @@ -4,13 +4,13 @@ #include "PressurePlateTile.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BasePressurePlateTile.h" +#include "minecraft/world/phys/AABB.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h b/minecraft/minecraft/world/level/tile/PressurePlateTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h rename to minecraft/minecraft/world/level/tile/PressurePlateTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp b/minecraft/minecraft/world/level/tile/PumpkinTile.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp rename to minecraft/minecraft/world/level/tile/PumpkinTile.cpp index 378d66d6d..077f84a38 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp +++ b/minecraft/minecraft/world/level/tile/PumpkinTile.cpp @@ -1,19 +1,19 @@ #include #include "PumpkinTile.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/animal/SnowMan.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/Tile.h" const std::wstring PumpkinTile::TEXTURE_FACE = L"pumpkin_face"; const std::wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h b/minecraft/minecraft/world/level/tile/PumpkinTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h rename to minecraft/minecraft/world/level/tile/PumpkinTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp b/minecraft/minecraft/world/level/tile/QuartzBlockTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp rename to minecraft/minecraft/world/level/tile/QuartzBlockTile.cpp index 99ec73f2c..793c103ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp +++ b/minecraft/minecraft/world/level/tile/QuartzBlockTile.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/net.minecraft.world.h" #include "QuartzBlockTile.h" // 4J Added -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/entity/player/Player.h" int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = { IDS_TILE_QUARTZ_BLOCK, IDS_TILE_QUARTZ_BLOCK_CHISELED, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h b/minecraft/minecraft/world/level/tile/QuartzBlockTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h rename to minecraft/minecraft/world/level/tile/QuartzBlockTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp b/minecraft/minecraft/world/level/tile/RailTile.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp rename to minecraft/minecraft/world/level/tile/RailTile.cpp index ccec8f4fb..a03b2d799 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp +++ b/minecraft/minecraft/world/level/tile/RailTile.cpp @@ -1,9 +1,9 @@ #include #include "RailTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/tile/BaseRailTile.h" +#include "minecraft/world/level/tile/Tile.h" RailTile::RailTile(int id) : BaseRailTile(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h b/minecraft/minecraft/world/level/tile/RailTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h rename to minecraft/minecraft/world/level/tile/RailTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp b/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp rename to minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp index ebabff887..e3878c7bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/minecraft/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -4,22 +4,22 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "RedStoneDustTile.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/Direction.h" #include "DiodeTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h b/minecraft/minecraft/world/level/tile/RedStoneDustTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h rename to minecraft/minecraft/world/level/tile/RedStoneDustTile.h index 0ae3e45fd..26b6af6b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h +++ b/minecraft/minecraft/world/level/tile/RedStoneDustTile.h @@ -5,7 +5,7 @@ #include "Tile.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "minecraft/world/level/TilePos.h" class Random; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp b/minecraft/minecraft/world/level/tile/RedStoneOreTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp rename to minecraft/minecraft/world/level/tile/RedStoneOreTile.cpp index 79b34f242..5b111b698 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/minecraft/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -1,13 +1,13 @@ #include #include "RedStoneOreTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" RedStoneOreTile::RedStoneOreTile(int id, bool lit) : Tile(id, Material::stone) { if (lit) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h b/minecraft/minecraft/world/level/tile/RedStoneOreTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h rename to minecraft/minecraft/world/level/tile/RedStoneOreTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp b/minecraft/minecraft/world/level/tile/RedlightTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp rename to minecraft/minecraft/world/level/tile/RedlightTile.cpp index 5e35d575e..3727fc289 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp +++ b/minecraft/minecraft/world/level/tile/RedlightTile.cpp @@ -1,10 +1,10 @@ #include #include "RedlightTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" RedlightTile::RedlightTile(int id, bool isLit) : Tile(id, Material::buildable_glass) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.h b/minecraft/minecraft/world/level/tile/RedlightTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.h rename to minecraft/minecraft/world/level/tile/RedlightTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp b/minecraft/minecraft/world/level/tile/ReedTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp rename to minecraft/minecraft/world/level/tile/ReedTile.cpp index d9a941741..1ffa1dd55 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp +++ b/minecraft/minecraft/world/level/tile/ReedTile.cpp @@ -1,11 +1,11 @@ #include #include "ReedTile.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" ReedTile::ReedTile(int id) : Tile(id, Material::plant, false) { this->updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h b/minecraft/minecraft/world/level/tile/ReedTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h rename to minecraft/minecraft/world/level/tile/ReedTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp b/minecraft/minecraft/world/level/tile/RepeaterTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp rename to minecraft/minecraft/world/level/tile/RepeaterTile.cpp index 8d7bbdefa..1c8b1c9b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp +++ b/minecraft/minecraft/world/level/tile/RepeaterTile.cpp @@ -1,14 +1,14 @@ #include #include "RepeaterTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Direction.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/DiodeTile.h" +#include "minecraft/world/level/tile/Tile.h" const double RepeaterTile::DELAY_RENDER_OFFSETS[4] = { -1.0f / 16.0f, 1.0f / 16.0f, 3.0f / 16.0f, 5.0f / 16.0f}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h b/minecraft/minecraft/world/level/tile/RepeaterTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h rename to minecraft/minecraft/world/level/tile/RepeaterTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp b/minecraft/minecraft/world/level/tile/RotatedPillarTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp rename to minecraft/minecraft/world/level/tile/RotatedPillarTile.cpp index 197b4b6f7..36928c952 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp +++ b/minecraft/minecraft/world/level/tile/RotatedPillarTile.cpp @@ -1,9 +1,9 @@ #include #include "RotatedPillarTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h b/minecraft/minecraft/world/level/tile/RotatedPillarTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h rename to minecraft/minecraft/world/level/tile/RotatedPillarTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp b/minecraft/minecraft/world/level/tile/SandStoneTile.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp rename to minecraft/minecraft/world/level/tile/SandStoneTile.cpp index 04c725998..d9802e15c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp +++ b/minecraft/minecraft/world/level/tile/SandStoneTile.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "minecraft/world/net.minecraft.world.h" #include "SandStoneTile.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h b/minecraft/minecraft/world/level/tile/SandStoneTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h rename to minecraft/minecraft/world/level/tile/SandStoneTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp b/minecraft/minecraft/world/level/tile/SaplingPlantTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp rename to minecraft/minecraft/world/level/tile/SaplingPlantTile.cpp index 89aef28aa..44bb9afd4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/minecraft/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "minecraft/world/net.minecraft.world.h" #include "SaplingPlantTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h b/minecraft/minecraft/world/level/tile/SaplingPlantTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h rename to minecraft/minecraft/world/level/tile/SaplingPlantTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp b/minecraft/minecraft/world/level/tile/SignTile.cpp similarity index 85% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp rename to minecraft/minecraft/world/level/tile/SignTile.cpp index 28f8a9bca..96436e9cf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp +++ b/minecraft/minecraft/world/level/tile/SignTile.cpp @@ -1,14 +1,14 @@ #include -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "SignTile.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround) : BaseEntityTile(id, Material::wood, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h b/minecraft/minecraft/world/level/tile/SignTile.h similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h rename to minecraft/minecraft/world/level/tile/SignTile.h index e300d92e0..3320509ae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h +++ b/minecraft/minecraft/world/level/tile/SignTile.h @@ -4,8 +4,8 @@ #include #include "BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/material/Material.h" #include "java/Class.h" class SignTile : public BaseEntityTile { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp b/minecraft/minecraft/world/level/tile/SkullTile.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp rename to minecraft/minecraft/world/level/tile/SkullTile.cpp index 8f1662277..5cd8ca586 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp +++ b/minecraft/minecraft/world/level/tile/SkullTile.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/entity/boss/wither/WitherBoss.h" +#include "minecraft/net.minecraft.h" #include "SkullTile.h" #include "console_helpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" SkullTile::SkullTile(int id) : BaseEntityTile(id, Material::decoration, false) { setShape(4.0f / 16.0f, 0, 4.0f / 16.0f, 12.0f / 16.0f, .5f, 12.0f / 16.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.h b/minecraft/minecraft/world/level/tile/SkullTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.h rename to minecraft/minecraft/world/level/tile/SkullTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/minecraft/minecraft/world/level/tile/SmoothStoneBrickTile.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp rename to minecraft/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index dfe23070a..f0f3a62b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/minecraft/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -1,5 +1,5 @@ #include "SmoothStoneBrickTile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/net.minecraft.world.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h b/minecraft/minecraft/world/level/tile/SmoothStoneBrickTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h rename to minecraft/minecraft/world/level/tile/SmoothStoneBrickTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp b/minecraft/minecraft/world/level/tile/SnowTile.cpp similarity index 67% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp rename to minecraft/minecraft/world/level/tile/SnowTile.cpp index 120c1ce5f..dff1c418c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp +++ b/minecraft/minecraft/world/level/tile/SnowTile.cpp @@ -1,9 +1,9 @@ #include "SnowTile.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" SnowTile::SnowTile(int id) : Tile(id, Material::snow) { setTicking(true); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.h b/minecraft/minecraft/world/level/tile/SnowTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.h rename to minecraft/minecraft/world/level/tile/SnowTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp b/minecraft/minecraft/world/level/tile/SoulSandTile.cpp similarity index 64% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp rename to minecraft/minecraft/world/level/tile/SoulSandTile.cpp index d2819655d..ed6cf51f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp +++ b/minecraft/minecraft/world/level/tile/SoulSandTile.cpp @@ -2,10 +2,10 @@ #include #include "SoulSandTile.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" SoulSandTile::SoulSandTile(int id) : Tile(id, Material::sand) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h b/minecraft/minecraft/world/level/tile/SoulSandTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h rename to minecraft/minecraft/world/level/tile/SoulSandTile.h diff --git a/minecraft/minecraft/world/level/tile/SpongeTile.cpp b/minecraft/minecraft/world/level/tile/SpongeTile.cpp new file mode 100644 index 000000000..e44525e72 --- /dev/null +++ b/minecraft/minecraft/world/level/tile/SpongeTile.cpp @@ -0,0 +1,7 @@ +#include "SpongeTile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +const int RANGE = 2; + +Sponge::Sponge(int id) : Tile(id, Material::sponge) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.h b/minecraft/minecraft/world/level/tile/SpongeTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.h rename to minecraft/minecraft/world/level/tile/SpongeTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp b/minecraft/minecraft/world/level/tile/StainedGlassBlock.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp rename to minecraft/minecraft/world/level/tile/StainedGlassBlock.cpp index 6a61d13a3..bcc8e216a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp +++ b/minecraft/minecraft/world/level/tile/StainedGlassBlock.cpp @@ -1,9 +1,9 @@ #include #include "StainedGlassBlock.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/level/tile/HalfTransparentTile.h" class Icon; class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h b/minecraft/minecraft/world/level/tile/StainedGlassBlock.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h rename to minecraft/minecraft/world/level/tile/StainedGlassBlock.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp b/minecraft/minecraft/world/level/tile/StainedGlassPaneBlock.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp rename to minecraft/minecraft/world/level/tile/StainedGlassPaneBlock.cpp index 32037d899..cb40beae0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp +++ b/minecraft/minecraft/world/level/tile/StainedGlassPaneBlock.cpp @@ -1,10 +1,10 @@ #include #include "StainedGlassPaneBlock.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/ThinFenceTile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h b/minecraft/minecraft/world/level/tile/StainedGlassPaneBlock.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h rename to minecraft/minecraft/world/level/tile/StainedGlassPaneBlock.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp b/minecraft/minecraft/world/level/tile/StairTile.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp rename to minecraft/minecraft/world/level/tile/StairTile.cpp index 0a0a69e19..0d742b5f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp +++ b/minecraft/minecraft/world/level/tile/StairTile.cpp @@ -1,13 +1,13 @@ #include "StairTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/phys/Vec3.h" int StairTile::DEAD_SPACES[8][2] = {{2, 6}, {3, 7}, {2, 3}, {6, 7}, {0, 4}, {1, 5}, {0, 1}, {4, 5}}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h b/minecraft/minecraft/world/level/tile/StairTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h rename to minecraft/minecraft/world/level/tile/StairTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp b/minecraft/minecraft/world/level/tile/StemTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp rename to minecraft/minecraft/world/level/tile/StemTile.cpp index baf06ee02..2ce7d932f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp +++ b/minecraft/minecraft/world/level/tile/StemTile.cpp @@ -5,13 +5,13 @@ #include "StemTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h b/minecraft/minecraft/world/level/tile/StemTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h rename to minecraft/minecraft/world/level/tile/StemTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp b/minecraft/minecraft/world/level/tile/StoneButtonTile.cpp similarity index 52% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp rename to minecraft/minecraft/world/level/tile/StoneButtonTile.cpp index 8a0446201..a41c4a9f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp +++ b/minecraft/minecraft/world/level/tile/StoneButtonTile.cpp @@ -1,7 +1,7 @@ #include "StoneButtonTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/tile/ButtonTile.h" +#include "minecraft/world/level/tile/Tile.h" StoneButtonTile::StoneButtonTile(int id) : ButtonTile(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.h b/minecraft/minecraft/world/level/tile/StoneButtonTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.h rename to minecraft/minecraft/world/level/tile/StoneButtonTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/minecraft/world/level/tile/StoneMonsterTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp rename to minecraft/minecraft/world/level/tile/StoneMonsterTile.cpp index 93d9785df..883ea3c11 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" #include "StoneMonsterTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h b/minecraft/minecraft/world/level/tile/StoneMonsterTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h rename to minecraft/minecraft/world/level/tile/StoneMonsterTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp b/minecraft/minecraft/world/level/tile/StoneSlabTile.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp rename to minecraft/minecraft/world/level/tile/StoneSlabTile.cpp index e2c08a480..53b05b67c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/minecraft/minecraft/world/level/tile/StoneSlabTile.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/net.minecraft.world.h" #include "StoneSlabTile.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h b/minecraft/minecraft/world/level/tile/StoneSlabTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h rename to minecraft/minecraft/world/level/tile/StoneSlabTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp b/minecraft/minecraft/world/level/tile/StoneTile.cpp similarity index 58% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp rename to minecraft/minecraft/world/level/tile/StoneTile.cpp index 06a7b8a8a..650865dfc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp +++ b/minecraft/minecraft/world/level/tile/StoneTile.cpp @@ -1,6 +1,6 @@ #include "StoneTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" StoneTile::StoneTile(int id) : Tile(id, Material::stone) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.h b/minecraft/minecraft/world/level/tile/StoneTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.h rename to minecraft/minecraft/world/level/tile/StoneTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp b/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp rename to minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp index 4b3c15047..649913b2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/minecraft/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.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" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/net.minecraft.world.h" #include "TallGrassPlantTile.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h b/minecraft/minecraft/world/level/tile/TallGrassPlantTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h rename to minecraft/minecraft/world/level/tile/TallGrassPlantTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp b/minecraft/minecraft/world/level/tile/TheEndPortalFrameTile.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp rename to minecraft/minecraft/world/level/tile/TheEndPortalFrameTile.cpp index 615604606..d8e61ee5a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp +++ b/minecraft/minecraft/world/level/tile/TheEndPortalFrameTile.cpp @@ -1,14 +1,14 @@ #include #include "TheEndPortalFrameTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h b/minecraft/minecraft/world/level/tile/TheEndPortalFrameTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h rename to minecraft/minecraft/world/level/tile/TheEndPortalFrameTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp b/minecraft/minecraft/world/level/tile/ThinFenceTile.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp rename to minecraft/minecraft/world/level/tile/ThinFenceTile.cpp index 8a5a59115..6e943bfa0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp +++ b/minecraft/minecraft/world/level/tile/ThinFenceTile.cpp @@ -1,10 +1,10 @@ #include "ThinFenceTile.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h b/minecraft/minecraft/world/level/tile/ThinFenceTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h rename to minecraft/minecraft/world/level/tile/ThinFenceTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp b/minecraft/minecraft/world/level/tile/Tile.cpp similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp rename to minecraft/minecraft/world/level/tile/Tile.cpp index 601eb02e2..abcf48eaa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp +++ b/minecraft/minecraft/world/level/tile/Tile.cpp @@ -1,22 +1,22 @@ #include -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/locale/net.minecraft.locale.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include "minecraft/world/level/material/net.minecraft.world.level.material.h" #include "net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/food/net.minecraft.world.food.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/phys/Vec3.h" #include "console_helpers/StringHelpers.h" #include "Tile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h b/minecraft/minecraft/world/level/tile/Tile.h similarity index 99% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h rename to minecraft/minecraft/world/level/tile/Tile.h index e66ea53be..bdfb7622c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h +++ b/minecraft/minecraft/world/level/tile/Tile.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/Vec3.h" #include "console_helpers/Definitions.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp b/minecraft/minecraft/world/level/tile/TntTile.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp rename to minecraft/minecraft/world/level/tile/TntTile.cpp index 30fa9e6e8..df3361905 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp +++ b/minecraft/minecraft/world/level/tile/TntTile.cpp @@ -3,22 +3,22 @@ #include "TntTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Explosion.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Explosion.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" TntTile::TntTile(int id) : Tile(id, Material::explosive) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h b/minecraft/minecraft/world/level/tile/TntTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h rename to minecraft/minecraft/world/level/tile/TntTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp b/minecraft/minecraft/world/level/tile/TopSnowTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp rename to minecraft/minecraft/world/level/tile/TopSnowTile.cpp index 0d968fe89..38107e4e7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp +++ b/minecraft/minecraft/world/level/tile/TopSnowTile.cpp @@ -2,16 +2,16 @@ #include #include "TopSnowTile.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" const int TopSnowTile::MAX_HEIGHT = 6; const int TopSnowTile::HEIGHT_MASK = 7; // max 8 steps diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h b/minecraft/minecraft/world/level/tile/TopSnowTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h rename to minecraft/minecraft/world/level/tile/TopSnowTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp b/minecraft/minecraft/world/level/tile/TorchTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp rename to minecraft/minecraft/world/level/tile/TorchTile.cpp index fffe9e021..5c6809c1f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp +++ b/minecraft/minecraft/world/level/tile/TorchTile.cpp @@ -1,12 +1,12 @@ #include #include "TorchTile.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" TorchTile::TorchTile(int id) : Tile(id, Material::decoration, false) { this->setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h b/minecraft/minecraft/world/level/tile/TorchTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h rename to minecraft/minecraft/world/level/tile/TorchTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp b/minecraft/minecraft/world/level/tile/TransparentTile.cpp similarity index 83% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp rename to minecraft/minecraft/world/level/tile/TransparentTile.cpp index 24674078c..4d4794f3c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp +++ b/minecraft/minecraft/world/level/tile/TransparentTile.cpp @@ -1,6 +1,6 @@ #include "TransparentTile.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h b/minecraft/minecraft/world/level/tile/TransparentTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h rename to minecraft/minecraft/world/level/tile/TransparentTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp b/minecraft/minecraft/world/level/tile/TrapDoorTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp rename to minecraft/minecraft/world/level/tile/TrapDoorTile.cpp index ae2988c8d..4aba1d5e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp +++ b/minecraft/minecraft/world/level/tile/TrapDoorTile.cpp @@ -1,15 +1,15 @@ #include #include "TrapDoorTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/StairTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" TrapDoorTile::TrapDoorTile(int id, Material* material) : Tile(id, material, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h b/minecraft/minecraft/world/level/tile/TrapDoorTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h rename to minecraft/minecraft/world/level/tile/TrapDoorTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp b/minecraft/minecraft/world/level/tile/TreeTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp rename to minecraft/minecraft/world/level/tile/TreeTile.cpp index c0dc3104c..70954b6a7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp +++ b/minecraft/minecraft/world/level/tile/TreeTile.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/net.minecraft.world.h" #include "LeafTile.h" #include "TreeTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.h b/minecraft/minecraft/world/level/tile/TreeTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.h rename to minecraft/minecraft/world/level/tile/TreeTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp b/minecraft/minecraft/world/level/tile/TripWireSourceTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp rename to minecraft/minecraft/world/level/tile/TripWireSourceTile.cpp index d808e0828..be5bfcd64 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/minecraft/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -1,16 +1,16 @@ #include "TripWireSourceTile.h" #include "optional" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TripWireTile.h" +#include "minecraft/world/phys/AABB.h" TripWireSourceTile::TripWireSourceTile(int id) : Tile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h b/minecraft/minecraft/world/level/tile/TripWireSourceTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h rename to minecraft/minecraft/world/level/tile/TripWireSourceTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp b/minecraft/minecraft/world/level/tile/TripWireTile.cpp similarity index 89% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp rename to minecraft/minecraft/world/level/tile/TripWireTile.cpp index 5ec4e7ecd..0b7224d24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp +++ b/minecraft/minecraft/world/level/tile/TripWireTile.cpp @@ -3,17 +3,17 @@ #include #include "TripWireTile.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TripWireSourceTile.h" +#include "minecraft/world/phys/AABB.h" TripWireTile::TripWireTile(int id) : Tile(id, Material::decoration, false) { setShape(0, 0, 0, 1, 2.5f / 16.0f, 1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h b/minecraft/minecraft/world/level/tile/TripWireTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h rename to minecraft/minecraft/world/level/tile/TripWireTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp b/minecraft/minecraft/world/level/tile/VineTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp rename to minecraft/minecraft/world/level/tile/VineTile.cpp index 848c80457..c9295ad7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp +++ b/minecraft/minecraft/world/level/tile/VineTile.cpp @@ -1,22 +1,22 @@ #include #include "VineTile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/world/level/material/Material.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/Direction.h" -#include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" -#include "Minecraft.World/net/minecraft/world/level/FoliageColor.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/Direction.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ShearsItem.h" +#include "minecraft/world/level/FoliageColor.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" VineTile::VineTile(int id) : Tile(id, Material::replaceable_plant, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h b/minecraft/minecraft/world/level/tile/VineTile.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h rename to minecraft/minecraft/world/level/tile/VineTile.h index 66edbe43f..3ce0c3054 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h +++ b/minecraft/minecraft/world/level/tile/VineTile.h @@ -2,7 +2,7 @@ #include #include "Tile.h" -#include "Minecraft.World/net/minecraft/Direction.h" +#include "minecraft/Direction.h" class Level; class LevelSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp b/minecraft/minecraft/world/level/tile/WallTile.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp rename to minecraft/minecraft/world/level/tile/WallTile.cpp index 82887ebae..5941d76ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp +++ b/minecraft/minecraft/world/level/tile/WallTile.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/net.minecraft.h" #include "WallTile.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.h b/minecraft/minecraft/world/level/tile/WallTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.h rename to minecraft/minecraft/world/level/tile/WallTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp b/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp rename to minecraft/minecraft/world/level/tile/WaterLilyTile.cpp index 743ad33c1..0970e6ea7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/minecraft/minecraft/world/level/tile/WaterLilyTile.cpp @@ -6,12 +6,12 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h b/minecraft/minecraft/world/level/tile/WaterLilyTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h rename to minecraft/minecraft/world/level/tile/WaterLilyTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp b/minecraft/minecraft/world/level/tile/WebTile.cpp similarity index 72% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp rename to minecraft/minecraft/world/level/tile/WebTile.cpp index 3dbce838e..8c3d4429f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp +++ b/minecraft/minecraft/world/level/tile/WebTile.cpp @@ -2,11 +2,11 @@ #include #include "WebTile.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" WebTile::WebTile(int id) : Tile(id, Material::web) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.h b/minecraft/minecraft/world/level/tile/WebTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.h rename to minecraft/minecraft/world/level/tile/WebTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/minecraft/minecraft/world/level/tile/WeightedPressurePlateTile.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp rename to minecraft/minecraft/world/level/tile/WeightedPressurePlateTile.cpp index 9124a729c..709ffcefc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp +++ b/minecraft/minecraft/world/level/tile/WeightedPressurePlateTile.cpp @@ -2,13 +2,13 @@ #include #include "WeightedPressurePlateTile.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BasePressurePlateTile.h" +#include "minecraft/world/phys/AABB.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h b/minecraft/minecraft/world/level/tile/WeightedPressurePlateTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h rename to minecraft/minecraft/world/level/tile/WeightedPressurePlateTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp b/minecraft/minecraft/world/level/tile/WoodButtonTile.cpp similarity index 51% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp rename to minecraft/minecraft/world/level/tile/WoodButtonTile.cpp index 05c94ef2f..baa056b92 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp +++ b/minecraft/minecraft/world/level/tile/WoodButtonTile.cpp @@ -1,7 +1,7 @@ #include "WoodButtonTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/tile/ButtonTile.h" +#include "minecraft/world/level/tile/Tile.h" WoodButtonTile::WoodButtonTile(int id) : ButtonTile(id, true) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.h b/minecraft/minecraft/world/level/tile/WoodButtonTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.h rename to minecraft/minecraft/world/level/tile/WoodButtonTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp b/minecraft/minecraft/world/level/tile/WoodSlabTile.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp rename to minecraft/minecraft/world/level/tile/WoodSlabTile.cpp index 812c8c27b..82dbdfd3a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp +++ b/minecraft/minecraft/world/level/tile/WoodSlabTile.cpp @@ -1,10 +1,10 @@ #include "WoodSlabTile.h" #include "WoodTile.h" #include "TreeTile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/stats/net.minecraft.stats.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.h b/minecraft/minecraft/world/level/tile/WoodSlabTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.h rename to minecraft/minecraft/world/level/tile/WoodSlabTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp b/minecraft/minecraft/world/level/tile/WoodTile.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp rename to minecraft/minecraft/world/level/tile/WoodTile.cpp index d0fbc1166..54a083b95 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp +++ b/minecraft/minecraft/world/level/tile/WoodTile.cpp @@ -1,10 +1,10 @@ #include "WoodTile.h" #include "TreeTile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/stats/net.minecraft.stats.h" +#include "minecraft/world/net.minecraft.world.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.h b/minecraft/minecraft/world/level/tile/WoodTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.h rename to minecraft/minecraft/world/level/tile/WoodTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp b/minecraft/minecraft/world/level/tile/WoolCarpetTile.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp rename to minecraft/minecraft/world/level/tile/WoolCarpetTile.cpp index a20c8e43e..750d8ae5d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp +++ b/minecraft/minecraft/world/level/tile/WoolCarpetTile.cpp @@ -1,12 +1,12 @@ #include #include "WoolCarpetTile.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" WoolCarpetTile::WoolCarpetTile(int id) : Tile(id, Material::clothDecoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h b/minecraft/minecraft/world/level/tile/WoolCarpetTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h rename to minecraft/minecraft/world/level/tile/WoolCarpetTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp b/minecraft/minecraft/world/level/tile/WorkbenchTile.cpp similarity index 76% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp rename to minecraft/minecraft/world/level/tile/WorkbenchTile.cpp index 23ba46db3..c9099ede6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp +++ b/minecraft/minecraft/world/level/tile/WorkbenchTile.cpp @@ -2,12 +2,12 @@ #include #include "WorkbenchTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" WorkbenchTile::WorkbenchTile(int id) : Tile(id, Material::wood) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h b/minecraft/minecraft/world/level/tile/WorkbenchTile.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h rename to minecraft/minecraft/world/level/tile/WorkbenchTile.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 40baea71d..2e761f1fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,12 +1,12 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "minecraft/world/effect/net.minecraft.world.effect.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/world/phys/net.minecraft.world.phys.h" #include "BeaconTileEntity.h" std::shared_ptr BeaconTileEntity::clone() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h b/minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.h index 3f7c700d7..54106b36c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -1,8 +1,8 @@ #pragma once #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/Container.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "minecraft/world/Container.h" +#include "minecraft/SharedConstants.h" class MobEffect; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index f1fd92907..2b2b1904d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "BrewingStandTileEntity.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "minecraft/world/item/alchemy/PotionMacros.h" int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT}; int slotsForOtherFaces[] = {0, 1, 2}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h b/minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.h index 6d6c38c56..2cf7ad62d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/BrewingStandTileEntity.h @@ -1,6 +1,6 @@ #pragma once #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/WorldlyContainer.h" +#include "minecraft/world/WorldlyContainer.h" class BrewingStandTileEntity : public TileEntity, public WorldlyContainer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/ChestTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/ChestTileEntity.cpp index fbf5cc3cc..b8a1f9ae8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,18 +1,18 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/net.minecraft.world.h" +#include "minecraft/world/level/net.minecraft.world.level.h" #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.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" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/sounds/SoundTypes.h" int ChestTileEntity::getContainerType() { if (isBonusChest) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h b/minecraft/minecraft/world/level/tile/entity/ChestTileEntity.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/ChestTileEntity.h index b1d81ad3f..f969ac57f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/ChestTileEntity.h @@ -1,7 +1,7 @@ #pragma once #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index 5208478ed..02830e1fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -3,9 +3,9 @@ #include "CommandBlockEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/Pos.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h b/minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.h similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h rename to minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.h index 8b3497e63..c4bcb1de4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/CommandBlockEntity.h @@ -3,10 +3,10 @@ #include #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "minecraft/commands/CommandSender.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" -#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/ChatPacket.h" class ChatMessageComponent; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index 60474a7fe..8b0efdc29 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -3,7 +3,7 @@ #include "ComparatorTileEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" void ComparatorTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h b/minecraft/minecraft/world/level/tile/entity/ComparatorTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/ComparatorTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp similarity index 75% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp index b4efdde79..49dd9bc9d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp @@ -1,10 +1,10 @@ #include #include "DaylightDetectorTileEntity.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/DaylightDetectorTile.h" +#include "minecraft/world/level/tile/Tile.h" DaylightDetectorTileEntity::DaylightDetectorTileEntity() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h b/minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h index 48e759eae..0f334d061 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h @@ -1,7 +1,7 @@ #pragma once #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class DaylightDetectorTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index d0048214f..4c43ff7fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/item/net.minecraft.world.item.h" #include "DispenserTileEntity.h" DispenserTileEntity::DispenserTileEntity() : TileEntity() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h b/minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.h index f30455465..1f1c0e143 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -2,7 +2,7 @@ #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class Player; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/DropperTileEntity.cpp similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/DropperTileEntity.cpp index a3f4dd7a1..01444600c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h b/minecraft/minecraft/world/level/tile/entity/DropperTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/DropperTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index f6844cbb3..d2439f18f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,10 +1,10 @@ #include -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "EnchantmentTableTileEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" EnchantmentTableEntity::EnchantmentTableEntity() { random = new Random(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h b/minecraft/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp similarity index 87% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index f525256ac..7a98e6137 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -1,11 +1,11 @@ #include "EnderChestTileEntity.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" EnderChestTileEntity::EnderChestTileEntity() { openness = oOpenness = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h b/minecraft/minecraft/world/level/tile/entity/EnderChestTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/EnderChestTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 41b914c2c..d93031521 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/item/net.minecraft.world.item.h" +#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.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/material/Material.h" #include "FurnaceTileEntity.h" int furnaceSlotsForUp[] = {FurnaceTileEntity::SLOT_INPUT}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.h similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.h index db0476f53..84551dc10 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/FurnaceTileEntity.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h" +#include "minecraft/world/level/tile/FurnaceTile.h" #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/WorldlyContainer.h" +#include "minecraft/world/WorldlyContainer.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h b/minecraft/minecraft/world/level/tile/entity/Hopper.h similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h rename to minecraft/minecraft/world/level/tile/entity/Hopper.h index 7b4dd77d5..7a944b159 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h +++ b/minecraft/minecraft/world/level/tile/entity/Hopper.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/net/minecraft/world/Container.h" +#include "minecraft/world/Container.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/HopperTileEntity.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 8f29afd0f..35c77a4a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,16 +1,16 @@ -#include "Minecraft.World/stdafx.h" +#include "minecraft/stdafx.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/net.minecraft.h" +#include "minecraft/world/entity/net.minecraft.world.entity.h" +#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "minecraft/world/level/net.minecraft.world.level.h" +#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "minecraft/world/net.minecraft.world.h" #include "HopperTileEntity.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "minecraft/util/Mth.h" HopperTileEntity::HopperTileEntity() { items = std::vector>(5); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h b/minecraft/minecraft/world/level/tile/entity/HopperTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/HopperTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index a897844f3..6c638079c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -2,11 +2,11 @@ #include "MobSpawnerTileEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" MobSpawnerTileEntity::TileEntityMobSpawner::TileEntityMobSpawner( MobSpawnerTileEntity* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h b/minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h index f5b655b63..c8c554a78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h @@ -3,7 +3,7 @@ #include #include "TileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "minecraft/world/level/BaseMobSpawner.h" #include "java/Class.h" class Packet; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/MusicTileEntity.cpp similarity index 81% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/MusicTileEntity.cpp index f2e722698..238bd225b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -3,10 +3,10 @@ #include "MusicTileEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" MusicTileEntity::MusicTileEntity() : TileEntity() { note = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h b/minecraft/minecraft/world/level/tile/entity/MusicTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/MusicTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp index 5f7953917..1b4961a3f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp @@ -3,13 +3,13 @@ #include "PistonMovingTileEntity.h" #include "PistonPieceTileEntity.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" PistonMovingPiece::PistonMovingPiece(int id) : BaseEntityTile(id, Material::piston, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h b/minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.h similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.h index 0ac1933e9..227295c83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/PistonMovingTileEntity.h @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" class PistonPieceEntity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp similarity index 93% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index b28db5319..02fd2a61e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -6,12 +6,12 @@ #include "PistonPieceTileEntity.h" #include "PistonMovingTileEntity.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" PistonPieceEntity::PistonPieceEntity() { // for the tile entity loader diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h b/minecraft/minecraft/world/level/tile/entity/PistonPieceTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/PistonPieceTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp index 7cfa29787..d0324e77d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -3,11 +3,11 @@ #include "SignTileEntity.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "minecraft/world/level/Level.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" const int SignTileEntity::MAX_LINE_LENGTH = 15; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/SignTileEntity.h index 6cc894f9c..60977f524 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h +++ b/minecraft/minecraft/world/level/tile/entity/SignTileEntity.h @@ -6,7 +6,7 @@ #include "TileEntity.h" #include "platform/IPlatformInput.h" #include "java/Class.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/Player.h" #define MAX_SIGN_LINES 4 diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/SkullTileEntity.cpp similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/SkullTileEntity.cpp index 3b0a3d367..8cbdbae04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -3,8 +3,8 @@ #include "SkullTileEntity.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" SkullTileEntity::SkullTileEntity() { skullType = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h b/minecraft/minecraft/world/level/tile/entity/SkullTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/SkullTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.cpp similarity index 88% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp rename to minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index 098c5d743..f7eef99db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -4,15 +4,15 @@ #include "TheEndPortalTileEntity.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.h similarity index 91% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h rename to minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.h index e77411012..ce5d8833b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h +++ b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTile.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/tile/EntityTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/EntityTile.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" class IconRegister; class Material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp index 2718dd522..b657fd570 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp @@ -1,7 +1,7 @@ #include #include "TheEndPortalTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" // 4J Added std::shared_ptr TheEndPortalTileEntity::clone() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h b/minecraft/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h rename to minecraft/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp b/minecraft/minecraft/world/level/tile/entity/TileEntity.cpp similarity index 79% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp rename to minecraft/minecraft/world/level/tile/entity/TileEntity.cpp index 6b9c4f001..c9f2feedf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/minecraft/minecraft/world/level/tile/entity/TileEntity.cpp @@ -2,29 +2,29 @@ #include "TileEntity.h" #include "PistonPieceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "nbt/CompoundTag.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/JukeboxTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "minecraft/world/level/tile/entity/ComparatorTileEntity.h" +#include "minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/tile/entity/DropperTileEntity.h" +#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" +#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/level/tile/entity/MusicTileEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" TileEntity::idToCreateMapType TileEntity::idCreateMap = std::unordered_map(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h b/minecraft/minecraft/world/level/tile/entity/TileEntity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h rename to minecraft/minecraft/world/level/tile/entity/TileEntity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h b/minecraft/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h rename to minecraft/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h b/minecraft/minecraft/world/level/tile/net.minecraft.world.level.tile.h similarity index 92% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h rename to minecraft/minecraft/world/level/tile/net.minecraft.world.level.tile.h index 594f59ad3..a3fa8a7a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h +++ b/minecraft/minecraft/world/level/tile/net.minecraft.world.level.tile.h @@ -74,8 +74,8 @@ #include "NotGateTile.h" #include "ObsidianTile.h" #include "OreTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/level/tile/piston/PistonExtensionTile.h" #include "PortalTile.h" #include "PotatoTile.h" #include "PoweredMetalTile.h" @@ -107,7 +107,7 @@ #include "StoneSlabTile.h" #include "StoneTile.h" #include "TallGrassPlantTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h" +#include "minecraft/world/level/tile/entity/TheEndPortalTile.h" #include "TheEndPortalFrameTile.h" #include "ThinFenceTile.h" #include "TntTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp rename to minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp index def086529..36be9a400 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -1,26 +1,26 @@ #include #include "PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" +#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h" +#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "PistonExtensionTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" +#include "minecraft/Facing.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/sounds/SoundTypes.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/IconRegister.h" -#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/SkinBox.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.h similarity index 98% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h rename to minecraft/minecraft/world/level/tile/piston/PistonBaseTile.h index 7869e8ec9..393abe490 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h +++ b/minecraft/minecraft/world/level/tile/piston/PistonBaseTile.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp b/minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.cpp similarity index 94% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp rename to minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.cpp index 319abdd6e..c845c0724 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp +++ b/minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.cpp @@ -1,12 +1,12 @@ #include "PistonExtensionTile.h" #include "PistonBaseTile.h" -#include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" -#include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/Facing.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h b/minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.h similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h rename to minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.h index 6e3b92b5c..903f4fe8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h +++ b/minecraft/minecraft/world/level/tile/piston/PistonExtensionTile.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/minecraft/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h b/minecraft/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h new file mode 100644 index 000000000..be7272b06 --- /dev/null +++ b/minecraft/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h @@ -0,0 +1,6 @@ +#pragma once + +#include "PistonBaseTile.h" +#include "PistonExtensionTile.h" +#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h" +#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/net.minecraft.world.ContainerListener.h b/minecraft/minecraft/world/net.minecraft.world.ContainerListener.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/net.minecraft.world.ContainerListener.h rename to minecraft/minecraft/world/net.minecraft.world.ContainerListener.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/net.minecraft.world.h b/minecraft/minecraft/world/net.minecraft.world.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/net.minecraft.world.h rename to minecraft/minecraft/world/net.minecraft.world.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp b/minecraft/minecraft/world/phys/AABB.cpp similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp rename to minecraft/minecraft/world/phys/AABB.cpp index 5c1fc4293..c793d9e77 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp +++ b/minecraft/minecraft/world/phys/AABB.cpp @@ -11,9 +11,9 @@ #include #include "HitResult.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" AABB::AABB(double x0, double y0, double z0, double x1, double y1, double z1) { this->x0 = x0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h b/minecraft/minecraft/world/phys/AABB.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h rename to minecraft/minecraft/world/phys/AABB.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp b/minecraft/minecraft/world/phys/HitResult.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp rename to minecraft/minecraft/world/phys/HitResult.cpp index 03fcb0505..bc0213583 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp +++ b/minecraft/minecraft/world/phys/HitResult.cpp @@ -1,5 +1,5 @@ #include "HitResult.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Entity.h" HitResult::HitResult(int x, int y, int z, int f, const Vec3& pos) { type = TILE; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h b/minecraft/minecraft/world/phys/HitResult.h similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h rename to minecraft/minecraft/world/phys/HitResult.h index 2117721f7..5b15b9912 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h +++ b/minecraft/minecraft/world/phys/HitResult.h @@ -2,7 +2,7 @@ #include #include "Vec3.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp b/minecraft/minecraft/world/phys/Vec3.cpp similarity index 96% rename from minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp rename to minecraft/minecraft/world/phys/Vec3.cpp index 7f06d91fd..9b08e21ae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp +++ b/minecraft/minecraft/world/phys/Vec3.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" Vec3 Vec3::vectorTo(const Vec3& p) const { return {p.x - x, p.y - y, p.z - z}; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.h b/minecraft/minecraft/world/phys/Vec3.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.h rename to minecraft/minecraft/world/phys/Vec3.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h b/minecraft/minecraft/world/phys/net.minecraft.world.phys.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h rename to minecraft/minecraft/world/phys/net.minecraft.world.phys.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp b/minecraft/minecraft/world/scores/Objective.cpp similarity index 90% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp rename to minecraft/minecraft/world/scores/Objective.cpp index 60c5c4845..9d97636c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp +++ b/minecraft/minecraft/world/scores/Objective.cpp @@ -1,5 +1,5 @@ #include "Objective.h" -#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/Scoreboard.h" Objective::Objective(Scoreboard* scoreboard, const std::wstring& name, ObjectiveCriteria* criteria) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h b/minecraft/minecraft/world/scores/Objective.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h rename to minecraft/minecraft/world/scores/Objective.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp b/minecraft/minecraft/world/scores/PlayerTeam.cpp similarity index 95% rename from minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp rename to minecraft/minecraft/world/scores/PlayerTeam.cpp index 79cec7fe1..d8759847c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp +++ b/minecraft/minecraft/world/scores/PlayerTeam.cpp @@ -1,6 +1,6 @@ #include "PlayerTeam.h" -#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" -#include "Minecraft.World/net/minecraft/world/scores/Team.h" +#include "minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/Team.h" PlayerTeam::PlayerTeam(Scoreboard* scoreboard, const std::wstring& name) { this->scoreboard = scoreboard; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h b/minecraft/minecraft/world/scores/PlayerTeam.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h rename to minecraft/minecraft/world/scores/PlayerTeam.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp b/minecraft/minecraft/world/scores/Score.cpp similarity index 86% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp rename to minecraft/minecraft/world/scores/Score.cpp index 534d64dd3..1c3ced32f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp +++ b/minecraft/minecraft/world/scores/Score.cpp @@ -1,7 +1,7 @@ #include "Score.h" -#include "Minecraft.World/net/minecraft/world/scores/Objective.h" -#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h" +#include "minecraft/world/scores/Objective.h" +#include "minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/criteria/ObjectiveCriteria.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.h b/minecraft/minecraft/world/scores/Score.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Score.h rename to minecraft/minecraft/world/scores/Score.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/ScoreHolder.h b/minecraft/minecraft/world/scores/ScoreHolder.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/ScoreHolder.h rename to minecraft/minecraft/world/scores/ScoreHolder.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp b/minecraft/minecraft/world/scores/Scoreboard.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp rename to minecraft/minecraft/world/scores/Scoreboard.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h b/minecraft/minecraft/world/scores/Scoreboard.h similarity index 97% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h rename to minecraft/minecraft/world/scores/Scoreboard.h index a9b955de2..68f36d985 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h +++ b/minecraft/minecraft/world/scores/Scoreboard.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ItemInstance.h" class Objective; class ObjectiveCriteria; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/ScoreboardSaveData.h b/minecraft/minecraft/world/scores/ScoreboardSaveData.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/ScoreboardSaveData.h rename to minecraft/minecraft/world/scores/ScoreboardSaveData.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp b/minecraft/minecraft/world/scores/Team.cpp similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp rename to minecraft/minecraft/world/scores/Team.cpp diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.h b/minecraft/minecraft/world/scores/Team.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/Team.h rename to minecraft/minecraft/world/scores/Team.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp b/minecraft/minecraft/world/scores/criteria/DummyCriteria.cpp similarity index 82% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp rename to minecraft/minecraft/world/scores/criteria/DummyCriteria.cpp index bdd9123a1..06c504c93 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp +++ b/minecraft/minecraft/world/scores/criteria/DummyCriteria.cpp @@ -1,7 +1,7 @@ #include #include "DummyCriteria.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h" +#include "minecraft/world/scores/criteria/ObjectiveCriteria.h" DummyCriteria::DummyCriteria(const std::wstring& name) { this->name = name; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h b/minecraft/minecraft/world/scores/criteria/DummyCriteria.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h rename to minecraft/minecraft/world/scores/criteria/DummyCriteria.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp b/minecraft/minecraft/world/scores/criteria/HealthCriteria.cpp similarity index 74% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp rename to minecraft/minecraft/world/scores/criteria/HealthCriteria.cpp index fae24f2e9..ddb017b18 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp +++ b/minecraft/minecraft/world/scores/criteria/HealthCriteria.cpp @@ -2,9 +2,9 @@ #include #include "HealthCriteria.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h" +#include "minecraft/util/Mth.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/scores/criteria/DummyCriteria.h" HealthCriteria::HealthCriteria(const std::wstring& id) : DummyCriteria(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h b/minecraft/minecraft/world/scores/criteria/HealthCriteria.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h rename to minecraft/minecraft/world/scores/criteria/HealthCriteria.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp b/minecraft/minecraft/world/scores/criteria/ObjectiveCriteria.cpp similarity index 78% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp rename to minecraft/minecraft/world/scores/criteria/ObjectiveCriteria.cpp index 6f9c358f5..d30c0f064 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp +++ b/minecraft/minecraft/world/scores/criteria/ObjectiveCriteria.cpp @@ -1,6 +1,6 @@ #include "ObjectiveCriteria.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h" -#include "Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h" +#include "minecraft/world/scores/criteria/DummyCriteria.h" +#include "minecraft/world/scores/criteria/HealthCriteria.h" std::unordered_map ObjectiveCriteria::CRITERIA_BY_NAME; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h b/minecraft/minecraft/world/scores/criteria/ObjectiveCriteria.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h rename to minecraft/minecraft/world/scores/criteria/ObjectiveCriteria.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h b/minecraft/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h rename to minecraft/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/net.minecraft.world.scores.h b/minecraft/minecraft/world/scores/net.minecraft.world.scores.h similarity index 100% rename from minecraft/Minecraft.World/net/minecraft/world/scores/net.minecraft.world.scores.h rename to minecraft/minecraft/world/scores/net.minecraft.world.scores.h