Commit Graph
129 Commits
Author SHA1 Message Date
gnembon ac9fcd9ece Merge branch 'master' into light 2020-06-12 00:12:06 -03:00
gnembon 9aa580cfa5 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-10 01:36:11 -03:00
gnembon 73cb9d6968 added hunger, saturation, and exhaustion entity API calls. 2020-06-07 18:53:17 -03:00
GhoulboyandGhoulboy78 d9ed35676f Added hunger, saturation and exhaustion modification and querying (#286)
* Added hunger querying and modification

* Cleaning up old code

* forgot semicolon

* Added saturation querying and modification and exhaustion modification

working on exhaustion querying

* added if statements

to avoid crash

* more if statements

* o ye boi!

Co-authored-by: Ghoulboy78 <53367549+Ghoulboy-78@users.noreply.github.com>
2020-06-07 17:57:04 -03:00
gnembon 0b22359f8c mappings 2020-05-31 03:18:40 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon e540f9e238 carpet client synchronizations and protocols 2020-05-28 00:06:28 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00
gnembon dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon b16991d84b mapping updates 2020-05-04 00:09:22 -03:00
gnembon 460a78f866 spawn_potential 2020-04-30 19:25:59 -03:00
gnembon 95a7420e7d Merge branch 'master' into 1.16 2020-04-29 11:41:10 -03:00
gnembon 1e9a8726be tweaks to entity API code 2020-04-29 11:32:42 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon c0d8f1e5a1 Merge branch 'master' into 1.16 2020-04-22 01:46:31 -03:00
gnembon 24787e8e56 renaming getTicketManager to de-conflict with other mods 2020-04-22 01:26:06 -03:00
gnembon d56706b133 fixes #234 2020-04-21 03:03:28 -03:00
gnembon 9b9750280c fixes for 1.16 2020-04-13 01:18:39 -03:00
gnembon 7ebc96106b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
2020-04-13 01:08:06 -03:00
gnembon 2a1d5542f1 just to change from disabling spawn chunks to control over its size. Removes disableSpawnChunks, adds spawnChunksSize. Fixes #192 2020-04-13 00:59:55 -03:00
gnembon 646be6298e trying to flush the toileight 2020-04-04 01:32:46 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon 419b739d5e Merge branch 'master' into 1.16 2020-03-28 22:03:58 -03:00
gnembon 9806af6ff9 reset chunks allow to refresh chunk client side + report. 2020-03-27 01:39:59 -03:00
gnembon 1fcd8ceffa mappings 2020-03-18 02:34:03 -03:00
gnembon f43bd968bb still causes massive loadage if requested more than 2 chunks. Don't really know why. WIP I guess 2020-02-29 00:00:53 -04:00
gnembon b2e5053c6b reset multiple chunks WvmIP 2020-02-27 17:00:21 -04:00
gnembon 7af08306e4 reset_chunk 2020-02-26 02:52:12 -04:00
gnembon 9601ab9973 regenerate WIP 2020-02-25 09:41:02 -04:00
gnembon ee4a073a57 added ability set unmountable entities 2020-02-10 01:52:08 -04:00
gnembon 145bcf1b3c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/mixins/StructureFeatureMixin.java
2020-01-21 01:43:53 -04:00
gnembon 50d30aafb2 structure_set and unification with scarpet naming conventions 2020-01-21 01:39:23 -04:00
gnembon c995716357 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
2020-01-06 21:28:07 -04:00
gnembon 6ac249968a remove a few warnings 2020-01-06 21:26:44 -04:00
gnembon 8022d88d28 WOOL 2019-12-28 18:00:28 -04:00
gnembon 762ddacdbd Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/resources/carpet.mixins.json
2019-12-28 17:58:13 -04:00
gnembon b2a72dbcd8 WOOL 2019-12-28 17:57:52 -04:00
gnembon e9e36f64a3 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/resources/carpet.mixins.json
2019-12-27 11:26:49 -04:00
gnembon d7ca974f1a statistics, block placed and interacted events, stats event test 2019-12-27 03:25:56 -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 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon 24d4159f9f Merge branch 'dummy_enchants' into 1.15 2019-11-07 07:58:32 -04:00
gnembon fa3b119857 Merge branch 'master' into 1.15 2019-10-30 01:24:20 -03:00
gnembon 5bb959a853 falling blocks can also tick 2019-10-30 01:23:52 -03:00
gnembon f41ae0f00e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-23 08:58:57 -03:00