Commit Graph
341 Commits
Author SHA1 Message Date
gnembon f50fa8cde2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-06-23 00:35:44 -03:00
gnembon 0a5b6a5481 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-23 00:35:04 -03:00
gnembon 0e88f37b13 structure lag, booyah 2020-06-23 00:34:53 -03:00
gnembon 12309e9e2d making sure try, return etc. control flow doesn't leak through in_dimension. 2020-06-22 16:21:55 -03:00
gnembon 5cb019d5b5 there can be more than 3 dimensions, fixes #336 2020-06-20 11:18:39 -03:00
gnembon 3700377686 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
#	src/main/java/carpet/script/value/BlockValue.java
2020-06-20 09:03:20 -03:00
gnembon ccd92c5957 added encode_nbt, added 'nbt' and 'nbt_merge' to modify entity API. 2020-06-20 02:19:20 -03:00
gnembon 4fe18a402c optimize a little 2020-06-18 22:22:49 -03:00
gnembon 98b95a74f4 Merge branch 'master' into 1.16 2020-06-18 20:11:50 -03:00
gnembon 4145280bcd added parse_nbt and ability for set to submit params in list, and block data. 2020-06-18 17:15:07 -03:00
gnembon 639283fce3 allow for more characters in file names. 2020-06-18 13:52:31 -03:00
gnembon 8f72c3ef8c Merge branch 'master' into 1.16 2020-06-17 17:00:04 -03:00
gnembon 7764217710 fixing diamonds 2020-06-17 13:08:34 -03:00
Ghoulboy 986909c1f4 Add support for triples of positions in volume (#321)
* Add support for triples of positions in volume

it work good!

* Updating docs

* made it work with 5 arguments

so like volume(x,y,z,pos) or volume(pos,x,y,z).
Also renamed previous variables

* updated docs

* making it smarter

* made it work for rect and diamond

and cleaned up some earlier code

* updated docs

* did all ur stuffs

* fixin the issues
2020-06-17 12:11:01 -03:00
gnembon 2b6a8406c0 Merge branch 'master' into 1.16 2020-06-17 11:12:41 -03:00
gnembonandGhoulboy78 29a81d53d6 unix_time and convert_date (#332)
* very simple stuff

* added unix_date and imporved unix_time

* Update docs/scarpet/api/Auxiliary.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update Full.md

* Dont 100% work, but It'll do untl I fix tomorrow

* works, I think

* changeing weekdays

* removing weird stuff I didnt mean to do

* previous commits

* moving to expression.java

because prof.gnembon said

* moving away from LazyFUnctions

cos gnembon doesn't like evaluating somewhere

* updating docs

* tweaks to dates

Co-authored-by: Ghoulboy78 <ghoulboy27@gmail.com>
2020-06-17 11:10:59 -03:00
gnembon 5bf1b734dc Merge branch 'master' into 1.16 2020-06-14 23:48:45 -03:00
gnembon 72e7ba5e7e added optional player to print as target. 2020-06-14 23:48:26 -03:00
gnembon dd820a450b Merge branch 'master' into 1.16 2020-06-14 01:51:45 -03:00
gnembon ff1226bac3 cleaned debug infos 2020-06-14 01:50:02 -03:00
gnembon 80ca80fe24 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-06-14 01:25:58 -03:00
gnembon d098087e05 added recipe_data() and crafting_remaining_item() - for convenient crafting scripts. 2020-06-14 01:17:36 -03:00
gnembon 7f98564122 seed looses resolution - returned as string. 2020-06-12 22:46:03 -03:00
gnembon 9aa580cfa5 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-10 01:36:11 -03:00
gnembon 2f102a7785 Switched to 64FNV-1a as shapes keying algorithm as collision resistant
Allow shapes to be sent in bulk as one / few packets
Optimized rendering of shapes that not render all faces
Moving shapes render now smoothly with higher framerates
2020-06-08 21:24:56 -03:00
gnembon 0fc71e97ef added mobcaps to API 2020-06-07 16:55:32 -03:00
gnembon f29153c3d2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
#	src/main/java/carpet/script/CarpetScriptServer.java
#	src/main/java/carpet/script/bundled/Module.java
2020-06-07 01:59:15 -03:00
gnembon fb3a5cfa64 read_file, delete_file, and write_file
Deprecated some uses of load_app_data and store_app_data
2020-06-07 01:52:38 -03:00
gnembon a15da8c007 1.16-pre2 2020-06-05 13:48:15 -03:00
gnembon d4c0c7307b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-05 00:50:20 -03:00
gnembon 50b414727c refactor 2020-06-05 00:48:02 -03:00
gnembon 6c01ae6807 1.16-pre1 2020-06-04 16:55:21 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon c2381b88e7 Merge branch 'master' into 1.16 2020-06-02 21:05:56 -03:00
gnembon a7cd2c49cc added view_distance to API 2020-06-02 18:44:23 -03:00
gnembon c94ba6a021 mappings 2020-06-02 12:23:52 -03:00
gnembon b5e34ad030 Merge branch 'master' into 1.16 2020-06-02 11:59:38 -03:00
gnembon 59be8b3fb4 redocced to draw_shape 2020-06-01 12:05:01 -03:00
gnembon f97ca9e9bd mappings 2020-06-01 03:25:09 -03:00
gnembon d5cb99d7f9 Merge branch 'master' into 1.16
# 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
2020-06-01 03:05:23 -03:00
gnembon a86c127c72 added params and changed syntax for draw_shape 2020-06-01 03:01:39 -03:00
gnembon 0b22359f8c mappings 2020-05-31 03:18:40 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon 47452b5b12 added marker lines and boxes with client synchro fixes. 2020-05-31 01:57:04 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon 934038828c handled errors in server docked tasks to continue stack trace of internal exceptions. 2020-05-20 02:13:12 -03:00