Commit Graph
689 Commits
Author SHA1 Message Date
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 37a6913e72 mark off unnecessary iface 2021-04-10 02:19:24 -03:00
gnembon ba38080208 Merge branch 'master' into 1.17 2021-04-09 01:44:08 -03:00
gnembon c264011646 cleanup 2021-04-09 01:43:54 -03:00
gnembon 93c989e2b6 added create_explosion and more event handlers. 2021-04-09 01:42:57 -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
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -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 75a823f994 mapping 2021-04-07 19:05:45 -03:00
gnembon 9b9251190b Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-04-06 00:44:16 -03:00
gnembon 647a3a15b6 profiler rework 2021-04-06 00:41:12 -03:00
gnembon b96ef34e31 merge fix 2021-04-04 22:36:04 -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 da2873de52 Merge branch 'master' into 1.17 2021-04-03 20:31:35 -03:00
gnembon 5c7bbc19ad optional mixins to provide better compatibility. fixes #788 2021-04-03 13:17:34 -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 b49b99aea6 21w11a mappings 2021-03-31 19:20:44 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 365892b9ca cleaner 2021-03-24 02:22:21 -03:00
gnembon 4616bf4333 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java
2021-03-21 02:35:43 -03:00
gnembon f8208c8334 fixed commands disappearing when using datapack command or create_datapack 2021-03-18 18:54:15 -03:00
gnembon 7d135187b1 fixed shapes for 1.17 rendringo 2021-03-18 00:37:05 -03:00
gnembon 0b93101248 mapping 2021-03-17 10:42:31 -03:00
gnembon 7e0ba198e3 Merge branch 'master' into 1.17 2021-03-16 15:32:41 -03:00
gnembon 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00
altrisi a3acaed466 Make command stacktrace mixin not required 2021-03-15 20:41:56 +01:00
gnembon 42f78a596a 20w10a
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon 170fd9d762 mappings 2021-03-09 20:06:29 -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 38458a8e35 added create_datapack, check_hidden_dimensions and world_dimensions in system info. 2021-03-07 16:37:13 -04:00
gnembon 3f16c45a69 mappings 2021-03-02 09:08:16 -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 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 3505138351 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
2021-02-24 20:41:06 -04:00
gnembon 7029c6b9b9 Merge pull request #722 from fxmorin/master
Added Rule `lightningKillsDrops`
2021-02-18 22:17:37 -04:00
gnembon fd84a5a6d0 making sure custom structure limits are always working. 2021-02-18 22:14:50 -04:00
FX 680916880e Added Rule lightningKillsDrops
Which fixes [MC-206922](https://bugs.mojang.com/browse/MC-206922)
2021-02-18 21:12:06 -05:00
gnembon d537faae98 restored structureBlockOutlineDistance 2021-02-17 23:36:11 -04:00
gnembon 6d320866e6 21w07a 2021-02-17 20:17:01 -04:00
gnembon 695d66da50 mapping 2021-02-17 13:18:57 -04:00
gnembon af5aae24cb Merge branch 'master' into 1.17 2021-02-17 12:56:17 -04:00
gnembon df7a4a6681 applying altrisi's observations. 2021-02-17 03:09:41 -04:00
gnembon 5b1ef77009 only when necessary really 2021-02-16 11:08:54 -04:00
gnembon 6a43ee25c7 fixes #712 2021-02-16 11:03:05 -04:00
gnembon ef4dc62f1f 21w06a 2021-02-10 23:29:42 -04:00
gnembon 257aca4254 mappings 2021-02-09 00:16:07 -04:00
gnembon 6108cdce23 Merge branch 'master' into 1.17 2021-02-08 23:54:23 -04:00