Commit Graph
273 Commits
Author SHA1 Message Date
gnembon 72a3d74a97 extremeBehaviours let wither spawn charged skulls at 10%, not 0.1% 2021-04-20 17:35:41 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03:00
gnembon 8f2c935fe6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
2021-04-17 01:37:40 -03:00
gnembon 3e24c24648 silenced obtrusive log message with custom biomes. Fixes #810 2021-04-17 00:47:12 -03:00
gnembon d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00
Fallen_Breath 0f051cb4f7 Fixed #745 2021-04-16 11:06:40 +08:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -03:00
replaceitemandgnembon c878ffd637 Added renewableDeepslate (#806)
* Added renewableDeepslate

* Check for stillness

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-13 10:44:49 -03:00
gnembon 388a3de577 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
7b00952653 Added onExplosion Scarpet Event (#620)
* Added onExplosion Scarpet Event

* Reverted changes to Full.md

* Grammar corrections by James103

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>

* Separated Explosion Mixins

Applied Ghoulboy78 suggestion.
WARNING: 'blocks' list is now empty if 'explosionNoBlockDamage' carpet rule is set to 'true'

* List Value from Triple

Suggested by Gnembon

* Explosion Mixin priority

Suggestion by Gnembon

* Added affectedEntities parameter

* Updated docs

* Optimizing calls

* Update src/main/java/carpet/helpers/OptimizedExplosion.java

* Update docs/scarpet/api/Events.md

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

* Update docs/scarpet/api/Events.md

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

* Update src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java

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

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-08 18:05:13 -03:00
gnembon 0cce983092 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon 00f932bafc Can place skulls inside when creativeNoClip. Fixes #775 2021-04-04 18:28:25 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 365892b9ca cleaner 2021-03-24 02:22:21 -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 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
Andrew S 69a0eeed7d Add pingPlayerListLimit setting (#704)
* Update CarpetSettings.java

* Add pingPlayerListLimit

* Fix formatting & fail softer
2021-03-01 22:48:31 -04:00
gnembon d537faae98 restored structureBlockOutlineDistance 2021-02-17 23:36:11 -04:00
gnembon 71a8dcc31e Merge branch 'master' into 1.17 2021-01-26 05:42:20 -04:00
gnembon 40b537501f reverting that merge of mixins since it will cause havoc on the future version branches 2021-01-26 05:32:59 -04:00
e32b37dcf1 Add three Structure Block related settings (#664)
* Added structureBlockOutlineDistance

* Added structureBlockIgnored

* Added structureBlockLimit

* Made structureBlockLimit work on dedicated server

* Correct packet contents check and fix mixin list

* Add limits to structure block settings, slight optimisation to ignored block

* Fixed the `structureBlockLimit` limit

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

Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>

* Fix missing imports and a typo

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

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2021-01-22 23:38:10 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
replaceitem 6bb7eb2ae2 Merge branch 'master' into scoreboard-criterion-mod 2020-12-16 20:40:29 +01:00
replaceitem 055c26d44a added changing criterion to scoreboard_add #624 2020-12-16 20:35:28 +01:00
gnembon e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00
Kevin Delugan 2be4ac8ee0 Added onTrade Scarpet Event 2020-12-11 05:19:06 +01:00
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -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 f306da7cc2 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java
2020-11-06 00:25:36 -04:00
gnembon dcb048c986 that has been fixed already 2020-11-06 00:22:55 -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 9633b402b4 improved handling of fake players in boats and when pushed by slimeblocks. Fixes #507 2020-10-25 01:19:03 -03:00
altrisi 020866c0e9 Change load method to Loader's entrypoints (#497)
* Start moving away from noop mixins

Remove the mixin from the json list

* Change startup method to Loader entrypoints
2020-10-15 22:15:20 -03:00
gnembon fc3ceae767 added chainStone, fixes #495 2020-10-14 04:55:47 -03:00
gnembon f1b1538bcf added datapacks to the profiler 2020-10-09 22:57:27 -03:00
gnembon 32292d4909 renamed PhiPro's classes so it doesn't clashes with their own mods. 2020-09-23 03:34:37 -03:00
gnembon 9ca7892859 added player_picks_up_item and better docs on events. 2020-09-23 03:26:39 -03:00
Andrew S 3429bb4b50 Fix fillupdates (#441)
* Add BlockStateArgument_fillUpdatesMixin

* Create BlockStateArgument_fillUpdatesMixin.java
2020-08-31 17:22:05 -03:00
gnembon dedd6e3c8f removed unloadedEntityFix since its no longer reproducible and causes entity duplications. Fixes #443 2020-08-31 00:29:12 -03:00
gnembon 046d931770 cleanLogs rule 2020-08-25 01:01:51 -03:00
gnembon 3167fe06f3 cleanup unused code and mixins 2020-08-18 01:54:24 -03:00
gnembon 8833d33286 adjusting to 1.16 2020-07-19 02:57:14 -03:00
gnembon 6fad107c6b restored timer on the villager 2020-07-15 15:15:16 -03:00
gnembon f500da08a0 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
2020-07-15 01:21:02 -03:00