Commit Graph
199 Commits
Author SHA1 Message Date
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
gnembon c720c2c935 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/value/EntityValue.java
#	src/main/java/carpet/script/value/ListValue.java
2021-05-25 01:08:32 -03:00
altrisi 9d9844fd5d Deprecate old boolean constructor and move existing usages 2021-05-24 11:41:24 +02:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
gnembon edc90133b2 fix run position, fixes #866 2021-05-18 21:18:53 -03:00
gnembon f67d50d3d3 Merge branch 'master' into 1.17 2021-05-17 22:23:16 -03:00
altrisi be0635de82 Use primitive specific Predicates instead of Function (#859) 2021-05-15 18:54:16 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
gnembon 8d97ab26a9 script compile time optimizations. 2021-05-05 00:25:31 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 31afc28401 Merge branch 'master' into 1.17 2021-04-24 01:13:57 -03:00
gnembon 28101e716b lists are now properly mutable 2021-04-24 01:13:33 -03:00
gnembon 5e3812e1f0 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java
2021-04-23 01:46:11 -03:00
gnembon edca3fb131 using proper logger now 2021-04-22 22:30:45 -03:00
gnembon 74bd0bb81e dont be lazy refactor 2021-04-22 20:37:48 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon a65d16c9ba WIP unpacking of parameters. 2021-04-21 12:21:47 -03:00
replaceitem e26e332a6d Adding getTextByValue method to replace duplicate code (#823)
* Added FormattedTextValue.getTextByValue()

* changed getBoolean() and added to display_title
2021-04-20 17:14:08 -03:00
gnembon 709d74ea47 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
2021-04-19 23:42:38 -03:00
gnembon ba89d0164f handling snooped commands properly 2021-04-19 23:40:22 -03:00
gnembon 5cceec9486 Merge branch 'master' into 1.17 2021-04-19 23:35:30 -03:00
gnembon b0dafccc18 re-name 2021-04-19 23:35:13 -03:00
gnembon e438fbf56d fix 2021-04-19 03:57:59 -03:00
gnembon d636965f59 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/logging/HUDController.java
#	src/main/java/carpet/script/api/Auxiliary.java
2021-04-19 03:51:32 -03:00
gnembon fa3505763e fix 2021-04-19 03:48:37 -03:00
altrisi 1819694d19 Make player_list take arguments one at a time and make it compatible with loggers (#819)
* Make `player_list` take arguments one at a time and make it compatible with loggers

* Update docs for `player_list` modification
2021-04-19 02:31:54 -03:00
gnembon ee6ea80ce6 update 2021-04-18 01:56:59 -03:00
gnembon 9120aae313 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
2021-04-18 01:50:29 -03:00
gnembon 0e84ef5d65 Merge pull request #750 from replaceitem/display-title-additions
Added player_list option to display_title()
2021-04-18 01:36:49 -03:00
replaceitem eaa242c8eb Added option to only set footer, and clear both 2021-04-17 12:33:31 +02:00
replaceitem 53fc6fab9c Removed 'motd' 2021-04-17 11:47:53 +02:00
replaceitemandgnembon 794a80e4d4 update exception
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-17 11:42:02 +02:00
replaceitemandgnembon fad68163c2 player_list
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-17 11:41:33 +02:00
gnembon cc3723ae12 mapping 2021-04-13 19:54:23 -03:00
gnembon 8ed4561a98 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2021-04-12 14:26:22 -03:00
gnembon 92cc545896 less restricting use of shapes 2021-04-12 07:57:04 -03:00
replaceitem 396e844dce Merge branch 'master' into display-title-additions 2021-04-11 21:21:46 +02:00
gnembon 388a3de577 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -03:00
gnembon 2ed5861278 Merge branch 'master' into 1.17 2021-04-05 13:42:54 -03:00
gnembon 063b4b84ec deferred creation of a dummy entity for block breaking to when its needed. 2021-04-05 13:42:22 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 4616bf4333 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java
2021-03-21 02:35:43 -03:00
gnembon 1a47f4333f refactored file IO and zupport for sips 2021-03-20 06:22:23 -03:00
gnembon 0b93101248 mapping 2021-03-17 10:42:31 -03:00
gnembon e19ae0ef0f name 2021-03-14 03:20:51 -03:00
gnembon 98745a7341 Merge branch 'master' into 1.17 2021-03-14 03:17:06 -03:00