From f50c959201822c43292d2cb03de267a6afe8bc09 Mon Sep 17 00:00:00 2001 From: Zepsun <51090210+SputterSizzle@users.noreply.github.com> Date: Sun, 9 Jul 2023 09:27:48 -0500 Subject: [PATCH] reformatted --- .../data/MinestuckBlockStateProvider.java | 6 ++- .../data/MinestuckItemModelProvider.java | 43 +++++++++++++------ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java b/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java index 068f76c71b..35ae0168e9 100644 --- a/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java +++ b/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java @@ -10,8 +10,10 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.RegistryObject; -public class MinestuckBlockStateProvider extends BlockStateProvider { - public MinestuckBlockStateProvider(DataGenerator gen, ExistingFileHelper exFileHelper) { +public class MinestuckBlockStateProvider extends BlockStateProvider +{ + public MinestuckBlockStateProvider(DataGenerator gen, ExistingFileHelper exFileHelper) + { super(gen, Minestuck.MOD_ID, exFileHelper); } diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java b/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java index 34bf511673..6ed77862e4 100644 --- a/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java +++ b/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java @@ -12,12 +12,16 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.RegistryObject; -public class MinestuckItemModelProvider extends ItemModelProvider { - public MinestuckItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { - super(generator, Minestuck.MOD_ID, existingFileHelper);} +public class MinestuckItemModelProvider extends ItemModelProvider +{ + public MinestuckItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) + { + super(generator, Minestuck.MOD_ID, existingFileHelper); + } @Override - protected void registerModels() { + protected void registerModels() + { handheldItemTextureName(MSItems.ACE_OF_CLUBS, "ace_clubs"); @@ -26,23 +30,36 @@ protected void registerModels() { } - private ItemModelBuilder simpleItem(RegistryObject item) { + private ItemModelBuilder simpleItem(RegistryObject item) + { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")).texture("layer0", - new ResourceLocation(Minestuck.MOD_ID,"item/" + item.getId().getPath()));} - private ItemModelBuilder simpleItemTextureName(RegistryObject item, String textureName) { + new ResourceLocation(Minestuck.MOD_ID,"item/" + item.getId().getPath())); + } + + private ItemModelBuilder simpleItemTextureName(RegistryObject item, String textureName) + { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")).texture("layer0", - new ResourceLocation(Minestuck.MOD_ID,"item/" + textureName));} - private ItemModelBuilder handheldItem(RegistryObject item) { + new ResourceLocation(Minestuck.MOD_ID,"item/" + textureName)); + } + + private ItemModelBuilder handheldItem(RegistryObject item) + { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/handheld")).texture("layer0", - new ResourceLocation(Minestuck.MOD_ID,"item/" + item.getId().getPath()));} - private ItemModelBuilder handheldItemTextureName(RegistryObject item, String textureName) { + new ResourceLocation(Minestuck.MOD_ID,"item/" + item.getId().getPath())); + } + + private ItemModelBuilder handheldItemTextureName(RegistryObject item, String textureName) + { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/handheld")).texture("layer0", - new ResourceLocation(Minestuck.MOD_ID,"item/" + textureName));} - private ItemModelBuilder blockItem(RegistryObject block) { + new ResourceLocation(Minestuck.MOD_ID,"item/" + textureName)); + } + + private ItemModelBuilder blockItem(RegistryObject block) + { return withExistingParent(block.getId().getPath(), new ResourceLocation("minestuck:block/" + block.getId().getPath())); }