From 257b3a6308f5fcf218dffcab9700cfc151d09ddb Mon Sep 17 00:00:00 2001 From: Lord Cambion Date: Mon, 16 Mar 2026 16:56:50 +0100 Subject: [PATCH 1/2] Armorstand bugfixes #2 --- Minecraft.World/ArmorStand.cpp | 73 ++++++++++++++++++++++------------ Minecraft.World/ArmorStand.h | 5 +++ Minecraft.World/Recipes.cpp | 2 +- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/Minecraft.World/ArmorStand.cpp b/Minecraft.World/ArmorStand.cpp index cff11345..af2aacc9 100644 --- a/Minecraft.World/ArmorStand.cpp +++ b/Minecraft.World/ArmorStand.cpp @@ -80,6 +80,9 @@ void ArmorStand::defineSynchedData() void ArmorStand::tick() { float lockedRot = this->yRot; + if (this->isInWater()|| this->isInLava()) { + this->yd -= 0.0392; + } LivingEntity::tick(); this->yRot = lockedRot; this->yRotO = lockedRot; @@ -87,6 +90,8 @@ void ArmorStand::tick() this->yBodyRotO = lockedRot; this->yHeadRot = lockedRot; this->yHeadRotO = lockedRot; + + } bool ArmorStand::interact(shared_ptr player) @@ -142,50 +147,61 @@ bool ArmorStand::interact(shared_ptr player) return true; } } - bool ArmorStand::hurt(DamageSource *source, float damage) { - if (isInvulnerable()) return false; - if (level->isClientSide || removed) return false; - if (isMarker()) return false; + if (isInvulnerable() || level->isClientSide || removed || isMarker()) return false; - if (dynamic_cast(source) != nullptr) - { - shared_ptr attacker = source->getEntity(); - if (attacker != nullptr && attacker->instanceof(eTYPE_PLAYER)) - { - shared_ptr player = dynamic_pointer_cast(attacker); - if (player->abilities.instabuild) - { - - - level->broadcastEntityEvent(shared_from_this(), (byte)31); + if (source != nullptr && source->getMsgId() == eEntityDamageType_Suffocate) return false; + bool isFireDamage = source->isFire(); + + + if (dynamic_cast(source) != nullptr) { + shared_ptr attacker = source->getEntity(); + if (attacker != nullptr && attacker->instanceof(eTYPE_PLAYER)) { + if (dynamic_pointer_cast(attacker)->abilities.instabuild) { + level->broadcastEntityEvent(shared_from_this(), (byte)31); remove(); return true; } } } + long long now = (long long)tickCount; - if (now - lastHit > 5) - { + + + if (isFireDamage) { + + float currentHealth = this->getHealth() - 0.1f; + this->setHealth(currentHealth); + + if (currentHealth <= 0) { + //level->broadcastEntityEvent(shared_from_this(), (byte)31); + remove(); + return true; + } + + + return false; + } + + + if (now - lastHit > 5) { level->broadcastEntityEvent(shared_from_this(), (byte)32); lastHit = now; - } - else - { + return true; + } else { + level->broadcastEntityEvent(shared_from_this(), (byte)31); remove(); spawnAtLocation(Item::armor_stand_Id, 1); for (int i = 0; i < 5; i++) { - if (equipment[i] != nullptr) { - spawnAtLocation(equipment[i], 0.0f); - } + if (equipment[i] != nullptr) spawnAtLocation(equipment[i], 0.0f); } + return true; } - return true; } bool ArmorStand::isPickable() @@ -427,4 +443,11 @@ void ArmorStand::handleEntityEvent(byte id) lastHit = (long long)tickCount; else LivingEntity::handleEntityEvent(id); -} \ No newline at end of file +} + +bool ArmorStand::updateInWaterState() +{ + + return Entity::updateInWaterState(); +} + diff --git a/Minecraft.World/ArmorStand.h b/Minecraft.World/ArmorStand.h index af1a8f3f..e8f91311 100644 --- a/Minecraft.World/ArmorStand.h +++ b/Minecraft.World/ArmorStand.h @@ -97,6 +97,9 @@ public: virtual wstring getAName() override { return L""; } virtual wstring getDisplayName() override { return L""; } virtual wstring getNetworkName() override { return L""; } + virtual bool isInWall() override { return false; } + + virtual shared_ptr getCarriedItem() override; virtual shared_ptr getCarried(int slot) override; @@ -107,6 +110,8 @@ public: virtual void readAdditionalSaveData(CompoundTag *tag) override; virtual void addAdditonalSaveData(CompoundTag *tag) override; virtual void handleEntityEvent(byte eventId) override; + + virtual bool updateInWaterState() override; protected: virtual void defineSynchedData() override; diff --git a/Minecraft.World/Recipes.cpp b/Minecraft.World/Recipes.cpp index f6645025..54ebb91e 100644 --- a/Minecraft.World/Recipes.cpp +++ b/Minecraft.World/Recipes.cpp @@ -1030,7 +1030,7 @@ Recipes::Recipes() L" S ", L"SXS", L'S', Item::stick, - L'X',Tile::stoneSlabHalf, + L'X', Tile::stoneSlabHalf, L'D'); From 230872ed36fe765d26aaba983f6eb783aa598e54 Mon Sep 17 00:00:00 2001 From: Lord Cambion Date: Mon, 16 Mar 2026 19:30:33 +0100 Subject: [PATCH 2/2] Rabbit drops and mutton name changed --- .../Common/Media/MediaWindows64.arc | Bin 57351524 -> 57352133 bytes .../Common/UI/IUIScene_CreativeMenu.cpp | 3 +- .../Common/res/TitleUpdate/res/colours.xml | 2 + .../Windows64Media/loc/stringsGeneric.xml | 36 +++ Minecraft.Client/Windows64Media/strings.h | 262 +++++++++--------- Minecraft.World/Item.cpp | 12 +- 6 files changed, 182 insertions(+), 133 deletions(-) diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index 58ff6badeebfc7438f3191fbfe2ba0a543544b47..ea0095ab44fa22d6e1488a1dec70ca92dc78ec1c 100644 GIT binary patch delta 11792 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 nL4PQOA}EFu7yzYE25J}xM_bN9 diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 4be3e89e..2da3f876 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -439,7 +439,7 @@ void IUIScene_CreativeMenu::staticCtor() BuildFirework(list, FireworksItem::TYPE_BURST, DyePowderItem::MAGENTA, 3, true, false, DyePowderItem::BLUE); BuildFirework(list, FireworksItem::TYPE_STAR, DyePowderItem::YELLOW, 2, false, true, DyePowderItem::ORANGE); -#ifndef _CONTENT_PACKAGE + DEF(eCreativeInventory_ArtToolsMisc) if(app.DebugSettingsOn()) { @@ -451,7 +451,6 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Item::spawnEgg_Id, 52 | (2 << 12)); // Spider-Jockey ITEM_AUX(Item::spawnEgg_Id, 63); // Enderdragon } -#endif // Food DEF(eCreativeInventory_Food) diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml index 6c45b660..1a657e0e 100644 --- a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml +++ b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml @@ -273,6 +273,8 @@ if __name__=="__main__": notecolors() + + diff --git a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml index b2b63217..4ee26883 100644 --- a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml +++ b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml @@ -8943,5 +8943,41 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc A harmless creature. May drop a rabbit hide or a rabbit's foot when killed. + + Rabbit Hide + + + Used in crafting leather. + + + Rabbit's Foot + + + Used as an ingredient for brewing potions. + + + Raw Rabbit + + + Restores 0.5{*ICON_SHANK_01*}, or can be cooked in a furnace. + + + Cooked Rabbit + + + Restores 2.5{*ICON_SHANK_01*}. Used to cook up some rabbit stew. + + + Raw Mutton + + + Restores 1{*ICON_SHANK_01*}, or can be cooked in a furnace. + + + Cooked Mutton + + + Restores 3{*ICON_SHANK_01*}. Created by cooking raw mutton in a furnace. + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/strings.h b/Minecraft.Client/Windows64Media/strings.h index 9fffb0a2..fecbcd57 100644 --- a/Minecraft.Client/Windows64Media/strings.h +++ b/Minecraft.Client/Windows64Media/strings.h @@ -1,7 +1,7 @@ #pragma once // Auto-generated by StringTable builder — do not edit manually. // Source language: en-US -// Total strings: 2319 +// Total strings: 2331 #define IDS_NULL 0 #define IDS_OK 1 @@ -2198,127 +2198,139 @@ #define IDS_DESC_ARMOR_STAND 2192 #define IDS_RABBIT 2193 #define IDS_DESC_RABBIT 2194 -#define IDS_LANG_SYSTEM 2195 -#define IDS_LANG_ENGLISH 2196 -#define IDS_LANG_GERMAN 2197 -#define IDS_LANG_SPANISH 2198 -#define IDS_LANG_SPANISH_SPAIN 2199 -#define IDS_LANG_SPANISH_LATIN_AMERICA 2200 -#define IDS_LANG_FRENCH 2201 -#define IDS_LANG_ITALIAN 2202 -#define IDS_LANG_PORTUGUESE 2203 -#define IDS_LANG_PORTUGUESE_PORTUGAL 2204 -#define IDS_LANG_PORTUGUESE_BRAZIL 2205 -#define IDS_LANG_JAPANESE 2206 -#define IDS_LANG_KOREAN 2207 -#define IDS_LANG_CHINESE_TRADITIONAL 2208 -#define IDS_LANG_CHINESE_SIMPLIFIED 2209 -#define IDS_LANG_DANISH 2210 -#define IDS_LANG_FINISH 2211 -#define IDS_LANG_DUTCH 2212 -#define IDS_LANG_POLISH 2213 -#define IDS_LANG_RUSSIAN 2214 -#define IDS_LANG_SWEDISH 2215 -#define IDS_LANG_NORWEGIAN 2216 -#define IDS_LANG_GREEK 2217 -#define IDS_LANG_TURKISH 2218 -#define IDS_LEADERBOARD_KILLS_EASY 2219 -#define IDS_LEADERBOARD_KILLS_NORMAL 2220 -#define IDS_LEADERBOARD_KILLS_HARD 2221 -#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2222 -#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2223 -#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2224 -#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2225 -#define IDS_LEADERBOARD_FARMING_PEACEFUL 2226 -#define IDS_LEADERBOARD_FARMING_EASY 2227 -#define IDS_LEADERBOARD_FARMING_NORMAL 2228 -#define IDS_LEADERBOARD_FARMING_HARD 2229 -#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2230 -#define IDS_LEADERBOARD_TRAVELLING_EASY 2231 -#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2232 -#define IDS_LEADERBOARD_TRAVELLING_HARD 2233 -#define IDS_TIPS_GAMETIP_0 2234 -#define IDS_TIPS_GAMETIP_1 2235 -#define IDS_TIPS_GAMETIP_48 2236 -#define IDS_TIPS_GAMETIP_44 2237 -#define IDS_TIPS_GAMETIP_45 2238 -#define IDS_TIPS_TRIVIA_4 2239 -#define IDS_TIPS_TRIVIA_17 2240 -#define IDS_HOW_TO_PLAY_MULTIPLAYER 2241 -#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2242 -#define IDS_HOW_TO_PLAY_CREATIVE 2243 -#define IDS_TUTORIAL_TASK_FLY 2244 -#define IDS_TOOLTIPS_SELECTDEVICE 2245 -#define IDS_TOOLTIPS_CHANGEDEVICE 2246 -#define IDS_TOOLTIPS_VIEW_GAMERCARD 2247 -#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2248 -#define IDS_TOOLTIPS_INVITE_PARTY 2249 -#define IDS_CONFIRM_START_CREATIVE 2250 -#define IDS_CONFIRM_START_SAVEDINCREATIVE 2251 -#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2252 -#define IDS_CONFIRM_START_HOST_PRIVILEGES 2253 -#define IDS_CONNECTION_LOST_LIVE 2254 -#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2255 -#define IDS_AWARD_AVATAR1 2256 -#define IDS_AWARD_AVATAR2 2257 -#define IDS_AWARD_AVATAR3 2258 -#define IDS_AWARD_THEME 2259 -#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2260 -#define IDS_UNLOCK_AVATAR_TEXT 2261 -#define IDS_UNLOCK_GAMERPIC_TEXT 2262 -#define IDS_UNLOCK_THEME_TEXT 2263 -#define IDS_UNLOCK_ACCEPT_INVITE 2264 -#define IDS_UNLOCK_GUEST_TEXT 2265 -#define IDS_LEADERBOARD_GAMERTAG 2266 -#define IDS_GROUPNAME_POTIONS_480 2267 -#define IDS_RETURNEDTOTITLESCREEN_TEXT 2268 -#define IDS_TRIALOVER_TEXT 2269 -#define IDS_FATAL_ERROR_TEXT 2270 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2271 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2272 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2273 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2274 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2275 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2276 -#define IDS_SAVE_ICON_MESSAGE 2277 -#define IDS_GAMEOPTION_HOST_PRIVILEGES 2278 -#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2279 -#define IDS_ACHIEVEMENTS 2280 -#define IDS_LABEL_GAMERTAGS 2281 -#define IDS_IN_GAME_GAMERTAGS 2282 -#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2283 -#define IDS_TITLE_UPDATE_NAME 2284 -#define IDS_PLATFORM_NAME 2285 -#define IDS_BACK_BUTTON 2286 -#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2287 -#define IDS_KICK_PLAYER_DESCRIPTION 2288 -#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2289 -#define IDS_WORLD_SIZE_TITLE_SMALL 2290 -#define IDS_WORLD_SIZE_TITLE_MEDIUM 2291 -#define IDS_WORLD_SIZE_TITLE_LARGE 2292 -#define IDS_WORLD_SIZE_TITLE_CLASSIC 2293 -#define IDS_WORLD_SIZE 2294 -#define IDS_GAMEOPTION_WORLD_SIZE 2295 -#define IDS_DISABLE_SAVING 2296 -#define IDS_GAMEOPTION_DISABLE_SAVING 2297 -#define IDS_RICHPRESENCE_GAMESTATE 2298 -#define IDS_RICHPRESENCE_IDLE 2299 -#define IDS_RICHPRESENCE_MENUS 2300 -#define IDS_RICHPRESENCE_MULTIPLAYER 2301 -#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2302 -#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2303 -#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2304 -#define IDS_RICHPRESENCESTATE_BLANK 2305 -#define IDS_RICHPRESENCESTATE_RIDING_PIG 2306 -#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2307 -#define IDS_RICHPRESENCESTATE_BOATING 2308 -#define IDS_RICHPRESENCESTATE_FISHING 2309 -#define IDS_RICHPRESENCESTATE_CRAFTING 2310 -#define IDS_RICHPRESENCESTATE_FORGING 2311 -#define IDS_RICHPRESENCESTATE_NETHER 2312 -#define IDS_RICHPRESENCESTATE_CD 2313 -#define IDS_RICHPRESENCESTATE_MAP 2314 -#define IDS_RICHPRESENCESTATE_ENCHANTING 2315 -#define IDS_RICHPRESENCESTATE_BREWING 2316 -#define IDS_RICHPRESENCESTATE_ANVIL 2317 -#define IDS_RICHPRESENCESTATE_TRADING 2318 +#define IDS_ITEM_RABBIT_HIDE 2195 +#define IDS_DESC_RABBIT_HIDE 2196 +#define IDS_ITEM_RABBIT_FOOT 2197 +#define IDS_DESC_RABBIT_FOOT 2198 +#define IDS_ITEM_RABBIT_RAW 2199 +#define IDS_DESC_RABBIT_RAW 2200 +#define IDS_ITEM_RABBIT_COOKED 2201 +#define IDS_DESC_RABBIT_COOKED 2202 +#define IDS_ITEM_MUTTON_RAW 2203 +#define IDS_DESC_MUTTON_RAW 2204 +#define IDS_ITEM_MUTTON_COOKED 2205 +#define IDS_DESC_MUTTON_COOKED 2206 +#define IDS_LANG_SYSTEM 2207 +#define IDS_LANG_ENGLISH 2208 +#define IDS_LANG_GERMAN 2209 +#define IDS_LANG_SPANISH 2210 +#define IDS_LANG_SPANISH_SPAIN 2211 +#define IDS_LANG_SPANISH_LATIN_AMERICA 2212 +#define IDS_LANG_FRENCH 2213 +#define IDS_LANG_ITALIAN 2214 +#define IDS_LANG_PORTUGUESE 2215 +#define IDS_LANG_PORTUGUESE_PORTUGAL 2216 +#define IDS_LANG_PORTUGUESE_BRAZIL 2217 +#define IDS_LANG_JAPANESE 2218 +#define IDS_LANG_KOREAN 2219 +#define IDS_LANG_CHINESE_TRADITIONAL 2220 +#define IDS_LANG_CHINESE_SIMPLIFIED 2221 +#define IDS_LANG_DANISH 2222 +#define IDS_LANG_FINISH 2223 +#define IDS_LANG_DUTCH 2224 +#define IDS_LANG_POLISH 2225 +#define IDS_LANG_RUSSIAN 2226 +#define IDS_LANG_SWEDISH 2227 +#define IDS_LANG_NORWEGIAN 2228 +#define IDS_LANG_GREEK 2229 +#define IDS_LANG_TURKISH 2230 +#define IDS_LEADERBOARD_KILLS_EASY 2231 +#define IDS_LEADERBOARD_KILLS_NORMAL 2232 +#define IDS_LEADERBOARD_KILLS_HARD 2233 +#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2234 +#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2235 +#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2236 +#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2237 +#define IDS_LEADERBOARD_FARMING_PEACEFUL 2238 +#define IDS_LEADERBOARD_FARMING_EASY 2239 +#define IDS_LEADERBOARD_FARMING_NORMAL 2240 +#define IDS_LEADERBOARD_FARMING_HARD 2241 +#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2242 +#define IDS_LEADERBOARD_TRAVELLING_EASY 2243 +#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2244 +#define IDS_LEADERBOARD_TRAVELLING_HARD 2245 +#define IDS_TIPS_GAMETIP_0 2246 +#define IDS_TIPS_GAMETIP_1 2247 +#define IDS_TIPS_GAMETIP_48 2248 +#define IDS_TIPS_GAMETIP_44 2249 +#define IDS_TIPS_GAMETIP_45 2250 +#define IDS_TIPS_TRIVIA_4 2251 +#define IDS_TIPS_TRIVIA_17 2252 +#define IDS_HOW_TO_PLAY_MULTIPLAYER 2253 +#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2254 +#define IDS_HOW_TO_PLAY_CREATIVE 2255 +#define IDS_TUTORIAL_TASK_FLY 2256 +#define IDS_TOOLTIPS_SELECTDEVICE 2257 +#define IDS_TOOLTIPS_CHANGEDEVICE 2258 +#define IDS_TOOLTIPS_VIEW_GAMERCARD 2259 +#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2260 +#define IDS_TOOLTIPS_INVITE_PARTY 2261 +#define IDS_CONFIRM_START_CREATIVE 2262 +#define IDS_CONFIRM_START_SAVEDINCREATIVE 2263 +#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2264 +#define IDS_CONFIRM_START_HOST_PRIVILEGES 2265 +#define IDS_CONNECTION_LOST_LIVE 2266 +#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2267 +#define IDS_AWARD_AVATAR1 2268 +#define IDS_AWARD_AVATAR2 2269 +#define IDS_AWARD_AVATAR3 2270 +#define IDS_AWARD_THEME 2271 +#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2272 +#define IDS_UNLOCK_AVATAR_TEXT 2273 +#define IDS_UNLOCK_GAMERPIC_TEXT 2274 +#define IDS_UNLOCK_THEME_TEXT 2275 +#define IDS_UNLOCK_ACCEPT_INVITE 2276 +#define IDS_UNLOCK_GUEST_TEXT 2277 +#define IDS_LEADERBOARD_GAMERTAG 2278 +#define IDS_GROUPNAME_POTIONS_480 2279 +#define IDS_RETURNEDTOTITLESCREEN_TEXT 2280 +#define IDS_TRIALOVER_TEXT 2281 +#define IDS_FATAL_ERROR_TEXT 2282 +#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2283 +#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2284 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2285 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2286 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2287 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2288 +#define IDS_SAVE_ICON_MESSAGE 2289 +#define IDS_GAMEOPTION_HOST_PRIVILEGES 2290 +#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2291 +#define IDS_ACHIEVEMENTS 2292 +#define IDS_LABEL_GAMERTAGS 2293 +#define IDS_IN_GAME_GAMERTAGS 2294 +#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2295 +#define IDS_TITLE_UPDATE_NAME 2296 +#define IDS_PLATFORM_NAME 2297 +#define IDS_BACK_BUTTON 2298 +#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2299 +#define IDS_KICK_PLAYER_DESCRIPTION 2300 +#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2301 +#define IDS_WORLD_SIZE_TITLE_SMALL 2302 +#define IDS_WORLD_SIZE_TITLE_MEDIUM 2303 +#define IDS_WORLD_SIZE_TITLE_LARGE 2304 +#define IDS_WORLD_SIZE_TITLE_CLASSIC 2305 +#define IDS_WORLD_SIZE 2306 +#define IDS_GAMEOPTION_WORLD_SIZE 2307 +#define IDS_DISABLE_SAVING 2308 +#define IDS_GAMEOPTION_DISABLE_SAVING 2309 +#define IDS_RICHPRESENCE_GAMESTATE 2310 +#define IDS_RICHPRESENCE_IDLE 2311 +#define IDS_RICHPRESENCE_MENUS 2312 +#define IDS_RICHPRESENCE_MULTIPLAYER 2313 +#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2314 +#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2315 +#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2316 +#define IDS_RICHPRESENCESTATE_BLANK 2317 +#define IDS_RICHPRESENCESTATE_RIDING_PIG 2318 +#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2319 +#define IDS_RICHPRESENCESTATE_BOATING 2320 +#define IDS_RICHPRESENCESTATE_FISHING 2321 +#define IDS_RICHPRESENCESTATE_CRAFTING 2322 +#define IDS_RICHPRESENCESTATE_FORGING 2323 +#define IDS_RICHPRESENCESTATE_NETHER 2324 +#define IDS_RICHPRESENCESTATE_CD 2325 +#define IDS_RICHPRESENCESTATE_MAP 2326 +#define IDS_RICHPRESENCESTATE_ENCHANTING 2327 +#define IDS_RICHPRESENCESTATE_BREWING 2328 +#define IDS_RICHPRESENCESTATE_ANVIL 2329 +#define IDS_RICHPRESENCESTATE_TRADING 2330 diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp index 26984ea4..c05a3519 100644 --- a/Minecraft.World/Item.cpp +++ b/Minecraft.World/Item.cpp @@ -509,10 +509,10 @@ void Item::staticCtor() Item::lead = (new LeashItem(164)) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined)->setIconName(L"lead")->setDescriptionId(IDS_ITEM_LEAD)->setUseDescriptionId(IDS_DESC_LEAD); Item::nameTag = (new NameTagItem(165)) ->setIconName(L"name_tag")->setDescriptionId(IDS_ITEM_NAME_TAG)->setUseDescriptionId(IDS_DESC_NAME_TAG); - Item::mutton_raw = (new FoodItem(167, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setIconName(L"muttonRaw")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW); - Item::mutton_cooked = (new FoodItem(168, 8, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"muttonCooked")->setDescriptionId(IDS_ITEM_BEEF_COOKED)->setUseDescriptionId(IDS_DESC_BEEF_COOKED); - Item::rabbit_raw = (new FoodItem(155, 1.8, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitRaw")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW); - Item::rabbit_cooked = (new FoodItem(156, 5, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitCooked")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW); + Item::mutton_raw = (new FoodItem(167, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setIconName(L"muttonRaw")->setDescriptionId(IDS_ITEM_MUTTON_RAW)->setUseDescriptionId(IDS_DESC_MUTTON_RAW); + Item::mutton_cooked = (new FoodItem(168, 6, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"muttonCooked")->setDescriptionId(IDS_ITEM_MUTTON_COOKED)->setUseDescriptionId(IDS_DESC_MUTTON_COOKED); + Item::rabbit_raw = (new FoodItem(155, 1, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitRaw")->setDescriptionId(IDS_ITEM_RABBIT_RAW)->setUseDescriptionId(IDS_DESC_RABBIT_RAW); + Item::rabbit_cooked = (new FoodItem(156, 5, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitCooked")->setDescriptionId(IDS_ITEM_RABBIT_COOKED)->setUseDescriptionId(IDS_DESC_RABBIT_COOKED); Item::door_spruce = (new DoorItem(171, Material::wood, L"doorSpruce"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorSpruce")->setDescriptionId(IDS_ITEM_DOOR_SPRUCE)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Item::door_birch = (new DoorItem(172, Material::wood, L"doorBirch"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorBirch")->setDescriptionId(IDS_ITEM_DOOR_BIRCH)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); @@ -520,8 +520,8 @@ void Item::staticCtor() Item::door_acacia = (new DoorItem(174, Material::wood, L"doorAcacia"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorAcacia")->setDescriptionId(IDS_ITEM_DOOR_ACACIA)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Item::door_dark = (new DoorItem(175, Material::wood, L"doorDark"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorDark")->setDescriptionId(IDS_ITEM_DOOR_DARK)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::rabbit_hide = ( new Item(159) ) ->setIconName(L"rabbitHide")->setDescriptionId(IDS_ITEM_LEATHER)->setUseDescriptionId(IDS_DESC_LEATHER); - Item::rabbits_foot = ( new Item(158) ) ->setIconName(L"rabbitsFoot")->setDescriptionId(IDS_ITEM_LEATHER)->setUseDescriptionId(IDS_DESC_LEATHER); + Item::rabbit_hide = ( new Item(159) ) ->setIconName(L"rabbitHide")->setDescriptionId(IDS_ITEM_RABBIT_HIDE)->setUseDescriptionId(IDS_DESC_RABBIT_HIDE); + Item::rabbits_foot = ( new Item(158) ) ->setIconName(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); }