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 1b2871def..d2f98a9cc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -136,7 +136,6 @@ public final class ModelHandler { registerStairs(); registerSlabs(); registerWalls(); - registerPanes(); registerQuartzBlocks(); /** Normal Items **/ @@ -259,7 +258,9 @@ public final class ModelHandler { private static void registerStandardBlocks() { registerBlockStandardPath(ModBlocks.alchemyCatalyst); registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); registerBlockStandardPath(ModBlocks.bifrost); + registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); registerBlockStandardPath(ModBlocks.bifrostPerm); registerBlockStandardPath(ModBlocks.blazeBlock); registerBlockStandardPath(ModBlocks.cacophonium); @@ -290,6 +291,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.manaBomb); registerBlockStandardPath(ModBlocks.manaDetector); registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); registerBlockStandardPath(ModBlocks.manaVoid); registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); registerBlockStandardPath(ModBlocks.prism); @@ -769,12 +771,6 @@ public final class ModelHandler { registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); } - private static void registerPanes() { - registerBlockStandardPath(ModFluffBlocks.alfglassPane); - registerBlockStandardPath(ModFluffBlocks.bifrostPane); - registerBlockStandardPath(ModFluffBlocks.managlassPane); - } - private static void registerQuartzBlocks() { for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { if (b == null) // Dark quartz disabled diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json index 3d16698ae..f26442e9e 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/bifrost" - } - }] + } } } diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index f89c7ffe7..91e8fff09 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/elfGlass" - } - }] + } } } diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index d302a6427..4b9443f11 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/manaGlass" - } - }] + } } } diff --git a/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json new file mode 100644 index 000000000..421b6da4d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/elfGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json b/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json new file mode 100644 index 000000000..38006dc9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json new file mode 100644 index 000000000..0316bf04a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/manaGlass" + } +} \ No newline at end of file