From e541201129ce984133983b96602d44df7b0bf24d Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Mon, 12 Dec 2022 13:22:32 -0500 Subject: [PATCH] Add simpleBlockWithItem for data gens (#9170) --- .../client/model/generators/BlockStateProvider.java | 5 +++++ .../java/net/minecraftforge/debug/DeferredRegistryTest.java | 4 +--- .../java/net/minecraftforge/debug/block/PistonEventTest.java | 4 +--- .../net/minecraftforge/debug/item/TagBasedToolTypesTest.java | 4 +--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java index 7807a11271..14ff75b990 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java +++ b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java @@ -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); diff --git a/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java b/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java index e91ff2c01c..e81a59dc2a 100644 --- a/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java @@ -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"))); } }); } diff --git a/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java b/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java index e6a9d67d4a..b8759f3555 100644 --- a/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java @@ -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"))); } } diff --git a/src/test/java/net/minecraftforge/debug/item/TagBasedToolTypesTest.java b/src/test/java/net/minecraftforge/debug/item/TagBasedToolTypesTest.java index 326ce916bc..92b005ec63 100644 --- a/src/test/java/net/minecraftforge/debug/item/TagBasedToolTypesTest.java +++ b/src/test/java/net/minecraftforge/debug/item/TagBasedToolTypesTest.java @@ -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)