diff --git a/src/generated/resources/assets/botania/models/block/red_string_comparator.json b/src/generated/resources/assets/botania/models/block/red_string_comparator.json new file mode 100644 index 000000000..8ee8e0302 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_comparator.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_comparator", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_comparator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_string_container.json b/src/generated/resources/assets/botania/models/block/red_string_container.json new file mode 100644 index 000000000..3c54872c5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_container.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_container", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_container" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_string_dispenser.json b/src/generated/resources/assets/botania/models/block/red_string_dispenser.json new file mode 100644 index 000000000..a01f62e30 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_dispenser.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_dispenser", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_dispenser" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_string_fertilizer.json b/src/generated/resources/assets/botania/models/block/red_string_fertilizer.json new file mode 100644 index 000000000..b5c7900d7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_fertilizer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_fertilizer", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_fertilizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_string_interceptor.json b/src/generated/resources/assets/botania/models/block/red_string_interceptor.json new file mode 100644 index 000000000..7237cdea2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_interceptor.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_interceptor", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_interceptor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_string_relay.json b/src/generated/resources/assets/botania/models/block/red_string_relay.json new file mode 100644 index 000000000..af6f126fe --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_string_relay.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "side": "botania:block/red_string_relay", + "front": "botania:block/red_string_sender", + "top": "botania:block/red_string_relay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_comparator.json b/src/generated/resources/assets/botania/models/item/red_string_comparator.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_comparator.json rename to src/generated/resources/assets/botania/models/item/red_string_comparator.json index 8a983846b..a956414c0 100644 --- a/src/main/resources/assets/botania/models/item/red_string_comparator.json +++ b/src/generated/resources/assets/botania/models/item/red_string_comparator.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_comparator" +{ + "parent": "botania:block/red_string_comparator" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_container.json b/src/generated/resources/assets/botania/models/item/red_string_container.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_container.json rename to src/generated/resources/assets/botania/models/item/red_string_container.json index a932f453f..89de485e0 100644 --- a/src/main/resources/assets/botania/models/item/red_string_container.json +++ b/src/generated/resources/assets/botania/models/item/red_string_container.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_container" +{ + "parent": "botania:block/red_string_container" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_dispenser.json b/src/generated/resources/assets/botania/models/item/red_string_dispenser.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_dispenser.json rename to src/generated/resources/assets/botania/models/item/red_string_dispenser.json index 394161847..fbcc888d6 100644 --- a/src/main/resources/assets/botania/models/item/red_string_dispenser.json +++ b/src/generated/resources/assets/botania/models/item/red_string_dispenser.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_dispenser" +{ + "parent": "botania:block/red_string_dispenser" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_fertilizer.json b/src/generated/resources/assets/botania/models/item/red_string_fertilizer.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_fertilizer.json rename to src/generated/resources/assets/botania/models/item/red_string_fertilizer.json index cd7c520f3..918b433b1 100644 --- a/src/main/resources/assets/botania/models/item/red_string_fertilizer.json +++ b/src/generated/resources/assets/botania/models/item/red_string_fertilizer.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_fertilizer" +{ + "parent": "botania:block/red_string_fertilizer" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_interceptor.json b/src/generated/resources/assets/botania/models/item/red_string_interceptor.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_interceptor.json rename to src/generated/resources/assets/botania/models/item/red_string_interceptor.json index 740d59fef..385740c81 100644 --- a/src/main/resources/assets/botania/models/item/red_string_interceptor.json +++ b/src/generated/resources/assets/botania/models/item/red_string_interceptor.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_interceptor" +{ + "parent": "botania:block/red_string_interceptor" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_relay.json b/src/generated/resources/assets/botania/models/item/red_string_relay.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_string_relay.json rename to src/generated/resources/assets/botania/models/item/red_string_relay.json index d461d1875..f68563ff1 100644 --- a/src/main/resources/assets/botania/models/item/red_string_relay.json +++ b/src/generated/resources/assets/botania/models/item/red_string_relay.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_string_relay" +{ + "parent": "botania:block/red_string_relay" } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 4bde55ccd..bea483a29 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -167,7 +167,10 @@ public class BlockstateProvider extends BlockStateProvider { } private void redStringBlock(Block b) { - ModelFile file = models().getExistingFile(prefix("block/" + Registry.BLOCK.getKey(b).getPath())); + String name = Registry.BLOCK.getKey(b).getPath(); + ResourceLocation selfName = prefix("block/" + name); + ResourceLocation front = prefix("block/red_string_sender"); + ModelFile file = models().orientable(name, selfName, front, selfName); getVariantBuilder(b) .partialState().with(BlockStateProperties.FACING, Direction.NORTH).setModels(new ConfiguredModel(file)) .partialState().with(BlockStateProperties.FACING, Direction.SOUTH).setModels(new ConfiguredModel(file, 0, 180, false)) diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index f26083d68..20e98765e 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -16,6 +16,7 @@ import net.minecraftforge.client.model.generators.ExistingFileHelper; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.decor.BlockFloatingFlower; +import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -37,7 +38,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator String name = Registry.ITEM.getKey(i).getPath(); if (b instanceof BlockSpecialFlower) { withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); - } else if (b instanceof BlockFloatingFlower) { + } else if (b instanceof BlockFloatingFlower || b instanceof BlockRedString) { withExistingParent(name, prefix("block/" + name)); } } diff --git a/src/main/resources/assets/botania/models/block/red_string_comparator.json b/src/main/resources/assets/botania/models/block/red_string_comparator.json deleted file mode 100644 index fcc14fb74..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_comparator.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_comparator", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_comparator" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_string_container.json b/src/main/resources/assets/botania/models/block/red_string_container.json deleted file mode 100644 index 8129d654d..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_container.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_container", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_container" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_string_dispenser.json b/src/main/resources/assets/botania/models/block/red_string_dispenser.json deleted file mode 100644 index 9d08fc64c..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_dispenser.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_dispenser", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_dispenser" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json deleted file mode 100644 index 158789a91..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_fertilizer", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_fertilizer" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_string_interceptor.json b/src/main/resources/assets/botania/models/block/red_string_interceptor.json deleted file mode 100644 index e2f672270..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_interceptor.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_interceptor", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_interceptor" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_string_relay.json b/src/main/resources/assets/botania/models/block/red_string_relay.json deleted file mode 100644 index df9fb292c..000000000 --- a/src/main/resources/assets/botania/models/block/red_string_relay.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "botania:block/red_string_relay", - "front": "botania:block/red_string_sender", - "side": "botania:block/red_string_relay" - } -}