Commit Graph
260 Commits
Author SHA1 Message Date
Ed Voas e4cb807899 Always reset the app store root in the validator (#1275).
The validator used to clear the sealed flag and the children in the validator. But it did not clear the count down latch. This led to a situation where we would throw an IOException from fillChildren because we did have the latch, but it was zero, and the sealed flag was cleared. This simply resets the node every time, which I think is the safest solution as setting the childrenProgress to null in the validator might end poorly if someone was waiting on it. Another solution was to just remove the throw inside fillChildren. This felt like the cleanest solution.
2022-01-25 18:26:50 -08:00
altrisi 06af9ce8b1 Migrate the Carpet codebase to Mojang Mappings 2022-01-24 20:33:16 +01:00
gnembon 77f8d2cbd7 update issues 2022-01-11 23:57:50 +01:00
gnembon 529a5b358d Merge branch 'master' into future
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/annotation/AnnotationParser.java
#	src/main/java/carpet/script/utils/BiomeInfo.java
#	src/main/resources/fabric.mod.json
2022-01-11 23:44:52 +01:00
Ghoulboy f697924d30 Used wrong method to query world border size (#1236) 2022-01-11 23:29:03 +01:00
altrisi 212b6a792e Remove a few no longer needed mixins (#1243) 2022-01-08 23:18:13 +01:00
altrisi de305f4284 Allow apps to retrieve information about the source (#1229)
* Give information about the sources

* Document source related system_info properties
2022-01-08 21:08:26 +01:00
gnembon 5be52c993c Merge branch 'master' into future 2021-11-30 03:29:24 +01:00
gnembon 1cefef82f7 no-bs world height info 2021-11-30 03:28:44 +01:00
Ghoulboyandgnembon 6c776b6131 Adding min_y, max_y and world_border_info to system_info (#1168)
* Adding min_y and max_y

* Making it return all dimensions

* Adding world_border_info as well, cos y not

* Update docs/scarpet/api/Auxiliary.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-11-30 03:03:15 +01:00
gnembon 90964e2e57 1.18-pre4 2021-11-17 20:45:25 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01:00
gnembon 1642976d0d 21w44a 2021-11-04 00:34:40 +01:00
gnembon 81f0b8a8da mappings 2021-10-27 23:28:44 -03:00
gnembon 074fd910cf 21w42a 2021-10-20 23:05:27 -03:00
gnembon 543a4aa38f 21w41a 2021-10-13 19:36:28 -03:00
gnembon 6a03675b4f Merge branch 'master' into future 2021-10-12 23:24:41 -03:00
altrisi d034b8945a Move some functions into system_info (#1084)
* Move some functions into `system_info`

* Add docs for new `system_info()` properties
2021-10-05 21:21:29 -03:00
gnembon 7b9e5e6feb mappings 2021-09-22 21:12:11 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
gnembon 9dad47d7a0 Merge branch 'master' into future 2021-09-08 16:22:44 -03:00
gnembon 229d0b037b events handling is disabled now when potentially triggered from the scarpet script preventing from recursive callbacks. 2021-09-06 02:37:08 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
gnembon 6594c2c07f Merge branch 'master' into future 2021-08-08 21:51:42 -03:00
altrisi 7fb5e47da5 Use newer Java features in places where it makes sense and more (#1009) 2021-08-03 07:32:40 -03:00
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon 4062a980f6 WIP 1.18 2021-07-14 00:53:24 -03:00
gnembon af368a159d Merge branch '1.17' 2021-07-14 00:26:22 -03:00
altrisi cca9d2ec7e Provide script download suggestions async (#986) 2021-07-11 07:43:11 -03:00
gnembon 41a34b52a3 Merge branch 'master' into 1.17 2021-07-10 23:26:38 -03:00
gnembon a9a119e172 default foliage color has to be fixed on the server since its actually part of client resourcepack. Fixes #992 2021-07-09 22:16:29 -03:00
gnembon 33500dde29 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	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-07-05 16:53:01 -03:00
gnembon d07fe18bb5 handle invalid identifiers, fixes #980 2021-07-05 16:52:08 -03:00
gnembon 4f77327b6c Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java
2021-06-30 13:33:10 -03:00
altrisi 97e69d347e Change how resource type works, allow proper app and library installation (#956)
* Change how app store types work, allow proper app and library installation

* Add node for resources in dependencies and docs

* Fix NPE without `type`

* Fix docs trying to change location of app type resource

* Separate libraries and apps and add trash for them

* Update docs

* Create trash directory if it doesn't exist
2021-06-30 12:42:24 -03:00
gnembon 9a4e15da48 mappings 2021-06-29 17:28:58 -03:00
gnembon 54c6ef1ec1 Merge branch 'master' into 1.17 2021-06-27 23:15:57 -03:00
altrisi cd50919a90 Filter script download suggestions according to player input (#958) 2021-06-27 22:33:13 -03:00
gnembon 241537b172 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-22 01:28:32 -03:00
gnembon cf6eb2c7d6 issues with mocked inventories, fixes #946 2021-06-22 00:35:03 -03:00
gnembon f64cf67e41 1.17-pre1 2021-05-27 15:01:07 -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
gnembon c60167405d Merge pull request #881 from altrisi/deprecate-old-booleans
Deprecate old boolean constructor and move existing usages
2021-05-25 00:50:11 -03:00
gnembon cab37358ed Merge branch 'master' into 1.17 2021-05-25 00:41:29 -03:00
gnembon db9039c02a added app resources for apps from appstores 2021-05-25 00:41:06 -03:00
altrisi 9d9844fd5d Deprecate old boolean constructor and move existing usages 2021-05-24 11:41:24 +02:00
gnembon 95d8c5fd90 Merge branch 'master' into 1.17 2021-05-22 22:14:43 -03:00
gnembon dbae5813f0 added framework for auto resource fetching for the apps 2021-05-21 22:31:02 -03:00
gnembon 74cc9a39e1 Merge branch 'master' into 1.17 2021-05-21 14:14:18 -03:00
gnembon 79fb489ab7 renames 2021-05-21 14:13:50 -03:00