Commit Graph
524 Commits
Author SHA1 Message Date
gnembon 8be832a74c Merge branch 'master' into 1.17 2021-03-23 20:15:44 -03:00
gnembon ff4b292871 Merge pull request #742 from Ghoulboy78/draw_beta-upgrade
Update draw_beta.sc
2021-03-23 08:36:42 -03:00
Ghoulboy 36f766ae75 Removing return statements to improve performance by a few microprocessor ticks to satisfy @altrisi 2021-03-12 22:36:25 +01: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
Ghoulboy78 6d7f7a7bdc improving prims not to calculate blocks unnecessarily (thx @Firigion) 2021-03-05 22:24:42 +01:00
gnembon a58dface03 Merge branch 'master' into 1.17 2021-03-02 09:17:13 -04:00
gnembon 8f592735ca fixes 2021-03-02 09:16:56 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
Andrew S 69a0eeed7d Add pingPlayerListLimit setting (#704)
* Update CarpetSettings.java

* Add pingPlayerListLimit

* Fix formatting & fail softer
2021-03-01 22:48:31 -04:00
Ghoulboy78 facac439cf compacting hollow code 2021-02-24 12:11:51 +01:00
Ghoulboy78 467767a8e7 using bresenham algorithm for circles to make it more efficient 2021-02-24 12:06:17 +01:00
Ghoulboy78 fa75401278 minor editing tweaks 2021-02-24 10:17:06 +01:00
Ghoulboy78 eafc618792 oboi, remember that caching bs? I apparently forgot to remove this bit lol 2021-02-24 10:14:57 +01:00
Ghoulboy78 ac031090ef making the shapes in shapes.scl purely mathematical, no strings attached, only returning a set of the positions to iterate over. 2021-02-24 10:14:28 +01:00
Ghoulboy78 8eba0b9b8a removed debug and easter egg 2021-02-24 09:46:28 +01:00
Ghoulboy78 180b2285f9 moved drawing commands to separate library app
now gotta import, and fix issues
2021-02-24 09:44:43 +01:00
Ghoulboy78 96bce75db1 Update draw_beta.sc 2021-02-24 09:40:20 +01:00
Ghoulboy78 b649f5c830 Update camera.sc 2021-02-24 09:37:21 +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