Minecraft/Revelations
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 97a43994725008e35fceb984d5549df9c8cea470.

* 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
Minecraft.World/Enchantment.cpp
+7 -7
View File
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.world.item.enchantment.h"
#include "net.minecraft.world.item.h"
#include "Enchantment.h"
//Enchantment *Enchantment::enchantments[256];
@@ -129,9 +130,9 @@ int Enchantment::getDamageProtection(int level, DamageSource *source)
return 0;
}
int Enchantment::getDamageBonus(int level, shared_ptr<Mob> target)
float Enchantment::getDamageBonus(int level, shared_ptr<LivingEntity> target)
{
return 0;
return 0.0f;
}
bool Enchantment::isCompatibleWith(Enchantment *other) const
@@ -150,13 +151,12 @@ int Enchantment::getDescriptionId()
return descriptionId;
}
wstring Enchantment::getFullname(int level,wstring &unformatted)
HtmlString Enchantment::getFullname(int level)
{
wchar_t formatted[256];
swprintf(formatted,256,L"%ls %ls",app.GetString( getDescriptionId() ), getLevelString(level).c_str());
unformatted = formatted;
swprintf(formatted,256,L"<font color=\"#%08x\">%ls</font>",app.GetHTMLColour(eHTMLColor_f),unformatted.c_str());
return formatted;
swprintf(formatted, 256, L"%ls %ls", app.GetString(getDescriptionId()), getLevelString(level).c_str());
return HtmlString(formatted, eHTMLColor_f);
}
bool Enchantment::canEnchant(shared_ptr<ItemInstance> item)