Commit Graph
862 Commits
Author SHA1 Message Date
gnembon 529a5b358d Merge branch 'master' into future
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/annotation/AnnotationParser.java
#	src/main/java/carpet/script/utils/BiomeInfo.java
#	src/main/resources/fabric.mod.json
2022-01-11 23:44:52 +01:00
altrisi 212b6a792e Remove a few no longer needed mixins (#1243) 2022-01-08 23:18:13 +01:00
Starmute e4426f3a3c fix typo 2021-12-16 14:55:45 -05:00
Starmute 6c1a2e7d0e Fix caveEntrance noise being scaled incorrectly (please check) 2021-12-16 14:34:29 -05:00
gnembon 5a55666f94 Merge branch 'master' into future 2021-12-11 22:30:54 +01:00
gnembon 4a1a710eb0 why not, may affect #1195, but I doubt 2021-12-06 01:20:21 +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 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 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 3312c00ee8 Merge branch 'master' into future 2021-11-27 22:22:38 +01:00
gnembon 0e1a8f20d4 fixes #1105 maxEntityCollisions will not affect maxEntityCramming setting 2021-11-27 20:58:23 +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 368229d607 1.18-pre6 2021-11-22 22:27:52 +01:00
gnembon e4356c5fa0 17 2021-11-21 21:24:44 +01:00
gnembon 90964e2e57 1.18-pre4 2021-11-17 20:45:25 +01:00
gnembon adaf19170d mappings 2021-11-16 21:08:26 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01:00
gnembon 1642976d0d 21w44a 2021-11-04 00:34:40 +01:00
gnembon 679c20d78e 21w43a 2021-10-28 00:04:54 -03:00
gnembon f19b314b78 Merge branch 'master' into future 2021-10-21 08:44:52 -03:00
Fallen_Breath 8fa10a1c67 Fixed player ticking issue caused by rule updateSuppressionCrashFix (#1137)
* Fixed player ticking issue caused by #1133

* use abstract class for ServerPlayerEntity_updateSuppressionCrashFixMixin
2021-10-21 08:40:27 -03:00
gnembon 31a6bd21df Merge branch 'master' into future 2021-10-20 23:24:52 -03:00
Fx Morin 0714098347 Ported rule updateSuppressionCrashFix from Carpet-Extra + More (#1133)
* Posted rule `updateSuppressionCrashFix` from Carpet-Extra
Also added catch for update suppression in neighbour update during ServerPlayerEntity tick.
Added Logger `updateSuppressedCrashes` so not everyone sees the crash messages
Added Coords to crash message so we now know where it originates from

* Make it easier to read

* that `s` has been there for a long time

* Made `updateSuppressionCrashFix` compatible with carpet-extra
2021-10-20 23:08:23 -03:00
altrisi 506457d878 Fix Stack Overflow in dev environment with mojmap (#1134) 2021-10-20 23:06:19 -03:00
gnembon 074fd910cf 21w42a 2021-10-20 23:05:27 -03:00
gnembon 0f4c418a0e just mappings 2021-10-20 22:44:46 -03:00
gnembon 322f9124b5 Merge branch 'master' into future 2021-10-13 19:10:50 -03:00
Fallen_Breath aa32411484 Added missing @Mutable @Final annotations (#1129)
Fixed #1101
2021-10-13 16:09:12 -03:00
gnembon cfaf596c29 update mappings and 21w40a, apparently. 2021-10-12 23:54:25 -03:00
gnembon 6a03675b4f Merge branch 'master' into future 2021-10-12 23:24:41 -03:00
gnembon f9207a1b4b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-10-12 22:57:55 -03:00
gnembon 5b80c845c6 added liquidDamageDisabled inspired by TIS additions and ported by permission by Fallen Breath 2021-10-12 22:57:47 -03:00
altrisi 7486670918 Report stack traces through the logger (#1050) 2021-10-11 03:37:30 -03:00
gnembon e849cdf6c1 21w38a 2021-09-24 09:29:13 -03:00
gnembon 7b9e5e6feb mappings 2021-09-22 21:12:11 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
gnembon 70754dbfe8 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-09-17 03:15:30 -03:00
gnembon 86d89aab20 added death messages control to cleanLogs (require showDeathMessages to be false as well). Fixes #1095 2021-09-08 21:13:17 -03:00
gnembon 7e67966fd2 Merge branch 'master' into future 2021-08-25 15:19:30 -03:00
gnembon 6222c97375 fixed unknown recipe types. Fixes #1068 2021-08-19 09:43:00 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
gnembon 16f3832d16 Fixes inventory behaviour with stackable empty shulker boxes. fixes #1048 2021-08-08 23:08:14 -03:00
Mitchell Skaggs 28cb136c6b Max collisions optimization (#1038)
* Lift entity limit up to the `getOtherEntities` method so it bails early

This has the potential to prevent a lot of bounding box computation

* Clean up decompiled code

* Fix raw generic types

This doesn't alter the signature, but it helps the compiler warn about misuse of the type later on

* Actually abort forEach when `limit` entities have been checked

`throw`ing a known exception is the easiest way to `break` out of a forEach call
2021-08-03 07:20:09 -03:00
HED-GITandgnembon 56a15fb384 added more customizability to renewableCoral (#1022)
* added more customizability to renewableCoral

* changed renewableCoral to use enums instead of strings

* added suggested changes to renewablecoralmode

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-07-29 23:48:04 -03:00
altrisi 2a391962ff Remove no longer needed Mixins (#1030) 2021-07-26 09:20:01 -03:00
gnembon 19ad8cfbf3 Mixin mixup, borken profiler sections. Fixes #1027 2021-07-24 22:40:33 -03:00