Commit Graph
862 Commits
Author SHA1 Message Date
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
gnembon 1d4f105174 shapes would render much better without shaders 2021-02-08 15:42:00 -04:00
gnembon 50eae09c17 21w05a 2021-02-03 20:15:45 -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
ramidzkh 566d2a7bca Use WorldRenderEvents if available (#680)
* Use WorldRenderEvents if available

Fixes an issue when Canvas is installed

* Improve code

* Depend only on fabric-rendering-v1

* Use fabricApi.module
2021-01-26 01:19:44 -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
hqics eb334013ee make sure the index is within bounds 2021-01-21 17:30:44 +01:00
gnembon 6305fcab65 21w03a 2021-01-20 19:13:44 -04:00
gnembon b14cf288a1 mappings 2021-01-15 04:51:06 -04:00
gnembon 95bac227a0 Merge branch 'master' into 1.17 2021-01-13 21:36:05 -04:00
Andrew S df20f9e4e4 Add the lightEngineMaxBatchSize rule (#654)
* Apply light batch sizes after start region has been created

* Add light batch rules
2021-01-13 21:07:42 -04:00
gnembon 0453dc33a0 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
2021-01-13 18:19:51 -04:00
Mitchell Skaggs 0f90328e53 Modify mixin signature to match 1.16 signature 2021-01-12 03:27:08 -06:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
gnembon eac4eb0537 Merge pull request #634 from altrisi/freeze-schedules
❄️ Freezing Scarpet ❄️
2021-01-07 00:00:48 -04:00
altrisi 706d632956 Also freeze shapes 2021-01-03 23:55:47 +01:00
altrisi 6d3ac93e4c Use setters and getters for frozen state, separate superHot and
don't tick regular tick events
2020-12-29 16:00:07 +01:00
gnembon a0507400ee Merge pull request #631 from replaceitem/scoreboard-criterion-mod
Added ability to change criterion with scoreboard_add Fixes #624
2020-12-29 00:01:58 -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 941b7d4836 Merge branch 'master' into 1.17 2020-12-20 19:27:04 -04:00
altrisi 33347baaf7 Freezing Scarpet
And the client
2020-12-21 00:14:20 +01:00
gnembon f54ab746fe player swinging events. 2020-12-20 18:34:43 -04:00
gnembon 32d0ba9694 20w51a 2020-12-16 19:06:09 -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 00ad9eccc7 mappings 2020-12-14 02:51:01 -04:00
gnembon 50a0e4b886 Merge branch 'master' into 1.17 2020-12-14 02:37:48 -04:00