Commit Graph
264 Commits
Author SHA1 Message Date
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
replaceitem 15c5c8753f Optimizing scoreboard API with scoreboard_property (#753)
* Adding scoreboard_property, deprecating scoreboard_remove

* Docs

* Editor keywords

* Whoops

* adding scoreboard_remove back

* Making rendertype snake case

* Double scoreboard_remove

* Removed deprecation
2021-03-14 03:12:29 -03:00
gnembon e81f3d9629 sound and particle with now arguments now return list of available options. 2021-03-14 01:59:04 -04:00
gnembon e51451db83 fixed custom worlds loaded via scarpet not ticking properly. 2021-03-12 04:02:18 -04:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
gnembon 72af3f732e cleaned docs 2021-03-09 13:51:52 -04:00
gnembon 2d1b53258c simplify error messages 2021-03-09 13:29:20 -04:00
gnembon 25eccc9569 Merge branch 'master' into more-throwables 2021-03-07 17:52:10 -04:00
gnembon a82a9a60a3 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/EntityValue.java
2021-03-07 16:39:17 -04:00
gnembon 38458a8e35 added create_datapack, check_hidden_dimensions and world_dimensions in system info. 2021-03-07 16:37:13 -04:00
gnembon d97110a1ba fixed use of client method when using item, entity and block tags. 2021-03-06 00:57:03 -04:00
gnembon 3f16c45a69 mappings 2021-03-02 09:08:16 -04:00
replaceitem 6b2ead46c8 Added list header and motd option to display_title() 2021-02-28 13:50:54 +01:00
gnembon 2cf403057c 21w08a
- rework on handling /log packets
 - rework on player attack and interaction with entities
 - rework display_title (need recheck)
 - rework packets for structure blocks
2021-02-24 18:25:16 -04:00
altrisi 86dabe0080 Add exception hierarchy 2021-02-21 00:57:37 +01:00
altrisi a155494d11 Allow some exceptions to be handled 2021-02-19 19:54:41 +01:00
gnembon 6d320866e6 21w07a 2021-02-17 20:17:01 -04:00
gnembon b14cf288a1 mappings 2021-01-15 04:51:06 -04:00
gnembon 95bac227a0 Merge branch 'master' into 1.17 2021-01-13 21:36:05 -04:00
BisUmToandgnembon 2121a91a55 Added nbt_storage() scapet function (#655)
* Added storage() scarpet function

Allows you to easly manage vanilla data command storage

* Added docs and uniformed with scoreboard()

storage(key, nbt) will now return the previous value to be consistant with the scoreboard() command.

* Included imports

* Renamed storage function to nbt_storage

* Update docs/scarpet/api/Auxiliary.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-01-13 21:14:57 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
altrisi cdaf17ea1e JSON support tweaks 2021-01-05 02:42:02 +01:00
gnembon a0507400ee Merge pull request #631 from replaceitem/scoreboard-criterion-mod
Added ability to change criterion with scoreboard_add Fixes #624
2020-12-29 00:01:58 -04:00
replaceitem 5771d42c98 scoreboard_add returns current criterion and null 2020-12-28 12:44:17 +01:00
altrisi 929c17da36 Fix Value mess 2020-12-27 15:53:44 +01:00
altrisi aabff1623b Reading/Writing JSON, first working version 2020-12-27 02:04:19 +01:00
gnembon 6225e5f632 player() returns consistently on player scoped apps. 2020-12-23 11:55:45 -04:00
gnembon 3b6261d3d6 Merge branch 'master' into 1.17 2020-12-21 02:58:09 -04:00
gnembon d99ab4fc24 limit depth of game_tick, just in case. 2020-12-20 22:58:41 -04:00
gnembon 32d0ba9694 20w51a 2020-12-16 19:06:09 -04:00
gnembon c2436f1f09 Merge branch 'master' into 1.17 2020-12-16 18:04:52 -04:00
replaceitem 6bb7eb2ae2 Merge branch 'master' into scoreboard-criterion-mod 2020-12-16 20:40:29 +01:00
replaceitem 055c26d44a added changing criterion to scoreboard_add #624 2020-12-16 20:35:28 +01:00
gnembon 5280cda3ee set can now accept map of properties. 2020-12-16 02:05:05 -04:00
gnembon 4466f9e8bb set vanishes block data on unsuccessful replace. Fixes #629 2020-12-16 01:37:00 -04:00
gnembon e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00