Commit Graph
36 Commits
Author SHA1 Message Date
ch-yx 8be36cb641 remove screen demo 2022-08-28 18:59:11 +02:00
ch-yx a690e477ae draft 2022-08-28 18:59:11 +02:00
altrisi f18cfb09d2 Fix more warnings and do some small optimizations (#1356)
* Fix more warnings and do some small optimizations

* Fix more warnings in ValueConversions

* Clean up some decompiler names and fix an unnecessary transformation around commands

* Use (way) more compact data structure for slot map

* Minor tweaks
Such as map directly in the collector

* I hate vanilla javac
Revert map changes in latest commit
2022-05-27 19:43:45 +02:00
altrisi b1c934da28 Fix a few IDE warnings (#1345) 2022-02-20 19:16:12 +01:00
gnembon 212814f46d 22w06a 2022-02-10 03:15:53 +01:00
gnembon 695b569977 remove instanceof NullValues fixes #1313 2022-02-06 00:18:42 +01:00
altrisi 06af9ce8b1 Migrate the Carpet codebase to Mojang Mappings 2022-01-24 20:33:16 +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 6222c97375 fixed unknown recipe types. Fixes #1068 2021-08-19 09:43:00 -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
altrisi 7ebc990ef6 Use pattern matching for instanceof (#1019) 2021-07-21 22:24:24 -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 9a4e15da48 mappings 2021-06-29 17:28:58 -03:00
gnembon 0937ba8352 1.17.1-pre1 2021-06-18 23:43:47 -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
altrisi 9d9844fd5d Deprecate old boolean constructor and move existing usages 2021-05-24 11:41:24 +02: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 cc3723ae12 mapping 2021-04-13 19:54:23 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
gnembon 2d1b53258c simplify error messages 2021-03-09 13:29:20 -04:00
gnembon 25eccc9569 Merge branch 'master' into more-throwables 2021-03-07 17:52:10 -04: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 d97110a1ba fixed use of client method when using item, entity and block tags. 2021-03-06 00:57:03 -04:00
altrisi 86dabe0080 Add exception hierarchy 2021-02-21 00:57:37 +01:00
altrisi a155494d11 Allow some exceptions to be handled 2021-02-19 19:54:41 +01:00
gnembon b14cf288a1 mappings 2021-01-15 04:51:06 -04:00
gnembon 32d0ba9694 20w51a 2020-12-16 19:06:09 -04:00
gnembon 7ecef187d4 fix 2020-12-07 01:22:12 -04:00
gnembon a0067d0d61 added item_list, item_tags to support item tags as well as options for entities to support entity type tags. fixes #382 2020-12-07 00:12:55 -04:00
gnembon 677ff2da90 boi 2020-09-24 03:34:31 -03:00
Ghoulboy 38bda134b7 Update item_category (#473)
* Update item_catrgory so it doesnt crash with an item which has no category
2020-09-23 20:59:53 -03:00
gnembon 33f400e904 refactor 2020-09-09 16:19:12 -03:00
gnembon 59575ec607 refactor breaking up API and language defs 2020-09-09 15:37:03 -03:00