Commit Graph
831 Commits
Author SHA1 Message Date
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
gnembon cd892f95bc cleaner 2020-12-14 02:36:53 -04:00
gnembon e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00
gnembon fe611145a9 Merge pull request #623 from BisUmTo/onTrade-Scarpet-Event
Added onTrade Scarpet Event
2020-12-12 00:43:14 -04:00
gnembon 5e98fbef66 Update src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java 2020-12-12 00:42:03 -04:00
Kevin Delugan 2be4ac8ee0 Added onTrade Scarpet Event 2020-12-11 05:19:06 +01:00
gnembon 97971322e5 better death messages for fake players and handling idling. Fixes #619 2020-12-11 00:14:11 -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 56313ae74f using more standard approach to what mojang is using. JIT should inline that anyways. not broken, but closes / fixes #604 2020-12-03 22:02:01 -04:00
gnembon 5422493c33 20w49a 2020-12-02 19:22:56 -04:00
gnembon 62ee3a17c9 mappings 2020-11-30 09:38:43 -04:00
gnembon f95838d631 optimizations 2020-11-29 02:50:17 -04:00
gnembon 685c156f1c fixed diagonal light propagations. 2020-11-29 02:31:13 -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 735925b48f we don't need these actually 2020-11-29 01:21:11 -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 4f7ebdd9ff Merge branch 'master' into 1.17 2020-11-28 12:13:07 -04:00
gnembon a099ed79e1 added player_escapes_sleep event. Fixes #579 2020-11-27 00:34:24 -04:00
gnembon 3aee1a7f7f 20w48a 2020-11-25 19:21:56 -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 24e8c00998 Merge branch 'master' into 1.17 2020-11-16 09:43:22 -04:00
altrisiandgnembon ba1071a8d1 Javadocs, cleanup, extension's client rules, built-in BundledModules generators, etc (#544)
* Add javadocs to many methods

* Added built-in ways to generate BundledModules and documented them

* Add Eclipse launch files to .gitignore and fix 11 warnings

* Remove many unused imports

* Remove some dead and unused code around app loading

* Allow extensions to have client-side rules in their SettingsManager

Also change tabs to spaces when those changed

* Remove unnecessary classloader param in BundledModule

* Change max tickwarp duration to Integer.MAX_VALUE

* Move RulePrinter into the source so it can be managed by the IDE

* Properly reset hopperCounters when changing worlds

Also change tabs to spaces again and minor tweaks to javadocs

* Run mergedocs even if Full.md was modified

* Update src/main/java/carpet/commands/TickCommand.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2020-11-16 09:30:59 -04:00
gnembon ecca8d44f1 temp fix 2020-11-15 23:10:12 -04:00
gnembon 6c8defae91 fixes to entity selection in scripts and xp no cooldown 2020-11-15 01:55:40 -04:00
gnembon 21700e8d7e 20w46a 2020-11-11 16:18:27 -04:00
gnembon 735bc58772 fix update 2020-11-11 02:12:29 -04:00
gnembon be3cb35f75 Merge branch 'master' into 1.17 2020-11-11 02:08:05 -04:00
gnembon ddba688f59 remove updates when removing blocks, fixes #533 2020-11-09 09:43:15 -04:00
gnembon d48896ad8b mappings. More colors and materials 2020-11-06 23:10:43 -04:00