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
This commit is contained in:
gnembon committed 2020-06-18 01:57:42 -03:00
2 parents 569df8773c cc8008a367
commit f5a7455c19
2 files changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/utils/ShapesRenderer.java
+1 -2
View File
@@ -62,8 +62,7 @@ public class ShapesRenderer
//RenderSystem.shadeModel(7425); //RenderSystem.shadeModel(7425);
RenderSystem.shadeModel(GL11.GL_FLAT); RenderSystem.shadeModel(GL11.GL_FLAT);
RenderSystem.enableAlphaTest(); RenderSystem.enableAlphaTest();
RenderSystem.defaultAlphaFunc(); RenderSystem.alphaFunc(GL11.GL_GREATER, 0.003f);
//RenderSystem.alphaFunc(GL11.GL_GREATER, 0.005F);
RenderSystem.disableCull(); RenderSystem.disableCull();
RenderSystem.disableLighting(); RenderSystem.disableLighting();
RenderSystem.depthMask(false); RenderSystem.depthMask(false);
src/main/resources/assets/carpet/scripts/overlay.sc
+1 -1
View File
@@ -98,7 +98,7 @@ __structure_renderer(player_name) ->
l(from, to) = structure_data; l(from, to) = structure_data;
total_size = _euclidean(from, to); total_size = _euclidean(from, to);
density = max(10, total_size/10); density = max(10, total_size/10);
draw_shape('box', 15, 'from', from, 'to', to+1, 'color', 0x00FFFFFF, 'line', 3, 'fill', 0x00FFFF22); draw_shape('box', 15, 'from', from, 'to', to+1, 'color', 0x00FFFFFF, 'line', 3, 'fill', 0x00FFFF08);
structure_pieces = slice(sort_key(structure_pieces, _euclidean_sq((_:2+_:3)/2,ppos)), 0, config:'max_pieces'); 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) = _; for (structure_pieces, l(piece, direction, from, to) = _;
r = 255 - floor(128 * _i/config:'max_pieces'); r = 255 - floor(128 * _i/config:'max_pieces');