From 7b28bcbcb6b06d082b0a8790ba8509d37f45b7b5 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 8 Apr 2026 20:02:14 +1000 Subject: [PATCH] refactor: move ColourTable into minecraft --- targets/app/common/DLC/DLCColourTableFile.cpp | 2 +- targets/app/common/Game.cpp | 2 +- targets/app/common/LocalizationManager.cpp | 2 +- targets/app/common_sources.txt | 1 - targets/minecraft/client/Minecraft.cpp | 2 +- targets/minecraft/client/gui/Minimap.cpp | 2 +- targets/minecraft/client/particle/DragonBreathParticle.cpp | 2 +- targets/minecraft/client/particle/DripParticle.cpp | 2 +- targets/minecraft/client/particle/EnchantmentTableParticle.cpp | 2 +- targets/minecraft/client/particle/EnderParticle.cpp | 2 +- targets/minecraft/client/particle/ExplodeParticle.cpp | 2 +- targets/minecraft/client/particle/HugeExplosionParticle.cpp | 2 +- targets/minecraft/client/particle/NetherPortalParticle.cpp | 2 +- targets/minecraft/client/particle/NoteParticle.cpp | 2 +- targets/minecraft/client/particle/SmokeParticle.cpp | 2 +- targets/minecraft/client/particle/SuspendedParticle.cpp | 2 +- targets/minecraft/client/renderer/GameRenderer.cpp | 2 +- targets/minecraft/client/renderer/ItemInHandRenderer.cpp | 2 +- targets/minecraft/client/renderer/LevelRenderer.cpp | 2 +- targets/minecraft/client/renderer/TileRenderer.cpp | 2 +- targets/minecraft/client/renderer/entity/MobRenderer.cpp | 2 +- targets/minecraft/client/renderer/tileentity/SignRenderer.cpp | 2 +- .../client/resources}/Colours/ColourTable.cpp | 2 +- .../common => minecraft/client/resources}/Colours/ColourTable.h | 0 targets/minecraft/client/skins/AbstractTexturePack.cpp | 2 +- targets/minecraft/client/skins/DLCTexturePack.cpp | 2 +- targets/minecraft/sources.txt | 1 + targets/minecraft/world/entity/EntityIO.h | 2 +- targets/minecraft/world/item/ArmorItem.cpp | 2 +- targets/minecraft/world/item/SpawnEggItem.cpp | 2 +- targets/minecraft/world/item/alchemy/PotionBrewing.cpp | 2 +- targets/minecraft/world/level/FoliageColor.cpp | 2 +- targets/minecraft/world/level/Level.cpp | 2 +- targets/minecraft/world/level/biome/Biome.cpp | 2 +- targets/minecraft/world/level/dimension/Dimension.cpp | 2 +- targets/minecraft/world/level/dimension/HellDimension.cpp | 2 +- targets/minecraft/world/level/dimension/TheEndDimension.cpp | 2 +- targets/minecraft/world/level/tile/GrassTile.cpp | 2 +- targets/minecraft/world/level/tile/LeafTile.cpp | 2 +- targets/minecraft/world/level/tile/RedStoneDustTile.cpp | 2 +- targets/minecraft/world/level/tile/StemTile.cpp | 2 +- targets/minecraft/world/level/tile/TallGrassPlantTile.cpp | 2 +- targets/minecraft/world/level/tile/WaterLilyTile.cpp | 2 +- 43 files changed, 41 insertions(+), 41 deletions(-) rename targets/{app/common => minecraft/client/resources}/Colours/ColourTable.cpp (99%) rename targets/{app/common => minecraft/client/resources}/Colours/ColourTable.h (100%) diff --git a/targets/app/common/DLC/DLCColourTableFile.cpp b/targets/app/common/DLC/DLCColourTableFile.cpp index af08ce99d..479ec07d8 100644 --- a/targets/app/common/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/DLC/DLCColourTableFile.cpp @@ -1,7 +1,7 @@ #include "DLCColourTableFile.h" #include "DLCManager.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 8d7a67455..8357f07a9 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -74,7 +74,7 @@ #include "platform/input/input.h" #include "app/common/Audio/SoundEngine.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/DLC/DLCPack.h" #include "minecraft/locale/StringTable.h" #include "app/common/UI/All Platforms/ArchiveFile.h" diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index 85bb26c4f..c4b975d5e 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -9,7 +9,7 @@ #include "minecraft/GameEnums.h" #include "app/common/App_structs.h" #include "minecraft/locale/StringTable.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" diff --git a/targets/app/common_sources.txt b/targets/app/common_sources.txt index b34508a53..8f1b38284 100644 --- a/targets/app/common_sources.txt +++ b/targets/app/common_sources.txt @@ -4,7 +4,6 @@ common/Audio/Consoles_SoundEngine.cpp common/Audio/SoundEngine.cpp common/Audio/SoundNames.cpp common/BannedListManager.cpp -common/Colours/ColourTable.cpp common/ConsoleGameMode.cpp common/DLC/DLCAudioFile.cpp common/DLC/DLCCapeFile.cpp diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 91fbb8db1..519234943 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -103,7 +103,7 @@ #if defined(ENABLE_JAVA_GUIS) #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/ConsoleGameMode.h" #include "app/common/DLC/DLCPack.h" #include "app/common/Minecraft_Macros.h" diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index cae204f9c..b245410e7 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -10,7 +10,7 @@ #include "platform/renderer/renderer.h" #include "Font.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/BufferedImage.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/particle/DragonBreathParticle.cpp b/targets/minecraft/client/particle/DragonBreathParticle.cpp index 95fb45e85..9c8b011cd 100644 --- a/targets/minecraft/client/particle/DragonBreathParticle.cpp +++ b/targets/minecraft/client/particle/DragonBreathParticle.cpp @@ -1,7 +1,7 @@ #include "DragonBreathParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp index a91826588..c95ff1979 100644 --- a/targets/minecraft/client/particle/DripParticle.cpp +++ b/targets/minecraft/client/particle/DripParticle.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp index 5f1fc3a4c..6b3de3eeb 100644 --- a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -1,7 +1,7 @@ #include "EnchantmentTableParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/EnderParticle.cpp b/targets/minecraft/client/particle/EnderParticle.cpp index 09b440886..b9fa842e6 100644 --- a/targets/minecraft/client/particle/EnderParticle.cpp +++ b/targets/minecraft/client/particle/EnderParticle.cpp @@ -1,7 +1,7 @@ #include "EnderParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/ExplodeParticle.cpp b/targets/minecraft/client/particle/ExplodeParticle.cpp index 497e50880..cb2858ea5 100644 --- a/targets/minecraft/client/particle/ExplodeParticle.cpp +++ b/targets/minecraft/client/particle/ExplodeParticle.cpp @@ -1,7 +1,7 @@ #include "ExplodeParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index b29c58a9b..81eab7ac6 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -4,7 +4,7 @@ #include "platform/renderer/renderer.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NetherPortalParticle.cpp b/targets/minecraft/client/particle/NetherPortalParticle.cpp index 2f74cf654..d01344b51 100644 --- a/targets/minecraft/client/particle/NetherPortalParticle.cpp +++ b/targets/minecraft/client/particle/NetherPortalParticle.cpp @@ -1,7 +1,7 @@ #include "NetherPortalParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NoteParticle.cpp b/targets/minecraft/client/particle/NoteParticle.cpp index e9544152e..6e8b26354 100644 --- a/targets/minecraft/client/particle/NoteParticle.cpp +++ b/targets/minecraft/client/particle/NoteParticle.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/SmokeParticle.cpp b/targets/minecraft/client/particle/SmokeParticle.cpp index a4cd52689..b91241b83 100644 --- a/targets/minecraft/client/particle/SmokeParticle.cpp +++ b/targets/minecraft/client/particle/SmokeParticle.cpp @@ -1,7 +1,7 @@ #include "SmokeParticle.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp index 2251c52ab..7b86453be 100644 --- a/targets/minecraft/client/particle/SuspendedParticle.cpp +++ b/targets/minecraft/client/particle/SuspendedParticle.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index 0df0927e9..d96ca4295 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -17,7 +17,7 @@ #include "LevelRenderer.h" #include "minecraft/GameEnums.h" #include "platform/ShutdownManager.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/BufferedImage.h" #include "util/FrameProfiler.h" #include "platform/stubs.h" diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index fd4afe9d5..fe85738aa 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -10,7 +10,7 @@ #include "platform/renderer/renderer.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "Tesselator.h" #include "Textures.h" #include "TileRenderer.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index c785d827c..c855edc15 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -22,7 +22,7 @@ #include "GameRenderer.h" #include "minecraft/GameEnums.h" #include "app/common/Audio/SoundEngine.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/Console_Debug_enum.h" #include "util/FrameProfiler.h" #include "minecraft/client/renderer/MobSkinMemTextureProcessor.h" diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index aea9f3f63..273e79d90 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -13,7 +13,7 @@ #include "EntityTileRenderer.h" #include "GameRenderer.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "util/FrameProfiler.h" #include "Tesselator.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index 48fc3df65..b74d3236e 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -8,7 +8,7 @@ #include "EntityRenderDispatcher.h" #include "LivingEntityRenderer.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index ee9b663f0..16b433fa3 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -7,7 +7,7 @@ #include "platform/renderer/renderer.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "platform/XboxStubs.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/app/common/Colours/ColourTable.cpp b/targets/minecraft/client/resources/Colours/ColourTable.cpp similarity index 99% rename from targets/app/common/Colours/ColourTable.cpp rename to targets/minecraft/client/resources/Colours/ColourTable.cpp index 044e31b87..0db6b345f 100644 --- a/targets/app/common/Colours/ColourTable.cpp +++ b/targets/minecraft/client/resources/Colours/ColourTable.cpp @@ -1,4 +1,4 @@ -#include "ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include #include diff --git a/targets/app/common/Colours/ColourTable.h b/targets/minecraft/client/resources/Colours/ColourTable.h similarity index 100% rename from targets/app/common/Colours/ColourTable.h rename to targets/minecraft/client/resources/Colours/ColourTable.h diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index 92463a4ef..13b02e3ad 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -6,7 +6,7 @@ #include -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/IGameServices.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/BufferedImage.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index aca47c4dd..bc2447de8 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -11,7 +11,7 @@ #include "platform/storage/storage.h" #include "minecraft/GameEnums.h" #include "app/common/Audio/SoundEngine.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/DLC/DLCAudioFile.h" #include "app/common/DLC/DLCColourTableFile.h" #include "app/common/DLC/DLCFile.h" diff --git a/targets/minecraft/sources.txt b/targets/minecraft/sources.txt index 514d291a5..cb6d0b47a 100644 --- a/targets/minecraft/sources.txt +++ b/targets/minecraft/sources.txt @@ -255,6 +255,7 @@ client/renderer/tileentity/SkullTileRenderer.cpp client/renderer/tileentity/TheEndPortalRenderer.cpp client/renderer/tileentity/TileEntityRenderDispatcher.cpp client/renderer/tileentity/TileEntityRenderer.cpp +client/resources/Colours/ColourTable.cpp client/skins/AbstractTexturePack.cpp client/skins/DLCTexturePack.cpp client/skins/DefaultTexturePack.cpp diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index 8693f099a..e309b6876 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -6,7 +6,7 @@ #include "Entity.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Class.h" #include "java/JavaIntHash.h" diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index 5559d51ad..9600b2a98 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -5,7 +5,7 @@ #include #include -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/core/BehaviorRegistry.h" diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index acaaf79b0..2acc074fe 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -5,7 +5,7 @@ #include #include "Facing.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "util/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index c98b2924d..acb0c336b 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/FoliageColor.cpp b/targets/minecraft/world/level/FoliageColor.cpp index c406d365e..32b64bc16 100644 --- a/targets/minecraft/world/level/FoliageColor.cpp +++ b/targets/minecraft/world/level/FoliageColor.cpp @@ -1,7 +1,7 @@ #include "FoliageColor.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" // 4J Stu - Don't use this any more diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index dbf3d0c22..42512fc21 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -18,7 +18,7 @@ #include "platform/input/input.h" #include "LevelListener.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "util/FrameProfiler.h" diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index f617b1f30..6dc0e967c 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -7,7 +7,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index 0700a9fee..12ac98d46 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -8,7 +8,7 @@ #include "HellDimension.h" #include "platform/input/input.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/Console_Debug_enum.h" #include "NormalDimension.h" #include "TheEndDimension.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 6b7694c4d..abc2a17e8 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -5,7 +5,7 @@ #include "platform/input/input.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "app/common/Console_Debug_enum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/dimension/TheEndDimension.cpp b/targets/minecraft/world/level/dimension/TheEndDimension.cpp index 10b1ee6ad..5558b808d 100644 --- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp @@ -5,7 +5,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/Pos.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp index 52c629a32..ffba0293c 100644 --- a/targets/minecraft/world/level/tile/GrassTile.cpp +++ b/targets/minecraft/world/level/tile/GrassTile.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index 3883be2e6..e37d26e44 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index f2cfe9409..49a593141 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -7,7 +7,7 @@ #include "DiodeTile.h" #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp index e6bda67c5..e46db21c9 100644 --- a/targets/minecraft/world/level/tile/StemTile.cpp +++ b/targets/minecraft/world/level/tile/StemTile.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/IconRegister.h" diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index a66f5a3e5..5925a7066 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp index ec4dda5da..0b5093458 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp @@ -4,7 +4,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Colours/ColourTable.h" +#include "minecraft/client/resources/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/Entity.h"