Commit Graph
280 Commits
Author SHA1 Message Date
gnembon 812d361af2 22w14a 2022-04-06 22:16:05 +02:00
altrisi 330fd6f466 Make desertShrubs check for waterlogged blocks instead of just water blocks (#1388) 2022-04-03 13:06:29 +02:00
gnembon ef3e71b9b6 22w13a 2022-03-31 20:23:49 +02:00
gnembon f4bccfb594 fix 2022-03-18 16:45:47 +01:00
gnembon 7003ea8cf0 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2022-03-18 16:42:44 +01:00
gnembon 6ed33ecc50 structures save to world, fixes #1346, attempt to fix biome and dimension recreation, but the other ones need more testing. 2022-03-18 16:41:21 +01:00
gnembon 193cf3777f fixes for 22w11a 2022-03-17 23:57:42 +01:00
gnembon 302a7b4817 fixes for 22w11a 2022-03-17 20:21:55 +01:00
gnembon d24f711e27 1.18.2-pre3 2022-02-23 22:15:48 +01:00
altrisi b1c934da28 Fix a few IDE warnings (#1345) 2022-02-20 19:16:12 +01:00
gnembon c01ad9ce9d 1.18.2-pre 2022-02-20 01:50:46 +01:00
gnembon fa1e6ce086 22w07a
- disabled "sample_noise"
2022-02-16 22:23:52 +01:00
gnembon 212814f46d 22w06a 2022-02-10 03:15:53 +01:00
gnembon ac7da0c2ca 22w05a 2022-02-02 19:55:54 +01:00
altrisi 06af9ce8b1 Migrate the Carpet codebase to Mojang Mappings 2022-01-24 20:33:16 +01:00
gnembon 6150e1f29c Merge branch 'master' into future 2021-11-29 00:10:47 +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 c0b79df6f6 fixes #1115 fixed structure_eligibility to 1.18 2021-11-28 15:47:08 +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 adaf19170d mappings 2021-11-16 21:08:26 +01:00
gnembon ab989155ad Merge branch 'master' into future 2021-11-16 20:11:49 +01:00
intricate 5005268df4 Optimize explosion BlockState caching (#1156)
optimize caching for explosions
2021-11-13 22:08:03 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01: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
gnembon cfaf596c29 update mappings and 21w40a, apparently. 2021-10-12 23:54:25 -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 f517b8d4b0 Merge branch 'master' into future 2021-09-18 09:36:26 -03:00
gnembon 18c3dc13fe fixed plop not plopping unconfigured features. 2021-09-18 09:36:06 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
altrisi 7fb5e47da5 Use newer Java features in places where it makes sense and more (#1009) 2021-08-03 07:32:40 -03:00
altrisi 7ebc990ef6 Use pattern matching for instanceof (#1019) 2021-07-21 22:24:24 -03:00
gnembon 4dd3cc7fd6 mappings 2021-07-14 00:57:37 -03:00
gnembon 9a4e15da48 mappings 2021-06-29 17:28:58 -03:00
gnembon 241537b172 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-22 01:28:32 -03:00
gnembon 28374b977b interrupting of unexising warp will message. Fixes #944 2021-06-22 01:05:13 -03:00
gnembon 0937ba8352 1.17.1-pre1 2021-06-18 23:43:47 -03:00
gnembon f64cf67e41 1.17-pre1 2021-05-27 15:01:07 -03:00
gnembon b96a1b1216 Merge branch 'master' into 1.17 2021-05-25 17:25:55 -03:00
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
gnembon 866f1f1497 moved downloader 2021-05-19 20:46:19 -03:00
Ghoulboy 5f16ffd933 Adding /script download (#826)
This reverts commit e98adb77a52d1e274ec320e0cafab34b24c1c738.

* First attempt at creating download system...

* Last try, I had uncommitted changes which I forgot to add.

If it fails now i swear imma delete my fork of fabric carpet.

* OK, this is the last chance. I have checked and double checked, this should not fail.

Todo make them more detailed, Im not the best person to do that tbh...

* Towards a suggestion builder

(Also committing stuff in ScriptDownloader incase it crashes)

* Finished first theoretically functional draft of suggestion builder

* improving suggestion building with actual github api

* Collapsing identical error messages

* Got suggestions to work!

Now gotta get the actual file to save to disk properly

* replacing whitespace with url whitespace to make it read form 'creativ building tools' etc

* Successfully downloaded script into folder location!

* only clients can access global scripts folder, so don't want to cause error message

* Compacting code and updating docs

* Fixed getting folders from file names
2021-05-19 17:30:39 -03:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
gnembon f67d50d3d3 Merge branch 'master' into 1.17 2021-05-17 22:23:16 -03:00
gnembon 7380580a3e fixes #864 2021-05-17 22:20:32 -03:00
Ghoulboyandgnembon 7536edc2b9 Adding Javadocs to CounterCommand.java and relevant files (#838)
* adding class javadoc

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-05-17 19:32:57 -03:00
gnembon fb40120460 cluenap 2021-05-13 02:00:05 -03:00