backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-13 00:27:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hit a wall

Browse source
This commit is contained in:
Leah Anderson 2026-03-03 09:29:08 -07:00
parent 88c850bc42
commit 5a3768ce36
12 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "AreaConstraint.h"
#include "../../../Minecraft.World/AABB.h"
@ -49,4 +49,4 @@ bool AreaConstraint::canMoveToPosition(double xo, double yo, double zo, double x
double currDist = origPos->distanceTo(movementArea);
double targetDist = targetPos->distanceTo(movementArea);
return targetDist < currDist;
}
}

4
Minecraft.Client/Common/Tutorial/AreaHint.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "AreaHint.h"
#include "../../../Minecraft.World/AABB.h"
#include "Tutorial.h"
@ -46,4 +46,4 @@ int AreaHint::tick()
{
return -1;
}
}
}

4
Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
View file

@ -2,7 +2,7 @@
#include "Tutorial.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "ChangeStateConstraint.h"
#include "../../../Minecraft.World/AABB.h"
@ -133,4 +133,4 @@ void ChangeStateConstraint::tick(int iPad)
}
}
}
}
}

2
Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ChoiceTask.h"

4
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ControllerTask.h"
@ -120,4 +120,4 @@ void ControllerTask::setAsCurrentTask(bool active /*= true*/)
{
TutorialTask::setAsCurrentTask(active);
enableConstraints(!active);
}
}

2
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "InfoTask.h"

4
Minecraft.Client/Common/Tutorial/TutorialHint.cpp
View file

@ -5,7 +5,7 @@
#include "Tutorial.h"
#include "TutorialHint.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/)
: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),
@ -125,4 +125,4 @@ int TutorialHint::tick()
break;
}
return returnVal;
}
}

4
Minecraft.Client/Common/Tutorial/TutorialMode.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include <memory>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../MultiPlayerLevel.h"
#include "../../../Minecraft.World/Inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
@ -121,4 +121,4 @@ void TutorialMode::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
bool TutorialMode::isInputAllowed(int mapping)
{
return tutorial->m_allTutorialsComplete || tutorial->isInputAllowed( mapping );
}
}

6
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

@ -6,13 +6,15 @@
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Minecraft.h"
#ifdef __ORBIS__
#include <pad.h>
#endif
#ifdef __linux__
#include <math.h>
#endif
IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
{
m_menu = NULL;

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

@ -2,7 +2,7 @@
#include "IUIScene_CreativeMenu.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"

4
Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "IUIScene_EnchantingMenu.h"
IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
@ -182,4 +182,4 @@ bool IUIScene_EnchantingMenu::IsSectionSlotList( ESceneSection eSection )
EnchantmentMenu *IUIScene_EnchantingMenu::getMenu()
{
return (EnchantmentMenu *)m_menu;
}
}

2
Minecraft.Client/Linux/LinuxStubs.h
View file

@ -697,7 +697,7 @@ HANDLE CreateEvent(int manual_reset, int initial_state) {
return (HANDLE)ev;
}
typedef bool rrbool;
//typedef bool rrbool;
#define S_OK 0