Commit Graph
196 Commits
Author SHA1 Message Date
gnembon 0dd88cd1dc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon d6d3167bcf hopper counters pretty 2021-04-15 03:06:32 -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 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 f0d044a49f added scarpet to the carpet profiler 2021-04-04 22:32:34 -03:00
gnembon 51a548991d reword to properly reflect what up. fixes #761 2021-04-04 20:56:50 -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 ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00
gnembon 42f78a596a 20w10a
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon 9fb43b6095 mappings 2021-03-02 08:52:32 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
gnembon 84797bef0e restrict player placement to buildable area. 2021-02-25 21:59:36 -04:00
gnembon 71a8dcc31e Merge branch 'master' into 1.17 2021-01-26 05:42:20 -04:00
gnembon 58b6974369 fixing so that the player option in /log is accessible. 2021-01-26 04:25:57 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04: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
altrisi 33347baaf7 Freezing Scarpet
And the client
2020-12-21 00:14:20 +01:00
gnembon b2bde4b836 Merge branch 'master' into 1.17 2020-12-04 00:39:18 -04:00
gnembon 4b0fd8296c player selects hotbar slot, fixes #557 2020-12-03 22:40:16 -04:00
gnembon 0bacbcc2f5 Merge branch 'master' into 1.17 2020-12-02 13:23:32 -04:00
gnembon d29f49967f rework of the event system, allowing apps to function more independently and allowing for player scoped apps to handle global events. fixes #596 2020-12-02 01:02:36 -04:00
gnembon 253604b34a Merge branch 'master' into 1.17 2020-11-25 02:12:41 -04:00
gnembon 209c3b9262 fixed issues with reload and missing command handler 2020-11-24 22:52:05 -04:00
gnembon c8d3f01f78 Merge branch 'master' into 1.17 2020-11-23 02:40:16 -04:00
gnembon a297fd1441 Scarpet rules can provide multinary boolean permission level, fixes #572 2020-11-23 02:35:01 -04:00
gnembon 091a4deadc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/value/ValueConversions.java
2020-11-22 21:59:57 -04:00
gnembon 190d17d1fe fixes NPE when summoning a player with a banned account. 2020-11-22 21:47:32 -04:00
gnembon ede1872803 Merge branch 'master' into 1.17 2020-11-16 21:35:21 -04:00
gnembon b00b5772c9 player doesn't attack in continuous and fixed event suggestions fixes #552. 2020-11-16 20:02:47 -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 be3cb35f75 Merge branch 'master' into 1.17 2020-11-11 02:08:05 -04:00
gnembon 55643632ca custom events, and low level event API 2020-11-11 02:06:45 -04:00
gnembon a40b8ff0cc fixed player use timings 2020-11-09 20:39:45 -04:00
gnembon 2cdea92da7 20w45a 2020-11-06 00:06:53 -04:00
altrisi b9eee6e58b Allow rules to manage Scarpet apps (Scarpet Rules) (#519)
by altrisi
2020-11-02 21:52:21 -04:00
gnembon 1d81768c54 custom args WIP 2020-11-02 01:32:04 -04:00
gnembon 7ccd46433a entity load handler and rework of handling of events. 2020-10-30 22:59:27 -03:00
gnembon 8a2ddcbf2a 1.4.12 2020-10-01 14:14:01 -03:00
gnembon 3105d5bb71 Events are defined statically in normal classes and added handler for extensions to add their built-ins 2020-09-08 23:47:31 -03:00
gnembon 1006e0ac40 commands return integer value if possible, fixes #408
handle infinite values as infinities.
2020-09-05 02:06:59 -03:00
gnembon 3167fe06f3 cleanup unused code and mixins 2020-08-18 01:54:24 -03:00
gnembon eaded1450d apps when loaded while being loaded are now properly reloaded 2020-08-15 02:32:32 -03:00
gnembon 7b4c3f8add Merge branch 'master' into 1.16 2020-07-21 12:45:07 -03:00
gnembon 5ed55ecf9e spawned test entity below bedrock 2020-07-21 12:44:07 -03:00
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -03:00
gnembon bba9f4e88d Merge branch 'master' into 1.16 2020-07-08 00:48:56 -03:00