icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.16

Browse Source 
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
This commit is contained in:
gnembon committed 2020-06-01 03:05:23 -03:00
2 parents b186e21aea a86c127c72
commit d5cb99d7f9
6 files changed
+463 -188
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/resources/assets/carpet/scripts/overlay.sc
+10 -10
View File
@@ -99,7 +99,7 @@ __structure_renderer(player_name) ->
total_size = _euclidean(from, to);
density = max(10, total_size/10);
//particle_box('dust 0 1 1 2', from, to+1, density);
marker_box(from, to+1, 15, 0x00FFFFFF );
draw_shape('box', 15, 'from', from, 'to', to+1, 'color', 0x00FFFFFF);
structure_pieces = slice(sort_key(structure_pieces, _euclidean_sq((_:2+_:3)/2,ppos)), 0, config:'max_pieces');
for (structure_pieces, l(piece, direction, from, to) = _;
//factor = 1- _i / config:'max_pieces' / 2;
@@ -111,7 +111,7 @@ __structure_renderer(player_name) ->
b = 255;
a = 255;
color = a+256*(b+256*(g+256*r));
marker_box(from, to+1, 15, color);
draw_shape('box', 15, 'from', from, 'to', to+1, 'color', color);
)
)
);
@@ -137,20 +137,20 @@ __chunk_renderer(player_name) ->
top_11 = ref_pos + l(16, top('terrain', ref_pos+l(15,0,15))+10, 16);
top_10 = ref_pos + l(16, top('terrain', ref_pos+l(15, 0, 0))+10, 0);
top_01 = ref_pos + l(0, top('terrain', ref_pos+l(0, 0, 15))+10, 16);
part = 'dust 0.2 0.8 0.2 2';
density = 2+player_distance/2;
r = 30;
g = 220;
b = 30;
a = max(0, 255-player_distance);
color = a+256*(b+256*(g+256*r));
marker_line(top_00, top_10, 15, color);
marker_line(top_10, top_11, 15, color);
marker_line(top_11, top_01, 15, color);
marker_line(top_01, top_00, 15, color);
marker_line(top_00, top_11, 15, color);
marker_line(top_01, top_10, 15, color);
draw_shape('box', 15, 'from', top_00, 'to', top_10, 'color', color);
draw_shape('box', 15, 'from', top_10, 'to', top_11, 'color', color);
draw_shape('box', 15, 'from', top_11, 'to', top_01, 'color', color);
draw_shape('box', 15, 'from', top_01, 'to', top_00, 'color', color);
draw_shape('box', 15, 'from', top_00, 'to', top_11, 'color', color);
draw_shape('box', 15, 'from', top_01, 'to', top_10, 'color', color);
//part = 'dust 0.2 0.8 0.2 2';
//density = 2+player_distance/2;
//particle_line(part, top_00, top_10, density);
//particle_line(part, top_10, top_11, density);
//particle_line(part, top_11, top_01, density);