Commit Graph
84 Commits
Author SHA1 Message Date
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -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 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 5dd2a12aa7 mapping 2021-04-02 18:38:55 -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 98745a7341 Merge branch 'master' into 1.17 2021-03-14 03:17:06 -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 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 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 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
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 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 e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00
gnembon 6dc6a42bda client function, duh. 2020-12-08 19:15:33 -04:00
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -04:00
Ghoulboy 49e5c012b3 Adding Gamerule modification to scarpet (#610) 2020-12-06 20:32:29 -04:00
gnembon bbde2bb173 simplify code for print 2020-12-06 16:43:07 -04:00