Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Minecraft.Client/Common/Tutorial/FullTutorial.cpp
View File

@@ -154,10 +154,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
addTask(e_Tutorial_State_Gameplay, new UseItemTask(Item::door_wood->id, this, IDS_TUTORIAL_TASK_PLACE_DOOR) );
addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::torch_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_TORCH) );
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tutorialArea");
if(area != NULL)
if(area != nullptr)
{
vector<TutorialConstraint *> *areaConstraints = new vector<TutorialConstraint *>();
areaConstraints->push_back( new AreaConstraint( IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -283,10 +283,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* MINECART
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"minecartArea");
if(area != NULL)
if(area != nullptr)
{
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Minecart, IDS_TUTORIAL_HINT_MINECART, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
}
@@ -298,10 +298,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* BOAT
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"boatArea");
if(area != NULL)
if(area != nullptr)
{
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Boat, IDS_TUTORIAL_HINT_BOAT, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
}
@@ -313,10 +313,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* FISHING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fishingArea");
if(area != NULL)
if(area != nullptr)
{
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Fishing, IDS_TUTORIAL_HINT_FISHING, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
}
@@ -328,10 +328,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* PISTON - SELF-REPAIRING BRIDGE
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonBridgeArea");
if(area != NULL)
if(area != nullptr)
{
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_None, IDS_TUTORIAL_HINT_PISTON_SELF_REPAIRING_BRIDGE, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1, true ) );
}
@@ -343,10 +343,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* PISTON - PISTON AND REDSTONE CIRCUITS
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State redstoneAndPistonStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Redstone_And_Piston, redstoneAndPistonStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -368,10 +368,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* PORTAL
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"portalArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State portalStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Portal, portalStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -391,10 +391,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* CREATIVE
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"creativeArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State creativeStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_CreativeMode, creativeStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1,true,true,GameType::CREATIVE) );
@@ -411,7 +411,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
ProcedureCompoundTask *creativeFinalTask = new ProcedureCompoundTask( this );
AABB *exitArea = app.getGameRuleDefinitions()->getNamedArea(L"creativeExitArea");
if(exitArea != NULL)
if(exitArea != nullptr)
{
vector<TutorialConstraint *> *creativeExitAreaConstraints = new vector<TutorialConstraint *>();
creativeExitAreaConstraints->push_back( new AreaConstraint( -1, exitArea->x0,exitArea->y0,exitArea->z0,exitArea->x1,exitArea->y1,exitArea->z1,true,false) );
@@ -434,10 +434,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* BREWING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"brewingArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State brewingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Brewing, brewingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -467,10 +467,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* ENCHANTING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enchantingArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enchanting, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -492,10 +492,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* ANVIL
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"anvilArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Anvil, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -517,10 +517,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* TRADING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tradingArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State tradingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Trading, tradingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -541,10 +541,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* FIREWORKS
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fireworksArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State fireworkStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Fireworks, fireworkStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -563,10 +563,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* BEACON
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"beaconArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State beaconStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Beacon, beaconStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -585,10 +585,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* HOPPER
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"hopperArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State hopperStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Hopper, hopperStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -610,10 +610,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* ENDERCHEST
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enderchestArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enderchests, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -632,10 +632,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* FARMING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"farmingArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State farmingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Farming, farmingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -661,10 +661,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* BREEDING
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"breedingArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State breedingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Breeding, breedingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
@@ -689,10 +689,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
* SNOW AND IRON GOLEM
*
*/
if(app.getGameRuleDefinitions() != NULL)
if(app.getGameRuleDefinitions() != nullptr)
{
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"golemArea");
if(area != NULL)
if(area != nullptr)
{
eTutorial_State golemStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Golem, golemStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );