Commit Graph
53 Commits
Author SHA1 Message Date
altrisi 7fb5e47da5 Use newer Java features in places where it makes sense and more (#1009) 2021-08-03 07:32:40 -03:00
gnembon 01aeb79617 Merge branch 'master' into 1.17 2021-06-20 00:15:45 -03:00
altrisi 7975ab65cd A bit more nio and log IO errors (#920)
* A bit more nio and log IO errors

* Use Scarpet logger
2021-06-19 11:59:56 -03:00
gnembon 5f630e7d1a Merge branch 'master' into 1.17 2021-05-31 15:54:32 -03:00
altrisi b359c6c76c Implement @Locator.Function and @Locator.Vec3d (#891)
* Implemente `@Locator.Function`

* Implement `@Locator.Vec3d`

* Small import cleanup

* Javadoc
2021-05-31 15:51:10 -03:00
gnembon b96a1b1216 Merge branch 'master' into 1.17 2021-05-25 17:25:55 -03:00
gnembon c3fe5d685b Merge pull request #884 from altrisi/annotated-block-locator
Implement `@Locator.Block`
2021-05-25 13:17:28 -03:00
gnembon d6bde212e2 Merge branch 'master' into 1.17 2021-05-25 07:45:58 -03:00
gnembon 5d00709b1f fix for downloadable zip folders 2021-05-25 07:31:22 -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 7f2cb0f4a7 Implement @Locator.Block 2021-05-24 13:04:51 +02:00
gnembon 93b8d98a79 Merge branch 'master' into 1.17 2021-05-23 14:01:18 -03:00
gnembon 1b39feaab7 wrap stream before closing zip files. 2021-05-23 14:00:49 -03:00
gnembon 95d8c5fd90 Merge branch 'master' into 1.17 2021-05-22 22:14:43 -03:00
gnembon c6db496a1f fixes behaviour of folder and file detections in java 16, fixes #869 2021-05-22 01:57:04 -03:00
gnembon fb40120460 cluenap 2021-05-13 02:00:05 -03:00
gnembon 65447f09ad Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2021-05-13 01:52:08 -03:00
gnembon a522e2ae37 fixed changed behaviour under java 16 2021-05-13 01:51:01 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 5e3812e1f0 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java
2021-04-23 01:46:11 -03:00
gnembon 74bd0bb81e dont be lazy refactor 2021-04-22 20:37:48 -03:00
gnembon a65d16c9ba WIP unpacking of parameters. 2021-04-21 12:21:47 -03: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 40869ef9bf moved custom arguments to before the commands and handled missing functions nicely. 2021-04-12 14:24:10 -03:00
gnembon 0aff2f90c3 Merge branch 'master' into 1.17 2021-04-06 20:59:59 -03:00
gnembon 6fc38d6ec1 slashes fix issues with some java versions 2021-04-06 20:57:14 -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 53f6a49b8d removed sun's import 2021-03-20 17:41:17 -03:00
gnembon ecb578bf49 fixed chopped directories names. 2021-03-20 17:39:37 -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 57f34a9eac deprecated some IO functions 2021-03-17 08:23:56 -03:00
gnembon 28e84dd64e entity_area can accept entity as a starting bounding box. 2020-12-05 22:41:15 -04:00
gnembon 54d306d9bc added biome query to biome 2020-11-28 12:11:31 -04:00
gnembon 9f6771123f custom command trees, no validation so far 2020-11-12 02:55:18 -04:00
gnembon 14d3a1725b shit, snap 2020-11-11 12:45:29 -04:00
gnembon 55643632ca custom events, and low level event API 2020-11-11 02:06:45 -04:00
gnembon 390dbe1725 fixed NPE in resetting entity event 2020-11-06 00:11:13 -04:00
gnembon 7ccd46433a entity load handler and rework of handling of events. 2020-10-30 22:59:27 -03:00
gnembon 15ac7a4621 entity actions 2020-10-29 11:26:59 -03:00
gnembon e8b2060fb3 variable number of arguments for user defined functions. 2020-09-22 04:38:08 -03:00
gnembon 3e0cd65434 fixed entity 'home' arguments 2020-05-13 09:28:44 -03:00
gnembon e5aea149cf Merge branch 'master' into 1.16 2020-05-12 23:04:04 -03:00
gnembon a4750f7238 fixed entity 'home' arguments 2020-05-12 23:28:34 -03:00
gnembon 5e5393ba3d Merge branch 'master' into 1.16 2020-05-10 17:25:21 -03:00
gnembon 56f8f17aaa tighten up function args for non-linear calls 2020-05-10 13:11:58 -03:00
gnembon ae0975d626 mappings 2020-05-10 01:42:19 -03:00
gnembon a02d4d7e7c Merge branch 'master' into 1.16 2020-04-16 22:34:20 -03:00