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

implement DebugArtToolsOn, fix strings and includes

Browse source
This commit is contained in:
Tropical 2026-03-21 23:50:56 -05:00
parent d230a1e4e4
commit e444bef081
6 changed files with 6961 additions and 8403 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15331
Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang
View file

File diff suppressed because it is too large Load diff

10
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -1,4 +1,4 @@

#include "../Minecraft.World/Platform/stdafx.h" #include "../Minecraft.World/Platform/stdafx.h"
#include "../Minecraft.World/Recipes/Recipy.h" #include "../Minecraft.World/Recipes/Recipy.h"
@ -4929,6 +4929,14 @@ void CMinecraftApp::UpsellReturnedCallback(void *pParam, eUpsellType type, eUpse
TelemetryManager->RecordUpsellResponded(ProfileManager.GetPrimaryPad(), eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, senResponse); TelemetryManager->RecordUpsellResponded(ProfileManager.GetPrimaryPad(), eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, senResponse);
} }
#ifdef _DEBUG_MENUS_ENABLED
bool CMinecraftApp::DebugArtToolsOn() {
return DebugSettingsOn() &&
(GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad()) &
(1L << eDebugSetting_ArtTools)) != 0;
}
#endif
void CMinecraftApp::SetDebugSequence(const char *pchSeq) void CMinecraftApp::SetDebugSequence(const char *pchSeq)
{ {
InputManager.SetDebugSequence(pchSeq,&CMinecraftApp::DebugInputCallback,this); InputManager.SetDebugSequence(pchSeq,&CMinecraftApp::DebugInputCallback,this);

6
Minecraft.Client/Platform/Common/Consoles_App.h
View file

@ -306,9 +306,11 @@ public:
#endif #endif
#ifdef _DEBUG_MENUS_ENABLED #ifdef _DEBUG_MENUS_ENABLED
bool DebugSettingsOn() { return m_bDebugOptions;} bool DebugSettingsOn() { return m_bDebugOptions; }
bool DebugArtToolsOn();
#else #else
bool DebugSettingsOn() { return false;} bool DebugSettingsOn() { return false; }
bool DebugArtToolsOn() { return false; }
#endif #endif
void SetDebugSequence(const char *pchSeq); void SetDebugSequence(const char *pchSeq);
static int DebugInputCallback(void *pParam); static int DebugInputCallback(void *pParam);

11
Minecraft.World/Blocks/StoneMonsterTile.cpp
View file

@ -16,12 +16,11 @@ StoneMonsterTile::StoneMonsterTile(int id) : Tile(id, Material::clay) {
} }
Icon* StoneMonsterTile::getTexture(int face, int data) { Icon* StoneMonsterTile::getTexture(int face, int data) {
// 4jcraft: removed in TU19 merge for now #ifndef _CONTENT_PACKAGE
// #ifndef _CONTENT_PACKAGE if (app.DebugArtToolsOn()) {
// if (app.DebugArtToolsOn()) { return Tile::fire->getTexture(face, 0);
// return Tile::fire->getTexture(face, 0); }
// } #endif
// #endif
if (data == HOST_COBBLE) { if (data == HOST_COBBLE) {
return Tile::cobblestone->getTexture(face); return Tile::cobblestone->getTexture(face);
} }

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 "../Minecraft.World/ChatPacket.h" #include "../Network/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
meson.build
View file

@ -5,8 +5,8 @@ project('4jcraft-chucklegrounds', ['cpp', 'c'],
'cpp_std=c++23', 'cpp_std=c++23',
'warning_level=0', 'warning_level=0',
'buildtype=debug', # for now 'buildtype=debug', # for now
'unity=off', # merge source files per target 'unity=on', # merge source files per target
# 'unity_size=8', # TODO: mess around with this 'unity_size=8', # TODO: mess around with this
'b_pch=true', # precompiled headers 'b_pch=true', # precompiled headers
], ],
) )