implement DebugArtToolsOn, fix strings and includes

Minecraft.Client/Platform/Common/Consoles_App.cpp

@@ -1,4 +1,4 @@
-
+
 #include "../Minecraft.World/Platform/stdafx.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);
 }
 
+#ifdef _DEBUG_MENUS_ENABLED
+bool CMinecraftApp::DebugArtToolsOn() {
+    return DebugSettingsOn() &&
+           (GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad()) &
+            (1L << eDebugSetting_ArtTools)) != 0;
+}
+#endif
+
 void CMinecraftApp::SetDebugSequence(const char *pchSeq)
 {
 	InputManager.SetDebugSequence(pchSeq,&CMinecraftApp::DebugInputCallback,this);

Minecraft.Client/Platform/Common/Consoles_App.h

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

Minecraft.World/Blocks/StoneMonsterTile.cpp

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

Minecraft.World/Items/BucketItem.cpp

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

meson.build

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