Commit Graph
1391 Commits
Author SHA1 Message Date
gnembon 82bdd5e61c Merge pull request #1292 from FieryRobot/ScriptDownloadFix
Always reset the app store root in the validator (#1275).
2022-01-29 23:11:45 +01:00
gnembon 39ec78ea40 fixed not resetting of iterators after ... 2022-01-29 22:54:36 +01:00
FX - PR0CESS a547677597 Migrate Carpet Mixin names to mojang mappings 2022-01-28 16:47:18 -05:00
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 f469810fbc 22w03a 2022-01-20 00:20:52 +01:00
gnembon 0de2d74ef0 Merge branch 'master' into future 2022-01-19 21:46:37 +01:00
intricateandgnembon 0ac214963f Add on_move Entity Event for Scarpet (#1096)
* Add ON_MOVE Entity Event for Scarpet

* Update src/main/java/carpet/script/EntityEventsGroup.java

* Add on_move to Entities.md

* Switch to ValueConversions

* Update docs/scarpet/api/Entities.md

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

* Fix #1126

* undo last commit cause it was on the wrong branch

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2022-01-19 21:36:16 +01:00
gnembon ec1993efb1 mappings 2022-01-19 20:31:30 +01:00
gnembon 5abbae5b62 Merge branch 'master' into future 2022-01-19 20:03:57 +01:00
ch-yx a27b8b6b5c minor issue (#1279) 2022-01-19 20:00:28 +01:00
gnembon eb186fb61e Merge branch 'master' into future 2022-01-13 00:04:32 +01:00
ch-yx 1485e8978b Update create_datapack (#1227) 2022-01-13 00:00:09 +01:00
gnembon 74f6e57edc Merge branch 'master' into future 2022-01-12 22:53:45 +01:00
replaceitemandreplaceitem 3f6ddc43e5 Added screen handler system (#888)
* Added screen handler value

* Added screen handler constructor and function to show to player

* Made inventory_* functions work with screen handlers

* Event callbacks and some refactoring

* Exception if screen has no inventory

* Fixed NPE

* Close screen when null

* Added screen_property

* UNKNOWN_SCREEN throwable

* Fix error when not specifying click callback

* Access to non-container screen handler slots via the inventory_* functions

* Change lectern page

* Added button event

* Added 'close' event and refactoring callback

* Beacon and Brewing screens

* Cartography table screen

* Crafting screen

* Enchantment screen

* Grindstone

* Loom

* Merchant

* Shulkerbox

* Smithing table

* Stonecutter

* Use strings as screen type instead of ScreenHandlerType

* Remove support for multiple players

* Combining create_screen and open_screen and refactoring

* Allow modifying cursor stack

* Cleanup

* Docs

* Added multiple screen examples

* Rename to screen

* Added smoker and blast furnace

* Serialize screen content

* Store host name instead of context

* Add button value special cases to docs

* Spelling and grammar fixes by @James103

* Optimize screen inventory access

* Use -1 for slot click outside the screen

* As boolean, ScreenValue equals isOpen

* Revert "Use -1 for slot click outside the screen"

This reverts commit 68c113e71bb653191cedf4cc356ab7705838dc25.

* Rework of callback function

* Improve screen functionality with drop_item

* Editor keywords

* Only check syncId

* slot_update event callback

* Screem typo

* Mistake

* toTag returns "null" NBT for  closed screen

* Use null for slot index of -999

Co-authored-by: replaceitem <replaceitem.mc@gmail.com>
2022-01-12 22:52:38 +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 8a278e46de Fix deprecated last_tick_times (#1265) 2022-01-09 00:08:55 +01:00
altrisi 34e32973fa Use Fabric's newly exposed version APIs for app requirement parsing, expand it to allow wildcards and change load stopping to be a special exception (#1252) 2022-01-08 23:26:14 +01:00
altrisi 212b6a792e Remove a few no longer needed mixins (#1243) 2022-01-08 23:18:13 +01:00
altrisi 8f265f4e52 Improve performance of player() related methods (#1240) 2022-01-08 23:11:10 +01:00
altrisi 9fb6ec91cb Minor improvements to scarpet annotation API (#1239) 2022-01-08 23:05:21 +01:00
altrisi f2989d51fd Improve CarpetExpressionException error messages (#1230) 2022-01-08 21:09:15 +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
Ghoulboy a8f9b96e9e Fixes #1222 (#1224) 2022-01-08 20:58:43 +01:00
replaceitem caafaa2039 [Scarpet] Task value refactor for better extendability (#1202) 2022-01-08 20:40:20 +01:00
gnembon 5a55666f94 Merge branch 'master' into future 2021-12-11 22:30:54 +01:00
gnembon fe6018a43b allowing event callbacks be added concurrently (e.g. registered event while handling some other events), with safe event pruning. fixes #1193 fixes #889 2021-12-06 01:02:37 +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 74e177d18d renamed query_noise to sample_noise 2021-11-30 02:52:55 +01:00
Crec0 aa57b586cb Multi noise support for scarpet (#1176)
* fix: infinite params bug in AnnotationParser
feat: scarpet function query_noise()

* refactor: remove Method reflection

* fix: use BiomeCoords

* update: game version to 1.18-pre5

* feat: biome lookup from multinoise
fix: noise lookup wrongly scaled

* fix: jagged noise. Thanks, @Starmute

* fix: cave cheese and layer. Thanks, @Starmute

* fix: revert formatting
fix: caveLayer and caveCheese
feat: add terrain support

* more formatting reverts

* fix mapping issue

* use BlockPos

* docs: add documentation for query_noise

* docs: add documentation for biome(noise_map)
2021-11-30 02:47:28 +01:00
gnembon 3312c00ee8 Merge branch 'master' into future 2021-11-27 22:22:38 +01:00
gnembon 339633f1f0 fixes #1103 game will close peacefully when running ticks from scarpet 2021-11-27 21:14:59 +01:00
gnembon 7bd18a27e4 fixes #1113 boo 2021-11-27 20:29:16 +01:00
gnembon 18c728db2e fixes #1172 lol 2021-11-27 20:11:05 +01:00
gnembon 9750dd9e78 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java
#	src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2021-11-27 18:55:05 +01:00
altrisi d8c10c6e4a Complete removal of /info entity, it's correspondent carpet and two small changes (#1047)
* Remove no longer needed language packet mixin

* Make StringArgument properly return a StringArgument supplier, so `string` isn't `term`

Fixes gnembon/fabric-carpet#1044

* Complete removal of `/info entity` and it's correspondent carpet

Resolves gnembon/fabric-carpet#1033

* Remove yet another no longer needed mixin
2021-11-27 17:43:39 +01:00
gnembon ff44e847c0 Merge branch 'master' into future 2021-11-23 22:03:43 +01:00
Gnotteroandgnembon 775e923252 Added player abilities actions to the entity API (#1160)
* Added 'mayfly' and 'fly_speed' actions to the modify() function

* Added 'mayfly' and 'fly_speed' actions to the modify() function

* Added a query and a modify action for each of the abilities. Added the  modify action. Modified the docs to include all the new actions and queries

* Fixed an error with mod version

* Saving changes

* Modified the docs and fix an issue with float type variables

* Modified the docs and fixed an issue with float type variables

* Update src/main/java/carpet/script/value/EntityValue.java

* Update gradle.properties

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-11-22 22:46:02 +01:00
gnembon 90964e2e57 1.18-pre4 2021-11-17 20:45:25 +01:00
gnembon 59e0a9ebaf Merge branch 'master' into future 2021-11-17 20:17:04 +01:00
gnembon dc9ba2f83c Merge pull request #1083 from altrisi/more-debugging
Make ErrorSnooper report values for locals in the stacktrace
2021-11-17 20:12:23 +01:00
gnembon adaf19170d mappings 2021-11-16 21:08:26 +01:00
gnembon ab989155ad Merge branch 'master' into future 2021-11-16 20:11:49 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01:00
Jacek Wolkowicz 40370aaa7d Merge branch 'master' into future 2021-11-11 19:38:50 +01:00
James103 af2ba900b2 Fix gnembon/fabric-carpet#1161: Typo in extreme velocity log message 2021-11-10 15:00:04 -06:00