Commit Graph
259 Commits
Author SHA1 Message Date
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
gnembon 65447f09ad Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2021-05-13 01:52:08 -03:00
gnembon 495a22ca0c fix concurrentModifications from Java 16 2021-05-13 01:50:29 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 9a6b598e48 taste the rainbow 2021-04-15 14:59:12 -03:00
gnembon 0dd88cd1dc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon 14263203c5 taste the rainbow 2021-04-15 14:47:58 -03:00
gnembon d6d3167bcf hopper counters pretty 2021-04-15 03:06:32 -03:00
b7252a3465 Fixing small issues (#717)
* adding unix_time and convert_dat eto editor autocomplete

I never used it, and only realised rn when I needed it.

* updating npp docs too

* Fixes #690

Fixes #690

* Fixes #687

Fixes #687

* fixes #672

* adding comma to make it look gooder

* Update src/main/java/carpet/helpers/HopperCounter.java

* using alias to shorten code

* compacting wool code

* Fixing minor todos

* removing hit/hand garbage

* removing scoreboards garbage

* making sure I dont edit file accidentally

* fixing borken code and problem with pink and magenta showing same colour

* Change name of mod to, you know, actually be the name of the mod

* Reverting previous change because it is more descriptive of the actual mod

* Update src/main/java/carpet/script/api/WorldAccess.java

Co-authored-by: Ghoulboy78 <ghoulboy78@gmail.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-14 22:47:14 -03:00
gnembon ffcc269f3a Merge branch 'master' into 1.17 2021-04-10 15:09:14 -03:00
gnembon cd9a5b96c2 fix superhot not working on singleplayer when riding stuffs 2021-04-10 14:53:48 -03:00
gnembon 388a3de577 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -03:00
7b00952653 Added onExplosion Scarpet Event (#620)
* Added onExplosion Scarpet Event

* Reverted changes to Full.md

* Grammar corrections by James103

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>

* Separated Explosion Mixins

Applied Ghoulboy78 suggestion.
WARNING: 'blocks' list is now empty if 'explosionNoBlockDamage' carpet rule is set to 'true'

* List Value from Triple

Suggested by Gnembon

* Explosion Mixin priority

Suggestion by Gnembon

* Added affectedEntities parameter

* Updated docs

* Optimizing calls

* Update src/main/java/carpet/helpers/OptimizedExplosion.java

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-08 18:05:13 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 42f78a596a 20w10a
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon 170fd9d762 mappings 2021-03-09 20:06:29 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00