mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-09-24 03:30:54 +00:00
feat: TU19 (Dec 2014) Features & Content (#155)
* 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 <[email protected]>
This commit is contained in:
+18
-17
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Item.h"
|
||||
#include "DefaultDispenseItemBehavior.h"
|
||||
|
||||
class ArmorItem : public Item
|
||||
{
|
||||
@@ -18,6 +19,13 @@ private:
|
||||
public:
|
||||
static const wstring TEXTURE_EMPTY_SLOTS[];
|
||||
|
||||
private:
|
||||
class ArmorDispenseItemBehavior : public DefaultDispenseItemBehavior
|
||||
{
|
||||
protected:
|
||||
virtual shared_ptr<ItemInstance> execute(BlockSource *source, shared_ptr<ItemInstance> dispensed, eOUTCOME &outcome);
|
||||
};
|
||||
|
||||
public:
|
||||
class ArmorMaterial
|
||||
{
|
||||
@@ -64,27 +72,20 @@ private:
|
||||
public:
|
||||
ArmorItem(int id, const ArmorMaterial *armorType, int icon, int slot);
|
||||
|
||||
//@Override
|
||||
int getColor(shared_ptr<ItemInstance> item, int spriteLayer);
|
||||
|
||||
//@Override
|
||||
bool hasMultipleSpriteLayers();
|
||||
|
||||
virtual int getColor(shared_ptr<ItemInstance> item, int spriteLayer);
|
||||
virtual bool hasMultipleSpriteLayers();
|
||||
virtual int getEnchantmentValue();
|
||||
virtual const ArmorMaterial *getMaterial();
|
||||
virtual bool hasCustomColor(shared_ptr<ItemInstance> item);
|
||||
virtual int getColor(shared_ptr<ItemInstance> item);
|
||||
|
||||
const ArmorMaterial *getMaterial();
|
||||
bool hasCustomColor(shared_ptr<ItemInstance> item);
|
||||
int getColor(shared_ptr<ItemInstance> item);
|
||||
virtual Icon *getLayerIcon(int auxValue, int spriteLayer);
|
||||
virtual void clearColor(shared_ptr<ItemInstance> item);
|
||||
virtual void setColor(shared_ptr<ItemInstance> item, int color);
|
||||
|
||||
//@Override
|
||||
Icon *getLayerIcon(int auxValue, int spriteLayer);
|
||||
void clearColor(shared_ptr<ItemInstance> item);
|
||||
void setColor(shared_ptr<ItemInstance> item, int color);
|
||||
|
||||
bool isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<ItemInstance> repairItem);
|
||||
|
||||
//@Override
|
||||
void registerIcons(IconRegister *iconRegister);
|
||||
virtual bool isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<ItemInstance> repairItem);
|
||||
virtual void registerIcons(IconRegister *iconRegister);
|
||||
|
||||
static Icon *getEmptyIcon(int slot);
|
||||
};
|
||||
Reference in New Issue
Block a user