Add simpleBlockWithItem for data gens (#9170)

This commit is contained in:
J.T. McQuigg authored and GitHub committed 2022-12-12 10:22:32 -08:00
1 parent 09aac3a4d3
commit e541201129
4 files changed
+8 -9

No files matched your search

@@ -188,6 +188,11 @@ public abstract class BlockStateProvider implements DataProvider {
itemModels().getBuilder(key(block).getPath()).parent(model);
}
public void simpleBlockWithItem(Block block, ModelFile model) {
simpleBlock(block, model);
simpleBlockItem(block, model);
}
public void simpleBlock(Block block, ConfiguredModel... models) {
getVariantBuilder(block)
.partialState().setModels(models);
@@ -106,9 +106,7 @@ public class DeferredRegistryTest {
gen.addProvider(event.includeClient(), new BlockStateProvider(gen, MODID, event.getExistingFileHelper()) {
@Override
protected void registerStatesAndModels() {
ModelFile model = models().cubeAll(BLOCK.getId().getPath(), mcLoc("block/furnace_top"));
simpleBlock(BLOCK.get(), model);
simpleBlockItem(BLOCK.get(), model);
simpleBlockWithItem(BLOCK.get(), models().cubeAll(BLOCK.getId().getPath(), mcLoc("block/furnace_top")));
}
});
}
@@ -159,9 +159,7 @@ public class PistonEventTest
@Override
protected void registerStatesAndModels()
{
ModelFile model = models().cubeAll(SHIFT_ON_MOVE.getId().getPath(), mcLoc("block/furnace_top"));
simpleBlock(SHIFT_ON_MOVE.get(), model);
simpleBlockItem(SHIFT_ON_MOVE.get(), model);
simpleBlockWithItem(SHIFT_ON_MOVE.get(), models().cubeAll(shiftOnMove.getId().getPath(), mcLoc("block/furnace_top")));
}
}
@@ -148,9 +148,7 @@ public class TagBasedToolTypesTest
@Override
protected void registerStatesAndModels()
{
ModelFile model = models().cubeAll(STONE.getId().getPath(), mcLoc("block/debug"));
simpleBlock(STONE.get(), model);
simpleBlockItem(STONE.get(), model);
simpleBlockWithItem(STONE.get(), models().cubeAll(STONE.getId().getPath(), mcLoc("block/debug")));
}
});
gen.addProvider(event.includeClient(), new ItemModelProvider(gen, MODID, existing)