Commit Graph
673 Commits
Author SHA1 Message Date
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 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
gnembon 0177ef4298 Merge branch 'master' into future 2021-11-30 03:36:00 +01:00
gnembon 06eda1052f boi 2021-11-30 03:35:48 +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 6150e1f29c Merge branch 'master' into future 2021-11-29 00:10:47 +01:00
Crec0 28a5e7acf1 XpNoCooldown and combineXpOrbs refactor (#1149)
* - Fix xpNoCooldown to work as it did in 1.17-
- Remove XPcombine
- Use vanilla merge methods

* Remove debug code

* fix: rollback sort carpet.mixins.json

* rework: nerf xp cooldown absorption a little

* remove: combineXpOrbs
fix: xpCooldown

* revert renames

* fix newlines

* fix: wrong implementation for absorption

* add missing `private` keyword

* fix: player xp cooldown set wrongly

* fix: injection point to be within condition
2021-11-28 23:39:13 +01:00
gnembon a990be607f allowed plopping of all sorts of structures regardless of required conditions 2021-11-28 20:23:41 +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
Ghoulboy 49dff77ebe Missing semicolon in draw_beta.sc (#1151) 2021-11-22 22:47:32 +01:00
gnembon d09ecf17fb one less java 2021-11-16 20:27:38 +01:00
gnembon b64427a4ac Merge branch 'master' into future
# Conflicts:
#	src/main/resources/fabric.mod.json
2021-11-16 20:14:38 +01:00
gnembon 3eae059ee0 one more java 2021-11-16 20:13:08 +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
Fx Morin 0714098347 Ported rule updateSuppressionCrashFix from Carpet-Extra + More (#1133)
* Posted rule `updateSuppressionCrashFix` from Carpet-Extra
Also added catch for update suppression in neighbour update during ServerPlayerEntity tick.
Added Logger `updateSuppressedCrashes` so not everyone sees the crash messages
Added Coords to crash message so we now know where it originates from

* Make it easier to read

* that `s` has been there for a long time

* Made `updateSuppressionCrashFix` compatible with carpet-extra
2021-10-20 23:08:23 -03:00
gnembon 6a03675b4f Merge branch 'master' into future 2021-10-12 23:24:41 -03:00
gnembon 5b80c845c6 added liquidDamageDisabled inspired by TIS additions and ported by permission by Fallen Breath 2021-10-12 22:57:47 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
gnembon 70754dbfe8 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-09-17 03:15:30 -03:00
gnembon 86d89aab20 added death messages control to cleanLogs (require showDeathMessages to be false as well). Fixes #1095 2021-09-08 21:13:17 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
gnembon 783f3f49f0 Merge branch 'master' into future 2021-08-11 15:02:51 -03:00
gnembon 16f3832d16 Fixes inventory behaviour with stackable empty shulker boxes. fixes #1048 2021-08-08 23:08:14 -03:00
gnembon 6594c2c07f Merge branch 'master' into future 2021-08-08 21:51:42 -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
HED-GITandgnembon 56a15fb384 added more customizability to renewableCoral (#1022)
* added more customizability to renewableCoral

* changed renewableCoral to use enums instead of strings

* added suggested changes to renewablecoralmode

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-07-29 23:48:04 -03:00
altrisi 2a391962ff Remove no longer needed Mixins (#1030) 2021-07-26 09:20:01 -03:00
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon 3affa8d5c8 shulker stacks can now be moved in 1.17, fixes #976 2021-07-05 16:28:59 -03:00
gnembon ca59c8f30a reloading chunks is not needed when resetting, fixing entities removed. 2021-06-29 02:21:47 -03:00
gnembon b8082ba5b8 Merge branch 'master' into 1.17 2021-06-29 02:07:39 -03:00
replaceitem 83afa95d98 Fixed team color using client method (#965) 2021-06-28 22:52:40 -03:00
gnembon 481fc97545 changes to entity load handler / not backwards compatible 2021-06-25 18:38:49 -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 00ab7c1601 flying in end gateways in cretiveNoClip won't teleport. fixes #943 2021-06-22 01:27:17 -03:00
gnembon 3ff7e1d4cb Merge branch 'master' into 1.17 2021-06-17 21:20:53 -03:00
gnembon 3a83a94361 added despawn timer 2021-06-17 21:20:11 -03:00
gnembon c7b059fdb8 update 2021-06-13 11:50:18 -03:00
gnembon dc38cd272f Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-13 11:47:56 -03:00
altrisi 1a92531554 Compact fabric initialization code (#918) 2021-06-12 23:02:33 -03:00
gnembon 0f03e6e3bd creativeNoClip player are not affected by opening shulkers. Fixes #878 2021-06-11 03:15:17 -03:00
gnembon a48a7df386 added perf command support 2021-06-06 10:32:22 -03:00