From 7ef27df0bce78728510c368608cb5835903b3c70 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 19:29:36 -0500 Subject: [PATCH] Cleanup the cleanup --- .../client/core/handler/ModelHandler.java | 271 ++++++++++-------- .../assets/botania/blockstates/dirtPath.json | 11 +- .../botania/blockstates/dirtPath0Slab.json | 6 +- .../blockstates/dirtPath0SlabFull.json | 2 +- .../assets/botania/blockstates/forestEye.json | 16 +- .../botania/blockstates/manaBeacon.json | 12 +- .../botania/blockstates/tinyPlanetBlock.json | 11 +- .../botania/blockstates/unstableBlock.json | 11 +- .../botania/models/block/eye_of_ancients.json | 11 + .../models/block/miniblock_all_tinted.json | 20 -- .../eightbyeight.json} | 1 + .../eightbyeight_all_tinted.json} | 1 + .../fifteen_high_all.json} | 1 + .../tenbyten_all.json} | 1 + .../tenbyten_top_tinted.json} | 1 + .../models/block/tiny_planet_block.json | 6 + .../botania/models/block/trodden_dirt.json | 6 + .../botania/models/block/unstable_beacon.json | 7 + .../botania/models/block/unstable_cube.json | 6 + .../item/itemblock/default_apothecary.json | 3 - .../item/itemblock/desert_apothecary.json | 3 - .../models/item/itemblock/drum_canopy.json | 3 - .../models/item/itemblock/drum_gathering.json | 3 - .../models/item/itemblock/drum_wild.json | 3 - .../item/itemblock/forest_apothecary.json | 3 - .../item/itemblock/fungal_apothecary.json | 3 - .../models/item/itemblock/life_imbuer.json | 3 - .../item/itemblock/luminizer_launcher.json | 3 - .../item/itemblock/mesa_apothecary.json | 3 - .../item/itemblock/mountain_apothecary.json | 3 - .../models/item/itemblock/petal_block.json | 3 - .../item/itemblock/plains_apothecary.json | 3 - .../models/item/itemblock/runic_altar.json | 3 - .../models/item/itemblock/spark_tinkerer.json | 3 - .../item/itemblock/starfield_creator.json | 3 - .../item/itemblock/swamp_apothecary.json | 3 - .../item/itemblock/taiga_apothecary.json | 3 - .../models/item/itemblock/terra_plate.json | 3 - 38 files changed, 194 insertions(+), 264 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/eye_of_ancients.json delete mode 100644 src/main/resources/assets/botania/models/block/miniblock_all_tinted.json rename src/main/resources/assets/botania/models/block/{microblock.json => shapes/eightbyeight.json} (93%) rename src/main/resources/assets/botania/models/block/{microblock_all_tinted.json => shapes/eightbyeight_all_tinted.json} (94%) rename src/main/resources/assets/botania/models/block/{minusone_all.json => shapes/fifteen_high_all.json} (94%) rename src/main/resources/assets/botania/models/block/{miniblock_all.json => shapes/tenbyten_all.json} (93%) rename src/main/resources/assets/botania/models/block/{miniblock_top_tinted.json => shapes/tenbyten_top_tinted.json} (94%) create mode 100644 src/main/resources/assets/botania/models/block/tiny_planet_block.json create mode 100644 src/main/resources/assets/botania/models/block/trodden_dirt.json create mode 100644 src/main/resources/assets/botania/models/block/unstable_beacon.json create mode 100644 src/main/resources/assets/botania/models/block/unstable_cube.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_wild.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/petal_block.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/runic_altar.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/terra_plate.json 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 90392f52b..6bc8e1663 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -140,7 +140,6 @@ public final class ModelHandler { registerWalls(); registerPanes(); registerQuartzBlocks(); - registerLuminizers(); /** Normal Items **/ registerStandardItems(); @@ -279,75 +278,75 @@ public final class ModelHandler { } private static void registerStandardBlocks() { - registerItemModel(ModBlocks.alchemyCatalyst); - registerItemModel(ModBlocks.alfPortal); - // Off by one on purpose to exclude MOSSY - registerBlockAllMetaNames(ModBlocks.altar, AltarVariant.values().length - 1, i -> AltarVariant.values()[i].getName() + "_apothecary"); - registerItemModel(ModBlocks.bifrost); - registerItemModel(ModBlocks.bifrostPerm); - registerItemModel(ModBlocks.blazeBlock); - registerItemModel(ModBlocks.cacophonium); - registerItemModel(ModBlocks.cellBlock); - registerItemModel(ModBlocks.conjurationCatalyst); - registerItemModel(ModBlocks.cocoon); - registerItemModel(ModBlocks.corporeaFunnel); - registerItemModel(ModBlocks.corporeaInterceptor); - registerItemModel(ModBlocks.corporeaRetainer); - registerItemModel(ModBlocks.dirtPath); - registerItemModel(ModBlocks.distributor); - registerItemModel(ModBlocks.elfGlass); - registerItemModel(ModBlocks.enchantedSoil); - registerItemModel(ModBlocks.enchanter); - registerItemModel(ModBlocks.enderEye); - registerItemModel(ModBlocks.felPumpkin); - registerItemModel(ModBlocks.floatingSpecialFlower); - registerItemModel(ModBlocks.forestEye); - registerItemModel(ModBlocks.ghostRail); - registerItemModel(ModBlocks.incensePlate); - registerBlock(ModBlocks.lightLauncher, "luminizer_launcher"); - registerItemModel(ModBlocks.manaBomb); - registerItemModel(ModBlocks.manaDetector); - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.manaVoid); - registerItemModel(ModBlocks.prism); - registerItemModel(ModBlocks.pistonRelay); - registerItemModel(ModBlocks.pump); - registerItemModel(ModBlocks.redStringComparator); - registerItemModel(ModBlocks.redStringContainer); - registerItemModel(ModBlocks.redStringDispenser); - registerItemModel(ModBlocks.redStringFertilizer); - registerItemModel(ModBlocks.redStringInterceptor); - registerItemModel(ModBlocks.redStringRelay); - registerItemModel(ModBlocks.rfGenerator); - registerItemModel(ModBlocks.root); - registerBlock(ModBlocks.runeAltar, "runic_altar"); - registerItemModel(ModBlocks.shimmerrock); - registerItemModel(ModBlocks.shimmerwoodPlanks); - registerBlock(ModBlocks.sparkChanger, "spark_tinkerer"); - registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); - registerItemModel(ModBlocks.specialFlower); - registerBlock(ModBlocks.starfield, "starfield_creator"); - registerBlock(ModBlocks.terraPlate, "terra_plate"); - registerItemModel(ModBlocks.tinyPlanet); - registerItemModel(ModBlocks.tinyPotato); - registerItemModel(ModBlocks.turntable); + registerBlockStandardPath(ModBlocks.alchemyCatalyst); + registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockStandardPath(ModBlocks.bifrost); + registerBlockStandardPath(ModBlocks.bifrostPerm); + registerBlockStandardPath(ModBlocks.blazeBlock); + registerBlockStandardPath(ModBlocks.cacophonium); + registerBlockStandardPath(ModBlocks.cellBlock); + registerBlockStandardPath(ModBlocks.conjurationCatalyst); + registerBlockStandardPath(ModBlocks.cocoon); + registerBlockStandardPath(ModBlocks.corporeaFunnel); + registerBlockStandardPath(ModBlocks.corporeaInterceptor); + registerBlockStandardPath(ModBlocks.corporeaRetainer); + registerBlockVariant(ModBlocks.dirtPath); + registerBlockStandardPath(ModBlocks.distributor); + registerBlockStandardPath(ModBlocks.elfGlass); + registerBlockStandardPath(ModBlocks.enchantedSoil); + registerBlockStandardPath(ModBlocks.enchanter); + registerBlockStandardPath(ModBlocks.enderEye); + registerBlockStandardPath(ModBlocks.felPumpkin); + registerBlockStandardPath(ModBlocks.floatingSpecialFlower); + registerBlockVariant(ModBlocks.forestEye); + registerBlockStandardPath(ModBlocks.ghostRail); + registerBlockStandardPath(ModBlocks.incensePlate); + registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); + registerBlockStandardPath(ModBlocks.manaBomb); + registerBlockStandardPath(ModBlocks.manaDetector); + registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockStandardPath(ModBlocks.manaVoid); + registerBlockStandardPath(ModBlocks.prism); + registerBlockStandardPath(ModBlocks.pistonRelay); + registerBlockStandardPath(ModBlocks.pump); + registerBlockStandardPath(ModBlocks.redStringComparator); + registerBlockStandardPath(ModBlocks.redStringContainer); + registerBlockStandardPath(ModBlocks.redStringDispenser); + registerBlockStandardPath(ModBlocks.redStringFertilizer); + registerBlockStandardPath(ModBlocks.redStringInterceptor); + registerBlockStandardPath(ModBlocks.redStringRelay); + registerBlockStandardPath(ModBlocks.rfGenerator); + registerBlockStandardPath(ModBlocks.root); + registerBlockVariant(ModBlocks.runeAltar); + registerBlockStandardPath(ModBlocks.shimmerrock); + registerBlockStandardPath(ModBlocks.shimmerwoodPlanks); + registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); + registerBlockVariant(ModBlocks.spawnerClaw); + registerBlockStandardPath(ModBlocks.specialFlower); + registerBlockVariant(ModBlocks.starfield, "powered=false"); + registerBlockVariant(ModBlocks.terraPlate); + registerBlockVariant(ModBlocks.tinyPlanet); + registerBlockStandardPath(ModBlocks.tinyPotato); + registerBlockStandardPath(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); // Item models which all use the same base model and recolored by render layer - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); - registerBlockAllMeta(ModBlocks.petalBlock, EnumDyeColor.values().length, "petal_block"); - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); + registerBlockVariantMetas(ModBlocks.manaBeacon, EnumDyeColor.values().length, "normal"); + registerBlockVariantMetas(ModBlocks.petalBlock, EnumDyeColor.values().length, "normal"); + registerBlockVariantMetas(ModBlocks.unstableBlock, EnumDyeColor.values().length, "normal"); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.altar, AltarVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.lightRelay, LuminizerVariant.class, "powered=false,variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); @@ -516,28 +515,28 @@ public final class ModelHandler { // Only for models that absolutely can't be converted to JSON. Use VERY sparingly @SuppressWarnings("deprecation") private static void registerTESRItems() { - registerItemModel(ModBlocks.avatar); + registerBlockStandardPath(ModBlocks.avatar); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - registerItemModel(ModBlocks.bellows); + registerBlockStandardPath(ModBlocks.bellows); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); - registerItemModel(ModBlocks.brewery); + registerBlockStandardPath(ModBlocks.brewery); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - registerItemModel(ModBlocks.corporeaCrystalCube); + registerBlockStandardPath(ModBlocks.corporeaCrystalCube); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - registerItemModel(ModBlocks.corporeaIndex); + registerBlockStandardPath(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); registerItemModel(ModItems.gaiaHead); ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerItemModel(ModBlocks.hourglass); + registerBlockStandardPath(ModBlocks.hourglass); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - registerItemModel(ModBlocks.teruTeruBozu); + registerBlockStandardPath(ModBlocks.teruTeruBozu); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } @@ -744,67 +743,67 @@ public final class ModelHandler { private static void registerStairs() { for (Block b : ModFluffBlocks.pavementStairs) { - registerItemModel(b); + registerBlockStandardPath(b); } for (Block b : ModFluffBlocks.biomeStoneStairs) { - registerItemModel(b); + registerBlockStandardPath(b); } - registerItemModel(ModFluffBlocks.blazeQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.blazeQuartzStairs); if (ConfigHandler.darkQuartzEnabled) - registerItemModel(ModFluffBlocks.darkQuartzStairs); - registerItemModel(ModFluffBlocks.dreamwoodStairs); - registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); - registerItemModel(ModFluffBlocks.elfQuartzStairs); - registerItemModel(ModFluffBlocks.lavenderQuartzStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.manaQuartzStairs); - registerItemModel(ModFluffBlocks.netherBrickStairs); - registerItemModel(ModFluffBlocks.redQuartzStairs); - registerItemModel(ModFluffBlocks.shimmerrockStairs); - registerItemModel(ModFluffBlocks.shimmerwoodPlankStairs); - registerItemModel(ModFluffBlocks.snowBrickStairs); - registerItemModel(ModFluffBlocks.soulBrickStairs); - registerItemModel(ModFluffBlocks.sunnyQuartzStairs); - registerItemModel(ModFluffBlocks.tileStairs); + registerBlockStandardPath(ModFluffBlocks.darkQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.dreamwoodStairs); + registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.elfQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.lavenderQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.livingrockStairs); + registerBlockStandardPath(ModFluffBlocks.livingrockBrickStairs); + registerBlockStandardPath(ModFluffBlocks.livingwoodStairs); + registerBlockStandardPath(ModFluffBlocks.livingwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.manaQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.netherBrickStairs); + registerBlockStandardPath(ModFluffBlocks.redQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.shimmerrockStairs); + registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.snowBrickStairs); + registerBlockStandardPath(ModFluffBlocks.soulBrickStairs); + registerBlockStandardPath(ModFluffBlocks.sunnyQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.tileStairs); } private static void registerSlabs() { for (Block b : ModFluffBlocks.biomeStoneSlabs) { - registerItemModel(b); + registerBlockStandardPath(b); } for (Block b : ModFluffBlocks.pavementSlabs) { - registerItemModel(b); + registerBlockStandardPath(b); } - registerItemModel(ModFluffBlocks.livingwoodSlab); - registerItemModel(ModFluffBlocks.livingwoodPlankSlab); - registerItemModel(ModFluffBlocks.livingrockSlab); - registerItemModel(ModFluffBlocks.livingrockBrickSlab); + registerBlockStandardPath(ModFluffBlocks.livingwoodSlab); + registerBlockStandardPath(ModFluffBlocks.livingwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.livingrockSlab); + registerBlockStandardPath(ModFluffBlocks.livingrockBrickSlab); - registerItemModel(ModFluffBlocks.blazeQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.blazeQuartzSlab); if (ConfigHandler.darkQuartzEnabled) - registerItemModel(ModFluffBlocks.darkQuartzSlab); - registerItemModel(ModFluffBlocks.elfQuartzSlab); - registerItemModel(ModFluffBlocks.lavenderQuartzSlab); - registerItemModel(ModFluffBlocks.manaQuartzSlab); - registerItemModel(ModFluffBlocks.redQuartzSlab); - registerItemModel(ModFluffBlocks.sunnyQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.darkQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.elfQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.lavenderQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.manaQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.redQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.sunnyQuartzSlab); - registerItemModel(ModFluffBlocks.dreamwoodSlab); - registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); - registerItemModel(ModFluffBlocks.dirtPathSlab); - registerItemModel(ModFluffBlocks.shimmerrockSlab); - registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); - registerItemModel(ModFluffBlocks.netherBrickSlab); - registerItemModel(ModFluffBlocks.soulBrickSlab); - registerItemModel(ModFluffBlocks.snowBrickSlab); - registerItemModel(ModFluffBlocks.tileSlab); + registerBlockStandardPath(ModFluffBlocks.dreamwoodSlab); + registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.dirtPathSlab); + registerBlockStandardPath(ModFluffBlocks.shimmerrockSlab); + registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.netherBrickSlab); + registerBlockStandardPath(ModFluffBlocks.soulBrickSlab); + registerBlockStandardPath(ModFluffBlocks.snowBrickSlab); + registerBlockStandardPath(ModFluffBlocks.tileSlab); } private static void registerWalls() { @@ -813,15 +812,15 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + variant.getName() + "_wall", "inventory")); } - registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); - registerBlock(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlock(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); + registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); + registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); + registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); } private static void registerPanes() { - registerItemModel(ModFluffBlocks.alfglassPane); - registerItemModel(ModFluffBlocks.bifrostPane); - registerItemModel(ModFluffBlocks.managlassPane); + registerBlockStandardPath(ModFluffBlocks.alfglassPane); + registerBlockStandardPath(ModFluffBlocks.bifrostPane); + registerBlockStandardPath(ModFluffBlocks.managlassPane); } private static void registerQuartzBlocks() { @@ -836,14 +835,6 @@ public final class ModelHandler { } } - private static void registerLuminizers() { - Item item = Item.getItemFromBlock(ModBlocks.lightRelay); - String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.lightRelay).toString(); - for (LuminizerVariant v : LuminizerVariant.values()) { - ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); - } - } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { @@ -876,28 +867,54 @@ public final class ModelHandler { } } - private static void registerBlock(Block b, String name) { - registerBlockAllMeta(b, 1, name); + + // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // + private static void registerBlockVariant(Block b) { + registerBlockVariant(b, "normal"); } - private static void registerBlockAllMeta(Block b, int maxExclusive, String name) { - registerBlockAllMetaNames(b, maxExclusive, i -> name); + private static void registerBlockVariant(Block b, String variant) { + registerBlockVariantMetas(b, 1, variant); } - private static void registerBlockAllMetaNames(Block b, int maxExclusive, IntFunction metaToName) { + private static void registerBlockVariantMetas(Block b, int maxExclusive, String variant) { + registerBlockVariantMetas(b, maxExclusive, i -> variant); + } + + private static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( item, i, - new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToName.apply(i), "inventory") + new ModelResourceLocation(item.getRegistryName(), metaToVariant.apply(i)) ); } } - private static void registerItemModel(Block b) { + // Registers the ItemBlock to models/item/#inventory + private static void registerBlockStandardPath(Block b) { registerItemModel(Item.getItemFromBlock(b)); } + // Registers the ItemBlock to a custom path in models/item/itemblock/ + private static void registerBlockCustomPath(Block b, String path) { + registerBlockCustomPathMetas(b, 1, path); + } + + private static void registerBlockCustomPathMetas(Block b, int maxExclusive, String path) { + registerBlockCustomPathMetas(b, maxExclusive, i -> path); + } + + private static void registerBlockCustomPathMetas(Block b, int maxExclusive, IntFunction metaToPath) { + Item item = Item.getItemFromBlock(b); + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToPath.apply(i), "inventory") + ); + } + } + private static void registerItemModel(Item i,int meta) { ResourceLocation loc = i.getRegistryName(); ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json index 46fdc670f..dba05d34f 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:minusone_all", - "textures": { - "all": "botania:blocks/dirtPath" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:trodden_dirt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json index f052f297d..321fdc8e1 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/dirtPath", - "top": "botania:blocks/dirtPath", - "side": "botania:blocks/dirtPath" + "bottom": "minecraft:blocks/grass_path_top", + "top": "minecraft:blocks/grass_path_top", + "side": "minecraft:blocks/grass_path_top" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json index c5205f908..8c1f76359 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dirtPath" } + "textures": { "all": "minecraft:blocks/grass_path_top" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestEye.json b/src/main/resources/assets/botania/blockstates/forestEye.json index 882a5bbc2..8b96be9a7 100644 --- a/src/main/resources/assets/botania/blockstates/forestEye.json +++ b/src/main/resources/assets/botania/blockstates/forestEye.json @@ -1,19 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:microblock", - "textures": { - "bottom": "botania:blocks/forestEye0", - "top": "botania:blocks/forestEye1", - "north": "botania:blocks/forestEye2", - "south": "botania:blocks/forestEye3", - "west": "botania:blocks/forestEye4", - "east": "botania:blocks/forestEye5" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:eye_of_ancients" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json index 646dcd2dc..09ef83a89 100644 --- a/src/main/resources/assets/botania/blockstates/manaBeacon.json +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:miniblock_top_tinted", - "textures": { - "all": "botania:blocks/manaBeacon0", - "top": "botania:blocks/manaBeacon1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:unstable_beacon" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json index daec2757c..dc46fcfaf 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json +++ b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:miniblock_all", - "textures": { - "all": "botania:blocks/tinyPlanetBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:tiny_planet_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json index 23238ca79..5083a6d3c 100644 --- a/src/main/resources/assets/botania/blockstates/unstableBlock.json +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:microblock_all_tinted", - "textures": { - "all": "botania:blocks/unstableBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:unstable_cube" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/eye_of_ancients.json b/src/main/resources/assets/botania/models/block/eye_of_ancients.json new file mode 100644 index 000000000..57b92028c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/eye_of_ancients.json @@ -0,0 +1,11 @@ +{ + "parent": "botania:block/shapes/eightbyeight", + "textures": { + "bottom": "botania:blocks/forestEye0", + "top": "botania:blocks/forestEye1", + "north": "botania:blocks/forestEye2", + "south": "botania:blocks/forestEye3", + "west": "botania:blocks/forestEye4", + "east": "botania:blocks/forestEye5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json deleted file mode 100644 index cda6e04b8..000000000 --- a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "textures": { - "particle": "#all" - }, - "elements": [ - { - "name": "Cube", - "from": [ 3, 3, 3 ], - "to": [ 13, 13, 13 ], - "faces": { - "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock.json b/src/main/resources/assets/botania/models/block/shapes/eightbyeight.json similarity index 93% rename from src/main/resources/assets/botania/models/block/microblock.json rename to src/main/resources/assets/botania/models/block/shapes/eightbyeight.json index e4ae95d3b..ca0a08ead 100644 --- a/src/main/resources/assets/botania/models/block/microblock.json +++ b/src/main/resources/assets/botania/models/block/shapes/eightbyeight.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#top" }, diff --git a/src/main/resources/assets/botania/models/block/microblock_all_tinted.json b/src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json similarity index 94% rename from src/main/resources/assets/botania/models/block/microblock_all_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json index 9cd2d3fc0..4bd8721fe 100644 --- a/src/main/resources/assets/botania/models/block/microblock_all_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/minusone_all.json b/src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json similarity index 94% rename from src/main/resources/assets/botania/models/block/minusone_all.json rename to src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json index 78896926e..bcca615cd 100644 --- a/src/main/resources/assets/botania/models/block/minusone_all.json +++ b/src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniblock_all.json b/src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json similarity index 93% rename from src/main/resources/assets/botania/models/block/miniblock_all.json rename to src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json index 78ea55b41..6691908eb 100644 --- a/src/main/resources/assets/botania/models/block/miniblock_all.json +++ b/src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json b/src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json similarity index 94% rename from src/main/resources/assets/botania/models/block/miniblock_top_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json index 9022ed180..d77c17bc9 100644 --- a/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/tiny_planet_block.json b/src/main/resources/assets/botania/models/block/tiny_planet_block.json new file mode 100644 index 000000000..62c80768e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/tiny_planet_block.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/tenbyten_all", + "textures": { + "all": "botania:blocks/tinyPlanetBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/trodden_dirt.json b/src/main/resources/assets/botania/models/block/trodden_dirt.json new file mode 100644 index 000000000..3547f8951 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/trodden_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/fifteen_high_all", + "textures": { + "all": "botania:blocks/dirtPath" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_beacon.json b/src/main/resources/assets/botania/models/block/unstable_beacon.json new file mode 100644 index 000000000..2d0e6eb60 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/unstable_beacon.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/tenbyten_top_tinted", + "textures": { + "all": "botania:blocks/manaBeacon0", + "top": "botania:blocks/manaBeacon1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_cube.json b/src/main/resources/assets/botania/models/block/unstable_cube.json new file mode 100644 index 000000000..9be86d7a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/unstable_cube.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/eightbyeight_all_tinted", + "textures": { + "all": "botania:blocks/unstableBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json deleted file mode 100644 index 4df782b0c..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/default_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json deleted file mode 100644 index bffef4406..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/desert_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json deleted file mode 100644 index 58385e894..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_canopy" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json deleted file mode 100644 index b18a74edb..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_gathering" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json deleted file mode 100644 index 3ec534da6..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_wild" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json deleted file mode 100644 index 3cd855b1a..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/forest_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json deleted file mode 100644 index 3245bebc2..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/fungal_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json deleted file mode 100644 index 06e94f1b1..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/life_imbuer" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json deleted file mode 100644 index fc2612afc..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/luminizer_launcher" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json deleted file mode 100644 index 5020f058b..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/mesa_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json deleted file mode 100644 index c5a551203..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/mountain_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/petal_block.json b/src/main/resources/assets/botania/models/item/itemblock/petal_block.json deleted file mode 100644 index f8bb788c2..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/petal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/petal_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json deleted file mode 100644 index 715eab38c..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/plains_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json deleted file mode 100644 index 942906288..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/runic_altar" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json b/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json deleted file mode 100644 index d419af93d..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/spark_tinkerer" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json deleted file mode 100644 index 64ac9b949..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/starfield_creator" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json deleted file mode 100644 index 8d0aa8c27..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/swamp_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json deleted file mode 100644 index efa64b8a9..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/taiga_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json b/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json deleted file mode 100644 index dd6a18f0a..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/terra_plate" -} \ No newline at end of file