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

build fixes

Browse source
This commit is contained in:
Tropical 2026-03-22 00:10:15 -05:00
parent ab2efa87e4
commit 330ce54cda
8 changed files with 144 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
Minecraft.Client/Platform/Common/App_Defines.h
View file

@ -1,6 +1,5 @@
#pragma once #pragma once
// 4J Stu - For non-splitscreen menus, default to this screen // 4J Stu - For non-splitscreen menus, default to this screen
#define DEFAULT_XUI_MENU_USER 0 #define DEFAULT_XUI_MENU_USER 0
#define MULTITHREAD_ENABLE #define MULTITHREAD_ENABLE
@ -16,27 +15,49 @@
#define MAX_LOCAL_PLAYERS 4 #define MAX_LOCAL_PLAYERS 4
#endif #endif
// 4J Stu - Required for sentient reporting of whether the volume level has been changed or not // 4J Stu - Required for sentient reporting of whether the volume level has been
// changed or not
#define DEFAULT_VOLUME_LEVEL 100 #define DEFAULT_VOLUME_LEVEL 100
#define GAME_HOST_OPTION_BITMASK_DIFFICULTY 0x00000003 // 0 - 3 #define GAME_HOST_OPTION_BITMASK_DIFFICULTY 0x00000003 // 0 - 3
#define GAME_HOST_OPTION_BITMASK_FRIENDSOFFRIENDS 0x00000004 #define GAME_HOST_OPTION_BITMASK_FRIENDSOFFRIENDS 0x00000004
#define GAME_HOST_OPTION_BITMASK_GAMERTAGS 0x00000008 #define GAME_HOST_OPTION_BITMASK_GAMERTAGS 0x00000008
#define GAME_HOST_OPTION_BITMASK_GAMETYPE 0x00000030 #define GAME_HOST_OPTION_BITMASK_GAMETYPE 0x00000030
#define GAME_HOST_OPTION_BITMASK_LEVELTYPE 0x00000040 #define GAME_HOST_OPTION_BITMASK_LEVELTYPE 0x00000040
#define GAME_HOST_OPTION_BITMASK_STRUCTURES 0x00000080 #define GAME_HOST_OPTION_BITMASK_STRUCTURES 0x00000080
#define GAME_HOST_OPTION_BITMASK_BONUSCHEST 0x00000100 #define GAME_HOST_OPTION_BITMASK_BONUSCHEST 0x00000100
#define GAME_HOST_OPTION_BITMASK_BEENINCREATIVE 0x00000200 #define GAME_HOST_OPTION_BITMASK_BEENINCREATIVE 0x00000200
#define GAME_HOST_OPTION_BITMASK_PVP 0x00000400 #define GAME_HOST_OPTION_BITMASK_PVP 0x00000400
#define GAME_HOST_OPTION_BITMASK_TRUSTPLAYERS 0x00000800 #define GAME_HOST_OPTION_BITMASK_TRUSTPLAYERS 0x00000800
#define GAME_HOST_OPTION_BITMASK_TNT 0x00001000 #define GAME_HOST_OPTION_BITMASK_TNT 0x00001000
#define GAME_HOST_OPTION_BITMASK_FIRESPREADS 0x00002000 #define GAME_HOST_OPTION_BITMASK_FIRESPREADS 0x00002000
#define GAME_HOST_OPTION_BITMASK_HOSTFLY 0x00004000 #define GAME_HOST_OPTION_BITMASK_HOSTFLY 0x00004000
#define GAME_HOST_OPTION_BITMASK_HOSTHUNGER 0x00008000 #define GAME_HOST_OPTION_BITMASK_HOSTHUNGER 0x00008000
#define GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE 0x00010000 #define GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE 0x00010000
#define GAME_HOST_OPTION_BITMASK_BEDROCKFOG 0x00020000 #define GAME_HOST_OPTION_BITMASK_BEDROCKFOG 0x00020000
#define GAME_HOST_OPTION_BITMASK_DISABLESAVE 0x00040000 #define GAME_HOST_OPTION_BITMASK_DISABLESAVE 0x00040000
#define GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF #define GAME_HOST_OPTION_BITMASK_NOTOWNER 0x00080000
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE \
0x00700000 // 3 bits, 5 values (unset(0), classic(1), small(2), medium(3),
// large(4))
#define GAME_HOST_OPTION_BITMASK_MOBGRIEFING 0x00800000
#define GAME_HOST_OPTION_BITMASK_KEEPINVENTORY 0x01000000
#define GAME_HOST_OPTION_BITMASK_DOMOBSPAWNING 0x02000000
#define GAME_HOST_OPTION_BITMASK_DOMOBLOOT 0x04000000
#define GAME_HOST_OPTION_BITMASK_DOTILEDROPS 0x08000000
#define GAME_HOST_OPTION_BITMASK_NATURALREGEN 0x10000000
#define GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE 0x20000000
#define GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF
#define GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT 20
enum EGameHostOptionWorldSize {
e_worldSize_Unknown = 0,
e_worldSize_Classic,
e_worldSize_Small,
e_worldSize_Medium,
e_worldSize_Large
};
#ifdef _XBOX #ifdef _XBOX
#define PROFILE_VERSION_1 1 #define PROFILE_VERSION_1 1
@ -53,77 +74,75 @@
#define PROFILE_VERSION_10 12 #define PROFILE_VERSION_10 12
// 4J-JEV: New Statistics and Achievements for 'NexGen' platforms. // 4J-JEV: New Statistics and Achievements for 'NexGen' platforms.
#define PROFILE_VERSION_BUILD_JUNE14 13 #define PROFILE_VERSION_11 13
#define MAX_FAVORITE_SKINS 10 // these are stored in the profile data so keep it small
// Java 1.6.4
#define PROFILE_VERSION_12 14
#define PROFILE_VERSION_CURRENT PROFILE_VERSION_12
#define MAX_FAVORITE_SKINS \
10 // these are stored in the profile data so keep it small
// defines for game settings - uiBitmaskValues // defines for game settings - uiBitmaskValues
#define GAMESETTING_CLOUDS 0x00000001 #define GAMESETTING_CLOUDS 0x00000001
#define GAMESETTING_ONLINE 0x00000002 #define GAMESETTING_ONLINE 0x00000002
#define GAMESETTING_INVITEONLY 0x00000004 #define GAMESETTING_INVITEONLY 0x00000004
#define GAMESETTING_FRIENDSOFFRIENDS 0x00000008 #define GAMESETTING_FRIENDSOFFRIENDS 0x00000008
#define GAMESETTING_DISPLAYUPDATEMSG 0x00000030 #define GAMESETTING_DISPLAYUPDATEMSG 0x00000030
#define GAMESETTING_BEDROCKFOG 0x00000040 #define GAMESETTING_BEDROCKFOG 0x00000040
#define GAMESETTING_DISPLAYHUD 0x00000080 #define GAMESETTING_DISPLAYHUD 0x00000080
#define GAMESETTING_DISPLAYHAND 0x00000100 #define GAMESETTING_DISPLAYHAND 0x00000100
#define GAMESETTING_CUSTOMSKINANIM 0x00000200 #define GAMESETTING_CUSTOMSKINANIM 0x00000200
#define GAMESETTING_DEATHMESSAGES 0x00000400 #define GAMESETTING_DEATHMESSAGES 0x00000400
#define GAMESETTING_UISIZE 0x00001800 #define GAMESETTING_UISIZE 0x00001800
#define GAMESETTING_UISIZE_SPLITSCREEN 0x00006000 #define GAMESETTING_UISIZE_SPLITSCREEN 0x00006000
#define GAMESETTING_ANIMATEDCHARACTER 0x00008000 #define GAMESETTING_ANIMATEDCHARACTER 0x00008000
#define GAMESETTING_PS3EULAREAD 0x00010000 #define GAMESETTING_PS3EULAREAD 0x00010000
#define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000 #define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
// defines for languages // defines for languages
#define MINECRAFT_LANGUAGE_DEFAULT 0x00 #define MINECRAFT_LANGUAGE_DEFAULT 0x00
#define MINECRAFT_LANGUAGE_ENGLISH 0x01 #define MINECRAFT_LANGUAGE_ENGLISH 0x01
#define MINECRAFT_LANGUAGE_JAPANESE 0x02 #define MINECRAFT_LANGUAGE_JAPANESE 0x02
#define MINECRAFT_LANGUAGE_GERMAN 0x03 #define MINECRAFT_LANGUAGE_GERMAN 0x03
#define MINECRAFT_LANGUAGE_FRENCH 0x04 #define MINECRAFT_LANGUAGE_FRENCH 0x04
#define MINECRAFT_LANGUAGE_SPANISH 0x05 #define MINECRAFT_LANGUAGE_SPANISH 0x05
#define MINECRAFT_LANGUAGE_ITALIAN 0x06 #define MINECRAFT_LANGUAGE_ITALIAN 0x06
#define MINECRAFT_LANGUAGE_KOREAN 0x07 #define MINECRAFT_LANGUAGE_KOREAN 0x07
#define MINECRAFT_LANGUAGE_TCHINESE 0x08 #define MINECRAFT_LANGUAGE_TCHINESE 0x08
#define MINECRAFT_LANGUAGE_PORTUGUESE 0x09 #define MINECRAFT_LANGUAGE_PORTUGUESE 0x09
#define MINECRAFT_LANGUAGE_BRAZILIAN 0x0A #define MINECRAFT_LANGUAGE_BRAZILIAN 0x0A
#define MINECRAFT_LANGUAGE_RUSSIAN 0x0B #define MINECRAFT_LANGUAGE_RUSSIAN 0x0B
#define MINECRAFT_LANGUAGE_DUTCH 0x0C #define MINECRAFT_LANGUAGE_DUTCH 0x0C
#define MINECRAFT_LANGUAGE_FINISH 0x0D #define MINECRAFT_LANGUAGE_FINISH 0x0D
#define MINECRAFT_LANGUAGE_SWEDISH 0x0E #define MINECRAFT_LANGUAGE_SWEDISH 0x0E
#define MINECRAFT_LANGUAGE_DANISH 0x0F #define MINECRAFT_LANGUAGE_DANISH 0x0F
#define MINECRAFT_LANGUAGE_NORWEGIAN 0x10 #define MINECRAFT_LANGUAGE_NORWEGIAN 0x10
#define MINECRAFT_LANGUAGE_POLISH 0x11 #define MINECRAFT_LANGUAGE_POLISH 0x11
#define MINECRAFT_LANGUAGE_TURKISH 0x12 #define MINECRAFT_LANGUAGE_TURKISH 0x12
#define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13 #define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13
#define MINECRAFT_LANGUAGE_GREEK 0x14 #define MINECRAFT_LANGUAGE_GREEK 0x14
/* Match these /* Match these
const int XC_LANGUAGE_ENGLISH =1; const int XC_LANGUAGE_ENGLISH =1; const int XC_LANGUAGE_JAPANESE
const int XC_LANGUAGE_JAPANESE =2; =2; const int XC_LANGUAGE_GERMAN
const int XC_LANGUAGE_GERMAN =3; =3; const int XC_LANGUAGE_FRENCH
const int XC_LANGUAGE_FRENCH =4; =4; const int XC_LANGUAGE_SPANISH
const int XC_LANGUAGE_SPANISH =5; =5; const int XC_LANGUAGE_ITALIAN
const int XC_LANGUAGE_ITALIAN =6; =6; const int XC_LANGUAGE_KOREAN
const int XC_LANGUAGE_KOREAN =7; =7; const int XC_LANGUAGE_TCHINESE
const int XC_LANGUAGE_TCHINESE =8; =8; const int XC_LANGUAGE_PORTUGUESE =9; const int XC_LANGUAGE_BRAZILIAN
const int XC_LANGUAGE_PORTUGUESE =9; =10; const int XC_LANGUAGE_RUSSIAN
const int XC_LANGUAGE_BRAZILIAN =10; =11; const int XC_LANGUAGE_DUTCH
const int XC_LANGUAGE_RUSSIAN =11; =12; const int XC_LANGUAGE_FINISH
const int XC_LANGUAGE_DUTCH =12; =13; const int XC_LANGUAGE_SWEDISH
const int XC_LANGUAGE_FINISH =13; =14; const int XC_LANGUAGE_DANISH
const int XC_LANGUAGE_SWEDISH =14; =15; const int XC_LANGUAGE_NORWEGIAN =16; const int XC_LANGUAGE_POLISH
const int XC_LANGUAGE_DANISH =15; =17; const int XC_LANGUAGE_TURKISH
const int XC_LANGUAGE_NORWEGIAN =16; =18; const int XC_LANGUAGE_LATINAMERICANSPANISH =19;
const int XC_LANGUAGE_POLISH =17; const int XC_LANGUAGE_GREEK =20;
const int XC_LANGUAGE_TURKISH =18; */
const int XC_LANGUAGE_LATINAMERICANSPANISH =19;
const int XC_LANGUAGE_GREEK =20;
*/

72
Minecraft.Client/Platform/Common/Console_Debug_enum.h
View file

@ -1,42 +1,40 @@
#pragma once #pragma once
enum eDebugSetting enum eDebugSetting {
{ eDebugSetting_LoadSavesFromDisk,
eDebugSetting_LoadSavesFromDisk, eDebugSetting_WriteSavesToDisk,
eDebugSetting_WriteSavesToDisk, eDebugSetting_FreezePlayers, // eDebugSetting_InterfaceOff,
eDebugSetting_FreezePlayers, //eDebugSetting_InterfaceOff, eDebugSetting_Safearea,
eDebugSetting_Safearea, eDebugSetting_MobsDontAttack,
eDebugSetting_MobsDontAttack, eDebugSetting_FreezeTime,
eDebugSetting_FreezeTime, eDebugSetting_DisableWeather,
eDebugSetting_DisableWeather, eDebugSetting_CraftAnything,
eDebugSetting_CraftAnything, eDebugSetting_UseDpadForDebug,
eDebugSetting_UseDpadForDebug, eDebugSetting_MobsDontTick,
eDebugSetting_MobsDontTick, eDebugSetting_ArtTools, // eDebugSetting_InstantDestroy,
eDebugSetting_InstantDestroy, eDebugSetting_ShowUIConsole,
eDebugSetting_ShowUIConsole, eDebugSetting_DistributableSave,
eDebugSetting_DistributableSave, eDebugSetting_DebugLeaderboards,
eDebugSetting_DebugLeaderboards, eDebugSetting_EnableHeightWaterOverride, // eDebugSetting_TipsAlwaysOn,
eDebugSetting_EnableHeightWaterBiomeOverride, //eDebugSetting_TipsAlwaysOn, eDebugSetting_SuperflatNether,
eDebugSetting_SuperflatNether, // eDebugSetting_LightDarkBackground,
//eDebugSetting_LightDarkBackground, eDebugSetting_RegularLightning,
eDebugSetting_RegularLightning, eDebugSetting_EnableBiomeOverride, // eDebugSetting_GoToNether,
eDebugSetting_GoToNether, // eDebugSetting_GoToEnd,
//eDebugSetting_GoToEnd, eDebugSetting_GoToOverworld,
eDebugSetting_GoToOverworld, eDebugSetting_UnlockAllDLC, // eDebugSetting_ToggleFont,
eDebugSetting_UnlockAllDLC, // eDebugSetting_ToggleFont, eDebugSetting_ShowUIMarketingGuide,
eDebugSetting_ShowUIMarketingGuide, eDebugSetting_Max,
eDebugSetting_Max,
}; };
enum eDebugButton enum eDebugButton {
{ eDebugButton_Theme = 0,
eDebugButton_Theme=0, eDebugButton_Avatar_Item_1,
eDebugButton_Avatar_Item_1, eDebugButton_Avatar_Item_2,
eDebugButton_Avatar_Item_2, eDebugButton_Avatar_Item_3,
eDebugButton_Avatar_Item_3, eDebugButton_Gamerpic_1,
eDebugButton_Gamerpic_1, eDebugButton_Gamerpic_2,
eDebugButton_Gamerpic_2, eDebugButton_CheckTips,
eDebugButton_CheckTips, eDebugButton_WipeLeaderboards,
eDebugButton_WipeLeaderboards, eDebugButton_Max,
eDebugButton_Max,
}; };

2
Minecraft.World/Items/BucketItem.cpp
View file

@ -15,7 +15,7 @@
#include "../../Minecraft.Client/Player/LocalPlayer.h" #include "../../Minecraft.Client/Player/LocalPlayer.h"
#include "../../Minecraft.Client/Player/ServerPlayer.h" #include "../../Minecraft.Client/Player/ServerPlayer.h"
#include "../../Minecraft.Client/Network/PlayerConnection.h" #include "../../Minecraft.Client/Network/PlayerConnection.h"
#include "../Network/ChatPacket.h" #include "../Network/Packets/ChatPacket.h"
#include "../Util/SoundTypes.h" #include "../Util/SoundTypes.h"
BucketItem::BucketItem(int id, int content) : Item(id) { BucketItem::BucketItem(int id, int content) : Item(id) {

4
Minecraft.World/Items/PotionItem.cpp
View file

@ -325,12 +325,12 @@ void PotionItem::appendHoverText(std::shared_ptr<ItemInstance> itemInstance,
} }
} }
bool PotionItem::isFoistd::l(std::shared_ptr<ItemInstance> itemInstance) { bool PotionItem::isFoil(std::shared_ptr<ItemInstance> itemInstance) {
std::vector<MobEffectInstance*>* mobEffects = getMobEffects(itemInstance); std::vector<MobEffectInstance*>* mobEffects = getMobEffects(itemInstance);
return mobEffects != NULL && !mobEffects->empty(); return mobEffects != NULL && !mobEffects->empty();
} }
unsigned int PotionItem::getUseDescriptionIstd::d( unsigned int PotionItem::getUseDescriptionId(
std::shared_ptr<ItemInstance> instance) { std::shared_ptr<ItemInstance> instance) {
int brew = instance->getAuxValue(); int brew = instance->getAuxValue();
if (brew == 0) if (brew == 0)

4
Minecraft.World/Level/Storage/OldChunkStorage.cpp
View file

@ -306,7 +306,7 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level,
std::vector<TickNextTickData>* ticksInChunk = std::vector<TickNextTickData>* ticksInChunk =
level->fetchTicksInChunk(lc, false); level->fetchTicksInChunk(lc, false);
if (ticksInChunk != NULL) { if (ticksInChunk != NULL) {
int64_t levelTime = level->getTime(); int64_t levelTime = level->getGameTime();
ListTag<CompoundTag>* tickTags = new ListTag<CompoundTag>(); ListTag<CompoundTag>* tickTags = new ListTag<CompoundTag>();
for (int i = 0; i < ticksInChunk->size(); i++) { for (int i = 0; i < ticksInChunk->size(); i++) {
@ -405,7 +405,7 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) {
std::vector<TickNextTickData>* ticksInChunk = std::vector<TickNextTickData>* ticksInChunk =
level->fetchTicksInChunk(lc, false); level->fetchTicksInChunk(lc, false);
if (ticksInChunk != NULL) { if (ticksInChunk != NULL) {
int64_t levelTime = level->getTime(); int64_t levelTime = level->getGameTime();
ListTag<CompoundTag>* tickTags = new ListTag<CompoundTag>(); ListTag<CompoundTag>* tickTags = new ListTag<CompoundTag>();
for (int i = 0; i < ticksInChunk->size(); i++) { for (int i = 0; i < ticksInChunk->size(); i++) {

2
Minecraft.World/Recipes/ArmorDyeRecipe.cpp
View file

@ -122,7 +122,7 @@ const ItemInstance* ArmorDyeRecipe::getResultItem() { return NULL; }
const int ArmorDyeRecipe::getGroup() { return ShapedRecipy::eGroupType_Armour; } const int ArmorDyeRecipe::getGroup() { return ShapedRecipy::eGroupType_Armour; }
// 4J-PB // 4J-PB
bool ArmorDyeRecipe::collectRequirements(int iRecipe) { return false; } bool ArmorDyeRecipe::requiresRecipe(int iRecipe) { return false; }
void ArmorDyeRecipe::collectRequirements(INGREDIENTS_REQUIRED* pIngReq) { void ArmorDyeRecipe::collectRequirements(INGREDIENTS_REQUIRED* pIngReq) {
// int iCount=0; // int iCount=0;

2
Minecraft.World/Recipes/ClothDyeRecipes.cpp
View file

@ -1,5 +1,5 @@
#include "../Platform/stdafx.h" #include "../Platform/stdafx.h"
#include "net.minecraft.world.item.h" #include "../Headers/net.minecraft.world.item.h"
#include "../Headers/net.minecraft.world.level.tile.h" #include "../Headers/net.minecraft.world.level.tile.h"
#include "Recipy.h" #include "Recipy.h"
#include "Recipes.h" #include "Recipes.h"

6
Minecraft.World/Stats/Achievement.cpp
View file

@ -76,12 +76,6 @@ Achievement::Achievement(int id, const std::wstring& name, int x, int y,
y(y), y(y),
prerequisite(prerequisite) {} prerequisite(prerequisite) {}
/**
* @brief Returns whether the Achivement is golden
* @return boolean
*/
bool Achievement::isGolden() { return isGoldenVar; }
int Achievement::getAchievementID() { int Achievement::getAchievementID() {
return id - Achievements::ACHIEVEMENT_OFFSET; return id - Achievements::ACHIEVEMENT_OFFSET;
} }