From c49c0a7f27647ea499ea4ed58ffd6c75b7777b4a Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 1 Apr 2026 10:28:52 -0500 Subject: [PATCH] restructure additional Minecraft.World headers --- .../Minecraft.Client/Common/Consoles_App.cpp | 2 +- .../Common/src/Audio/Consoles_SoundEngine.h | 2 +- .../Common/src/Audio/SoundEngine.h | 2 +- .../Common/src/Audio/SoundNames.cpp | 2 +- .../Common/src/GameRules/GameRuleManager.cpp | 4 +-- .../LevelGeneration/ConsoleSchematicFile.cpp | 2 +- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../Common/src/Network/GameNetworkManager.cpp | 2 +- .../Common/src/Tutorial/FullTutorial.cpp | 2 +- .../Common/src/Tutorial/TutorialMode.cpp | 2 +- .../src/UI/All Platforms/ArchiveFile.cpp | 2 +- .../src/UI/All Platforms/IUIController.h | 2 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 2 +- .../src/UI/Controls/UIControl_Slider.cpp | 2 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 2 +- .../Containers/UIScene_CreativeMenu.cpp | 2 +- .../Common/src/UI/UIController.cpp | 2 +- .../Common/src/UI/UIScene.cpp | 2 +- .../Linux/Linux_Minecraft.cpp | 2 +- .../Windows64/Iggy/gdraw/gdraw_d3d11.cpp | 2 +- .../Source Files/Windows64_Minecraft.cpp | 2 +- .../net/minecraft/client/Minecraft.cpp | 6 ++-- .../net/minecraft/client/gui/Screen.cpp | 2 +- .../client/gui/achievement/StatsScreen.cpp | 2 +- .../client/multiplayer/ClientConnection.cpp | 2 +- .../client/multiplayer/MultiPlayerLevel.cpp | 2 +- .../minecraft/client/particle/CritParticle.h | 2 +- .../client/particle/DripParticle.cpp | 2 +- .../client/particle/FireworksParticles.cpp | 2 +- .../particle/HugeExplosionSeedParticle.cpp | 2 +- .../client/particle/LavaParticle.cpp | 2 +- .../net/minecraft/client/particle/Particle.h | 2 +- .../minecraft/client/player/LocalPlayer.cpp | 4 +-- .../client/renderer/GameRenderer.cpp | 4 +-- .../client/renderer/LevelRenderer.cpp | 4 +-- .../minecraft/client/renderer/LevelRenderer.h | 2 +- .../net/minecraft/server/MinecraftServer.cpp | 2 +- .../server/level/ServerChunkCache.cpp | 2 +- .../server/level/ServerLevelListener.h | 2 +- .../ConsoleSaveFileOriginal.cpp | 2 +- .../ConsoleSaveFileSplit.cpp | 2 +- .../{src => ConsoleHelpers}/compression.cpp | 2 +- .../{include => ConsoleHelpers}/compression.h | 0 minecraft/Minecraft.World/ReadMe.txt | 30 ------------------- .../Minecraft.World/include/Minecraft.World.h | 3 -- minecraft/Minecraft.World/meson.build | 2 +- .../minecraft/StaticConstructors.cpp} | 4 +-- .../net/minecraft/StaticConstructors.h | 3 ++ .../minecraft/core/particles}/ParticleTypes.h | 0 .../net/minecraft/network/Connection.cpp | 2 +- .../packet/BlockRegionUpdatePacket.cpp | 2 +- .../minecraft/sounds}/SoundTypes.h | 0 .../net/minecraft/world/entity/Entity.cpp | 4 +-- .../minecraft/world/entity/ExperienceOrb.cpp | 2 +- .../minecraft/world/entity/LivingEntity.cpp | 4 +-- .../net/minecraft/world/entity/Mob.cpp | 2 +- .../minecraft/world/entity/TamableAnimal.cpp | 2 +- .../world/entity/ai/goal/BreedGoal.cpp | 2 +- .../minecraft/world/entity/ambient/Bat.cpp | 2 +- .../minecraft/world/entity/animal/Chicken.cpp | 2 +- .../net/minecraft/world/entity/animal/Cow.cpp | 2 +- .../world/entity/animal/EntityHorse.cpp | 4 +-- .../world/entity/animal/MushroomCow.cpp | 2 +- .../minecraft/world/entity/animal/Ocelot.cpp | 2 +- .../net/minecraft/world/entity/animal/Pig.cpp | 2 +- .../minecraft/world/entity/animal/Sheep.cpp | 2 +- .../minecraft/world/entity/animal/SnowMan.cpp | 2 +- .../world/entity/animal/VillagerGolem.cpp | 4 +-- .../minecraft/world/entity/animal/Wolf.cpp | 4 +-- .../entity/boss/enderdragon/EnderDragon.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.cpp | 2 +- .../world/entity/boss/wither/WitherBoss.h | 2 +- .../world/entity/global/LightningBolt.cpp | 2 +- .../net/minecraft/world/entity/item/Boat.cpp | 2 +- .../world/entity/item/ItemEntity.cpp | 2 +- .../world/entity/item/MinecartContainer.cpp | 2 +- .../world/entity/item/MinecartFurnace.cpp | 2 +- .../world/entity/item/MinecartTNT.cpp | 4 +-- .../minecraft/world/entity/item/PrimedTnt.cpp | 2 +- .../minecraft/world/entity/monster/Blaze.cpp | 4 +-- .../world/entity/monster/Creeper.cpp | 2 +- .../world/entity/monster/EnderMan.cpp | 4 +-- .../minecraft/world/entity/monster/Ghast.cpp | 2 +- .../world/entity/monster/LavaSlime.cpp | 2 +- .../world/entity/monster/LavaSlime.h | 2 +- .../world/entity/monster/PigZombie.cpp | 2 +- .../world/entity/monster/Silverfish.cpp | 2 +- .../world/entity/monster/Skeleton.cpp | 2 +- .../minecraft/world/entity/monster/Slime.cpp | 4 +-- .../minecraft/world/entity/monster/Slime.h | 2 +- .../minecraft/world/entity/monster/Spider.cpp | 2 +- .../minecraft/world/entity/monster/Witch.cpp | 4 +-- .../minecraft/world/entity/monster/Zombie.cpp | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 2 +- .../net/minecraft/world/entity/npc/Villager.h | 2 +- .../minecraft/world/entity/player/Player.cpp | 4 +-- .../world/entity/projectile/Arrow.cpp | 4 +-- .../world/entity/projectile/DragonFireball.h | 2 +- .../entity/projectile/EyeOfEnderSignal.cpp | 2 +- .../world/entity/projectile/Fireball.cpp | 2 +- .../world/entity/projectile/Fireball.h | 2 +- .../projectile/FireworksRocketEntity.cpp | 4 +-- .../world/entity/projectile/FishingHook.cpp | 4 +-- .../world/entity/projectile/Snowball.cpp | 2 +- .../world/entity/projectile/Throwable.cpp | 2 +- .../world/entity/projectile/ThrownEgg.cpp | 2 +- .../entity/projectile/ThrownEnderpearl.cpp | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- .../net/minecraft/world/item/BowItem.cpp | 2 +- .../net/minecraft/world/item/BucketItem.cpp | 4 +-- .../net/minecraft/world/item/EggItem.cpp | 2 +- .../net/minecraft/world/item/EnderEyeItem.cpp | 4 +-- .../minecraft/world/item/EnderpearlItem.cpp | 2 +- .../minecraft/world/item/ExperienceItem.cpp | 2 +- .../minecraft/world/item/FireChargeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 2 +- .../minecraft/world/item/FireworksItem.cpp | 2 +- .../minecraft/world/item/FishingRodItem.cpp | 2 +- .../world/item/FlintAndSteelItem.cpp | 2 +- .../net/minecraft/world/item/FoodItem.cpp | 2 +- .../net/minecraft/world/item/ItemInstance.cpp | 2 +- .../net/minecraft/world/item/PotionItem.cpp | 6 ++-- .../net/minecraft/world/item/SnowballItem.cpp | 2 +- .../net/minecraft/world/item/SpawnEggItem.cpp | 2 +- .../world/item/alchemy/PotionMacros.h} | 0 .../world/item/enchantment/Enchantment.cpp | 2 +- .../minecraft/world/level/BaseMobSpawner.cpp | 2 +- .../net/minecraft/world/level/Explosion.cpp | 4 +-- .../net/minecraft/world/level/Level.cpp | 4 +-- .../net/minecraft/world/level/Level.h | 2 +- .../net/minecraft/world/level/LevelListener.h | 2 +- .../world/level/biome/BiomeSource.cpp | 2 +- .../chunk/storage/McRegionChunkStorage.cpp | 2 +- .../world/level/chunk/storage/RegionFile.cpp | 2 +- .../world/level/chunk/storage/RegionFile.h | 2 +- .../level/tile/BasePressurePlateTile.cpp | 2 +- .../world/level/tile/BrewingStandTile.cpp | 2 +- .../minecraft/world/level/tile/ButtonTile.cpp | 2 +- .../world/level/tile/ComparatorTile.cpp | 2 +- .../minecraft/world/level/tile/EggTile.cpp | 2 +- .../world/level/tile/EnchantmentTableTile.cpp | 2 +- .../world/level/tile/EnderChestTile.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 4 +-- .../world/level/tile/FurnaceTile.cpp | 2 +- .../minecraft/world/level/tile/LeverTile.cpp | 2 +- .../minecraft/world/level/tile/LiquidTile.cpp | 4 +-- .../minecraft/world/level/tile/MycelTile.cpp | 2 +- .../world/level/tile/NotGateTile.cpp | 4 +-- .../world/level/tile/NoteBlockTile.cpp | 4 +-- .../minecraft/world/level/tile/PortalTile.cpp | 4 +-- .../world/level/tile/PumpkinTile.cpp | 2 +- .../world/level/tile/RedStoneDustTile.cpp | 2 +- .../world/level/tile/RedStoneOreTile.cpp | 2 +- .../world/level/tile/RepeaterTile.cpp | 2 +- .../world/level/tile/StoneMonsterTile.cpp | 2 +- .../net/minecraft/world/level/tile/Tile.h | 2 +- .../minecraft/world/level/tile/TntTile.cpp | 2 +- .../minecraft/world/level/tile/TorchTile.cpp | 2 +- .../world/level/tile/TripWireSourceTile.cpp | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 2 +- .../tile/entity/BrewingStandTileEntity.cpp | 4 +-- .../level/tile/entity/ChestTileEntity.cpp | 4 +-- .../level/tile/entity/DispenserTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 2 +- .../tile/entity/EnderChestTileEntity.cpp | 2 +- .../level/tile/entity/FurnaceTileEntity.cpp | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 2 +- .../level/tile/entity/TheEndPortalTile.cpp | 2 +- .../level/tile/piston/PistonBaseTile.cpp | 2 +- .../Minecraft.World/{include => }/stdafx.h | 0 173 files changed, 202 insertions(+), 232 deletions(-) rename minecraft/Minecraft.World/{src => ConsoleHelpers}/compression.cpp (99%) rename minecraft/Minecraft.World/{include => ConsoleHelpers}/compression.h (100%) delete mode 100644 minecraft/Minecraft.World/ReadMe.txt delete mode 100644 minecraft/Minecraft.World/include/Minecraft.World.h rename minecraft/Minecraft.World/{src/Minecraft.World.cpp => net/minecraft/StaticConstructors.cpp} (97%) create mode 100644 minecraft/Minecraft.World/net/minecraft/StaticConstructors.h rename minecraft/Minecraft.World/{include => net/minecraft/core/particles}/ParticleTypes.h (100%) rename minecraft/Minecraft.World/{include => net/minecraft/sounds}/SoundTypes.h (100%) rename minecraft/Minecraft.World/{include/Potion_Macros.h => net/minecraft/world/item/alchemy/PotionMacros.h} (100%) rename minecraft/Minecraft.World/{include => }/stdafx.h (100%) diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index d0463e6e8..7dbcca20d 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -41,7 +41,7 @@ #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.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.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/Audio/Consoles_SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h index 4a67a333e..be38ff46c 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/include/SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" class File; diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h index aaa333163..2a82de7a2 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/include/SoundTypes.h" +#include "Minecraft.World/net/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 1a4d65019..ad1ca0b50 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/include/SoundTypes.h" +#include "Minecraft.World/net/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/GameRuleManager.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp index 3dbd87358..9c1cd36a4 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/File.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" #include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 3b1aa57b0..41e8ef10e 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -6,7 +6,7 @@ #include #include "ConsoleSchematicFile.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/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" diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 190768de0..88dc5a7af 100644 --- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -12,7 +12,7 @@ #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class Level; diff --git a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index 48d526b0a..eff559f7e 100644 --- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -24,7 +24,7 @@ #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.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/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/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp index cb602fe13..3428d3c40 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp @@ -13,7 +13,7 @@ #include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h" #include "FullTutorial.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" -#include "Minecraft.World/include/Potion_Macros.h" +#include "Minecraft.World/net/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/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp index 32f689375..434164720 100644 --- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp index 0a29042e6..440656500 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp @@ -3,7 +3,7 @@ #include #include "Minecraft.World/ConsoleHelpers/PortableFileIO.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "ArchiveFile.h" #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" #include "Minecraft.Client/Linux/Linux_App.h" 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 403623489..307ab94ca 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/include/SoundTypes.h" +#include "Minecraft.World/net/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_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index f20421d40..120b4924f 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 @@ -14,7 +14,7 @@ #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.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.World/include/Potion_Macros.h" +#include "Minecraft.World/net/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_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index e3abea5c3..690f6ffbd 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 @@ -15,7 +15,7 @@ #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" int IUIScene_PauseMenu::ExitGameDialogReturned( 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 75efa49e8..8e36ec288 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 "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/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 4aeda6a09..62fa0fa85 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 @@ -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/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index c7a5926bb..7a88d62ed 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,7 +12,7 @@ #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/include/SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "Minecraft.World/net/minecraft/world/SimpleContainer.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp index 7f2e4be6c..e6897a4ad 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/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "UIController.h" #include "UI.h" diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp index 94f0d3b50..79397b6b3 100644 --- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -18,7 +18,7 @@ #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/SoundTypes.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.Client/include/NetTypes.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index 937100762..9ce0a8e78 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -61,7 +61,7 @@ static void sigsegv_handler(int sig) { #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/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 c331c7fb5..909af852d 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/include/stdafx.h" // 4J +#include "Minecraft.World/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 09d2e458d..d41e387ee 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -33,7 +33,7 @@ #include "Sentient/SentientManager.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "../Resource.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" HINSTANCE hMyInst; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index b9ac789ee..5361afa69 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -60,7 +60,7 @@ #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/include/Minecraft.World.h" +#include "Minecraft.World/net/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" @@ -85,7 +85,7 @@ #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/Potion_Macros.h" +#include "Minecraft.World/net/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" @@ -4158,7 +4158,7 @@ void Minecraft::main() { useLomp = true; - MinecraftWorld_RunStaticCtors(); + Minecraft_RunStaticCtors(); EntityRenderDispatcher::staticCtor(); TileEntityRenderDispatcher::staticCtor(); User::staticCtor(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp index 4326fe21e..f9fc6b413 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/include/SoundTypes.h" +#include "Minecraft.World/net/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/achievement/StatsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp index b1a9cd718..c6a7f7c09 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp @@ -5,7 +5,7 @@ #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/SoundTypes.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 477a3bbcb..c87214f39 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -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/include/SoundTypes.h" +#include "Minecraft.World/net/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/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 5d0991470..ff37cc6af 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -22,7 +22,7 @@ #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/include/ParticleTypes.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h index b10dd2e14..7ab23a14e 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/include/ParticleTypes.h" +#include "Minecraft.World/net/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 b1488f3ae..5dbdad7a8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp @@ -3,7 +3,7 @@ #include "DripParticle.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/include/ParticleTypes.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp index 951b508e4..74939bb7f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp @@ -6,7 +6,7 @@ #include "FireworksParticles.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/include/SoundTypes.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp index 94508ccc6..e87bf18d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -1,6 +1,6 @@ #include "HugeExplosionSeedParticle.h" #include "java/Random.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.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/LavaParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp index a926ad91c..fecfbf765 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp @@ -1,7 +1,7 @@ #include "LavaParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h index 53c2dc820..c5ecda0ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h @@ -4,7 +4,7 @@ #include #include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "ParticleEngine.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index 8762d7af2..c1e54c080 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -40,8 +40,8 @@ #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/include/ParticleTypes.h" -#include "Minecraft.World/include/SoundTypes.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index 523ddf65a..6c9d77e4a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -32,9 +32,9 @@ #include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" #include "Minecraft.Client/net/minecraft/client/Camera.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "BossMobGuiInfo.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp index 1879eb4d8..7d7db16f7 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/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/JavaMath.h" #include "java/System.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h index b8de5367f..ade9ebc4f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h @@ -5,7 +5,7 @@ #include "java/JavaIntHash.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/XboxStubs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index 52571c485..85e65462a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -42,7 +42,7 @@ #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/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp index 63cf942a2..347e7051a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp @@ -7,7 +7,7 @@ #include "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/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.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h index 6ef89f1c5..1b53097e1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h @@ -2,7 +2,7 @@ #include #include "Minecraft.World/net/minecraft/world/level/LevelListener.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" class Player; class TileEntity; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 8cb14cc54..166d2267e 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -25,7 +25,7 @@ #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 54fc0d1a2..df4d458c1 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -27,7 +27,7 @@ #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include #include "java/InputOutputStream/DataInputStream.h" diff --git a/minecraft/Minecraft.World/src/compression.cpp b/minecraft/Minecraft.World/ConsoleHelpers/compression.cpp similarity index 99% rename from minecraft/Minecraft.World/src/compression.cpp rename to minecraft/Minecraft.World/ConsoleHelpers/compression.cpp index c674b571c..513cb1654 100644 --- a/minecraft/Minecraft.World/src/compression.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/compression.cpp @@ -6,7 +6,7 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.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/include/compression.h b/minecraft/Minecraft.World/ConsoleHelpers/compression.h similarity index 100% rename from minecraft/Minecraft.World/include/compression.h rename to minecraft/Minecraft.World/ConsoleHelpers/compression.h diff --git a/minecraft/Minecraft.World/ReadMe.txt b/minecraft/Minecraft.World/ReadMe.txt deleted file mode 100644 index ba99773a2..000000000 --- a/minecraft/Minecraft.World/ReadMe.txt +++ /dev/null @@ -1,30 +0,0 @@ -======================================================================== - STATIC LIBRARY : Minecraft.World Project Overview -======================================================================== - -AppWizard has created this Minecraft.World library project for you. - -This file contains a summary of what you will find in each of the files that -make up your Minecraft.World application. - -Minecraft.World.vcxproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - - - -///////////////////////////////////////////////////////////////////////////// - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named Minecraft.World.pch and a precompiled types file named StdAfx.obj. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" comments to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/minecraft/Minecraft.World/include/Minecraft.World.h b/minecraft/Minecraft.World/include/Minecraft.World.h deleted file mode 100644 index e9abeec17..000000000 --- a/minecraft/Minecraft.World/include/Minecraft.World.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -void MinecraftWorld_RunStaticCtors(); \ No newline at end of file diff --git a/minecraft/Minecraft.World/meson.build b/minecraft/Minecraft.World/meson.build index 5ab32a997..ca0524f58 100644 --- a/minecraft/Minecraft.World/meson.build +++ b/minecraft/Minecraft.World/meson.build @@ -39,7 +39,7 @@ lib_world = static_library('Minecraft.World', platform_dep, simdutf_dep, ], - include_directories : include_directories('include', '..'), + include_directories : include_directories('..'), cpp_args : global_cpp_args + global_cpp_defs, ) diff --git a/minecraft/Minecraft.World/src/Minecraft.World.cpp b/minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp similarity index 97% rename from minecraft/Minecraft.World/src/Minecraft.World.cpp rename to minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp index e4844eef4..86ed8d649 100644 --- a/minecraft/Minecraft.World/src/Minecraft.World.cpp +++ b/minecraft/Minecraft.World/net/minecraft/StaticConstructors.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/Minecraft.World.h" +#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" @@ -39,7 +39,7 @@ #include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -void MinecraftWorld_RunStaticCtors() { +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 diff --git a/minecraft/Minecraft.World/net/minecraft/StaticConstructors.h b/minecraft/Minecraft.World/net/minecraft/StaticConstructors.h new file mode 100644 index 000000000..2237bf7fc --- /dev/null +++ b/minecraft/Minecraft.World/net/minecraft/StaticConstructors.h @@ -0,0 +1,3 @@ +#pragma once + +void Minecraft_RunStaticCtors(); \ No newline at end of file diff --git a/minecraft/Minecraft.World/include/ParticleTypes.h b/minecraft/Minecraft.World/net/minecraft/core/particles/ParticleTypes.h similarity index 100% rename from minecraft/Minecraft.World/include/ParticleTypes.h rename to minecraft/Minecraft.World/net/minecraft/core/particles/ParticleTypes.h diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp index 780a797cd..5db3655ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp @@ -8,7 +8,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp index af969be5b..950202e7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -6,7 +6,7 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/include/SoundTypes.h b/minecraft/Minecraft.World/net/minecraft/sounds/SoundTypes.h similarity index 100% rename from minecraft/Minecraft.World/include/SoundTypes.h rename to minecraft/Minecraft.World/net/minecraft/sounds/SoundTypes.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp index fae7b2189..3ef4ed843 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp @@ -12,7 +12,7 @@ #include "SyncedEntityData.h" #include "EntityIO.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "EntityPos.h" #include "Entity.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" @@ -23,7 +23,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp index a51fa2fb5..240a86c62 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp @@ -4,7 +4,7 @@ #include "java/JavaMath.h" #include "ExperienceOrb.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp index f1bc91b7e..1d829bfb3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/Minecraft.World/net/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/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp index a536e1d50..53cde668b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp @@ -9,7 +9,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "Minecraft.World/include/ParticleTypes.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 "ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp index aa5288ddb..0e354e4c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp @@ -1,5 +1,5 @@ #include "SyncedEntityData.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "TamableAnimal.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp index ad66336ec..a32a91556 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -5,7 +5,7 @@ #include "BreedGoal.h" #include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp index 30c964df8..33516d144 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp @@ -4,7 +4,7 @@ #include #include "Bat.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/Pos.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp index b0326851b..8932bcafb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp @@ -1,7 +1,7 @@ #include #include "Chicken.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp index 3eba04b10..fe08d7c8c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp @@ -1,7 +1,7 @@ #include #include "Cow.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp index 05983f1cd..de4bad195 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp @@ -7,8 +7,8 @@ #include "EntityHorse.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp index 5d846fe87..57b3f00bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp @@ -1,7 +1,7 @@ #include #include "MushroomCow.h" -#include "Minecraft.World/include/ParticleTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp index 2c831dac3..35bcca95d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp @@ -9,7 +9,7 @@ #include "Ocelot.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp index a4c2949bc..1874431fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp @@ -3,7 +3,7 @@ #include #include "Pig.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp index 71d48ddea..6817d496b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp @@ -5,7 +5,7 @@ #include "Sheep.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp index 776b7fe04..6cc028fa3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp @@ -1,7 +1,7 @@ #include #include "SnowMan.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp index ce6ac339f..3b9d779a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp @@ -2,8 +2,8 @@ #include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" #include "VillagerGolem.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/Pos.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp index 11ebd9cb6..adcc3febe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp @@ -5,8 +5,8 @@ #include "Sheep.h" #include "Wolf.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 8cf82bb01..eacba92dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 46dad7479..813b600b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" #include "Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp index 3f2c57fe1..fee056c81 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -13,7 +13,7 @@ #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/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/net/minecraft/world/entity/boss/wither/WitherBoss.h index b113b8a0e..47bcf309c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" #include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp index 26ba1d7c0..f46533e77 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp @@ -6,7 +6,7 @@ #include "LightningBolt.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp index 5d0264be3..1208f2826 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp @@ -5,7 +5,7 @@ #include #include "Boat.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp index ba28ee81b..77a3a375d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp @@ -7,7 +7,7 @@ #include "java/JavaMath.h" #include "ItemEntity.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp index 042016493..4e21a45f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp index 8cee7c6c9..b39d89223 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp @@ -3,7 +3,7 @@ #include #include "MinecartFurnace.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp index 04a2a8a03..cc4235bc0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp @@ -3,8 +3,8 @@ #include #include "MinecartTNT.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp index 87cc6f490..bdfdb1eaf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp @@ -5,7 +5,7 @@ #include "java/JavaMath.h" #include "PrimedTnt.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp index 185534b68..3dc5efa3e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp @@ -4,8 +4,8 @@ #include #include "Blaze.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp index c394b7569..414b6aa5b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp @@ -3,7 +3,7 @@ #include #include "Creeper.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp index fa5d3b7b3..645872af9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp @@ -6,8 +6,8 @@ #include "EnderMan.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp index 1b234fc39..ad5ef0c43 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp @@ -6,7 +6,7 @@ #include "Ghast.h" #include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp index b73433fe0..a011652dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp @@ -2,7 +2,7 @@ #include #include "LavaSlime.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h index fdd92ef2d..2e10de8c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h @@ -1,7 +1,7 @@ #pragma once #include "Slime.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp index 991897a0f..501777322 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp @@ -4,7 +4,7 @@ #include "PigZombie.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/Difficulty.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp index 8c4219989..1322a01fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp @@ -2,7 +2,7 @@ #include "Silverfish.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp index 79a92d715..79b6a0718 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp @@ -5,7 +5,7 @@ #include #include "Skeleton.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp index 1b5dfc514..a72c63dc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp @@ -4,8 +4,8 @@ #include #include "Slime.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h index 9f9ec3a65..30176840b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h @@ -4,7 +4,7 @@ #include "Minecraft.World/net/minecraft/world/entity/Mob.h" #include "Enemy.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/world/entity/Mob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp index 74bcd66bb..f65974f0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp @@ -5,7 +5,7 @@ #include "Spider.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp index 1627bbdc1..b3ba2923e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp @@ -3,8 +3,8 @@ #include #include "Witch.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp index 177089c34..7eb01128b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp @@ -6,7 +6,7 @@ #include "Zombie.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp index 2fa948bed..f521c4f32 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h index f45c57961..1f1b8f5d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h @@ -3,7 +3,7 @@ #include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" #include "Npc.h" #include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" class Level; class Village; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp index f480b4716..7141f4284 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp @@ -20,7 +20,7 @@ #include "java/JavaMath.h" #include "Inventory.h" #include "Player.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" @@ -30,7 +30,7 @@ #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp index 5b05e0b51..dc2ca540f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp @@ -10,8 +10,8 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Arrow.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h index a4687dc96..c6fa1ae39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h @@ -3,7 +3,7 @@ #include #include "Fireball.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index 48ce24932..1105c22a7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -4,7 +4,7 @@ #include "java/JavaMath.h" #include "EyeOfEnderSignal.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp index a5eaf33e1..e9efcc0c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp @@ -9,7 +9,7 @@ #include "Fireball.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h index 5fdb2d19c..47811329a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h @@ -3,7 +3,7 @@ #include #include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 3c1900175..ef9fda0ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -3,8 +3,8 @@ #include #include "FireworksRocketEntity.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp index 81e4d5956..a8b6d7252 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp @@ -6,8 +6,8 @@ #include #include "FishingHook.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp index 40aaea6cc..c7ebecf27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp @@ -1,5 +1,5 @@ #include "Snowball.h" -#include "Minecraft.World/include/ParticleTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp index 27409e316..62d9f9255 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp @@ -5,7 +5,7 @@ #include #include "Throwable.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp index a47e1a60d..8cf5367b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -1,5 +1,5 @@ #include "ThrownEgg.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index 9a8e2dfc1..dce67e2ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "ThrownEnderpearl.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp index 374650264..58ed2a795 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp index 73729e2ad..0aacc109e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp @@ -1,7 +1,7 @@ #include #include "BowItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp index cb5fc31f4..9567b6848 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp @@ -8,8 +8,8 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp index 5f231d3f8..95847a5c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp @@ -2,7 +2,7 @@ #include #include "EggItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp index 082d80440..b7476e845 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp @@ -3,8 +3,8 @@ #include "EnderEyeItem.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp index 1bee436d1..b3215cfd1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp @@ -1,7 +1,7 @@ #include #include "EnderpearlItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp index cbc499f19..0ac0d34e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp @@ -1,7 +1,7 @@ #include #include "ExperienceItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp index d5f828f65..d466ce0f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp @@ -3,7 +3,7 @@ #include "FireChargeItem.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp index c6f4b775b..6729c4888 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp index defa28c9c..d9b170ac7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp index 5c1bcc0f2..fa6f32bb7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp @@ -2,7 +2,7 @@ #include #include "FishingRodItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp index 06a4b85d5..f6dd061fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp @@ -1,7 +1,7 @@ #include #include "FlintAndSteelItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp index 9f0a0a6de..1638aee8f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp @@ -1,5 +1,5 @@ #include "FoodItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp index 3322a8239..af36cc137 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp @@ -12,7 +12,7 @@ #include "Minecraft.World/net/minecraft/util/HtmlString.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/include/Potion_Macros.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h" #include "nbt/CompoundTag.h" #include "nbt/IntTag.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp index bce53a6f6..5677185bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" @@ -12,8 +12,8 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "PotionItem.h" -#include "Minecraft.World/include/SoundTypes.h" -#include "Minecraft.World/include/Potion_Macros.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" +#include "Minecraft.World/net/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/SnowballItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp index a43441651..f115a63dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp @@ -1,7 +1,7 @@ #include #include "SnowballItem.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp index adadb8cff..41cd6925f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" diff --git a/minecraft/Minecraft.World/include/Potion_Macros.h b/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h similarity index 100% rename from minecraft/Minecraft.World/include/Potion_Macros.h rename to minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp index 8a8354ec0..96531ef68 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "net.minecraft.world.item.enchantment.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp index ff377987f..7f7ea97fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp @@ -2,7 +2,7 @@ #include "BaseMobSpawner.h" #include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp index b28e38e8d..92a6e09fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp @@ -5,8 +5,8 @@ #include "Explosion.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp index d827a1fd1..81bdfe3d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp @@ -21,8 +21,8 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "net/minecraft/Direction.h" #include "net/minecraft/Facing.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h index d2dfd67ba..a3d28bd79 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h @@ -15,7 +15,7 @@ #include "TickNextTickData.h" #include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h index 5b35000d1..297c80e78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h @@ -2,7 +2,7 @@ class TileEntity; #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" class LevelListener { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp index c8325e6dc..af0c1b82d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index a46947fe8..0f970c969 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -16,7 +16,7 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp index 26446fab6..f31350314 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -9,7 +9,7 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h index b59e543c2..75077c917 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/include/compression.h" +#include "Minecraft.World/ConsoleHelpers/compression.h" #include "java/InputOutputStream/InputOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp index be46ebe62..86ab9388b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -1,7 +1,7 @@ #include #include "BasePressurePlateTile.h" -#include "SoundTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp index fad8f9da3..84ba8791c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp @@ -3,7 +3,7 @@ #include "BrewingStandTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/Container.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp index e213d3577..144cb113b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp @@ -3,7 +3,7 @@ #include #include "ButtonTile.h" -#include "SoundTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp index cae878f86..7e2488624 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp @@ -1,7 +1,7 @@ #include #include "ComparatorTile.h" -#include "SoundTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp index 3fcbf71bb..dbc7cc88e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp @@ -1,7 +1,7 @@ #include #include "EggTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp index 9b418b9ad..5e5b448b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -2,7 +2,7 @@ #include "EnchantmentTableTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp index 86b5fdc2a..5fc294e56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp @@ -2,7 +2,7 @@ #include #include "EnderChestTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp index 50eb88776..515c61743 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp @@ -6,8 +6,8 @@ #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/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp index 046e8aab3..268f9a2f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp @@ -5,7 +5,7 @@ #include "FurnaceTile.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "FurnaceTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp index 00a77ff8d..60792ab72 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp @@ -1,7 +1,7 @@ #include #include "LeverTile.h" -#include "SoundTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp index 39e5a822a..997baebea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp @@ -7,8 +7,8 @@ #include "LiquidTile.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp index 81fd5923a..2584b5eb8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp @@ -1,7 +1,7 @@ #include #include "MycelTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp index 5e7e5cf62..70a121095 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp @@ -1,7 +1,7 @@ #include "NotGateTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp index 68033df25..34e0a27c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp @@ -3,8 +3,8 @@ #include "NoteBlockTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp index 130421760..9c12e1b27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp @@ -2,8 +2,8 @@ #include #include "PortalTile.h" -#include "Minecraft.World/include/ParticleTypes.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp index fb0b034f7..378d66d6d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp @@ -2,7 +2,7 @@ #include "PumpkinTile.h" #include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp index b6f10af11..ebabff887 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -8,7 +8,7 @@ #include "DiodeTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp index 50fffe1c8..79b34f242 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -1,7 +1,7 @@ #include #include "RedStoneOreTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp index bba38f207..8d7bbdefa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp @@ -1,7 +1,7 @@ #include #include "RepeaterTile.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp index efb1b5627..93d9785df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h index e017f3450..9c97b4390 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp index 6fa68f11f..30fa9e6e8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp @@ -3,7 +3,7 @@ #include "TntTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp index 61432f0db..fffe9e021 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp @@ -1,7 +1,7 @@ #include #include "TorchTile.h" -#include "Minecraft.World/include/ParticleTypes.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp index 6466096c9..d808e0828 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -1,6 +1,6 @@ #include "TripWireSourceTile.h" #include "optional" -#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Direction.h" #include "Minecraft.World/net/minecraft/Facing.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 746b3d07e..40baea71d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index 08701a20b..f1fd92907 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "BrewingStandTileEntity.h" @@ -7,7 +7,7 @@ #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/include/Potion_Macros.h" +#include "Minecraft.World/net/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/ChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp index b4c43d8b7..fbf5cc3cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" @@ -12,7 +12,7 @@ #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTileEntity.h" #include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/include/SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" int ChestTileEntity::getContainerType() { if (isBonusChest) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 6206e9d4d..d0048214f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 202f54c14..a3f4dd7a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index ca99a7000..f6844cbb3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "EnchantmentTableTileEntity.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index ccc6f6d43..f525256ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -1,5 +1,5 @@ #include "EnderChestTileEntity.h" -#include "SoundTypes.h" +#include "Minecraft.World/net/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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index f70ca659c..41b914c2c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 9f8267936..8f29afd0f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/include/stdafx.h" +#include "Minecraft.World/stdafx.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index fd701aae3..098c5d743 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -4,7 +4,7 @@ #include "TheEndPortalTileEntity.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 3bc53813f..def086529 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -9,7 +9,7 @@ #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 "SoundTypes.h" +#include "Minecraft.World/net/minecraft/sounds/SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/include/stdafx.h b/minecraft/Minecraft.World/stdafx.h similarity index 100% rename from minecraft/Minecraft.World/include/stdafx.h rename to minecraft/Minecraft.World/stdafx.h