Commit Graph
2895 Commits
Author SHA1 Message Date
gnembon 4aab5256aa Merge branch 'master' into future
# Conflicts:
#	docs/scarpet/api/BlocksAndWorldAccess.md
2021-11-30 03:00:05 +01:00
gnembon 16e1b7952e sample_noise keywords and docs 2021-11-30 02:59:08 +01:00
gnembon 74e177d18d renamed query_noise to sample_noise 2021-11-30 02:52:55 +01:00
Crec0 aa57b586cb Multi noise support for scarpet (#1176)
* fix: infinite params bug in AnnotationParser
feat: scarpet function query_noise()

* refactor: remove Method reflection

* fix: use BiomeCoords

* update: game version to 1.18-pre5

* feat: biome lookup from multinoise
fix: noise lookup wrongly scaled

* fix: jagged noise. Thanks, @Starmute

* fix: cave cheese and layer. Thanks, @Starmute

* fix: revert formatting
fix: caveLayer and caveCheese
feat: add terrain support

* more formatting reverts

* fix mapping issue

* use BlockPos

* docs: add documentation for query_noise

* docs: add documentation for biome(noise_map)
2021-11-30 02:47:28 +01:00
gnembon 6c7ac72c3e rc-4 2021-11-30 02:46:12 +01:00
gnembon dc25b617c1 Merge branch 'master' into future 2021-11-30 00:53:25 +01:00
gnembon 7a4c094607 fixes #1186 added carpetCommandPermissionLevel to allow admins to control who has access to /carpet command. 2021-11-29 23:27:54 +01:00
gnembon 6150e1f29c Merge branch 'master' into future 2021-11-29 00:10:47 +01:00
gnembon f5900cffc6 more code, simpler mixin 2021-11-29 00:10:29 +01:00
Crec0 28a5e7acf1 XpNoCooldown and combineXpOrbs refactor (#1149)
* - Fix xpNoCooldown to work as it did in 1.17-
- Remove XPcombine
- Use vanilla merge methods

* Remove debug code

* fix: rollback sort carpet.mixins.json

* rework: nerf xp cooldown absorption a little

* remove: combineXpOrbs
fix: xpCooldown

* revert renames

* fix newlines

* fix: wrong implementation for absorption

* add missing `private` keyword

* fix: player xp cooldown set wrongly

* fix: injection point to be within condition
2021-11-28 23:39:13 +01:00
gnembon 4cea6d3872 Merge branch 'master' into future 2021-11-28 23:34:31 +01:00
gnembon 4af1d66450 docs 2021-11-28 23:33:06 +01:00
gnembon 9b793de377 fix #1188 fix structure eligibility with strongholds 2021-11-28 23:32:24 +01:00
gnembon a990be607f allowed plopping of all sorts of structures regardless of required conditions 2021-11-28 20:23:41 +01:00
gnembon c0b79df6f6 fixes #1115 fixed structure_eligibility to 1.18 2021-11-28 15:47:08 +01:00
gnembon 3312c00ee8 Merge branch 'master' into future 2021-11-27 22:22:38 +01:00
gnembon 339633f1f0 fixes #1103 game will close peacefully when running ticks from scarpet 2021-11-27 21:14:59 +01:00
gnembon 0e1a8f20d4 fixes #1105 maxEntityCollisions will not affect maxEntityCramming setting 2021-11-27 20:58:23 +01:00
gnembon 7bd18a27e4 fixes #1113 boo 2021-11-27 20:29:16 +01:00
gnembon 18c728db2e fixes #1172 lol 2021-11-27 20:11:05 +01:00
gnembon 547ed9b6b9 fixes #1178 Yo 2021-11-27 19:36:44 +01:00
gnembon 0f57bf0bc6 fixes #1187 Ye 2021-11-27 19:09:35 +01:00
gnembon 9750dd9e78 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java
#	src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2021-11-27 18:55:05 +01:00
altrisi d8c10c6e4a Complete removal of /info entity, it's correspondent carpet and two small changes (#1047)
* Remove no longer needed language packet mixin

* Make StringArgument properly return a StringArgument supplier, so `string` isn't `term`

Fixes gnembon/fabric-carpet#1044

* Complete removal of `/info entity` and it's correspondent carpet

Resolves gnembon/fabric-carpet#1033

* Remove yet another no longer needed mixin
2021-11-27 17:43:39 +01:00
gnembon 5daad2d832 rc3 2021-11-27 14:09:52 +01:00
gnembon 2bef83ecfa Merge branch 'master' into future 2021-11-27 11:13:43 +01:00
gnembon 4d9c5eb391 docs 2021-11-25 21:45:53 +01:00
Sean Ferney 6321e1e9b6 Outdated comment, unable to modify NBT (#1183)
You can now modify NBT data with `modify nbt_merge` and `modify nbt`
2021-11-25 21:44:32 +01:00
gnembon 0387b2f75e 1.18-rc1 2021-11-25 21:40:15 +01:00
gnembon deda62aa5f Merge branch 'master' into future 2021-11-23 22:46:34 +01:00
gnembon 2f7433ecb1 fixes #1181 Revert "Optimize explosion BlockState caching (#1156)"
This reverts commit 5005268df4.
2021-11-23 22:46:15 +01:00
gnembon 58bda9cc32 1.18-pre7 2021-11-23 22:11:27 +01:00
gnembon ff44e847c0 Merge branch 'master' into future 2021-11-23 22:03:43 +01:00
Ghoulboy 49dff77ebe Missing semicolon in draw_beta.sc (#1151) 2021-11-22 22:47:32 +01:00
Gnotteroandgnembon 775e923252 Added player abilities actions to the entity API (#1160)
* Added 'mayfly' and 'fly_speed' actions to the modify() function

* Added 'mayfly' and 'fly_speed' actions to the modify() function

* Added a query and a modify action for each of the abilities. Added the  modify action. Modified the docs to include all the new actions and queries

* Fixed an error with mod version

* Saving changes

* Modified the docs and fix an issue with float type variables

* Modified the docs and fixed an issue with float type variables

* Update src/main/java/carpet/script/value/EntityValue.java

* Update gradle.properties

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-11-22 22:46:02 +01:00
gnembon 368229d607 1.18-pre6 2021-11-22 22:27:52 +01:00
gnembon e4356c5fa0 17 2021-11-21 21:24:44 +01:00
gnembon 1a27226c65 17 2021-11-18 18:47:33 +01:00
gnembon 2c47523ae7 Merge branch 'master' into future 2021-11-18 18:47:20 +01:00
gnembon e8f1d85824 16 2021-11-18 18:47:06 +01:00
github-actions[bot] 1cc48b95f1 Merge docs for 'Carpet Mod 1.4.54 for Minecraft 1.18-pre4 and 1.17.1' 2021-11-17 20:05:32 +00:00
gnembon 4cdb1bae28 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/settings/SettingsManager.java
2021-11-17 20:49:05 +01:00
gnembon c5594812d4 1.4.54 2021-11-17 20:48:30 +01:00
gnembon 90964e2e57 1.18-pre4 2021-11-17 20:45:25 +01:00
gnembon 59e0a9ebaf Merge branch 'master' into future 2021-11-17 20:17:04 +01:00
gnembon dc9ba2f83c Merge pull request #1083 from altrisi/more-debugging
Make ErrorSnooper report values for locals in the stacktrace
2021-11-17 20:12:23 +01:00
gnembon f95c4d4688 Merge pull request #1169 from Crec0/patch-1
Fix typo
2021-11-16 21:28:26 +01:00
gnembon ba4edb37b6 Merge pull request #1171 from Fallen-Breath/smart-rule-completion
Smart rule name auto-completion
2021-11-16 21:28:00 +01:00
gnembon f60de2198f 1.18-pre2 2021-11-16 21:11:00 +01:00
gnembon adaf19170d mappings 2021-11-16 21:08:26 +01:00