backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'smartcmd:main' into main

Browse source
This commit is contained in:
Tuff CWC 2026-03-07 18:26:05 +01:00 committed by GitHub
parent 4bcdb4b2a0 261c7f3de0
commit 1c0b88c56f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 143 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitattributes vendored Normal file
View file

@ -0,0 +1,8 @@
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.binka filter=lfs diff=lfs merge=lfs -text
*.arc filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.ico filter=lfs diff=lfs merge=lfs -text

2
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -103,7 +103,7 @@ char SoundEngine::m_szRedistName[]={"redist"};
#endif
char *SoundEngine::m_szStreamFileA[eStream_Max]=
const char *SoundEngine::m_szStreamFileA[eStream_Max]=
{
"calm1",
"calm2",

2
Minecraft.Client/Common/Audio/SoundEngine.h
View file

@ -151,7 +151,7 @@ private:
static char m_szSoundPath[];
static char m_szMusicPath[];
static char m_szRedistName[];
static char *m_szStreamFileA[eStream_Max];
static const char *m_szStreamFileA[eStream_Max];
AUDIO_LISTENER m_ListenerA[MAX_LOCAL_PLAYERS];
int m_validListenerCount;

2
Minecraft.Client/Common/Colours/ColourTable.cpp
View file

@ -4,7 +4,7 @@
unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;
wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
const wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
{
L"NOTSET",

2
Minecraft.Client/Common/Colours/ColourTable.h
View file

@ -5,7 +5,7 @@ class ColourTable
private:
unsigned int m_colourValues[eMinecraftColour_COUNT];
static wchar_t *ColourTableElements[eMinecraftColour_COUNT];
static const wchar_t *ColourTableElements[eMinecraftColour_COUNT];
static unordered_map<wstring,eMinecraftColour> s_colourNamesMap;
public:

2
Minecraft.Client/Common/DLC/DLCAudioFile.cpp
View file

@ -26,7 +26,7 @@ PBYTE DLCAudioFile::getData(DWORD &dwBytes)
return m_pbData;
}
WCHAR *DLCAudioFile::wchTypeNamesA[]=
const WCHAR *DLCAudioFile::wchTypeNamesA[]=
{
L"CUENAME",
L"CREDIT",

2
Minecraft.Client/Common/DLC/DLCAudioFile.h
View file

@ -28,7 +28,7 @@ public:
e_AudioParamType_Max,
};
static WCHAR *wchTypeNamesA[e_AudioParamType_Max];
static const WCHAR *wchTypeNamesA[e_AudioParamType_Max];
DLCAudioFile(const wstring &path);

2
Minecraft.Client/Common/DLC/DLCManager.cpp
View file

@ -7,7 +7,7 @@
#include "..\..\Minecraft.h"
#include "..\..\TexturePackRepository.h"
WCHAR *DLCManager::wchTypeNamesA[]=
const WCHAR *DLCManager::wchTypeNamesA[]=
{
L"DISPLAYNAME",
L"THEMENAME",

2
Minecraft.Client/Common/DLC/DLCManager.h
View file

@ -48,7 +48,7 @@ public:
e_DLCParamType_Max,
};
static WCHAR *wchTypeNamesA[e_DLCParamType_Max];
static const WCHAR *wchTypeNamesA[e_DLCParamType_Max];
private:
vector<DLCPack *> m_packs;

4
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -12,7 +12,7 @@
#include "ConsoleGameRules.h"
#include "GameRuleManager.h"
WCHAR *GameRuleManager::wchTagNameA[] =
const WCHAR *GameRuleManager::wchTagNameA[] =
{
L"", // eGameRuleType_Root
L"MapOptions", // eGameRuleType_LevelGenerationOptions
@ -34,7 +34,7 @@ WCHAR *GameRuleManager::wchTagNameA[] =
L"UpdatePlayer", // eGameRuleType_UpdatePlayerRule
};
WCHAR *GameRuleManager::wchAttrNameA[] =
const WCHAR *GameRuleManager::wchAttrNameA[] =
{
L"descriptionName", // eGameRuleAttr_descriptionName
L"promptName", // eGameRuleAttr_promptName

4
Minecraft.Client/Common/GameRules/GameRuleManager.h
View file

@ -24,8 +24,8 @@ class WstringLookup;
class GameRuleManager
{
public:
static WCHAR *wchTagNameA[ConsoleGameRules::eGameRuleType_Count];
static WCHAR *wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count];
static const WCHAR *wchTagNameA[ConsoleGameRules::eGameRuleType_Count];
static const WCHAR *wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count];
static const short version_number = 2;

3
Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
View file

@ -1051,7 +1051,8 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
m_pSaveDetails=StorageManager.ReturnSavesInfo();
if(m_pSaveDetails==NULL)
{
C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
char savename[] = "save";
C4JStorage::ESaveGameState eSGIStatus = StorageManager.GetSavesInfo(m_iPad, NULL, this, savename);
}
#if TO_BE_IMPLEMENTED

2
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
View file

@ -13,7 +13,7 @@
//#define SKIN_SELECT_PACK_PLAYER_CUSTOM 1
#define SKIN_SELECT_MAX_DEFAULTS 2
WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
const WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
{
L"USE LOCALISED VERSION", // Server selected
L"Steve",

2
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
View file

@ -6,7 +6,7 @@
class UIScene_SkinSelectMenu : public UIScene
{
private:
static WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
static const WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
// 4J Stu - How many to show on each side of the main control
static const BYTE sidePreviewControls = 4;

2
Minecraft.Client/DirtyChunkSorter.h
View file

@ -2,7 +2,7 @@
class Chunk;
class Mob;
class DirtyChunkSorter : public std::binary_function<const Chunk *,const Chunk *,bool>
class DirtyChunkSorter
{
private:
shared_ptr<LivingEntity> cameraEntity;

2
Minecraft.Client/DistanceChunkSorter.h
View file

@ -2,7 +2,7 @@
class Entity;
class Chunk;
class DistanceChunkSorter : public std::binary_function<const Chunk *,const Chunk *,bool>
class DistanceChunkSorter
{
private:
double ix, iy, iz;

6
Minecraft.Client/Extrax64Stubs.cpp
View file

@ -69,10 +69,10 @@ void XShowAchievementsUI(int i) {}
DWORD XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) { return 0; }
#ifndef _DURANGO
void PIXAddNamedCounter(int a, char* b, ...) {}
void PIXAddNamedCounter(int a, const char* b, ...) {}
//#define PS3_USE_PIX_EVENTS
//#define PS4_USE_PIX_EVENTS
void PIXBeginNamedEvent(int a, char* b, ...)
void PIXBeginNamedEvent(int a, const char* b, ...)
{
#ifdef PS4_USE_PIX_EVENTS
char buf[512];
@ -125,7 +125,7 @@ void PIXEndNamedEvent()
PixDepth -= 1;
#endif
}
void PIXSetMarkerDeprecated(int a, char* b, ...) {}
void PIXSetMarkerDeprecated(int a, const char* b, ...) {}
#else
// 4J Stu - Removed this implementation in favour of a macro that will convert our string format
// conversion at compile time rather than at runtime

6
Minecraft.Client/Textures.cpp
View file

@ -24,7 +24,7 @@ bool Textures::MIPMAP = true;
C4JRender::eTextureFormat Textures::TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw;
int Textures::preLoadedIdx[TN_COUNT];
wchar_t *Textures::preLoaded[TN_COUNT] =
const wchar_t *Textures::preLoaded[TN_COUNT] =
{
L"%blur%misc/pumpkinblur",
// L"%blur%/misc/vignette", // Not currently used
@ -1520,7 +1520,7 @@ TEXTURE_NAME TUImages[] =
};
// This is for any TU textures that aren't part of our enum indexed preload set
wchar_t *TUImagePaths[] =
const wchar_t *TUImagePaths[] =
{
L"font/Default",
L"font/Mojangles_7",
@ -1579,7 +1579,7 @@ TEXTURE_NAME OriginalImages[] =
TN_COUNT
};
wchar_t *OriginalImagesPaths[] =
const wchar_t *OriginalImagesPaths[] =
{
L"misc/watercolor.png",

2
Minecraft.Client/Textures.h
View file

@ -243,7 +243,7 @@ public:
static C4JRender::eTextureFormat TEXTURE_FORMAT;
private:
static wchar_t *preLoaded[TN_COUNT];
static const wchar_t *preLoaded[TN_COUNT];
static int preLoadedIdx[TN_COUNT];
unordered_map<wstring, int> idMap;

2
Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
View file

@ -56,7 +56,7 @@ typedef ID3D11DeviceContext ID3D1XContext;
typedef F32 ViewCoord;
typedef gdraw_d3d11_resourcetype gdraw_resourcetype;
static void report_d3d_error(HRESULT hr, char *call, char *context);
static void report_d3d_error(HRESULT hr, const char *call, const char *context);
static void *map_buffer(ID3D1XContext *ctx, ID3D11Buffer *buf, bool discard)
{

108
Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d1x_shared.inl
View file

@ -200,7 +200,7 @@ static void safe_release(T *&p)
}
}
static void report_d3d_error(HRESULT hr, char *call, char *context)
static void report_d3d_error(HRESULT hr, const char *call, const char *context)
{
if (hr == E_OUTOFMEMORY)
IggyGDrawSendWarning(NULL, "GDraw D3D out of memory in %s%s", call, context);
@ -478,7 +478,7 @@ static GDrawTexture * RADLINK gdraw_MakeTextureEnd(GDraw_MakeTexture_ProcessingI
D3D1X_(SUBRESOURCE_DATA) mipdata[24];
S32 i, w, h, nmips, bpp;
HRESULT hr = S_OK;
char *failed_call;
const char *failed_call;
U8 *ptr;
// generate mip maps and set up descriptors for them
@ -700,7 +700,7 @@ static void RADLINK gdraw_DescribeVertexBuffer(GDrawVertexBuffer *vbuf, GDraw_Ve
static GDrawHandle *get_color_rendertarget(GDrawStats *stats)
{
char *failed_call;
const char *failed_call;
// try to recycle LRU rendertarget
GDrawHandle *t = gdraw_HandleCacheGetLRU(&gdraw->rendertargets);
@ -762,7 +762,7 @@ static GDrawHandle *get_color_rendertarget(GDrawStats *stats)
static ID3D1X(DepthStencilView) *get_rendertarget_depthbuffer(GDrawStats *stats)
{
if (!gdraw->depth_buffer[1]) {
char *failed_call;
const char *failed_call;
assert(!gdraw->rt_depth_buffer);
D3D1X_(TEXTURE2D_DESC) desc = { static_cast<U32>(gdraw->frametex_width), static_cast<U32>(gdraw->frametex_height), 1U, 1U, DXGI_FORMAT_D24_UNORM_S8_UINT, { 1, 0 },
@ -2384,7 +2384,7 @@ static S32 num_pixels(S32 w, S32 h, S32 mipmaps)
GDrawTexture * RADLINK gdraw_D3D1X_(MakeTextureFromResource)(U8 *resource_file, S32 /*len*/, IggyFileTextureRaw *texture)
{
char *failed_call="";
const char *failed_call="";
U8 *free_data = 0;
GDrawTexture *t=0;
S32 width, height, mipmaps, size, blk;
@ -2405,6 +2405,8 @@ GDrawTexture * RADLINK gdraw_D3D1X_(MakeTextureFromResource)(U8 *resource_file,
D3D1X_(TEXTURE2D_DESC) desc = { static_cast<U32>(width), static_cast<U32>(height), static_cast<U32>(mipmaps), 1U, DXGI_FORMAT_UNKNOWN, { 1, 0 },
D3D1X_(USAGE_IMMUTABLE), D3D1X_(BIND_SHADER_RESOURCE), 0U, 0U };
bool done = false;
switch (texture->format) {
case IFT_FORMAT_rgba_8888 : size= 4; d3dfmt = DXGI_FORMAT_R8G8B8A8_UNORM; break;
case IFT_FORMAT_DXT1 : size= 8; d3dfmt = DXGI_FORMAT_BC1_UNORM; blk = 4; break;
@ -2412,60 +2414,62 @@ GDrawTexture * RADLINK gdraw_D3D1X_(MakeTextureFromResource)(U8 *resource_file,
case IFT_FORMAT_DXT5 : size=16; d3dfmt = DXGI_FORMAT_BC3_UNORM; blk = 4; break;
default: {
IggyGDrawSendWarning(NULL, "GDraw .iggytex raw texture format %d not supported by hardware", texture->format);
goto done;
done = true;
}
}
desc.Format = d3dfmt;
U8 *data = resource_file + texture->file_offset;
if (texture->format == IFT_FORMAT_i_8 || texture->format == IFT_FORMAT_i_4) {
// convert from intensity to luma+alpha
S32 i;
S32 total_size = 2 * num_pixels(width,height,mipmaps);
free_data = (U8 *) IggyGDrawMalloc(total_size);
if (!free_data) {
IggyGDrawSendWarning(NULL, "GDraw out of memory to store texture data to pass to D3D for %d x %d texture", width, height);
goto done;
}
U8 *cur = free_data;
for (k=0; k < mipmaps; ++k) {
S32 w = RR_MAX(width >> k, 1);
S32 h = RR_MAX(height >> k, 1);
for (i=0; i < w*h; ++i) {
cur[0] = cur[1] = *data++;
cur += 2;
if (!done) {
desc.Format = d3dfmt;
U8 *data = resource_file + texture->file_offset;
if (texture->format == IFT_FORMAT_i_8 || texture->format == IFT_FORMAT_i_4) {
// convert from intensity to luma+alpha
S32 i;
S32 total_size = 2 * num_pixels(width,height,mipmaps);
free_data = (U8 *) IggyGDrawMalloc(total_size);
if (!free_data) {
IggyGDrawSendWarning(NULL, "GDraw out of memory to store texture data to pass to D3D for %d x %d texture", width, height);
done = true;
} else {
U8 *cur = free_data;
for (k=0; k < mipmaps; ++k) {
S32 w = RR_MAX(width >> k, 1);
S32 h = RR_MAX(height >> k, 1);
for (i=0; i < w*h; ++i) {
cur[0] = cur[1] = *data++;
cur += 2;
}
}
data = free_data;
}
}
if (!done) {
for (k=0; k < mipmaps; ++k) {
S32 w = RR_MAX(width >> k, 1);
S32 h = RR_MAX(height >> k, 1);
S32 blkw = (w + blk-1) / blk;
S32 blkh = (h + blk-1) / blk;
mipdata[k].pSysMem = data;
mipdata[k].SysMemPitch = blkw * size;
data += blkw * blkh * size;
}
failed_call = "CreateTexture2D";
hr = gdraw->d3d_device->CreateTexture2D(&desc, mipdata, &tex);
if (!FAILED(hr)) {
failed_call = "CreateShaderResourceView for texture creation";
hr = gdraw->d3d_device->CreateShaderResourceView(tex, NULL, &view);
if (!FAILED(hr))
t = gdraw_D3D1X_(WrappedTextureCreate)(view);
}
}
data = free_data;
}
for (k=0; k < mipmaps; ++k) {
S32 w = RR_MAX(width >> k, 1);
S32 h = RR_MAX(height >> k, 1);
S32 blkw = (w + blk-1) / blk;
S32 blkh = (h + blk-1) / blk;
mipdata[k].pSysMem = data;
mipdata[k].SysMemPitch = blkw * size;
data += blkw * blkh * size;
}
failed_call = "CreateTexture2D";
hr = gdraw->d3d_device->CreateTexture2D(&desc, mipdata, &tex);
if (FAILED(hr)) goto done;
failed_call = "CreateShaderResourceView for texture creation";
hr = gdraw->d3d_device->CreateShaderResourceView(tex, NULL, &view);
if (FAILED(hr)) goto done;
t = gdraw_D3D1X_(WrappedTextureCreate)(view);
done:
if (FAILED(hr)) {
report_d3d_error(hr, failed_call, "");
}

34
Minecraft.Client/stdafx.h
View file

@ -20,6 +20,23 @@
// #endif
// #endif
#ifdef _WINDOWS64
#define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#include <malloc.h>
#include <tchar.h>
#include <windows.h>
#include <windowsx.h>
// TODO: reference additional headers your program requires here
#include <DirectXMath.h>
#include <d3d11.h>
using namespace DirectX;
#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
#endif
#ifdef __PS3__
#include "Ps3Types.h"
@ -59,23 +76,6 @@
#include <vector>
#endif
#ifdef _WINDOWS64
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#include <windows.h>
#include <windowsx.h>
#include <malloc.h>
#include <tchar.h>
// TODO: reference additional headers your program requires here
#include <d3d11.h>
#include <DirectXMath.h>
using namespace DirectX;
#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
#endif
#ifdef _DURANGO
#include <xdk.h>

12
Minecraft.World/Achievement.cpp
View file

@ -15,18 +15,18 @@ void Achievement::_init()
if (y > Achievements::yMax) Achievements::yMax = y;
}
Achievement::Achievement(int id, const wstring& name, int x, int y, Item *icon, Achievement *requires)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon( new ItemInstance(icon) ), x(x), y(y), requires(requires)
Achievement::Achievement(int id, const wstring& name, int x, int y, Item *icon, Achievement *reqs)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon( new ItemInstance(icon) ), x(x), y(y), reqs(reqs)
{
}
Achievement::Achievement(int id, const wstring& name, int x, int y, Tile *icon, Achievement *requires)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon( new ItemInstance(icon) ), x(x), y(y), requires(requires)
Achievement::Achievement(int id, const wstring& name, int x, int y, Tile *icon, Achievement *reqs)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon( new ItemInstance(icon) ), x(x), y(y), reqs(reqs)
{
}
Achievement::Achievement(int id, const wstring& name, int x, int y, shared_ptr<ItemInstance> icon, Achievement *requires)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon(icon), x(x), y(y), requires(requires)
Achievement::Achievement(int id, const wstring& name, int x, int y, shared_ptr<ItemInstance> icon, Achievement *reqs)
: Stat( Achievements::ACHIEVEMENT_OFFSET + id, I18n::get(wstring(L"achievement.").append(name)) ), desc( I18n::get(wstring(L"achievement.").append(name).append(L".desc"))), icon(icon), x(x), y(y), reqs(reqs)
{
}

8
Minecraft.World/Achievement.h
View file

@ -9,7 +9,7 @@ class Achievement : public Stat
{
public:
const int x, y;
Achievement *requires;
Achievement *reqs;
private:
const wstring desc;
@ -23,9 +23,9 @@ private:
void _init();
public:
Achievement(int id, const wstring& name, int x, int y, Item *icon, Achievement *requires);
Achievement(int id, const wstring& name, int x, int y, Tile *icon, Achievement *requires);
Achievement(int id, const wstring& name, int x, int y, shared_ptr<ItemInstance> icon, Achievement *requires);
Achievement(int id, const wstring& name, int x, int y, Item *icon, Achievement *reqs);
Achievement(int id, const wstring& name, int x, int y, Tile *icon, Achievement *reqs);
Achievement(int id, const wstring& name, int x, int y, shared_ptr<ItemInstance> icon, Achievement *reqs);
Achievement *setAwardLocallyOnly();
Achievement *setGolden();

4
Minecraft.World/ArmorDyeRecipe.cpp
View file

@ -147,12 +147,12 @@ const int ArmorDyeRecipe::getGroup()
}
// 4J-PB
bool ArmorDyeRecipe::requires(int iRecipe)
bool ArmorDyeRecipe::reqs(int iRecipe)
{
return false;
}
void ArmorDyeRecipe::requires(INGREDIENTS_REQUIRED *pIngReq)
void ArmorDyeRecipe::reqs(INGREDIENTS_REQUIRED *pIngReq)
{
//int iCount=0;
//bool bFound;

4
Minecraft.World/ArmorDyeRecipe.h
View file

@ -18,6 +18,6 @@ public:
virtual const int getGroup();
// 4J-PB
virtual bool requires(int iRecipe);
virtual void requires(INGREDIENTS_REQUIRED *pIngReq);
virtual bool reqs(int iRecipe);
virtual void reqs(INGREDIENTS_REQUIRED *pIngReq);
};

4
Minecraft.World/FireworksRecipe.h
View file

@ -37,8 +37,8 @@ public:
virtual const int getGroup() { return 0; }
// 4J-PB
virtual bool requires(int iRecipe) { return false; };
virtual void requires(INGREDIENTS_REQUIRED *pIngReq) {};
virtual bool reqs(int iRecipe) { return false; };
virtual void reqs(INGREDIENTS_REQUIRED *pIngReq) {};
// 4J Added
static void updatePossibleRecipes(shared_ptr<CraftingContainer> craftSlots, bool *firework, bool *charge, bool *fade);

2
Minecraft.World/Recipes.cpp
View file

@ -1312,7 +1312,7 @@ void Recipes::buildRecipeIngredientsArray(void)
int iCount=0;
for (auto& recipe : *recipies)
{
recipe->requires(&m_pRecipeIngredientsRequired[iCount++]);
recipe->reqs(&m_pRecipeIngredientsRequired[iCount++]);
}
//printf("Total recipes in buildRecipeIngredientsArray - %d",iCount);

4
Minecraft.World/Recipy.h
View file

@ -49,7 +49,7 @@ public:
virtual const int getGroup() = 0;
// 4J-PB
virtual bool requires(int iRecipe) = 0;
virtual void requires(INGREDIENTS_REQUIRED *pIngReq) = 0;
virtual bool reqs(int iRecipe) = 0;
virtual void reqs(INGREDIENTS_REQUIRED *pIngReq) = 0;
};

4
Minecraft.World/ShapedRecipy.cpp
View file

@ -106,7 +106,7 @@ int ShapedRecipy::size()
}
// 4J-PB
bool ShapedRecipy::requires(int iRecipe)
bool ShapedRecipy::reqs(int iRecipe)
{
app.DebugPrintf("ShapedRecipy %d\n",iRecipe);
int iCount=0;
@ -130,7 +130,7 @@ bool ShapedRecipy::requires(int iRecipe)
return false;
}
void ShapedRecipy::requires(INGREDIENTS_REQUIRED *pIngReq)
void ShapedRecipy::reqs(INGREDIENTS_REQUIRED *pIngReq)
{
//printf("ShapedRecipy %d\n",iRecipe);

4
Minecraft.World/ShapedRecipy.h
View file

@ -26,7 +26,7 @@ public:
ShapedRecipy *keepTag();
// 4J-PB - to return the items required to make a recipe
virtual bool requires(int iRecipe);
virtual void requires(INGREDIENTS_REQUIRED *pIngReq);
virtual bool reqs(int iRecipe);
virtual void reqs(INGREDIENTS_REQUIRED *pIngReq);
};

4
Minecraft.World/ShapelessRecipy.cpp
View file

@ -77,7 +77,7 @@ int ShapelessRecipy::size()
}
// 4J-PB
bool ShapelessRecipy::requires(int iRecipe)
bool ShapelessRecipy::reqs(int iRecipe)
{
vector <ItemInstance *> *tempList = new vector<ItemInstance *>;
@ -97,7 +97,7 @@ bool ShapelessRecipy::requires(int iRecipe)
return false;
}
void ShapelessRecipy::requires(INGREDIENTS_REQUIRED *pIngReq)
void ShapelessRecipy::reqs(INGREDIENTS_REQUIRED *pIngReq)
{
int iCount=0;
bool bFound;

4
Minecraft.World/ShapelessRecipy.h
View file

@ -17,7 +17,7 @@ public:
virtual int size();
// 4J-PB - to return the items required to make a recipe
virtual bool requires(int iRecipe);
virtual void requires(INGREDIENTS_REQUIRED *pIngReq);
virtual bool reqs(int iRecipe);
virtual void reqs(INGREDIENTS_REQUIRED *pIngReq);
};

2
Minecraft.World/Tag.cpp
View file

@ -153,7 +153,7 @@ Tag *Tag::newTag(byte type, const wstring &name)
return NULL;
}
wchar_t *Tag::getTagName(byte type)
const wchar_t *Tag::getTagName(byte type)
{
switch (type)
{

2
Minecraft.World/Tag.h
View file

@ -39,7 +39,7 @@ public:
static Tag *readNamedTag(DataInput *dis, int tagDepth);
static void writeNamedTag(Tag *tag, DataOutput *dos);
static Tag *newTag(byte type, const wstring &name);
static wchar_t *getTagName(byte type);
static const wchar_t *getTagName(byte type);
virtual ~Tag() {}
virtual bool equals(Tag *obj); // 4J Brought forward from 1.2
virtual Tag *copy() = 0; // 4J Brought foward from 1.2

2
Minecraft.World/Villager.cpp
View file

@ -513,7 +513,7 @@ void Villager::addOffers(int addCount)
}
// shuffle the list to make it more interesting
std::random_shuffle(newOffers->begin(), newOffers->end());
std::shuffle(newOffers->begin(), newOffers->end(), std::mt19937{std::random_device{}()});
if (offers == NULL)
{

5
Minecraft.World/stdafx.h
View file

@ -4,9 +4,8 @@
//
#pragma once
#include <cstdint>
#ifdef _WINDOWS64
#define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#include <windows.h>
@ -16,6 +15,8 @@
#include <d3d11.h>
#endif
#include <cstdint>
#ifdef _DURANGO
#include <xdk.h>
#include <wrl.h>

6
Minecraft.World/x64headers/extraX64.h
View file

@ -332,10 +332,10 @@ public:
#define PIXSetMarkerDeprecated(a, b, ...) PIXSetMarker(a, L ## b, __VA_ARGS__)
#define PIXAddNamedCounter(a, b) PIXReportCounter( L ## b, a)
#else
void PIXAddNamedCounter(int a, char *b, ...);
void PIXBeginNamedEvent(int a, char *b, ...);
void PIXAddNamedCounter(int a, const char *b, ...);
void PIXBeginNamedEvent(int a, const char *b, ...);
void PIXEndNamedEvent();
void PIXSetMarkerDeprecated(int a, char *b, ...);
void PIXSetMarkerDeprecated(int a, const char *b, ...);
#endif
void XSetThreadProcessor(HANDLE a, int b);