Commit Graph
161 Commits
Author SHA1 Message Date
gnembon 1650f3233b imports and better error reporting and stacktraces 2020-01-05 02:24:48 -04:00
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -04:00
gnembon 431080eea9 Merge branch 'master' into 1.15 2019-12-01 01:05:27 -04:00
gnembon b52b5c335f ops options for commands 2019-12-01 01:04:58 -04:00
gnembon bd5bd12e2a Merge branch 'master' into 1.15 2019-11-29 10:34:36 -04:00
gnembon afd7952a62 refactor entity events. Allow multiple hosts have events on things 2019-11-29 10:34:13 -04:00
gnembon 909b183bda Merge branch 'master' into 1.15 2019-11-19 01:32:15 -04:00
gnembon 9e529fe967 Separate ScriptHost from CarpetScriptHost 2019-11-19 01:31:56 -04:00
gnembon a3715f08a4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-24 00:53:40 -03:00
gnembon 835f63755d -> now returns function name. 2019-10-24 00:20:29 -03:00
gnembon 813cb2ab93 Merge branch 'master' into 1.15 2019-10-19 22:18:14 -03:00
gnembon 0226965ba0 fixed scarpet error msgs 2019-10-19 22:17:41 -03:00
gnembon 2bb9c8c145 Merge branch 'master' into 1.15 2019-10-15 09:38:35 -03:00
gnembon 6524725245 fixes to scarpet 1.5 2019-10-15 09:37:50 -03:00
gnembon dc9532cf05 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-08 02:07:45 -03:00
gnembon 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon 23c3dc58a5 Merge branch 'master' into 1.15 2019-09-27 11:16:57 -05:00
gnembon 2f83cb3100 added option to display rules from category 2019-09-27 11:00:51 -05:00
gnembon 49f66a61ce Merge branch 'master' into 1.15 2019-09-21 17:03:36 -03:00
gnembon 70a2c57d20 better wording 2019-09-21 17:02:51 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon be82935455 Merge branch 'master' into 1.15 2019-09-17 14:22:03 -03:00
gnembon b89bb3e503 added rule autoloadScripts to load scripts at startup. 2019-09-17 14:21:36 -03:00
gnembon 179bc21223 115 changes 2019-08-23 06:58:32 +02:00
gnembon 8a01ebea41 profiler remembers requestee, and better rounding in scarpet 2019-08-23 06:04:13 +02:00
gnembon 8e369c2549 fix harvest 2019-07-21 16:55:30 -03:00
gnembon 34bfe2e996 host tweaks 2019-07-20 19:05:11 -03:00
gnembon 3c96345a60 tracking and tracing 2019-07-20 18:53:17 -03:00
gnembon 239e7006a5 reworked script host, working on nbttags 2019-07-19 09:45:15 -03:00
gnembon 50d1d74579 player actions 2019-07-17 03:58:16 -03:00
gnembon 99229280c2 player modules 2019-07-15 08:50:27 -03:00
gnembon 95d556a978 rule management and extensibility 2019-07-04 01:54:13 -03:00
gnembon cd4ae14448 1.14.4pre1 2019-07-03 16:38:12 -03:00
gnembon 5bb813be76 cleanup 2019-06-29 20:39:41 -03:00
gnembon e6158c1aab code suggestions 2019-06-29 03:05:17 -03:00
gnembon 022f84b469 lazy rule fetching 2019-06-28 23:30:25 -03:00
gnembon 9bbaaccb3e freekin egyptian braces 2019-06-12 01:03:34 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon f05c661fbf categories not an enum, so its easier to extend. Validators can modify value. 2019-06-11 12:27:26 -03:00
gnembon 92f40c36b8 settings system 2019-06-11 02:08:50 -03:00
gnembon f3da8b2576 updated to 1.14.3 pre 2, still issues with fabric spawn tracking mappings 2019-06-07 11:51:11 -03:00
gnembon 730446b219 schedules and events from jarmod 2019-06-02 01:54:22 -03:00
gnembon 7800daacb8 added command source to rule validators and added WIP tag 2019-05-24 22:27:35 -03:00
gnembon 78739b3a2c consistency 2019-05-19 09:47:55 -03:00
gnembon 7737631774 fixed messages 2019-05-19 02:16:16 -03:00
gnembon 5ca22d94e2 spawn tracking 2019-05-19 02:01:27 -03:00
gnembon b879ca2cf4 fill stuff 2019-05-18 15:08:35 -03:00
gnembon 03b78b52c1 tick complete 2019-05-17 23:58:33 -03:00