Cleanup logs, make prints more uniform.

This commit is contained in:
JonShard
2026-08-14 10:02:26 +02:00
parent 9e0c3ed174
commit f28c987a3a
26 changed files with 184 additions and 184 deletions
+19 -19
View File
@@ -18,15 +18,15 @@ extends StaticBody3D
func _ready() -> void:
if not audio:
push_error("Counter is missing reference to AudioStreamPlayer3D")
SweetLogger.warning("{0} missing audio reference", [name])
if not chop_audio:
push_error("Counter is missing reference to chop_audio AudioStream")
SweetLogger.warning("{0} missing chop_audio reference", [name])
if not progress_bar or progress_bar is not ProgressBar3D:
push_error("Counter missing reference to progressbar, or wrong type:", progress_bar)
SweetLogger.warning("{0} missing progress_bar reference", [name])
if not knife or knife is not XRToolsPickable:
push_error("Counter missing reference to knife, or wrong type:", knife)
SweetLogger.warning("{0} missing knife reference", [name])
if not snap_zone or snap_zone is not XRToolsSnapZone:
push_error("Counter missing reference to snap_zone, or wrong type:", snap_zone)
SweetLogger.warning("{0} missing snap_zone reference", [name])
snap_zone.has_picked_up.connect(_on_object_picked_up)
snap_zone.has_dropped.connect(_on_object_dropped)
@@ -47,7 +47,7 @@ func _set_result(value: String) -> void:
if not process_result.is_empty():
knife.visible = true
knife.enabled = true
SweetLogger.debug("chopping recipe set: {0}", [process_result])
SweetLogger.debug("Chopping recipe set: {0}", [process_result])
else:
_hide_all_tools()
@@ -71,7 +71,7 @@ func _refresh_progress_bar() -> void:
# Add work from gesture area (knife hits). This increments the chopping progress.
func add_work(work: float) -> void:
SweetLogger.debug("add_work: {0}", [work])
SweetLogger.debug("Add work: {0}", [work])
# Only the world owner should drive the authoritative state. Guarding is
# handled by higher-level NetworkManager logic elsewhere, mirror hob's
# convert_held_to_item which checks ownership before spawning.
@@ -82,16 +82,16 @@ func add_work(work: float) -> void:
audio.play()
# If we've reached the required time, convert the held item
if process_result != "" and process_result_work > 0 and work_progress >= process_result_work:
SweetLogger.debug("chopping complete, converting item to: {0}", [process_result])
SweetLogger.debug("Chopping complete, converting item to: {0}", [process_result])
work_progress = 0
convert_held_to_item(process_result)
func _on_gesture_area_body_entered(body: Node3D) -> void:
SweetLogger.debug("gesture area entered: {0}", [body])
SweetLogger.debug("Gesture area entered: {0}", [body])
if body.is_in_group("chopping_tool"):
if process_result == "":
SweetLogger.debug("knife entered but nothing to chop")
SweetLogger.debug("Knife entered but nothing to chop")
return
var speed := 0.0
@@ -101,31 +101,31 @@ func _on_gesture_area_body_entered(body: Node3D) -> void:
speed = body.velocity.length()
if speed < chop_min_speed:
SweetLogger.debug("knife too slow for chopping: {0}", [speed])
SweetLogger.debug("Knife too slow for chopping: {0}", [speed])
return
add_work(chop_work_steps)
func _on_object_picked_up(_item: Variant) -> void:
SweetLogger.debug("object picked up: {0}", [_item])
SweetLogger.debug("Object picked up: {0}", [_item])
var food_item = Helper.find_food_item(_item)
if not food_item:
SweetLogger.debug("held object is not a FoodItem")
SweetLogger.debug("Held object is not a FoodItem")
return
var result = RecipeManager.get_chopping_result(food_item.id)
if not result:
SweetLogger.debug("held a FoodItem that is not choppable, id: {0} process_result: {1}", [food_item.id, result])
SweetLogger.debug("Held a FoodItem that is not choppable, id: {0} process_result: {1}", [food_item.id, result])
return
process_result = result
process_result_work = RecipeManager.get_chopping_work(food_item.id)
SweetLogger.debug("set process_result {0} work: {1}", [process_result, process_result_work])
SweetLogger.debug("Set process_result {0} work: {1}", [process_result, process_result_work])
func _on_object_dropped(_item: Variant) -> void:
SweetLogger.debug("object drop")
SweetLogger.debug("Object drop")
work_progress = 0
process_result = ""
process_result_work = 0
@@ -135,17 +135,17 @@ func _on_object_dropped(_item: Variant) -> void:
func convert_held_to_item(_item: String) -> void:
if not NetworkManager.owns_world():
return
SweetLogger.debug("converting {0}", [_item])
SweetLogger.debug("Converting {0}", [_item])
var old_pickable = snap_zone.picked_up_object
if not old_pickable:
push_warning("Counter finished processing _item, but snap zone is missing its reference")
SweetLogger.warning("{0} finished processing item, but snap_zone is missing its reference", [name])
return
var original_transform = old_pickable.global_transform
var new_scene_instance = NetworkManager.spawn_item(RecipeManager.get_item_scene(_item).resource_path, original_transform)
SweetLogger.debug("freeing old_pickable {0}", [old_pickable])
SweetLogger.debug("Freeing old_pickable {0}", [old_pickable])
snap_zone.drop_object()
NetworkManager.despawn_item(old_pickable)
snap_zone.pick_up_object(new_scene_instance)
+1 -1
View File
@@ -11,7 +11,7 @@ func _makeDirty(item) -> void:
return
var plate: PlateController = item.get_node_or_null("PlateController") as PlateController
if not plate:
SweetLogger.debug("held object is not a Plate")
SweetLogger.debug("Held object is not a Plate")
return
if not plate.is_dirty:
plate.is_dirty = true
+3 -3
View File
@@ -5,9 +5,9 @@ extends StaticBody3D
func _ready() -> void:
if not item_scene:
push_error("Item dispenser is missing a reference to it's item to dispense")
SweetLogger.warning("{0} missing item_scene reference", [name])
if not snap_zone:
push_error("Item dispenser is missing a reference to its snap zone child")
SweetLogger.warning("{0} missing snap_zone reference", [name])
func _process(_delta: float) -> void:
@@ -21,6 +21,6 @@ func _process(_delta: float) -> void:
#return
#
if not snap_zone.picked_up_object:
SweetLogger.debug("missing item, spawning new item")
SweetLogger.debug("Missing item, spawning new item")
var new_item = NetworkManager.spawn_item(item_scene.resource_path, snap_zone.global_transform)
snap_zone.pick_up_object(new_item)
+5 -5
View File
@@ -43,7 +43,7 @@ func _set_effects_playing(playing: bool) -> void:
func _ready() -> void:
if not progress_bar or progress_bar is not ProgressBar3D:
push_error("Sink missing reference to progressbar, or wrong type:", progress_bar)
SweetLogger.warning("{0} missing progress_bar reference", [name])
snap_zone.has_picked_up.connect(_on_object_picked_up)
snap_zone.has_dropped.connect(_on_object_dropped)
@@ -59,7 +59,7 @@ func _refresh_progress_bar() -> void:
func _on_object_picked_up(_item) -> void:
SweetLogger.debug("object picked up: {0}", [_item])
SweetLogger.debug("Object picked up: {0}", [_item])
plate = _item.get_node_or_null("PlateController") as PlateController
if plate:
# The setter starts the effects and shows the bar, here and on clients.
@@ -67,7 +67,7 @@ func _on_object_picked_up(_item) -> void:
func _on_object_dropped(_item) -> void:
SweetLogger.debug("object drop")
SweetLogger.debug("Object drop")
_reset_sink()
@@ -81,14 +81,14 @@ func complete_washing():
return
plate.is_dirty = false
_reset_sink()
SweetLogger.debug("washing complete!")
SweetLogger.debug("Washing complete")
func _process(delta: float) -> void:
if is_washing:
time_washed += wash_speed * delta
_refresh_progress_bar()
SweetLogger.debug("washing plate: {0}", [time_washed])
SweetLogger.debug("Washing plate: {0}", [time_washed])
if time_washed >= plate_wash_time:
complete_washing()
+11 -11
View File
@@ -21,7 +21,7 @@ const GHOST_COLOR_INVALID: Color = Color(1, 0, 0, 0.35)
func set_move_handle_enabled(enabled: bool) -> void:
SweetLogger.debug("set_move_handle_enabled: {0}", [enabled])
SweetLogger.debug("Set move handle enabled: {0}", [enabled])
move_handle.visible = enabled
move_handle.enabled = enabled
if enabled:
@@ -32,18 +32,18 @@ func _on_game_state_changed(new_state: GameManager.GameState) -> void:
set_move_handle_enabled(new_state == GameManager.GameState.BUILDING)
func _on_station_bought(_instance: Node3D):
SweetLogger.info("_on_station_bought")
SweetLogger.debug("->[]")
if GameManager.game_state == GameManager.GameState.BUILDING:
set_move_handle_enabled(true)
func _ready() -> void:
SweetLogger.debug("->[]")
if not station:
push_error("StationMovement is missing referece to station")
SweetLogger.warning("{0} missing station reference", [name])
if not move_handle:
push_error("StationMovement is missing reference to move_handle")
SweetLogger.warning("{0} missing move_handle reference", [name])
if not move_ghost:
push_error("StationMovement is missing reference to move_ghost")
SweetLogger.warning("{0} missing move_ghost reference", [name])
move_handle_rigid = move_handle as RigidBody3D
original_collision_layer = station.collision_layer
@@ -107,7 +107,7 @@ func _apply_visibility_state(ghost_visible: bool, station_visible: bool) -> void
func _handle_pickup(_by: Node) -> void:
SweetLogger.debug("->[]")
if move_handle.get_picked_up_by() and move_handle.get_picked_up_by() is XRToolsSnapZone:
SweetLogger.info("handle pickup by snap zone, dropping and resetting position")
SweetLogger.info("Handle pickup by snap zone, dropping and resetting position")
move_handle.drop()
move_handle.global_position = station.global_position + Vector3(0, original_handle_y_pos, 0)
move_handle.rotation = station.rotation
@@ -121,7 +121,7 @@ func _handle_pickup(_by: Node) -> void:
func _handle_drop(_by: Node) -> void:
SweetLogger.info("handle drop")
SweetLogger.info("Handle drop")
is_moving = false
_apply_visibility_state(false, true)
station.collision_layer = original_collision_layer
@@ -134,11 +134,11 @@ func _handle_drop(_by: Node) -> void:
if is_valid:
station.global_transform = move_ghost.global_transform
move_handle.global_transform = move_ghost.global_transform.translated(Vector3(0, original_handle_y_pos, 0))
SweetLogger.debug("handle drop (local apply), station authority: {0} move_handle authority: {1}", [station.get_multiplayer_authority(), move_handle.get_multiplayer_authority()])
SweetLogger.debug("Handle drop (local apply), station authority: {0} move_handle authority: {1}", [station.get_multiplayer_authority(), move_handle.get_multiplayer_authority()])
else:
station.global_transform = original_station_transform
move_handle.global_transform = original_station_transform.translated(Vector3(0, original_handle_y_pos, 0))
SweetLogger.debug("handle drop (local reject), restoring original position", [])
SweetLogger.debug("Handle drop (local reject), restoring original position")
func _process(_delta: float) -> void:
@@ -198,7 +198,7 @@ func server_handle_drop(new_transform: Transform3D, client_thinks_valid: bool):
if not _was_last_pos_valid: # Edge case
server_update_visibility.rpc(false, true)
SweetLogger.warning("Can not not reset visibility to normal when the last pos was invalid")
SweetLogger.debug("transform rejected (invalid)")
SweetLogger.debug("Transform rejected (invalid)")
_was_last_pos_valid = false
return
@@ -208,7 +208,7 @@ func server_handle_drop(new_transform: Transform3D, client_thinks_valid: bool):
server_update_visibility.rpc(false, true)
_was_last_pos_valid = true
SweetLogger.debug("transform applied")
SweetLogger.debug("Transform applied")
@rpc("any_peer", "call_local", "reliable") # Server updates clients
+26 -26
View File
@@ -47,7 +47,7 @@ var _players_count: int = 0
func place_order() -> void:
SweetLogger.debug("place_order()")
SweetLogger.debug("->[]")
var new_orders: Array[String] = _unsatisfied_orders.duplicate()
# for _i in range(0, randi_range(1, 2)):
# new_orders.append(GameManager.get_random_meal())
@@ -64,7 +64,7 @@ func server_place_order() -> void:
func absorb_items():
SweetLogger.debug("absorb_items()")
SweetLogger.debug("->[]")
for snap_zone_node in snap_zones:
var held_object = snap_zone_node.picked_up_object
if not held_object:
@@ -74,7 +74,7 @@ func absorb_items():
func satisfyAllOrders() -> void:
SweetLogger.debug("satisfyAllOrders()")
SweetLogger.debug("->[]")
_unsatisfied_orders.clear()
_original_orders.clear()
clearAllFood()
@@ -82,7 +82,7 @@ func satisfyAllOrders() -> void:
func clearAllFood() -> void:
SweetLogger.debug("clearAllFood()")
SweetLogger.debug("->[]")
for zone in snap_zones:
var held_object = zone.picked_up_object
if not held_object:
@@ -103,7 +103,7 @@ func clearAllFood() -> void:
# Group called from Queue when trying to assign customers to tables
func try_consume_customer() -> bool:
if _state == TableState.EMPTY:
SweetLogger.debug("try_consume_customer, consumed a customer")
SweetLogger.debug("Try consume customer, consumed a customer")
_state_end(TableState.EMPTY)
return true
return false
@@ -111,18 +111,18 @@ func try_consume_customer() -> bool:
func _ready() -> void:
if not label_3d:
push_error("Table is missing reference to Label3D")
SweetLogger.warning("{0} missing label_3d reference", [name])
if not label_3d_time:
push_error("Table is missing reference to Label3DTime")
SweetLogger.warning("{0} missing label_3d_time reference", [name])
if not progress_bar or progress_bar is not ProgressBar3D:
push_error("Table missing reference to progressbar, or wrong type:", progress_bar)
SweetLogger.warning("{0} missing progress_bar reference", [name])
progress_bar.y_billboard = true
progress_bar.exponential = true
# Render whatever state already arrived from the server before we were in
# the tree (see the guard in _refresh_display).
_refresh_display.call_deferred()
if not audio_player:
push_error("Table is missing reference to AudioStreamPlayer3D")
SweetLogger.warning("{0} missing audio_player reference", [name])
# Get snap_zones for plates, store in array snap_zones
for child in get_children():
@@ -131,7 +131,7 @@ func _ready() -> void:
snap_zones.append(snap_zone_node)
if snap_zones.is_empty():
push_error("Table is missing XRToolsSnapZone children")
SweetLogger.warning("{0} missing XRToolsSnapZone children", [name])
return
for snap_zone_node in snap_zones:
@@ -148,14 +148,14 @@ func _ready() -> void:
func _on_object_picked_up(_item) -> void:
SweetLogger.debug("object picked up: {0}", [_item])
SweetLogger.debug("Object picked up: {0}", [_item])
if _state == TableState.EATING:
return
_absorb_item_if_correct(_item)
func _on_object_dropped(_item) -> void:
SweetLogger.debug("object dropped, item: {0}", [_item])
SweetLogger.debug("Object dropped, item: {0}", [_item])
# If then player picks up a food_item (side) the table has already registerd, unregister
var food_item: FoodItem = Helper.find_food_item(_item)
if food_item and food_item.type == FoodItem.Type.SIDE:
@@ -172,12 +172,12 @@ func _on_object_dropped(_item) -> void:
# There is no on_stay signal, we have to track player with bool
func _on_player_enter(_body):
_players_count += 1
SweetLogger.debug("_on_player_enter() players_count: {0}", [_players_count])
SweetLogger.debug("Player enter, players_count: {0}", [_players_count])
func _on_player_exit(_body):
_players_count -= 1
SweetLogger.debug("_on_player_exit() players_count: {0}", [_players_count])
SweetLogger.debug("Player exit, players_count: {0}", [_players_count])
func _place_order_if_player():
@@ -194,20 +194,20 @@ func _place_order_if_player():
func _get_plate_controller_from_item(_item: Node) -> PlateController:
if not _item:
SweetLogger.debug("_item is null")
SweetLogger.debug("Item is null")
return null
for child in _item.get_children():
if child is PlateController:
SweetLogger.debug("found child")
SweetLogger.debug("Found child")
return child
SweetLogger.debug("no match")
SweetLogger.debug("No match")
return null
func _absorb_item_if_correct(_item: Node) -> void:
SweetLogger.debug("_absorb_item_if_correct, item: {0}", [_item])
SweetLogger.debug("Absorb item if correct, item: {0}", [_item])
if not _item:
return
if not (_state == TableState.WAITING_PRIMARY or _state == TableState.WAITING_FRIEND):
@@ -215,14 +215,14 @@ func _absorb_item_if_correct(_item: Node) -> void:
# Plate: Get plate controller in child of _item (hopefully a plate XRpickable)
var plate_controller = _get_plate_controller_from_item(_item)
SweetLogger.debug("_absorb_item_if_correct plate_controller ref: {0}", [plate_controller])
SweetLogger.debug("Plate_controller ref: {0}", [plate_controller])
_item.print_tree_pretty()
if plate_controller:
# Absorm items from the plate we want
for food_item: FoodItem in plate_controller.container.contained_items: # TOOD: handle registering the meal again when a side is added to the plate
if food_item.id in _unsatisfied_orders and not food_item.is_absorbed:
SweetLogger.debug("_absorb_item_if_correct held a plate with FoodItem that is in unsatisfied orders, removing it")
SweetLogger.debug("Held a plate with FoodItem that is in unsatisfied orders, removing it")
(plate_controller.get_parent() as XRToolsPickable).get_picked_up_by().enabled = false # Lock meal that is deliverd
_unsatisfied_orders.erase(food_item.id)
food_item.is_absorbed = true
@@ -232,17 +232,17 @@ func _absorb_item_if_correct(_item: Node) -> void:
# Side pickable item, no container
var food_item: FoodItem = Helper.find_food_item(_item)
if food_item and food_item.type == FoodItem.Type.SIDE:
SweetLogger.debug("_absorb_item_if_correct held a side that is in unsatisfied orders, removing it")
SweetLogger.debug("Held a side that is in unsatisfied orders, removing it")
# Do not lock snap zone here. Problem if table want many meals, but to many sides have filled up slots, so can't place plates.
_unsatisfied_orders.erase(food_item.id)
_update_state_from_orders()
return
SweetLogger.debug("absorb_item_if_correct() held object is not a Plate or Side")
SweetLogger.debug("Held object is not a Plate or Side")
func _update_state_from_orders():
SweetLogger.debug("_update_state_from_orders: unsatisfied_orders: {0}", [_unsatisfied_orders])
SweetLogger.debug("Unsatisfied_orders: {0}", [_unsatisfied_orders])
if _unsatisfied_orders.size() > 0 and _state != TableState.EATING:
_set_state(TableState.WAITING_FRIEND)
@@ -265,7 +265,7 @@ func _collect_money_from_food():
elif food_item:
GameManager.set_money(GameManager.money + food_item.sell_value)
SweetLogger.debug("_collect_money_from_food(), money: {0}", [GameManager.money])
SweetLogger.debug("Money: {0}", [GameManager.money])
func _set_snap_zones_enabled(value: bool) -> void:
@@ -349,7 +349,7 @@ func _refresh_display() -> void:
# null. Bail out until _ready() has resolved them; _ready() calls back in
# once it has, so nothing that arrived early is lost.
if not progress_bar or not label_3d or not label_3d_time:
push_error("Table missing progress bar or label")
SweetLogger.warning("{0} missing progress_bar or label reference", [name])
return
match _state:
TableState.IDLE:
@@ -388,7 +388,7 @@ func _process(delta: float) -> void:
#SweetLogger.error("State {0} time: {1} duration: {2}", [TableState.keys()[_state], _state_time, _state_duration])
if not NetworkManager.owns_world():
SweetLogger.error("Is not server, return")
SweetLogger.debug("Not server, skipping state update")
return
if GameManager.game_state == GameManager.GameState.GAME_OVER: