From 4fe92f9a5af6d83b13bf4d46f31ebdc41689d8f9 Mon Sep 17 00:00:00 2001 From: Lord_Cambion Date: Mon, 13 Apr 2026 18:21:58 +0200 Subject: [PATCH] changed: guardians placeholders --- Minecraft.Client/Common/App_enums.h | 4 ++++ .../Common/Colours/ColourTable.cpp | 4 ++++ .../Common/Media/MediaWindows64.arc | Bin 28661275 -> 28661301 bytes .../Common/res/TitleUpdate/res/colours.col | Bin 5788 -> 5902 bytes .../Common/res/TitleUpdate/res/colours.xml | 4 ++++ Minecraft.Client/Windows64Media/strings.h | 2 ++ Minecraft.World/EntityIO.cpp | 4 ++-- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Minecraft.Client/Common/App_enums.h b/Minecraft.Client/Common/App_enums.h index c054b252..21633706 100644 --- a/Minecraft.Client/Common/App_enums.h +++ b/Minecraft.Client/Common/App_enums.h @@ -449,6 +449,10 @@ enum eMinecraftColour eMinecraftColour_Mob_Rabbit_Colour2, eMinecraftColour_Mob_Endermite_Colour1, eMinecraftColour_Mob_Endermite_Colour2, + eMinecraftColour_Mob_Guardian_Colour1, + eMinecraftColour_Mob_Guardian_Colour2, + eMinecraftColour_Mob_ElderGuardian_Colour1, + eMinecraftColour_Mob_ElderGuardian_Colour2, eMinecraftColour_Armour_Default_Leather_Colour, diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp index 335240c8..5e7afa74 100644 --- a/Minecraft.Client/Common/Colours/ColourTable.cpp +++ b/Minecraft.Client/Common/Colours/ColourTable.cpp @@ -267,6 +267,10 @@ const wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] = L"Mob_Rabbit_Colour2", L"Mob_Endermite_Colour1", L"Mob_Endermite_Colour2", + L"Mob_Guardian_Colour1", + L"Mob_Guardian_Colour2", + L"Mob_ElderGuardian_Colour1", + L"Mob_ElderGuardian_Colour2", diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index 18e3db1f589fe8f4ec5eef4ffdd29afccbdbbdd3..4b637fbb43109460b0ae496c622084318650b072 100644 GIT binary patch delta 3921 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 OJLP^$*e-du?f(Ip#@k;2 delta 3895 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 delta 22 ccmeCvo1@FYz`(!=M9dpGbVN5V6U|@*057lvWB>pF diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml index e9b3dade..80c0f495 100644 --- a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml +++ b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml @@ -285,6 +285,10 @@ if __name__=="__main__": notecolors() + + + + diff --git a/Minecraft.Client/Windows64Media/strings.h b/Minecraft.Client/Windows64Media/strings.h index 1ed1b4be..98ae7a6e 100644 --- a/Minecraft.Client/Windows64Media/strings.h +++ b/Minecraft.Client/Windows64Media/strings.h @@ -2428,3 +2428,5 @@ #define IDS_DESC_EXITBOOK 2422 #define IDS_ENCHANTMENT_LURE 2423 #define IDS_ENCHANTMENT_LUCK_OF_THE_SEA 2424 +#define IDS_GUARDIAN 2425 +#define IDS_GUARDIAN_ELDER 2426 diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp index 3d5eec44..4fc52c73 100644 --- a/Minecraft.World/EntityIO.cpp +++ b/Minecraft.World/EntityIO.cpp @@ -46,7 +46,7 @@ void EntityIO::staticCtor() { setId(ItemEntity::create, eTYPE_ITEMENTITY, L"Item", 1); setId(ExperienceOrb::create, eTYPE_EXPERIENCEORB, L"XPOrb", 2); - setId(Guardian::create, eTYPE_ELDER_GUARDIAN, L"ElderGuardian", 4, eMinecraftColour_Armour_Default_Leather_Colour, eMinecraftColour_Sky_IceMountains, IDS_PIGZOMBIE); + setId(Guardian::create, eTYPE_ELDER_GUARDIAN, L"ElderGuardian", 4, eMinecraftColour_Mob_ElderGuardian_Colour1, eMinecraftColour_Mob_ElderGuardian_Colour2, IDS_GUARDIAN_ELDER); setId(LeashFenceKnotEntity::create, eTYPE_LEASHFENCEKNOT, L"LeashKnot", 8); setId(Painting::create, eTYPE_PAINTING, L"Painting", 9); setId(Arrow::create, eTYPE_ARROW, L"Arrow", 10); @@ -100,7 +100,7 @@ void EntityIO::staticCtor() eMinecraftColour_Mob_Endermite_Colour1, eMinecraftColour_Mob_Endermite_Colour2, IDS_ENDERMITE); - setId(Guardian::create, eTYPE_GUARDIAN, L"Guardian", 68, eMinecraftColour_Mob_Witch_Colour1, eMinecraftColour_Mob_Witch_Colour2, IDS_WITCH); + setId(Guardian::create, eTYPE_GUARDIAN, L"Guardian", 68, eMinecraftColour_Mob_Guardian_Colour1, eMinecraftColour_Mob_Guardian_Colour2, IDS_GUARDIAN); setId(Pig::create, eTYPE_PIG, L"Pig", 90, eMinecraftColour_Mob_Pig_Colour1, eMinecraftColour_Mob_Pig_Colour2, IDS_PIG);