Commit Graph
150 Commits
Author SHA1 Message Date
gnembon 0de2d74ef0 Merge branch 'master' into future 2022-01-19 21:46:37 +01:00
altrisi ec47dea267 Make fake players compatible with adventure platform lib and minor refactor around them (#1235)
* Make fake players compatible with adventure platform and minor refactor around them

Cleaner approach

* Remove no longer needed enderpearl mixin for fake players

Their ClientConnection now has an open channel so isOpen returns true
2022-01-19 21:28:36 +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 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
altrisi 212b6a792e Remove a few no longer needed mixins (#1243) 2022-01-08 23:18:13 +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 9b793de377 fix #1188 fix structure eligibility with strongholds 2021-11-28 23:32:24 +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 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 31a6bd21df Merge branch 'master' into future 2021-10-20 23:24:52 -03:00
altrisi 506457d878 Fix Stack Overflow in dev environment with mojmap (#1134) 2021-10-20 23:06:19 -03:00
gnembon e849cdf6c1 21w38a 2021-09-24 09:29:13 -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 7e67966fd2 Merge branch 'master' into future 2021-08-25 15:19:30 -03:00
gnembon 6222c97375 fixed unknown recipe types. Fixes #1068 2021-08-19 09:43:00 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
Mitchell Skaggs 28cb136c6b Max collisions optimization (#1038)
* Lift entity limit up to the `getOtherEntities` method so it bails early

This has the potential to prevent a lot of bounding box computation

* Clean up decompiled code

* Fix raw generic types

This doesn't alter the signature, but it helps the compiler warn about misuse of the type later on

* Actually abort forEach when `limit` entities have been checked

`throw`ing a known exception is the easiest way to `break` out of a forEach call
2021-08-03 07:20:09 -03:00
altrisi 2a391962ff Remove no longer needed Mixins (#1030) 2021-07-26 09:20:01 -03:00
gnembon ca59c8f30a reloading chunks is not needed when resetting, fixing entities removed. 2021-06-29 02:21:47 -03:00
gnembon c55019d048 fixed broken movable TEs under Java 16 2021-05-31 15:40:44 -03:00
gnembon 84dd972758 Merge branch 'master' into 1.17 2021-05-21 04:42:21 -03:00
gnembon 7fd49e0f04 fix client methods in biome, fixes #870 2021-05-21 04:22:18 -03:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
Ghoulboyandgnembon 7536edc2b9 Adding Javadocs to CounterCommand.java and relevant files (#838)
* adding class javadoc

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-05-17 19:32:57 -03:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00
Ghoulboy 164122eba2 Adding query player language (#824) 2021-04-26 21:38:29 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03: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
gnembon 2cf403057c 21w08a
- rework on handling /log packets
 - rework on player attack and interaction with entities
 - rework display_title (need recheck)
 - rework packets for structure blocks
2021-02-24 18:25:16 -04:00
gnembon 50eae09c17 21w05a 2021-02-03 20:15:45 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
gnembon d6eb53b6ce player entity value may become invalid due to respawns. This not only fixes #633, but also other cases where player reference is used over time while player respawns and its instance is recycled. 2020-12-24 06:48:14 -04:00
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -04:00
gnembon 56064a49cb fixes to xp stuff, saturation and weather 2020-12-06 19:55:01 -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 973dd29739 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java
2020-11-29 01:23:22 -04:00
gnembon e15afd9763 added support for block predicate argument support and tag_matches function. Fixes #563 2020-11-29 00:33:01 -04:00
gnembon ba58a99c21 Merge branch 'master' into 1.17 2020-11-25 17:53:00 -04:00
gnembon 201654ff44 adding support for equipment inventories as well as horse and pillager item inventories. 2020-11-25 17:52:17 -04:00
gnembon 2cdea92da7 20w45a 2020-11-06 00:06:53 -04:00
gnembon 945578fd89 moar types, wip 2020-11-04 02:14:57 -04:00
gnembon 1c1fb5eb59 fixes #486 2020-10-02 18:07:59 -03:00