Files
MinecraftForge/patches/minecraft/net/minecraft/client/data/models/ModelProvider.java.patch
T
2026-06-17 19:35:27 -07:00

113 lines
5.2 KiB
Diff

--- a/net/minecraft/client/data/models/ModelProvider.java
+++ b/net/minecraft/client/data/models/ModelProvider.java
@@ -43,11 +_,11 @@
@Override
public CompletableFuture<?> run(final CachedOutput cache) {
- ModelProvider.ItemInfoCollector itemModels = new ModelProvider.ItemInfoCollector();
- ModelProvider.BlockStateGeneratorCollector blockStateGenerators = new ModelProvider.BlockStateGeneratorCollector();
+ ModelProvider.ItemInfoCollector itemModels = new ModelProvider.ItemInfoCollector(this::getKnownItems);
+ ModelProvider.BlockStateGeneratorCollector blockStateGenerators = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
ModelProvider.SimpleModelCollector simpleModels = new ModelProvider.SimpleModelCollector();
- new BlockModelGenerators(blockStateGenerators, itemModels, simpleModels).run();
- new ItemModelGenerators(itemModels, simpleModels).run();
+ getBlockModelGenerators(blockStateGenerators, itemModels, simpleModels).run();
+ getItemModelGenerators(itemModels, simpleModels).run();
blockStateGenerators.validate();
itemModels.finalizeAndValidate();
return CompletableFuture.allOf(
@@ -57,6 +_,22 @@
);
}
+ protected java.util.stream.Stream<Block> getKnownBlocks() {
+ return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace()));
+ }
+
+ protected java.util.stream.Stream<Item> getKnownItems() {
+ return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace()));
+ }
+
+ protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
+ return new BlockModelGenerators(blocks, items, models);
+ }
+
+ protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
+ return new ItemModelGenerators(items, models);
+ }
+
@Override
public final String getName() {
return "Model Definitions";
@@ -65,6 +_,15 @@
@OnlyIn(Dist.CLIENT)
public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
+ private final Supplier<java.util.stream.Stream<Block>> known;
+
+ public BlockStateGeneratorCollector() {
+ this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace())));
+ }
+
+ public BlockStateGeneratorCollector(Supplier<java.util.stream.Stream<Block>> known) {
+ this.known = known;
+ }
public void accept(final BlockModelDefinitionGenerator generator) {
Block block = generator.block();
@@ -75,8 +_,7 @@
}
public void validate() {
- List<Identifier> missingDefinitions = BuiltInRegistries.BLOCK
- .listElements()
+ List<Identifier> missingDefinitions = known.get().map(Block::builtInRegistryHolder)
.filter(e -> !this.generators.containsKey(e.value()))
.map(e -> e.key().identifier())
.toList();
@@ -96,6 +_,15 @@
public static class ItemInfoCollector implements ItemModelOutput {
private final Map<Item, ClientItem> itemInfos = new HashMap<>();
private final Map<Item, Item> copies = new HashMap<>();
+ private final Supplier<java.util.stream.Stream<Item>> known;
+
+ public ItemInfoCollector() {
+ this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace())));
+ }
+
+ public ItemInfoCollector(Supplier<java.util.stream.Stream<Item>> known) {
+ this.known = known;
+ }
@Override
public void accept(final Item item, final ItemModel.Unbaked model, final ClientItem.Properties properties) {
@@ -114,7 +_,7 @@
this.copies.put(acceptor, donor);
}
- public void finalizeAndValidate() {
+ public void generateDefaultBlockModels() {
BuiltInRegistries.ITEM.forEach(item -> {
if (!this.copies.containsKey(item)) {
if (item instanceof BlockItem blockItem && !this.itemInfos.containsKey(blockItem)) {
@@ -123,6 +_,8 @@
}
}
});
+ }
+ public void finalizeAndValidate() {
this.copies.forEach((acceptor, donor) -> {
ClientItem donorInfo = this.itemInfos.get(donor);
if (donorInfo == null) {
@@ -131,8 +_,8 @@
this.register(acceptor, donorInfo);
});
- List<Identifier> missingDefinitions = BuiltInRegistries.ITEM
- .listElements()
+ List<Identifier> missingDefinitions = known.get()
+ .map(item -> item.builtInRegistryHolder())
.filter(e -> !this.itemInfos.containsKey(e.value()))
.map(e -> e.key().identifier())
.toList();