FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-21 10:48:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

1.21.4-pre1
Some checks are pending
Build / build (21-ubuntu) (push) Waiting to run
Details
Build / client_test (push) Waiting to run
Details
Build / server_test (push) Waiting to run
Details
Build / check_resources (push) Waiting to run
Details

Browse source
This commit is contained in:
modmuss50 2024-11-20 15:12:48 +00:00
parent 7db2e61470
commit 5d559cbc72
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemAssetsMixin.java
View file

@ -43,7 +43,7 @@ import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions;
public class ModelProviderItemAssetsMixin implements FabricModelProviderDefinitions {
@Shadow
@Final
private Map<Item, ItemAsset> ITEM_ASSETS;
private Map<Item, ItemAsset> itemAssets;
@Unique
private FabricDataOutput fabricDataOutput;
@ -58,7 +58,7 @@ public class ModelProviderItemAssetsMixin implements FabricModelProviderDefiniti
if (fabricDataOutput != null) {
// Only generate the item model if the block state json was registered
if (ITEM_ASSETS.containsKey(blockItem)) {
if (itemAssets.containsKey(blockItem)) {
return true;
}

2
fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener
View file

@ -213,7 +213,7 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadParticleModel (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuilltin (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltin (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWoolAndCarpet (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerFlowerbed (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRandomHorizontalRotations (Lnet/minecraft/client/data/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V

2
fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java
View file

@ -113,7 +113,7 @@ public class CustomAtlasSourcesTest implements ClientModInitializer {
int imageWidth = image.getWidth();
int imageHeight = image.getHeight();
AnimationResourceMetadata animationMetadata = metadata.decode(AnimationResourceMetadata.field_55537)
AnimationResourceMetadata animationMetadata = metadata.decode(AnimationResourceMetadata.SERIALIZER)
.orElse(new AnimationResourceMetadata(Optional.empty(), Optional.empty(), Optional.empty(), 1, false));
SpriteDimensions dimensions = animationMetadata.getSize(imageWidth, imageHeight);
int frameWidth = dimensions.width();

10
gradle.properties
View file

@ -1,9 +1,9 @@
org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
version=0.109.0
minecraft_version=24w46a
yarn_version=+build.3
version=0.109.1
minecraft_version=1.21.4-pre1
yarn_version=+build.1
loader_version=0.16.9
installer_version=1.0.1
@ -23,7 +23,7 @@ fabric-commands-v0-version=0.2.76
fabric-content-registries-v0-version=9.1.10
fabric-crash-report-info-v1-version=0.3.4
fabric-data-attachment-api-v1-version=1.4.0
fabric-data-generation-api-v1-version=22.0.3
fabric-data-generation-api-v1-version=22.0.4
fabric-dimensions-v1-version=4.0.8
fabric-entity-events-v1-version=2.0.9
fabric-events-interaction-v0-version=3.0.3
@ -47,7 +47,7 @@ fabric-renderer-api-v1-version=4.0.5
fabric-renderer-indigo-version=1.9.5
fabric-rendering-data-attachment-v1-version=0.3.55
fabric-rendering-fluids-v1-version=3.1.16
fabric-rendering-v1-version=9.0.2
fabric-rendering-v1-version=9.0.3
fabric-resource-conditions-api-v1-version=5.0.11
fabric-resource-loader-v0-version=3.0.8
fabric-screen-api-v1-version=2.0.35