Commit graph

32 commits

Author SHA1 Message Date
modmuss
6c0945c34f
Update Fabric Loader and re-enable server test (#4056) 2024-08-29 17:55:03 +01:00
apple502j
2cd4845256
24w35a (#4062) 2024-08-29 17:54:21 +01:00
Fabric Bot
024d2dbc91 Translation updates (#4027)
* New translations en_us.json (Korean)

* New translations en_us.json (Japanese)

* New translations en_us.json (German)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (Italian)

(cherry picked from commit 9b16164179)
2024-08-26 12:04:49 +01:00
apple502j
01f3a03986
24w34a porting fixes (#4054)
* Fix elytra events not working

* Add note on paused dedicated server

* Add note on thrown tridents in `CustomDamageHandler`

Thrown tridents are handled in a different method to ensure they do not break after
successful use (you cannot throw tridents that are almost broken). To make the API simple
(as you cannot use this with vanilla items anyway), exclude them from coverage.

* Fix javadoc in VillagerInteractionRegistries

* Fix javadoc
2024-08-26 12:02:31 +01:00
modmuss
1bb677a646 Port to 24w33a (#4033)
Some checks failed
Build / build (21-ubuntu) (push) Has been cancelled
Build / client_test (push) Has been cancelled
Build / server_test (push) Has been cancelled
Build / check_resources (push) Has been cancelled
Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
Co-authored-by: hypherionmc <hypherionmc@gmail.com>
(cherry picked from commit 952fb19a0df7354e8352ef0c993a956b2bed32c2)
2024-08-18 19:16:27 +01:00
Fabric Bot
605f22add7
New Crowdin updates (#4003)
* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (German)

* New translations en_us.json (Italian)
2024-08-11 14:52:51 +01:00
Juuz
fc91317048
Add crop and nugget tags (#4008)
* Add #c:nuggets/iron and #c:nuggets/gold

Closes #4005.

* Add crop item tags

Everything but c:crops/cocoa_bean is already in NeoForge.

* Add more crop tags and documentation for #c:crops
2024-08-11 14:52:25 +01:00
TelepathicGrunt
a1f763fa52
Add chorus fruit to c:foods/fruit tag (#4021)
* Add an API to add additional supported blocks to block entity types. (#4009)

(cherry picked from commit 40875a9333)

* Bump version

* Add chorus fruit to 1c:foods/fruit` tag

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
2024-08-11 14:51:42 +01:00
TelepathicGrunt
c5e2b5c62d
Add c:slime_balls tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags (#3957)
* Add slimeball tag

closes https://github.com/FabricMC/fabric/issues/3946

* Add sparse jungle to sparse tag

* add all melee weapons to melee tag

closes https://github.com/FabricMC/fabric/issues/3949

* fixed name of attribute

* Add c:fertilizers tag

closes https://github.com/FabricMC/fabric/issues/3956

* adjust ranged tag javadoc

* Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java

Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java

Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>

* rename slime ball to match translation name

* Add missing is cold biomes (less than 0.5 temperature)

* Move melon to fruits tag and remove glistering melon from golden tag

* Fixed fertilizers javadoc

* Undo melee tag change

* Put slimeballs tag back to no space

* Revert "Put slimeballs tag back to no space"

This reverts commit 2ca4b25917.

---------

Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>
2024-08-04 13:52:29 +01:00
Fabric Bot
56599129b7
Translation updates (#3944)
* New translations en_us.json (Russian)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (German)

* New translations en_us.json (Chinese Traditional)

* New translations en_us.json (Russian)
2024-08-04 13:52:17 +01:00
Fabric Bot
c111832abb
New Crowdin updates (#3928)
* New translations en_us.json (Russian)

* New translations en_us.json (Italian)
2024-07-14 15:02:09 +01:00
haykam821
8cfd8554f6
Add tests for convention tag keys matching field names (#3925)
* Add tests for convention tag keys matching field names

* Review feedback

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2024-07-14 15:01:31 +01:00
TelepathicGrunt
86024ea6d6
Fixed raw fish tag typo in name (#3921) 2024-07-07 15:30:38 +01:00
Fabric Bot
ee0ac32550
New translations en_us.json (Japanese) (#3892) 2024-07-07 14:05:55 +01:00
TelepathicGrunt
fb44a039c4
Several tag fixes and additions (#3912)
* Make food files not plural when inside `foods` folder

* Add flint and steel tool

closes https://github.com/FabricMC/fabric/issues/3895

* Add ender pearl tag and glass block/pane variant tags

Closes https://github.com/FabricMC/fabric/issues/3869

* Add golden food tag

closes https://github.com/FabricMC/fabric/issues/3899

* remove deprecated tags from log warning since fapi would trigger it itself

* checkstyle goes brrr
2024-07-07 14:05:36 +01:00
TelepathicGrunt
8d16166232
Add common Mace tag (#3909) 2024-07-07 13:52:41 +01:00
TelepathicGrunt
d57e92a907
Added Badlands and Wooded badlands to hot tag (#3902)
Was missed in original Unify Tag work
2024-07-07 13:52:18 +01:00
Fabric Bot
780172709f
New Translation updates (#3867)
* New translations en_us.json (Tatar)

* New translations en_us.json (Russian)

* New translations en_us.json (Icelandic)

* New translations en_us.json (Esperanto)

* New translations en_us.json (Tatar)

* New translations en_us.json (German)

* New translations en_us.json (Chinese Traditional)

* New translations en_us.json (Italian)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (Russian)
2024-06-25 18:15:31 +01:00
TelepathicGrunt
8a3b5617aa
Fix some new tags not being plural (#3848)
* Fix new tags not being plural

Fixes https://github.com/FabricMC/fabric/pull/3807

Matches https://github.com/neoforged/NeoForge/pull/1030

* Fixed concrete and terracotta

* Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* regen data

---------

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
2024-06-17 18:10:55 +01:00
modmuss
cb5ced13ef
Translation updates (#3864) 2024-06-17 18:03:29 +01:00
modmuss
d153f344b3
Fix incorrect tag warnings, and add fail option. (#3844) 2024-06-11 12:50:40 +01:00
TelepathicGrunt
bf2c390889 Add Mangrove Swamp and Bamboo Jungle to Dense Overworld Vegetation tag (#3839)
* Add Mangrove Swamp to Dense Overworld Vegetation tag

Closes https://github.com/FabricMC/fabric/issues/3823

* Added bamboo jungle to dense tag

(cherry picked from commit bd772e8311)
2024-06-08 14:05:50 +01:00
TelepathicGrunt
18dd60fee4
Tag cleanup and additions for 1.21 (#3807)
* Tag cleanup and additions for 1.21

Closes https://github.com/FabricMC/fabric/issues/3742
Closes https://github.com/FabricMC/fabric/issues/3755
Closes https://github.com/FabricMC/fabric/issues/3790
Closes https://github.com/FabricMC/fabric/issues/3731

* Fixed music disc javadoc

* Re-add redundant tags but deprecate them

* remove eroded badlands from sparse vegetation

* Switched to singular name for inner files for tools

* deprecate redundant shulker box tag

* Added glazed terracotta tag

* Added concrete and concrete powder tags

* checkstyle issue
2024-06-08 14:02:28 +01:00
modmuss
ea7ee968d4
Suppress translated tag warnings in prod (#3791) 2024-05-30 09:22:22 +01:00
modmuss
6573ed8ccc
24w21b (#3789)
Co-authored-by: Drex <nicknamedrex@gmail.com>
Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com>
2024-05-23 10:20:54 +01:00
apple502j
0684cd12de
Finish port to 24w20a (#3777)
* [BREAKING] pass entity to EquipmentSlotProvider

* Improve mixin for chunk unload event

* `TestContext#getBlockEntity` result can be used without checks/casts now

* Fix typos
2024-05-23 09:06:12 +01:00
modmuss50
5e47b9cbbd 24w19b 2024-05-10 16:33:03 +01:00
TelepathicGrunt
619abec242 Default English Translations for c namespaced tags (#3716)
* Created tag translation datagen

* generate lang file

* Add fruit translation

* renamed interface injection

* Adjust missing translation message

* Fixed for checkStyle

* More checkstyle fighting...

* Bump version of modules.

* Oops wrong module got bumped

* moving and renaming files

* adjust enum class naming

* rename enum and move package

* Renamed one more enum

* Undo version bump. Will be handled at release

* Some suggestions implemented

* Added crowdin entry

* Update crowdin.yml

Co-authored-by: modmuss <modmuss50@gmail.com>

* Cleanup enum checking

* spotless fixes

* Added buckets and powder snow bucket tag translation

* Some more suggested changes

* setup ConventionLogWarnings to match ConventionLogWarningsClient setup

* Change property to be usable in prod

* Set short as default property

* Remove unused import

* Fixed copy/paste error

* fixed ingot translations

* lang and method name fixes

* Fixed filepath issue

* Fixed redstone name

* fixed javadoc whitespace

* Move translation warning to server

* Move translation class to better file path

* trying to pass the regex

* put it under impl

* Cleanup translation check

* Update fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

* Update fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/FabricTagKey.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/FabricTagKey.java

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
(cherry picked from commit 70fd1b462f)
2024-05-07 19:06:41 +01:00
modmuss
0af3f5a702
24w18a (#3757)
Co-authored-by: Drex <nicknamedrex@gmail.com>
2024-05-04 14:28:29 +01:00
TelepathicGrunt
2b43c5c8df
Powder Snow Bucket tag, defense enchantment tag name fix, missing meat tag entry (#3727)
* Multiple tag fixes

* Make the tag rename not breaking
2024-04-21 16:35:27 +01:00
TelepathicGrunt
7ba3e3b760
Fix backwards compat for c:strings tag (#3720) 2024-04-20 11:28:21 +01:00
TelepathicGrunt
7f945d5bb6
Refactor convention tags (#3310) 2024-04-16 18:01:57 +01:00