Skip to content

Commit

Permalink
refactor(Client): remove custom Logger
Browse files Browse the repository at this point in the history
- due to a crash with GetStackTrace
- use FTLog instead of LogChannel.
  • Loading branch information
poirierlouis committed Dec 1, 2024
1 parent d5f1c87 commit 393362b
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 103 deletions.
25 changes: 12 additions & 13 deletions code/assets/redscript/Ink/ChatController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ public class ChatController extends inkHUDGameController {
private let m_uiSystem: wref<UISystem>;
private let m_player: wref<PlayerPuppet>;
private let m_repeatingScrollActionEnabled: Bool = false;
private let m_repeatingScrollActionEnabled: Bool = false;
private let m_messageController: ref<ListController>;
private let m_chatInputOpen: Bool;
private let m_input: wref<inkTextInput>;
private let m_lastMessageData: ref<ChatMessageData>;
protected cb func OnInitialize() -> Bool {
LogChannel(n"DEBUG", s"[ChatController] OnInitialize");
FTLog(s"[ChatController] OnInitialize");
this.m_player = this.GetPlayerControlledObject() as PlayerPuppet;
if !IsDefined(this.m_player) {
LogChannel(n"DEBUG", s"[ChatController] NO PLAYER");
FTLog(s"[ChatController] NO PLAYER");
}
this.m_uiSystem = GameInstance.GetUISystem(this.m_player.GetGame());
this.m_messageController = inkWidgetRef.GetController(this.m_messagesRef) as ListController;
Expand All @@ -35,11 +35,10 @@ public class ChatController extends inkHUDGameController {
messageData.author = "SERVER";
messageData.message = "Connected to...";
this.QueueEvent(messageData);
}
protected cb func OnUninitialize() -> Bool {
LogChannel(n"DEBUG", s"[ChatController] OnUninitialize");
FTLog(s"[ChatController] OnUninitialize");
this.m_player.UnregisterInputListener(this, n"UIEnterChatMessage");
}
Expand All @@ -57,7 +56,7 @@ public class ChatController extends inkHUDGameController {
}
protected cb func OnChatMessageUIEvent(evt: ref<ChatMessageUIEvent>) -> Bool {
LogChannel(n"DEBUG", s"[ChatController] OnChatMessageUIEvent");
FTLog(s"[ChatController] OnChatMessageUIEvent");
let messageData = new ChatMessageData();
messageData.m_author = evt.author;
messageData.m_message = evt.message;
Expand All @@ -70,11 +69,11 @@ public class ChatController extends inkHUDGameController {
this.m_lastMessageData = messageData;
inkScrollAreaRef.ScrollVertical(this.m_scrollRef, 0.0);
this.m_messageController.PushData(messageData, true);
let targets = new inkWidgetsSet();
targets.Select(this.m_messageController.GetItemAt(this.m_messageController.Size() - 1));
this.PlayLibraryAnimationOnTargets(n"new_message", targets);
inkScrollAreaRef.ScrollVertical(this.m_scrollRef, 1.0);
}
Expand Down Expand Up @@ -106,7 +105,7 @@ public class ChatController extends inkHUDGameController {
targets.Select(this.GetWidget(n"wrapper/chat/mask"));
targets.Select(this.GetWidget(n"wrapper/chat/bg"));
this.PlayLibraryAnimationOnTargets(n"from_input", targets);
uiBlackboard.SetBool(GetAllBlackboardDefs().UIGameData.UIChatInputContextRequest, false, true);
this.m_player.UnregisterInputListener(this, n"OpenPauseMenu");
this.m_player.UnregisterInputListener(this, n"back");
Expand All @@ -121,11 +120,11 @@ public class ChatController extends inkHUDGameController {
this.m_chatInputOpen = show;
this.UpdateInputHints();
}
private final func SendChat() -> Void {
let textEntered: String = this.m_input.GetText();
if NotEquals(textEntered, "") {
LogChannel(n"DEBUG", s"[ChatController] SendChat \"\(textEntered)\"");
FTLog(s"[ChatController] SendChat \"\(textEntered)\"");
GameInstance.GetNetworkWorldSystem().GetChatSystem().Send(textEntered);
};
Expand Down Expand Up @@ -205,7 +204,7 @@ public class ChatController extends inkHUDGameController {
protected cb func OnAction(action: ListenerAction, consumer: ListenerActionConsumer) -> Bool {
let actionName: CName = ListenerAction.GetName(action);
let actionType: gameinputActionType = ListenerAction.GetType(action);
if !this.m_chatInputOpen {
if Equals(actionName, n"UIEnterChatMessage") && Equals(actionType, gameinputActionType.BUTTON_RELEASED) {
// let targets = new inkWidgetsSet();
Expand All @@ -218,6 +217,6 @@ public class ChatController extends inkHUDGameController {
}
} else {
return this.OnChatInputAction(action, consumer);
}
}
}
}
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/ChatMessageController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ChatMessageController extends ListItemController {
public let m_messageLabel: wref<inkText>;
protected cb func OnInitialize() -> Bool {
LogChannel(n"DEBUG", s"[ChatMessageController] OnInitialize");
FTLog(s"[ChatMessageController] OnInitialize");
// super.OnInitialize();
this.m_authorLabel = inkTextRef.Get(this.m_authorWidget) as inkText;
this.m_messageLabel = inkTextRef.Get(this.m_messageWidget) as inkText;
Expand All @@ -21,9 +21,9 @@ public class ChatMessageController extends ListItemController {
protected cb func OnUninitialize() -> Bool {
// this.UnregisterFromCallback(n"OnAddedToList", this, n"OnAddedToList");
}
protected cb func OnDataChanged(value: ref<IScriptable>) -> Bool {
LogChannel(n"DEBUG", s"[ChatMessageController] OnDataChanged");
FTLog(s"[ChatMessageController] OnDataChanged");
// super.OnDataChanged(value);
this.m_data = value as ChatMessageData;
if this.m_data.m_needsAuthorLabel {
Expand All @@ -42,7 +42,7 @@ public class ChatMessageController extends ListItemController {
}
public final func Refresh(value: ref<IScriptable>) -> Void {
// LogChannel(n"DEBUG", s"[ChatMessageController] Refresh");
// FTLog(s"[ChatMessageController] Refresh");
this.m_data = value as ChatMessageData;
if this.m_data.m_needsAuthorLabel {
this.m_authorLabel.SetVisible(true);
Expand All @@ -60,7 +60,7 @@ public class ChatMessageController extends ListItemController {
}
protected cb func OnAddedToList(target: wref<ListItemController>) -> Bool {
// LogChannel(n"DEBUG", s"[ChatMessageController] OnAddedToList");
// FTLog(s"[ChatMessageController] OnAddedToList");
let m_animListText: ref<inkAnimDef>;
let m_animTextInterp: ref<inkAnimTextOffset>;
let stageOneTime: Float;
Expand Down
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/DeliveryListController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ public class DeliveryListController extends inkLogicController {
this.m_headerText.SetText("Select job");
this.m_scrollArea = this.GetWidget(n"container/scrollarea") as inkScrollArea;
if !IsDefined(this.m_scrollArea) {
LogChannel(n"DEBUG", s"[DeliveryListController] COULD NOT FIND SCROLLAREA");
FTLog(s"[DeliveryListController] COULD NOT FIND SCROLLAREA");
}
this.m_listController = this.GetWidget(n"container/scrollarea/list").GetController() as ListController;
if !IsDefined(this.m_listController) {
LogChannel(n"DEBUG", s"[DeliveryListController] COULD NOT FIND LIST CONTROLLER");
FTLog(s"[DeliveryListController] COULD NOT FIND LIST CONTROLLER");
}
this.m_scrollArea.RegisterToCallback(n"OnScrollChanged", this, n"OnScrollChanged");
this.m_scrollController = this.m_scrollArea.GetControllerByType(n"inkScrollController") as inkScrollController;
if !IsDefined(this.m_scrollController) {
LogChannel(n"DEBUG", s"[DeliveryListController] COULD NOT FIND SCROLL CONTROLLER");
FTLog(s"[DeliveryListController] COULD NOT FIND SCROLL CONTROLLER");
}
// this.m_leftMargin = new inkMargin(35.00, 10.00, 0.00, 0.00);
// this.m_rightMargin = new inkMargin(1400.00, 10.00, 0.00, 0.00);
Expand All @@ -133,7 +133,7 @@ public class DeliveryListController extends inkLogicController {
while i < ArraySize(GameInstance.GetNetworkWorldSystem().GetAppearanceSystem().m_deliveryEntries) {
let data = GameInstance.GetNetworkWorldSystem().GetAppearanceSystem().m_deliveryEntries[i];
this.m_listController.PushData(data, true);
i += 1;
i += 1;
}
// let shop = new ShopData();
Expand Down Expand Up @@ -162,7 +162,7 @@ public class DeliveryListController extends inkLogicController {
}
protected cb func OnItemSelected(previous: ref<inkVirtualCompoundItemController>, next: ref<inkVirtualCompoundItemController>) -> Bool {
LogChannel(n"DEBUG", s"[DeliveryListController] OnItemSelected");
FTLog(s"[DeliveryListController] OnItemSelected");
// let selectionChangeEvent: ref<ContactSelectionChangedEvent>;
// let contactData: ref<ContactData> = FromVariant<ref<IScriptable>>(next.GetData()) as ContactData;
// InkImageUtils.RequestAvatarOrUnknown(this, this.m_avatarImage, contactData.avatarID);
Expand Down
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/DeliveryListItemController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class DeliveryListItemController extends ListItemController {
public let m_itemIcon: wref<inkImage>;
protected cb func OnInitialize() -> Bool {
LogChannel(n"DEBUG", s"[DeliveryListItemController] OnInitialize");
FTLog(s"[DeliveryListItemController] OnInitialize");
// super.OnInitialize();
this.RegisterToCallback(n"OnSelected", this, n"OnSelected");
this.RegisterToCallback(n"OnDeselected", this, n"OnDeselected");
Expand All @@ -21,7 +21,7 @@ public class DeliveryListItemController extends ListItemController {
this.m_itemDescription = this.GetWidget(n"textContainer/NamePreviewContainer/preview") as inkText;
this.m_itemIcon = this.GetWidget(n"icon") as inkImage;
if !IsDefined(this.m_itemName) {
LogChannel(n"DEBUG", s"[DeliveryListItemController] COULD NOT FIND LABEL");
FTLog(s"[DeliveryListItemController] COULD NOT FIND LABEL");
}
// this.RegisterToCallback(n"OnAddedToList", this, n"OnAddedToList");
}
Expand All @@ -31,7 +31,7 @@ public class DeliveryListItemController extends ListItemController {
}
protected cb func OnSelected(itemController: wref<inkVirtualCompoundItemController>, discreteNav: Bool) -> Bool {
LogChannel(n"DEBUG", s"[DeliveryListItemController] OnSelected");
FTLog(s"[DeliveryListItemController] OnSelected");
// let animOptions: inkAnimOptions;
// if IsDefined(this.m_animProxySelection) {
// this.m_animProxySelection.GotoStartAndStop(true);
Expand All @@ -51,9 +51,9 @@ public class DeliveryListItemController extends ListItemController {
// };
this.m_root.SetState(n"Default");
}
protected cb func OnDataChanged(value: ref<IScriptable>) -> Bool {
LogChannel(n"DEBUG", s"[DeliveryListItemController] OnDataChanged");
FTLog(s"[DeliveryListItemController] OnDataChanged");
// super.OnDataChanged(value);
this.m_data = value as JobEntry;
// let itemid = ItemID.FromTDBID(this.m_data.item);
Expand Down
8 changes: 4 additions & 4 deletions code/assets/redscript/Ink/EmoteSelector.reds
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class EmoteSelector extends inkLogicController {
this.m_listController = this.GetWidget(n"container").GetController() as ListController;
this.m_indicator = this.GetWidget(n"indicator");
if !IsDefined(this.m_listController) {
LogChannel(n"DEBUG", s"[EmoteSelector] COULD NOT FIND LIST CONTROLLER");
FTLog(s"[EmoteSelector] COULD NOT FIND LIST CONTROLLER");
}
// let setMenuModeEvent: ref<inkMenuLayer_SetMenuModeEvent>;
Expand Down Expand Up @@ -116,7 +116,7 @@ public class EmoteSelector extends inkLogicController {
// this.QueueEvent(evt);
// this.SetCursorOverWidget(this.GetRootWidget());
// this.m_Player.RegisterInputListener(this, n"UI_PreviousAbility");
// this.m_Player.RegisterInputListener(this, n"UI_NextAbility");
// this.m_Player.RegisterInputListener(this, n"UI_MoveX_Axis");
Expand Down Expand Up @@ -144,7 +144,7 @@ public class EmoteSelector extends inkLogicController {
// this.UnregisterFromGlobalInputCallback(n"OnPostOnAxis", this, n"OnGlobalAxisInput");
// this.UnregisterFromGlobalInputCallback(n"OnPostOnRelative", this, n"OnMouseInput");
this.CloseEmoteSelector();
}
private final func UpdateAxisIndicator(value: Float, actionName: CName) -> Void {
Expand Down Expand Up @@ -198,7 +198,7 @@ public class EmoteSelector extends inkLogicController {
}
protected cb func OnItemSelected(previous: ref<inkVirtualCompoundItemController>, next: ref<inkVirtualCompoundItemController>) -> Bool {
LogChannel(n"DEBUG", s"[EmoteSelector] OnItemSelected");
FTLog(s"[EmoteSelector] OnItemSelected");
// let selectionChangeEvent: ref<ContactSelectionChangedEvent>;
// let contactData: ref<ContactData> = FromVariant<ref<IScriptable>>(next.GetData()) as ContactData;
// InkImageUtils.RequestAvatarOrUnknown(this, this.m_avatarImage, contactData.avatarID);
Expand Down
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/EmoteSelectorItem.reds
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EmoteSelectorItem extends ListItemController {
public let m_serverDescription: wref<inkText>;
protected cb func OnInitialize() -> Bool {
// LogChannel(n"DEBUG", s"[EmoteSelectorItem] OnInitialize");
// FTLog(s"[EmoteSelectorItem] OnInitialize");
// super.OnInitialize();
this.RegisterToCallback(n"OnSelected", this, n"OnSelected");
this.RegisterToCallback(n"OnDeselected", this, n"OnDeselected");
Expand All @@ -22,7 +22,7 @@ public class EmoteSelectorItem extends ListItemController {
this.m_container = this.GetWidget(n"container") as inkWidget;
// this.m_serverDescription = this.GetWidget(n"textContainer/NamePreviewContainer/preview") as inkText;
if !IsDefined(this.m_name) {
LogChannel(n"DEBUG", s"[EmoteSelectorItem] COULD NOT FIND LABEL");
FTLog(s"[EmoteSelectorItem] COULD NOT FIND LABEL");
}
this.RegisterToCallback(n"OnAddedToList", this, n"OnAddedToList");
}
Expand All @@ -47,7 +47,7 @@ public class EmoteSelectorItem extends ListItemController {
protected cb func OnSelected(itemController: wref<inkVirtualCompoundItemController>, discreteNav: Bool) -> Bool {
this.UnregisterFromCallback(n"OnHoverOver", this, n"OnHoverOver");
this.UnregisterFromCallback(n"OnHoverOut", this, n"OnHoverOut");
// LogChannel(n"DEBUG", s"[EmoteSelectorItem] OnSelected");
// FTLog(s"[EmoteSelectorItem] OnSelected");
// let animOptions: inkAnimOptions;
// if IsDefined(this.m_animProxySelection) {
// this.m_animProxySelection.GotoStartAndStop(true);
Expand Down Expand Up @@ -84,9 +84,9 @@ public class EmoteSelectorItem extends ListItemController {
// this.PlayLibraryAnimation(n"pause_button_hover_out_anim");
this.m_root.SetState(n"Default");
}
protected cb func OnDataChanged(value: ref<IScriptable>) -> Bool {
// LogChannel(n"DEBUG", s"[EmoteSelectorItem] OnDataChanged");
// FTLog(s"[EmoteSelectorItem] OnDataChanged");
// super.OnDataChanged(value);
this.m_data = value as EmoteData;
this.m_name.SetText(this.m_data.m_name);
Expand Down
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/JobListController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@ public class JobListController extends inkLogicController {
this.m_headerText.SetText("Select job type");
this.m_scrollArea = this.GetWidget(n"container/scrollarea") as inkScrollArea;
if !IsDefined(this.m_scrollArea) {
LogChannel(n"DEBUG", s"[JobListController] COULD NOT FIND SCROLLAREA");
FTLog(s"[JobListController] COULD NOT FIND SCROLLAREA");
}
this.m_listController = this.GetWidget(n"container/scrollarea/list").GetController() as ListController;
if !IsDefined(this.m_listController) {
LogChannel(n"DEBUG", s"[JobListController] COULD NOT FIND LIST CONTROLLER");
FTLog(s"[JobListController] COULD NOT FIND LIST CONTROLLER");
}
this.m_scrollArea.RegisterToCallback(n"OnScrollChanged", this, n"OnScrollChanged");
this.m_scrollController = this.m_scrollArea.GetControllerByType(n"inkScrollController") as inkScrollController;
if !IsDefined(this.m_scrollController) {
LogChannel(n"DEBUG", s"[JobListController] COULD NOT FIND SCROLL CONTROLLER");
FTLog(s"[JobListController] COULD NOT FIND SCROLL CONTROLLER");
}
// this.m_leftMargin = new inkMargin(35.00, 10.00, 0.00, 0.00);
// this.m_rightMargin = new inkMargin(1400.00, 10.00, 0.00, 0.00);
// this.m_pulseAnim = new PulseAnimation();
// this.m_pulseAnim.Configure(inkWidgetRef.Get(this.m_callsQuestFlag), 1.00, 0.20, 0.60);
let deliveryJob = new JobType();
deliveryJob.m_name = "Delivery Driver";
deliveryJob.m_description = "Courier items to customers";
Expand Down Expand Up @@ -155,7 +155,7 @@ public class JobListController extends inkLogicController {
}
protected cb func OnItemSelected(previous: ref<inkVirtualCompoundItemController>, next: ref<inkVirtualCompoundItemController>) -> Bool {
LogChannel(n"DEBUG", s"[JobListController] OnItemSelected");
FTLog(s"[JobListController] OnItemSelected");
// let selectionChangeEvent: ref<ContactSelectionChangedEvent>;
// let contactData: ref<ContactData> = FromVariant<ref<IScriptable>>(next.GetData()) as ContactData;
// InkImageUtils.RequestAvatarOrUnknown(this, this.m_avatarImage, contactData.avatarID);
Expand Down
10 changes: 5 additions & 5 deletions code/assets/redscript/Ink/JobListItemController.reds
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public class JobListItemController extends ListItemController {
public let m_shopDescription: wref<inkText>;
protected cb func OnInitialize() -> Bool {
LogChannel(n"DEBUG", s"[JobListItemController] OnInitialize");
FTLog(s"[JobListItemController] OnInitialize");
// super.OnInitialize();
this.RegisterToCallback(n"OnSelected", this, n"OnSelected");
this.RegisterToCallback(n"OnDeselected", this, n"OnDeselected");
this.m_root = this.GetRootWidget();
this.m_shopName = this.GetWidget(n"textContainer/NamePreviewContainer/NameContainer/contactLabel") as inkText;
this.m_shopDescription = this.GetWidget(n"textContainer/NamePreviewContainer/preview") as inkText;
if !IsDefined(this.m_shopName) {
LogChannel(n"DEBUG", s"[JobListItemController] COULD NOT FIND LABEL");
FTLog(s"[JobListItemController] COULD NOT FIND LABEL");
}
// this.RegisterToCallback(n"OnAddedToList", this, n"OnAddedToList");
}
Expand All @@ -29,7 +29,7 @@ public class JobListItemController extends ListItemController {
}
protected cb func OnSelected(itemController: wref<inkVirtualCompoundItemController>, discreteNav: Bool) -> Bool {
LogChannel(n"DEBUG", s"[JobListItemController] OnSelected");
FTLog(s"[JobListItemController] OnSelected");
// let animOptions: inkAnimOptions;
// if IsDefined(this.m_animProxySelection) {
// this.m_animProxySelection.GotoStartAndStop(true);
Expand All @@ -49,9 +49,9 @@ public class JobListItemController extends ListItemController {
// };
this.m_root.SetState(n"Default");
}
protected cb func OnDataChanged(value: ref<IScriptable>) -> Bool {
LogChannel(n"DEBUG", s"[JobListItemController] OnDataChanged");
FTLog(s"[JobListItemController] OnDataChanged");
// super.OnDataChanged(value);
this.m_data = value as JobType;
this.m_shopName.SetText(s"\(this.m_data.m_name)");
Expand Down
Loading

0 comments on commit 393362b

Please sign in to comment.