From 8c29db6c5de4e8efb36541f537b494ba5140c9bc Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 18 Nov 2020 08:37:54 -0400 Subject: [PATCH 1/2] no need to add that for now --- .../resources/assets/carpet/scripts/ai_tracker.sc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/carpet/scripts/ai_tracker.sc b/src/main/resources/assets/carpet/scripts/ai_tracker.sc index ad8a7d64..bf7c8195 100644 --- a/src/main/resources/assets/carpet/scripts/ai_tracker.sc +++ b/src/main/resources/assets/carpet/scripts/ai_tracker.sc @@ -369,8 +369,12 @@ global_functions = { 'xpstack' -> { 'experience_orb' -> [ _(arg) -> _(orb) -> ( - ct = query(orb, 'nbt', 'Count'); - [[], [], if (ct > 1, [['stack', 'stack:', ct]],[]) ] + tag = query(orb, 'nbt'); + ct = tag:'Count'; + [[], [], if (ct > 1, [ + //['value', 'size:', tag:'Value'], + ['stack', ct] + ],[]) ] ), , null @@ -548,7 +552,10 @@ __handle_entity(e) -> if (labels_to_add, base_height = 0; snap = global_entity_anchors:(e~'type') || 'dxydz'; + eid = e~'id'; + offset = ([(eid % 7)/7,(eid % 13)/13, (eid % 23)/23]-0.5)/2; base_pos = if(snap == 'xyz', [0, e~'height'+0.3, 0], [0.5, e~'height'+0.3, 0.5]); + //base_pos = base_pos+offset; for (labels_to_add, if (length(_) == 2, [label, text] = _; From f40e797e3e2a1811a728d83ce96f8a42ac43f511 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 18 Nov 2020 16:16:09 -0400 Subject: [PATCH 2/2] customize jitter --- .../resources/assets/carpet/scripts/ai_tracker.sc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/carpet/scripts/ai_tracker.sc b/src/main/resources/assets/carpet/scripts/ai_tracker.sc index bf7c8195..4e7e9fd0 100644 --- a/src/main/resources/assets/carpet/scripts/ai_tracker.sc +++ b/src/main/resources/assets/carpet/scripts/ai_tracker.sc @@ -532,6 +532,8 @@ global_entity_anchors = { 'player' -> 'xyz' }; +global_jitter = {'experience_orb'}; + __handle_entity(e) -> ( entity_type = e ~ 'type'; @@ -551,11 +553,14 @@ __handle_entity(e) -> if (labels_to_add, base_height = 0; - snap = global_entity_anchors:(e~'type') || 'dxydz'; + etype = e~'type'; eid = e~'id'; - offset = ([(eid % 7)/7,(eid % 13)/13, (eid % 23)/23]-0.5)/2; + snap = global_entity_anchors:etype || 'dxydz'; base_pos = if(snap == 'xyz', [0, e~'height'+0.3, 0], [0.5, e~'height'+0.3, 0.5]); - //base_pos = base_pos+offset; + if (has(global_jitter:etype), + offset = ([(eid % 7)/7,(eid % 13)/13, (eid % 23)/23]-0.5)/2; + base_pos = base_pos+offset; + ); for (labels_to_add, if (length(_) == 2, [label, text] = _;