Commit graph

1764 commits

Author SHA1 Message Date
modmuss50
2986a625c7 Fix build after bad merge 2024-10-15 14:16:00 +01:00
BasiqueEvangelist
c0bdb897d1 Add support for Item-containing Items (#4083)
* first steps toward container item support

* add bundle support

* Update fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerComponentStorage.java

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>

* address reviews + TIL ContainerItemContext#find exists

* address reviews of bundle code

---------

Co-authored-by: Technici4n <13494793+Technici4n@users.noreply.github.com>

(cherry picked from commit 4054068033)
2024-10-15 13:27:26 +01:00
IThundxr
83a9d3130d
Add Stripped Logs and Stripped Woods Tags (#4146)
* Add Stripped Logs and Stripped Woods Tags

* run spotless

* Address review
2024-10-15 13:23:42 +01:00
TelepathicGrunt
dde8f6bb9c
Add more c fluid tags (#4134)
* Add more `c` fluid tags

* fixed a javadoc

* Cleaned up javadoc

* checkstyle

* removed space

* Adjust experience rate to more reasonable amount

* explain perfect extractions

* fixed javadoc
2024-10-15 13:16:22 +01:00
Fabric Bot
487ccc21c8
New Crowdin updates (#4124)
* New translations en_us.json (Polish)

* New translations en_us.json (Italian)

* New translations en_us.json (German)

* New translations en_us.json (Japanese)
2024-10-15 13:16:13 +01:00
Joseph T. McQuigg
29d3a7035e
Add Pie Item Tag c:foods/pie (#4114)
Co-authored-by: modmuss <modmuss50@gmail.com>
2024-10-15 13:16:05 +01:00
modmuss50
3b9245a976 Bump version
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
2024-09-23 19:28:58 +01:00
modmuss50
d831205f6d Fix cherry pick issues 2024-09-23 19:19:42 +01:00
BasiqueEvangelist
5253a6d2b8 Add ItemVariant#withComponentChanges and FluidVariant#withComponentChanges (#4082)
* add ItemVariant#withChanges and FluidVariant#withChanges

* withChanges -> withComponentChanges

* add TransferVariant#withComponentChanges

* make TransferVariant#withComponentChanges throw

(cherry picked from commit 1d5c24337f)
2024-09-23 18:48:31 +01:00
Joseph Burton
c7469b213f
Add access to ClientConfigurationNetworkHandler in context (#4097) 2024-09-23 18:47:02 +01:00
TelepathicGrunt
9d22c5fde0
Create c:obsidians block and item tag (#4088)
* Create `c:obsidians`

* Add obsidians subtags
2024-09-23 18:46:54 +01:00
Fabric Bot
9d3173d557
New Crowdin updates (#4086)
* New translations en_us.json (German)

* New translations en_us.json (Turkish)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (Polish)

* New translations en_us.json (Czech)

* New translations en_us.json (Japanese)
2024-09-23 18:46:34 +01:00
TheDeathlyCow
d5debaed0e
Modify Enchantment and Fabric Component Map Builder Extensions (#4085)
* modify effects event

* give impaling fire aspect

* add fabric component map builder

* change interface name to match event

* gametests for weird impaling enchantment

* fix checkstyle issues

* fabric map builder javadoc

* modify effects javadoc

* fix checkstyle issues

* prefer extension methods over add

* add enchantment source

* fix missing asterisk on fabricitemstack javadoc

* switch to enchantment builder

* fix effects list

* fix checkstyle

* add note on exclusive set to javadoc

* add fabric component builder extensions to default component testmod

* remove threadlocal usage from mixin

* remove modid prefix from accessors

* remove unused import

* fix recursive invoker

* add test to automatically check modified item name
2024-09-23 18:46:27 +01:00
modmuss50
e521378444 Bump version
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
2024-09-10 13:27:30 +01:00
modmuss
427f7cbfec Use unix line endings on all files (#4079)
(cherry picked from commit f83d9a4a4d)
2024-09-10 13:17:44 +01:00
modmuss
d38f898f77 Add TransferVariant.getComponentMap() (#4074)
* Add TransferVariant.getComponentMap()

* used the cached stack

* Even better

(cherry picked from commit 0771530439)
2024-09-10 13:17:38 +01:00
TelepathicGrunt
405385578e
Add missing minecraft:enchantable/vanishing to c:enchantables (#4058) 2024-09-10 13:15:33 +01:00
Fabric Bot
aa34100ae2
New Crowdin updates (#4059)
* New translations en_us.json (Portuguese, Brazilian)

* New translations en_us.json (Malay)

* New translations en_us.json (Korean)

* New translations en_us.json (Malay (Jawi))

* New translations en_us.json (Malay (Jawi))

* New translations en_us.json (Malay (Jawi))

* New translations en_us.json (Polish)

* New translations en_us.json (Portuguese, Brazilian)
2024-09-10 13:15:21 +01:00
TelepathicGrunt
3d2379b573
Add c:animal_foods tag (#4080)
* Add `c:animal_foods` tag

* checkstyle

* Spotless

* Add to lang generator

* Actually use the generated lang file

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2024-09-10 13:15:13 +01:00
modmuss50
f054fb578a Bump version
Some checks are pending
Build / build (21-ubuntu) (push) Waiting to run
Build / client_test (push) Waiting to run
Build / server_test (push) Waiting to run
Build / check_resources (push) Waiting to run
2024-08-26 12:11:37 +01:00
TheDeathlyCow
2122d828f0
After Damage Event (#4051)
* after damage event

* add after damage event to testmod

* remove amount > 0 check to capture shield blocking

* add javadoc

* dont fire event if killed

* clarify javadoc a bit more

* fix checkstyle issue

* fix other checkstyle issues lol

* rename damageDealt to baseDamageTaken
2024-08-26 12:02:20 +01:00
AshyBoxy
3fc0e552c4
Dont invoke ItemGroupEvents.MODIFY_ENTRIES_ALL for the OP tab, when the OP tab is disabled (#4045) 2024-08-26 12:02:11 +01:00
Fabric Bot
9b16164179
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)
2024-08-26 12:01:36 +01:00
modmuss50
343cdcb01b 1.21.1
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
2024-08-11 17:23:06 +01:00
modmuss
e26765fae8
Install git in build workflow (#4025) 2024-08-11 15:13:09 +01:00
modmuss50
86f8729ec4 Bump versions 2024-08-11 15:00:10 +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
modmuss
8b68f1c766
Fix handled screen not calling super.mouseReleased or super.mouseDragged (#4010) 2024-08-11 14:52:13 +01:00
modmuss
1db1cc1f63
Crafter support for the transfer api. (#4013)
* Crafter support for the transfer api.
Closes #4004

* Review feedback
2024-08-11 14:52:04 +01:00
modmuss
dcbd126aea
Update grgit (#4019) 2024-08-11 14:51:54 +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
modmuss50
e8bb7c8e9a Bump version
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
2024-08-07 18:52:06 +01:00
modmuss
40875a9333
Add an API to add additional supported blocks to block entity types. (#4009) 2024-08-07 18:39:15 +01:00
modmuss50
1daea21533 1.21.1-rc1 2024-08-07 16:54:26 +01:00
modmuss50
7363c44ea9 Bump version
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
2024-08-05 10:52:50 +01:00
modmuss
60c3209bf5
Revert registry sync changes. Allowing duplicate entries and vanilla clients on servers with modded registries. (#3999)
* Revert "Prevent vanilla clients from joining servers that require modded registry entries. (#3992)"

This reverts commit 8759e7555a.

* Revert "Throw the exception when a duplicate registry entry is found. (#3991)"

* Keep javadoc fix
2024-08-05 10:51:31 +01:00
modmuss50
67e3cd4551 Bump version
Some checks are pending
Build / build (21-ubuntu) (push) Waiting to run
Build / client_test (push) Waiting to run
Build / server_test (push) Waiting to run
Build / check_resources (push) Waiting to run
2024-08-04 19:45:12 +01:00
modmuss
0a3a005780
Allow duplicate entries after being frozen on the client in prod. (#3994)
* Allow duplicate entries after being frozen on the client.

* Only apply work around to prod
2024-08-04 19:44:12 +01:00
modmuss50
eccb723f8b Bump version
Some checks are pending
Build / build (21-ubuntu) (push) Waiting to run
Build / client_test (push) Waiting to run
Build / server_test (push) Waiting to run
Build / check_resources (push) Waiting to run
2024-08-04 14:31:07 +01:00
Patbox
8759e7555a
Prevent vanilla clients from joining servers that require modded registry entries. (#3992)
* Prevent vanilla clients from joining servers that require modded registry entries
2024-08-04 14:10:27 +01:00
modmuss
66911b8fa5
Throw the exception when a duplicate registry entry is found. (#3991)
* Actually throw the exception when a duplicate registry entry is found.

* Improve mixin
2024-08-04 13:53:18 +01:00
Aaron
176f90366d
Add more TAWs for custom RenderLayers (#3981) 2024-08-04 13:52:54 +01:00
modmuss
ba9dae065f
Don't track fake player network addons (#3977)
* Don't track fake player network addons

* Review feedback
2024-08-04 13:52:41 +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
PepperCode1
c705a49cc5
Add ShadeMode to FRAPI (#3937)
* Add ShadeMode to the API

- Update material documentation
- Use ShadeMode in VanillaModelEncoder

* Add ShadeMode support to Indigo

- Rewrite header packing constants in EncodingFormat to match material packing constants
- Pass buffer Function to TerrainRenderContext instead of allocators and buffer map
- Restore functionality of ChunkRenderInfo#release
- Set captured terrain context to null after releasing it
- Bump mixin compatibility level to Java 21
- Remove unused AWs

* Add test for ShadeMode

- Fix RiverstoneUnbakedModel not calling setParents on models that it will bake

* Clarify documentation of inverted material properties
2024-08-04 13:52:02 +01:00
AlphaMode
6c1df360ce
Replace redirect in lifecycle events with wrap operation (#3887)
* Replace redirect in lifecycle events with wrap operation

* Remove old javadoc
2024-08-04 13:51:48 +01:00
Apollo
8dc279b1d0
Resource Conditions in Pack Overlays (#3872)
* Overlay conditions 1.21

* Move overlay test to gametest

* Fix style error

* Fix another style error

* Implement requested changes

* Import style fix

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2024-08-04 13:51:37 +01:00
modmuss50
31b5766379 Bump version
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
2024-07-29 14:38:42 +01:00