Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/FishingRodItem.cpp
View File

@@ -13,8 +13,6 @@
#include "FishingRodItem.h"
#include "SoundTypes.h"
const wstring FishingRodItem::TEXTURE_EMPTY = L"fishingRod_empty";
FishingRodItem::FishingRodItem(int id) : Item(id)
{
setMaxDamage(64);
@@ -37,12 +35,12 @@ shared_ptr<ItemInstance> FishingRodItem::use(shared_ptr<ItemInstance> instance,
if (player->fishing != NULL)
{
int dmg = player->fishing->retrieve();
instance->hurt(dmg, player);
instance->hurtAndBreak(dmg, player);
player->swing();
}
else
{
level->playSound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
level->playEntitySound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
if (!level->isClientSide)
{
// 4J Stu - Move the player->fishing out of the ctor as we cannot reference 'this'
@@ -57,8 +55,8 @@ shared_ptr<ItemInstance> FishingRodItem::use(shared_ptr<ItemInstance> instance,
void FishingRodItem::registerIcons(IconRegister *iconRegister)
{
Item::registerIcons(iconRegister);
emptyIcon = iconRegister->registerIcon(TEXTURE_EMPTY);
icon = iconRegister->registerIcon(getIconName() + L"_uncast");
emptyIcon = iconRegister->registerIcon(getIconName() + L"_cast");
}
Icon *FishingRodItem::getEmptyIcon()