refactor: move ColourTable into minecraft

2026-05-06 02:43:36 +00:00 · 2026-04-08 20:02:14 +10:00 · 2026-04-08 20:02:14 +10:00 · 7b28bcbcb6
parent 016b2d91b4
commit 7b28bcbcb6
43 changed files with 41 additions and 41 deletions
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/client/particle/DripParticle.cpp
+++ b/targets/minecraft/client/particle/DripParticle.cpp
@ -3,7 +3,7 @@
 #include <cmath>

 #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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/client/particle/NoteParticle.cpp
+++ b/targets/minecraft/client/particle/NoteParticle.cpp
@ -3,7 +3,7 @@
 #include <math.h>

 #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"

--- 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"
--- a/targets/minecraft/client/particle/SuspendedParticle.cpp
+++ b/targets/minecraft/client/particle/SuspendedParticle.cpp
@ -3,7 +3,7 @@
 #include <cmath>

 #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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/client/resources/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 <cstring>
 #include <utility>
--- a/targets/minecraft/client/resources/Colours/ColourTable.h
+++ b/targets/minecraft/client/resources/Colours/ColourTable.h
--- a/targets/minecraft/client/skins/AbstractTexturePack.cpp
+++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp
@ -6,7 +6,7 @@

 #include <vector>

-#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"
--- 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"
--- 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
--- 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"

--- a/targets/minecraft/world/item/ArmorItem.cpp
+++ b/targets/minecraft/world/item/ArmorItem.cpp
@ -5,7 +5,7 @@
 #include <format>
 #include <vector>

-#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"
--- a/targets/minecraft/world/item/SpawnEggItem.cpp
+++ b/targets/minecraft/world/item/SpawnEggItem.cpp
@ -5,7 +5,7 @@
 #include <utility>

 #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"
--- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp
+++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp
@ -3,7 +3,7 @@
 #include <utility>

 #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"
--- 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
--- 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"
--- a/targets/minecraft/world/level/biome/Biome.cpp
+++ b/targets/minecraft/world/level/biome/Biome.cpp
@ -7,7 +7,7 @@
 #include <vector>

 #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"
--- 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"
--- 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"
--- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp
+++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp
@ -5,7 +5,7 @@
 #include <numbers>

 #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"
--- a/targets/minecraft/world/level/tile/GrassTile.cpp
+++ b/targets/minecraft/world/level/tile/GrassTile.cpp
@ -3,7 +3,7 @@
 #include <string>

 #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"
--- a/targets/minecraft/world/level/tile/LeafTile.cpp
+++ b/targets/minecraft/world/level/tile/LeafTile.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- 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"
--- a/targets/minecraft/world/level/tile/StemTile.cpp
+++ b/targets/minecraft/world/level/tile/StemTile.cpp
@ -3,7 +3,7 @@
 #include <stdint.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/Minecraft.h"
 #include "minecraft/world/IconRegister.h"
--- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp
+++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp
+++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp
@ -4,7 +4,7 @@
 #include <optional>

 #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"