LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-01 10:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: clang-format the entire project

Browse Source
This commit is contained in:
MatthewBeshay
2026-04-09 10:17:55 +10:00
parent 81c2eb82f0
commit cd4b39cf88
803 changed files with 6092 additions and 6095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
targets/app/common/Tutorial/Tutorial.cpp
View File

@@ -6,8 +6,7 @@
#include <algorithm>
#include <compare>
#include "platform/profile/profile.h"
#include "minecraft/GameEnums.h"
#include "TutorialMessage.h"
#include "app/common/App_structs.h"
#include "app/common/Tutorial/Constraints/TutorialConstraint.h"
#include "app/common/Tutorial/Hints/DiggerItemHint.h"
@@ -23,10 +22,8 @@
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "TutorialMessage.h"
#include "util/Timer.h"
#include "util/StringHelpers.h"
#include "java/Class.h"
#include "minecraft/GameEnums.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
@@ -45,7 +42,10 @@
#include "minecraft/world/level/tile/Tile.h"
#include "minecraft/world/level/tile/TreeTile.h"
#include "minecraft/world/level/tile/WallTile.h"
#include "platform/profile/profile.h"
#include "strings.h"
#include "util/StringHelpers.h"
#include "util/Timer.h"
class MobEffect;
@@ -2131,7 +2131,8 @@ void Tutorial::tick() {
if (!m_allowShow) {
if (currentTask[m_CurrentState] != nullptr &&
(!currentTask[m_CurrentState]->AllowFade() ||
(lastMessageTime + std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
(lastMessageTime +
std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
time_util::clock::now())) {
uiTempDisabled = true;
}
@@ -2152,7 +2153,8 @@ void Tutorial::tick() {
if (ui.IsPauseMenuDisplayed(m_iPad)) {
if (currentTask[m_CurrentState] != nullptr &&
(!currentTask[m_CurrentState]->AllowFade() ||
(lastMessageTime + std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
(lastMessageTime +
std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
time_util::clock::now())) {
uiTempDisabled = true;
}
@@ -2232,7 +2234,9 @@ void Tutorial::tick() {
isCurrentTask = false;
if ((!task->ShowMinimumTime() ||
(task->hasBeenActivated() &&
(lastMessageTime + std::chrono::milliseconds(m_iTutorialMinimumDisplayMessageTime)) <
(lastMessageTime +
std::chrono::milliseconds(
m_iTutorialMinimumDisplayMessageTime)) <
time_util::clock::now())) &&
task->isCompleted()) {
eTutorial_CompletionAction compAction =
@@ -2323,7 +2327,9 @@ void Tutorial::tick() {
}
if (task != nullptr && task->ShowMinimumTime() &&
task->hasBeenActivated() &&
(lastMessageTime + std::chrono::milliseconds(m_iTutorialMinimumDisplayMessageTime)) <
(lastMessageTime +
std::chrono::milliseconds(
m_iTutorialMinimumDisplayMessageTime)) <
time_util::clock::now()) {
task->setShownForMinimumTime();
@@ -2392,14 +2398,17 @@ void Tutorial::tick() {
}
}
if (m_hintDisplayed && (lastMessageTime + std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) <
time_util::clock::now()) {
if (m_hintDisplayed &&
(lastMessageTime +
std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) <
time_util::clock::now()) {
m_hintDisplayed = false;
}
if (currentFailedConstraint[m_CurrentState] == nullptr &&
currentTask[m_CurrentState] != nullptr && (m_iTaskReminders != 0) &&
(lastMessageTime + std::chrono::milliseconds(m_iTaskReminders * m_iTutorialReminderTime)) <
(lastMessageTime + std::chrono::milliseconds(m_iTaskReminders *
m_iTutorialReminderTime)) <
time_util::clock::now()) {
// Reminder
PopupMessageDetails* message = new PopupMessageDetails();
@@ -2428,7 +2437,8 @@ bool Tutorial::setMessage(PopupMessageDetails* message) {
m_lastMessageState == m_CurrentState &&
message->isSameContent(m_lastMessage) &&
(!message->m_isReminder ||
((lastMessageTime + std::chrono::milliseconds(m_iTutorialReminderTime)) >
((lastMessageTime +
std::chrono::milliseconds(m_iTutorialReminderTime)) >
time_util::clock::now() &&
message->m_isReminder))) {
delete message;
@@ -2527,9 +2537,12 @@ bool Tutorial::setMessage(TutorialHint* hint, PopupMessageDetails* message) {
if (message != nullptr && (message->m_forceDisplay || hintsOn) &&
(!message->m_delay ||
((m_hintDisplayed &&
(now - m_lastHintDisplayedTime) > std::chrono::milliseconds(m_iTutorialHintDelayTime)) ||
(now - m_lastHintDisplayedTime) >
std::chrono::milliseconds(m_iTutorialHintDelayTime)) ||
(!m_hintDisplayed &&
(now - lastMessageTime) > std::chrono::milliseconds(m_iTutorialMinimumDisplayMessageTime))))) {
(now - lastMessageTime) >
std::chrono::milliseconds(
m_iTutorialMinimumDisplayMessageTime))))) {
messageShown = setMessage(message);
if (messageShown) {
@@ -2558,7 +2571,8 @@ void Tutorial::showTutorialPopup(bool show) {
if (!show) {
if (currentTask[m_CurrentState] != nullptr &&
(!currentTask[m_CurrentState]->AllowFade() ||
(lastMessageTime + std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
(lastMessageTime +
std::chrono::milliseconds(m_iTutorialDisplayMessageTime)) >
time_util::clock::now())) {
uiTempDisabled = true;
}
@@ -2786,8 +2800,8 @@ void Tutorial::onLookAtEntity(std::shared_ptr<Entity> entity) {
}
}
if ((m_CurrentState == e_Tutorial_State_Gameplay) &&
entity->instanceof(eTYPE_HORSE)) {
if ((m_CurrentState == e_Tutorial_State_Gameplay) && entity->instanceof
(eTYPE_HORSE)) {
changeTutorialState(e_Tutorial_State_Horse);
}