diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index c34ef7de6..adb5e268c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -808,7 +808,7 @@ public final class ModelHandler { private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":" + variant.getName() + "_wall", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + variant.getName() + "_wall", "inventory")); } registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); @@ -886,7 +886,7 @@ public final class ModelHandler { private static void registerBlock(Block b, String name) { ModelLoader.setCustomModelResourceLocation( Item.getItemFromBlock(b), 0, - new ModelResourceLocation(LibMisc.MOD_ID + ":" + name, "inventory")); + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + name, "inventory")); } private static void registerItemModel(Block b) { diff --git a/src/main/resources/assets/botania/models/item/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/desert_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/dreamwood_wall.json b/src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/dreamwood_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/forest_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/fungal_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/livingrock_wall.json b/src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingrock_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json diff --git a/src/main/resources/assets/botania/models/item/livingwood_wall.json b/src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingwood_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mesa_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mountain_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/plains_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/swamp_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/taiga_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json