From 8423170d131f4e6322426a93e37be8dedba430db Mon Sep 17 00:00:00 2001 From: Tranqlmao <110073921+Tranqlmao@users.noreply.github.com> Date: Thu, 19 Mar 2026 13:12:06 -0400 Subject: [PATCH] Strings Fix +Some block/item id parity --- .../Common/Media/MediaWindows64.arc | Bin 28538089 -> 28538642 bytes Minecraft.Client/Windows64Media/strings.h | 8 +++++++- Minecraft.World/Item.cpp | 4 ++-- Minecraft.World/Item.h | 4 ++-- Minecraft.World/Tile.cpp | 8 ++++---- Minecraft.World/Tile.h | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index cb4386cba2f7b81ebdd700cdd02f07a04ce38187..b5600b143a48832a52c14f35412ff42d9c2023fa 100644 GIT binary patch delta 4648 zcmb`~d0bTG9>?)#9+wbBK-pv#&M+W@Ebc2RnHnOHAZTiC2ROjUFoUz;l1iy1xn%k) zvog(A7b2H#c5SmXyH?K#z3ytTORs>36bS&1`_P%Ufb32*!(e3?rIrYX$GU^lBhL#GE z{|7nr(KJ;bET>PU8Tv%Ib2F{dn`E2$v>k^lgXyq7t~Mu5=KR~eGmTa{$)a38z4e+ovLrdf3NTM?G<8z?#6(BGv6EbVc-rC=D#AakMF&mFp_^` zWW0@>h9KEkOmhrInK+Bq;xOYg+GQ}w%|FpmgGqleQHYV#L};FBbF_S+P5l;Am@&Ga z-6}-iXGEBPJaDt7jUQm-=^G<~Ej1mjqA5nB>^Otw;Sjo)o-mqZm`1PR5H9J2v5PVM zDIo@q7U6lC+l|liHs@^r_RfqxL*b@axj2u~OeXopUdl7Y$;)lXfs;K)(Ng?v#zNYP zL*+F3(4&a<}r0JG+@{1!>X^EE+ zLusYO5|oW^S)bD)j%HdqQ=_G$Tu?`!TdYAl&*OZP(EH9S3BmI8QA$m)NK+;i;4ra~ zY7!FUBa>-ef>j<0qWuZUGB}eiCL|0VeoTmr71-JJ=WO{k__bEU!{}}v^uLo|UoNA9 zM1yQ9CTF4|P569J-G(yC%s6 z-KnChRlYuxR^#L!R@&9oIBd`uJYAHC^e;Cqo1f4B2$#Khz6_&?x_LP8hA(ehNRdhL z^2`Amm}HTOCunMtNlq`O1xW_^_!(M zlXN!O(CS6qb_(uhlv%4NxtmF@{Ft)4#mi$Osj8c$*0f)UtY7eUv1XxW*GfDs|BKQ! zlT9ay$zfGi9QcY8SKP7~mD&-fI7z zw_llr|KT3`%c%bmcl7Os(fuOwrfUQ5U`N#j>X~Mio32t(TD<(~0L@M_MjDR$R&1B$ zQmZR$CGN?(o#Qss7EHk5V46wVR?zvh1nKF#C?b7HM7jq2HL_c5CrWY7}`Sz z2!W0e3SkfqouD&BKqN##G{is`hy^_uzz8OY0|m?w4;Dy(MCb}hV1;Dp1}TsVX~56j z9eO}d=mou@5A=n8&>sfCKo|rWFc^lwP{@Q^VHn&7!(jxBgxettMnN`=h8)O+Jh%hK zKt2?}SSW-d7zg9wPM81_VG`U0lVJ)>g=sJyR49fLC`(;`a6&cA z1Q)o$174_sSuh*sz+AW+=D~be0JU%r+zSg~5iExL;C@&Fb?^Wzg=MfDR=|U>5*~t8 zuo?&+hDTrxJPK>!F?bxFfOYUBtcMNo6l{d2;Td=qo`dJ%1=s|eVGC@9dUz2U;3e1w z+hGUngqPuO@CxjLSK;rl8(xFg;SG2b-hw^wHoOCSVIRB;`{6zK2OQWHk^a7Mt6Y}- zXz%0iSLjlgtULZbe6VZX@ejivs13_^+1ypC%jVFO!V3JVD~iXeE=?)bO7Odw$5x{$ zZjTd#o(k2Yl&B7+SX0WJUPq~7b0}jAf{)<{d;*`sQ8)(2;WIb^C*gDW0=|S(@D+Rw|AKGeTlfyXhttpm zXW%US0O#O5{0JA|BK!nD!!PhFT!P==GW-sIz`x-NT!m}!=d$`@-Adp{PAg7pP8&{J z&MllEPCHI8r#+_wCxp|H6UqtWgmXG^I&&g8k(?+_G$)4Bg%iusa||3K$Ha-_C>%2< zo@3!8a1uFPIY}HVCz;cYlfp^mq;b+Y-8nrtJvqHNy*Yh2eL4L&{W$|T137~@8JxkK zA)KL{OwO&GVVv7I!#N{3BRRKovN)qS*__dw98NALk8=lS3@4vcz!}Ra

qnamI7* zfhVv+AE$1=Lo`wx)^j#+p5koeJk5EA^DO5% n&hwlXIGZ?|Ia@eeIrW?uISrhbINLbeIXiT3)fey74e9hBx9n(i delta 4091 zcmZA2d0Y9NeH!8)n4LJ)Lvbv zL%RHrNCM?&S5Dl;C&CZm0MgJ|Min` zLflOfzL^e-YsURq=RR5|#BjyK3HQyMSFXpzAmQge!*d_!%NjA0^>AjWjT~xk`FS!; zQ){GY5Us^fR7d;NTDk2r`c|z~U2PJg&lur5&|MvJsI5S?EYe(rhC zhc#~AikYnsXFRvmc(OO;X*9BJ8qL7qvyRqlw6a|)9pIsXzSo3le5VSL++X+)v^t&m zE_*pD-M4o!;}H34mGU_=#cQ?lz&aYJ)yW%Y$c}?g=x8ziRy2aDG1$7$F|A%sY)Myn zI8A=Kkj}+Bg-94Ie6uWeN10`k#eLmN>v1Ou1B9P@!gD8=j`gR}I<;(CL(_GdE^)tL zUFO4ep8L9-mmtK8zwk_j)7t!DUA`Ph^}5hhL$DB??g)R+0?%h$8QLCG_e79qDyOu> zR_@;1l_ddW&}-$vYm}xBlh?nX(R!VXHPB29U2o7Py!+1(eqdf-=57_{>7YBCtqGG_tx#IW!lFrp*RpO7swX ze{)38V5`mUEVq=DJn~-to_`Y4Q-oiRWs2)wJ-71vssYqwP^L7j!E@>=0`4zxeU0v2 zTx)e4bKOMyW^fYep);+bz~? zgpMYg+Ecx$ot!a-elSIO*L{lPjY8!*t~a-q=V~d=Y?A6=%EmD4HJV~JOG=~-<|tWz zmJXYvrFSr0Gn-S>b_tQP40rZmpUq!`8#7a}8O5WM?q_miPj|`=SIhIsK7 z9Th4+yhO!ODjE7NEsWC2tR~tXr49bkB!q7d(VACh^meUZdc{I#qLi{%Pr4PQkzT_o zBw8Wu|7rk++UwjQQ$hI`qNAyOclcK{^5T1bju{`{h14gXlZn4dcToE zguX7?xE4G(tHy#K1Jj?P9Up9VPR;y3gcy71{_#x9IBSX1b*-9nd+AcNx<$>sh15Dm zBl{Flbc|Lm+d=(ejPjJ4CdHU$t2YXfejQI2*UYh&SjU$){}-jGEvUkLrD*FcEwMO@ ztj-SQmF0@snpQ%Dj1+BiZIi5J4}Sa=wI7ccqQ#L1M<0BDirOPFuA@G#weGJ?QG4{7 z5G@tt8yg&U9Q$u6#r+lT7fDfj;yU$+4N;x?M2PP7!Z+99D9N>zI^7rE6<9^3v7vHs z9xaYl%N6moJyxTx{|&3Z7Jly4p3CiS^AY_VtCanF&>aj_V<;?6B~Q<#E^#`kdzpsC z>E(pOGz|xL-lf%XT6rUZ-j37e{k2aBIb8(iR+Kx+Y?hKNM`=Z=`=0A=cf^0VU;bm( zy~RC=3d|lBL64m4c?Nrmk5I>WgM8x~%8fV5vs>tlWnlqbjW^557v}|bSPt;BoMVR?r&SKwI#EcHj$s;12=N z9s(fYU^L`GK8%5}V1aQk9tyw;6QB@^zy=ec7)oFg*uep%Fd53g3FS}$Q(!7o z!Zer;&%z9t3A11}%z?S^9L$5~VLrS73t%BEg2k`|mclZ45thRWsDhP1unJy+)vyNE z!ppD@*24za2%BItY=Ku`E4&J?!Rzn_Y=iCaChUM}sDYhO3%g)9)WIIu3va={;BD9k z@4&mT9}d8K@IHJ12jN3F1Ruf2@Ckehhv5kP8$R0?*x{(AS}xMBNo+V;q=;Csq2VZe zzHdXrG5!HoEW8fG$CXSgC&WYeea-ulVoET0lCyo=(>A-n{lfdc7d6JXJ>BQ;G>B8yCN#Z1P zx^YrCshsYd9-N+>r#NYxUYw^ny*Yh2eL3lz3{F2zf6f3-CTAdL5a$_A7AKoCn3KcF zT*P&vIsPW^!h6W^?9n=5n6n%;P-Ina_EFvw*XZ zvxu{pvxKvhvyAg1XE|pDr;4+ZL!4EdmpH3AYdC8;FLTy$)^j#+HgYy`HgmRcUg2!z syvliv^E&4Z&Nj|=&YPSaoN7)DXD6qYvx~EvQ^(n(IC!dHuOcsetIconName(L"rabbitsFoot")->setDescriptionId(IDS_ITEM_RABBIT_FOOT)->setUseDescriptionId(IDS_DESC_RABBIT_FOOT); Item::armor_stand = (new ArmorStandItem(160)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem,eMaterial_cloth)->setIconName(L"armorStand")->setDescriptionId(IDS_ITEM_ARMOR_STAND)->setUseDescriptionId(IDS_DESC_ARMOR_STAND); - Item::prismarine_crystal = (new Item(176))->setIconName(L"prismarineCrystal")->setDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL)->setUseDescriptionId(IDS_DESC_BRICK); - Item::prismarine_shard = (new Item(177))->setIconName(L"prismarineShard")->setDescriptionId(IDS_ITEM_PRISMARINE_SHARD)->setUseDescriptionId(IDS_DESC_BRICK); + Item::prismarine_crystal = (new Item(154))->setIconName(L"prismarineCrystal")->setDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL)->setUseDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL_DESC); + Item::prismarine_shard = (new Item(153))->setIconName(L"prismarineShard")->setDescriptionId(IDS_ITEM_PRISMARINE_SHARD)->setUseDescriptionId(IDS_ITEM_PRISMARINE_SHARD_DESC); } diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h index e241af4c..18a7aaf1 100644 --- a/Minecraft.World/Item.h +++ b/Minecraft.World/Item.h @@ -662,8 +662,8 @@ public: static const int armor_stand_Id = 416; static const int rabbitStew_Id = 413; - static const int prismarine_cystal_Id = 432; - static const int prismarine_shard_Id = 433; + static const int prismarine_cystal_Id = 410; + static const int prismarine_shard_Id = 409; public: diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp index bb5a7517..3611cac5 100644 --- a/Minecraft.World/Tile.cpp +++ b/Minecraft.World/Tile.cpp @@ -510,10 +510,10 @@ void Tile::staticCtor() Tile::door_acacia = (new DoorTile(196, Material::wood, L"doorAcacia"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_acacia")->setDescriptionId(IDS_TILE_DOOR_ACACIA)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Tile::door_dark = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_dark")->setDescriptionId(IDS_TILE_DOOR_DARK)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::seaLantern = (new SeaLanternTile(198, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_GLOWSTONE); - Tile::prismarine = (new PrismarineTile(200, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stone")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_DESC_STONE); - Tile::prismarinedark = (new Tile(201, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"prismarine_dark")->setDescriptionId(IDS_TILE_PRISMARINE_DARK)->setUseDescriptionId(IDS_DESC_STONE_BRICK); - Tile::prismarinebrick = (new Tile(202, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"prismarine_bricks")->setDescriptionId(IDS_TILE_PRISMARINE_BRICKS)->setUseDescriptionId(IDS_DESC_STONE_BRICK); + Tile::seaLantern = (new SeaLanternTile(169, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_GLOWSTONE); + Tile::prismarine = (new PrismarineTile(168, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stone")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_ITEM_PRISMARINE_DESC); + Tile::prismarinedark = (new Tile(201, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"prismarine_dark")->setDescriptionId(IDS_TILE_PRISMARINE_DARK)->setUseDescriptionId(IDS_ITEM_PRISMARINE_DARK_DESC); + Tile::prismarinebrick = (new Tile(202, Material::stone))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"prismarine_bricks")->setDescriptionId(IDS_TILE_PRISMARINE_BRICKS)->setUseDescriptionId(IDS_ITEM_PRISMARINE_BRICK_DESC); diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index 9cf6a153..f91f71b4 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -395,8 +395,8 @@ public: static const int darkFence_Id = 191; static const int acaciaFence_Id = 192; - static const int seaLantern_Id = 198; - static const int prismarine_Id = 200; + static const int seaLantern_Id = 169; + static const int prismarine_Id = 168; static const int prismarinedark_Id = 201; static const int prismarinebrick_Id = 202;