Commit Graph
606 Commits
Author SHA1 Message Date
Ghoulboy78 71c82acdb1 Update ai_tracker.sc 2021-02-24 09:35:23 +01:00
gnembon d537faae98 restored structureBlockOutlineDistance 2021-02-17 23:36:11 -04:00
gnembon 6108cdce23 Merge branch 'master' into 1.17 2021-02-08 23:54:23 -04:00
gnembon 4c09d6b736 added __on_start and defined better meta-events 2021-02-08 18:08:38 -04:00
gnembon 71a8dcc31e Merge branch 'master' into 1.17 2021-01-26 05:42:20 -04:00
gnembon 40b537501f reverting that merge of mixins since it will cause havoc on the future version branches 2021-01-26 05:32:59 -04:00
e32b37dcf1 Add three Structure Block related settings (#664)
* Added structureBlockOutlineDistance

* Added structureBlockIgnored

* Added structureBlockLimit

* Made structureBlockLimit work on dedicated server

* Correct packet contents check and fix mixin list

* Add limits to structure block settings, slight optimisation to ignored block

* Fixed the `structureBlockLimit` limit

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>

* Fix missing imports and a typo

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2021-01-22 23:38:10 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
altrisi 96244dc4e2 Update Gradle and reintroduce automatic JSON version 2020-12-30 14:20:19 +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
gnembon 941b7d4836 Merge branch 'master' into 1.17 2020-12-20 19:27:04 -04:00
gnembon f54ab746fe player swinging events. 2020-12-20 18:34:43 -04:00
gnembon c2436f1f09 Merge branch 'master' into 1.17 2020-12-16 18:04:52 -04:00
gnembon c6529c3d3c 1.4.21 2020-12-16 18:03:04 -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 50a0e4b886 Merge branch 'master' into 1.17 2020-12-14 02:37:48 -04:00
gnembon cd892f95bc cleaner 2020-12-14 02:36:53 -04:00
gnembon e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00
Kevin Delugan 2be4ac8ee0 Added onTrade Scarpet Event 2020-12-11 05:19:06 +01:00
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -04:00
Ghoulboy 42e67f27b7 Adding absorption and xp API, and weather control (#540)
* fixes #537
* fixes  #547
2020-12-06 16:03:15 -04:00
gnembon 28e84dd64e entity_area can accept entity as a starting bounding box. 2020-12-05 22:41:15 -04:00
gnembon b2bde4b836 Merge branch 'master' into 1.17 2020-12-04 00:39:18 -04:00
gnembon 0c604593bb added ability to render shapes around any entity 2020-12-03 23:30:42 -04:00
gnembon 1c39914f4f Merge branch 'master' into 1.17 2020-12-02 18:21:25 -04:00
gnembon 632d7c3268 1.4.20 2020-12-02 18:15:26 -04:00
gnembon 0bacbcc2f5 Merge branch 'master' into 1.17 2020-12-02 13:23:32 -04:00
gnembon d29f49967f rework of the event system, allowing apps to function more independently and allowing for player scoped apps to handle global events. fixes #596 2020-12-02 01:02:36 -04:00
gnembon 91bff6a513 Merge branch 'master' into 1.17 2020-11-30 01:43:09 -04:00
gnembon 9bdc0c31e4 work on distance_beta 2020-11-30 01:27:08 -04:00
gnembon 4bf0a2a088 work on distance_beta 2020-11-29 23:57:02 -04:00
gnembon d980ab6d91 added blockpredicate argument support 2020-11-29 19:34:40 -04:00
gnembon 973dd29739 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java
2020-11-29 01:23:22 -04:00
gnembon 735925b48f we don't need these actually 2020-11-29 01:21:11 -04:00
gnembon e15afd9763 added support for block predicate argument support and tag_matches function. Fixes #563 2020-11-29 00:33:01 -04:00
gnembon 4f7ebdd9ff Merge branch 'master' into 1.17 2020-11-28 12:13:07 -04:00
gnembon a099ed79e1 added player_escapes_sleep event. Fixes #579 2020-11-27 00:34:24 -04:00
gnembon 8a95db6400 Merge branch 'master' into 1.17 2020-11-25 19:09:57 -04:00
gnembon dd9d6659fb 1.4.19 2020-11-25 19:08:33 -04:00
gnembon ba58a99c21 Merge branch 'master' into 1.17 2020-11-25 17:53:00 -04:00
gnembon 201654ff44 adding support for equipment inventories as well as horse and pillager item inventories. 2020-11-25 17:52:17 -04:00
gnembon 253604b34a Merge branch 'master' into 1.17 2020-11-25 02:12:41 -04:00
gnembon 53aec581bb simplify affected, not count set failures in draw 2020-11-25 01:50:32 -04:00
gnembon 2a403c36c8 added deprecation warnings, fixes #568 2020-11-25 01:49:56 -04:00
gnembon 4c6d449553 tweaks to distance beta app 2020-11-24 22:53:45 -04:00
gnembon 724b63df8a using beta as a indicator 2020-11-24 19:43:21 -04:00
Ghoulboyandaltrisi aeb3e382a6 Replacing draw and distance with apps (#553)
* added draw.sc app

Now working on distance app

* Adding apps as carpet rules

* adding distance app

Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2020-11-24 19:40:55 -04:00
gnembon 2d7ce5dccd Merge branch 'master' into 1.17 2020-11-21 07:02:20 -04:00
gnembon 8e3c330e04 1.4.18 2020-11-21 06:46:20 -04:00