diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index bec4fef7..a5e22f1d 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -112,6 +112,34 @@ set(ASSET_FOLDER_PAIRS ) setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}") +if(PLATFORM_NAME STREQUAL "Windows64") + file(GLOB_RECURSE PANORAMA_XML_ASSETS CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media/**/panorama.xml" + ) + + if(PANORAMA_XML_ASSETS) + set(PANORAMA_XML_COPY_COMMANDS) + foreach(PANORAMA_XML_ASSET IN LISTS PANORAMA_XML_ASSETS) + file(RELATIVE_PATH PANORAMA_XML_REL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PANORAMA_XML_ASSET}") + get_filename_component(PANORAMA_XML_REL_DIR "${PANORAMA_XML_REL_PATH}" DIRECTORY) + list(APPEND PANORAMA_XML_COPY_COMMANDS + COMMAND ${CMAKE_COMMAND} -E make_directory "$/${PLATFORM_NAME}Media/${PANORAMA_XML_REL_DIR}" + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${PANORAMA_XML_ASSET}" + "$/${PLATFORM_NAME}Media/${PANORAMA_XML_REL_PATH}" + ) + endforeach() + + add_custom_target(AssetPanoramaXmlCopy_Minecraft.Client ALL + ${PANORAMA_XML_COPY_COMMANDS} + COMMENT "Copying panorama XML assets into build folder..." + VERBATIM + ) + add_dependencies(Minecraft.Client AssetPanoramaXmlCopy_Minecraft.Client) + set_property(TARGET AssetPanoramaXmlCopy_Minecraft.Client PROPERTY FOLDER "Build") + endif() +endif() + set(LOOT_TABLES_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media/MediaWindows64/Structures/loot_tables") set(LOOT_TABLES_DEST "$/Common/Media/MediaWindows64/Structures/loot_tables") add_custom_target(AssetLootTablesCopy_Minecraft.Client ALL diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp index d0f99c5c..e4dc4144 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -1475,7 +1475,7 @@ if (cmd == L"tp" || cmd == L"teleport") shared_ptr packet = GiveItemCommand::preparePacket(target, item, amount, aux); server->getCommandDispatcher()->performCommand(player, eGameCommand_Give, packet->data); } -#ifndef _CONTENT_PACKAGE +#ifdef _DEBUG else if (cmd == L"spectator") { player->m_spectatorMode = !player->m_spectatorMode; diff --git a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml index aa3b928f..6ab2ae0b 100644 --- a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml +++ b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml @@ -628,40 +628,62 @@ so they can easily join you. {*T3*}Changes and Additions{*ETW*}{*B*} - {*T3*}neoLegacy v1.1.0b{*ETW*}{*B*}{*B*} + {*T3*}neoLegacy v1.1.1b{*ETW*}{*B*}{*B*} + Additions{*B*} - - Release builds now feature a logging system for developer debugging.{*B*}{*B*} - - Spectator mode has been added into Debug builds of neoLegacy.{*B*}{*B*} - - Added the Mario world into the game.{*B*}{*B*} - - Added all the TU43-related blocks into the game.{*B*}{*B*} - - Igloos and Fossils can now be found throughout the world.{*B*}{*B*} + - Banner patterns have been added to the game.{*B*}{*B*} + - Keyboard and mouse support has been fully added to the game, featuring improved graphics.{*B*}{*B*} + - Impact particles are now created when the player falls from a high distance.{*B*}{*B*} + - Additional sounds have been added for armor stands, cows, horses, item frames, paintings, and leads.{*B*}{*B*} + - A passive chunk loading option has been added to the 'Game Options' menu, featuring improved stability for lower-end devices.{*B*}{*B*} + - Support for additional languages (Czech, Danish, Greek, Finnish, Norwegian, Polish, and others) has been added to the game.{*B*}{*B*} + + Changes{*B*} + - Creepers now feature an 'Ignite' tooltip whilst holding a flint and steel.{*B*}{*B*} + - Panorama settings are now customizable to increase widespread DLC support.{*B*}{*B*} + - Host privileges are now enabled by default when creating a Creative Mode world.{*B*}{*B*} Welcome back! You may not have noticed, but your Minecraft has just been updated. - {*T3*}neoLegacy v1.1.0b{*ETW*} + {*T3*}neoLegacy v1.1.1b{*ETW*} + Additions - - Release builds now feature a logging system for developer debugging. - - Spectator mode has been added into Debug builds of neoLegacy. - - Added the Mario world into the game. - - Added all the TU43-related blocks into the game. - - Igloos and Fossils can now be found throughout the game. + - Added banner patterns. + - Added full keyboard and mouse support, including improved graphics. + - Added impact particles when players fall from significant heights. + - Added additional sounds for armor stands, cows, horses, item frames, paintings, and leads. + - Added a Passive Chunk Loading option to the Game Options menu, with improved stability on lower-end devices. + - Added support for additional languages, including Czech, Danish, Greek, Finnish, Norwegian, Polish, and more. + Changes - - neoLegacy branding has been added on the title screen. - - Dedicated servers now feature numerous stability improvements + bugfixes. - - Cow sounds have been updated to match their TU31 counterparts. - - The neoLegacy save format is now universal, meaning that anyone can make a DLC world purely from own unique saves. - - World generation has been updated to closely match the original Legacy Console Edition. - - Elytra has been updated with additional accuracy improvements. - - Animated textures have been updated to smoothly interpolate between frames. + - Creepers now display an "Ignite" tooltip when holding a flint and steel. + - Panorama settings are now customizable to improve DLC compatibility. + - Host Privileges are now enabled by default when creating a Creative Mode world. + Bug Fixes - - Flower pots can now properly store all flower variants when interacted with. - - The in-game localization menu no longer crashes when switching between Japanese, Chinese, or Korean languages. - - Jukeboxes now play audio correctly, causing the in-game soundtrack to fade out before playing any music. - - The zombie villager model has been updated to match the new 64x64 skin changes. - - neoLegacy dedicated servers no longer crash due to missing color files. + - Fixed main menu music not transitioning correctly when switching worlds. + - Fixed Debug builds on Linux not functioning correctly. + - Fixed fossils generating underwater or entirely as coal ore. + - Improved magma block generation for greater TU43 parity. + - Fixed zombie villagers despawning beneath igloos. + - Fixed servers not dropping mob loot. + - Fixed missing localization for TU43 blocks. + - Cooked rabbit can now be obtained through normal gameplay. + - Fixed skins not displaying correctly in server worlds. + - Fixed newer fence and fence gate blocks not connecting correctly. + - Fixed player capes behaving incorrectly while flying in Creative Mode. + - Treasure enchantments can no longer be obtained through standard enchanting methods. + - Fixed minimap text colors and several DirectX-related rendering issues. + - Fixed underground bedrock generation creating overlapping blocks. + - Updated magma blocks and grass paths to match TU43 generation behavior. + - Fixed the Classic Crafting interface and restored its full functionality. + - Fixed a crash that could occur when players traveled beyond the world border in Spectator Mode. + - Enchanted books can now generate in the loot chests of applicable structures. + - The Sword of Debug can no longer be obtained in non-Debug builds. + - Fixed item frames and other hanging entities having an incorrect positional offset. diff --git a/Minecraft.World/LootTableManager.cpp b/Minecraft.World/LootTableManager.cpp index 2554cc03..1a592f8b 100644 --- a/Minecraft.World/LootTableManager.cpp +++ b/Minecraft.World/LootTableManager.cpp @@ -174,7 +174,8 @@ int ResolveSmeltedItemId(const std::string &itemName, int currentItemId) else if (normalized == "beef" || normalized == "porkchop" || normalized == "chicken" - || normalized == "mutton") + || normalized == "mutton" + || normalized == "rabbit") { return GetItemIdByName("cooked_" + normalized); } diff --git a/NOTES.md b/NOTES.md index b5bf1c44..1d18fbf8 100644 --- a/NOTES.md +++ b/NOTES.md @@ -1,30 +1,44 @@ -# neoLegacy v1.1.0b +# neoLegacy v1.1.1b ### Additions -- Release builds now feature a logging system for developer debugging. -- Spectator mode has been added into Debug builds of neoLegacy. -- Added the Mario world into the game. -- Added all the TU43-related blocks into the game. -- Igloos and Fossils can now be found throughout the game. + +- Added banner patterns. +- Added full keyboard and mouse support, including improved graphics. +- Added impact particles when players fall from significant heights. +- Added additional sounds for armor stands, cows, horses, item frames, paintings, and leads. +- Added a Passive Chunk Loading option to the Game Options menu, with improved stability on lower-end devices. +- Added support for additional languages, including Czech, Danish, Greek, Finnish, Norwegian, Polish, and more. ### Changes -- neoLegacy branding has been added on the title screen. -- Dedicated servers now feature numerous stability improvements + bugfixes. -- Cow sounds have been updated to match their TU31 counterparts. -- The neoLegacy save format is now universal, meaning that -anyone can make a DLC world purely from own unique saves. -- World generation has been updated to closely match the original Legacy Console Edition. -- Elytra has been updated with additional accuracy improvements. -- Animated textures have been updated to smoothly interpolate between frames. + +- Creepers now display an **Ignite** tooltip when the player is holding a flint and steel. +- Panorama settings are now customizable to improve DLC compatibility. +- Host Privileges are now enabled by default when creating a Creative Mode world. ### Bug Fixes -- Flower pots can now properly store all flower variants when interacted with. -- The in-game localization menu no longer crashes when switching between Japanese, Chinese, or Korean languages. -- Jukeboxes now play audio correctly, causing the in-game soundtrack to fade out before playing any music. -- The zombie villager model has been updated to match the new 64x64 skin changes. -- neoLegacy dedicated servers no longer crash due to missing color files. -roadmap +- Fixed main menu music not transitioning correctly when switching worlds. +- Fixed Debug builds on Linux not functioning correctly. +- Fixed fossils generating underwater or entirely as coal ore. +- Improved magma block generation for greater TU43 parity. +- Fixed zombie villagers despawning beneath igloos. +- Fixed servers not dropping mob loot. +- Fixed missing localization for TU43 blocks. +- Cooked rabbit can now be obtained through normal gameplay. +- Fixed skins not displaying correctly in server worlds. +- Fixed newer fence and fence gate blocks not connecting correctly. +- Fixed player capes behaving incorrectly while flying in Creative Mode. +- Treasure enchantments can no longer be obtained through standard enchanting methods. +- Fixed minimap text colors and several DirectX-related rendering issues. +- Fixed underground bedrock generation creating overlapping blocks. +- Updated magma blocks and grass paths to match TU43 generation behavior. +- Fixed the Classic Crafting interface and restored its full functionality. +- Fixed a crash that could occur when players traveled beyond the world border in Spectator Mode. +- Enchanted books can now generate in the loot chests of applicable structures. +- The Sword of Debug can no longer be obtained in non-Debug builds. +- Fixed item frames and other hanging entities having an incorrect positional offset. + +roadmap # Download -Get the latest build from [LCE Emerald Launcher](https://github.com/LCE-Hub/LCE-Emerald-Launcher/releases) or the upcoming LC Launcher. +Get the latest build(s) from the [Emerald](https://github.com/LCE-Hub/LCE-Emerald-Launcher/releases/) or [LC](https://github.com/thehuckledev/LC-Launcher/releases/) Launcher(s).