From 2ee0d7f0ede3722030fe5b8f67a1caaf203a1049 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 21:36:49 -0500 Subject: [PATCH] More borign model cleaning --- .../client/core/handler/ModelHandler.java | 138 ++++++++---------- .../botania/blockstates/alchemyCatalyst.json | 14 +- .../botania/blockstates/alfheimPortal.json | 21 +-- .../assets/botania/blockstates/altGrass.json | 62 ++++---- .../assets/botania/blockstates/bifrost.json | 12 +- .../botania/blockstates/bifrostPerm.json | 12 +- .../botania/blockstates/blazeBlock.json | 11 +- .../botania/blockstates/cacophoniumBlock.json | 3 +- .../assets/botania/blockstates/cellBlock.json | 3 +- .../assets/botania/blockstates/cocoon.json | 3 +- .../blockstates/conjurationCatalyst.json | 3 +- .../botania/blockstates/corporeaFunnel.json | 3 +- .../blockstates/corporeaInterceptor.json | 3 +- .../botania/blockstates/corporeaRetainer.json | 3 +- .../botania/blockstates/distributor.json | 8 +- .../assets/botania/blockstates/elfGlass.json | 9 +- .../botania/blockstates/enchantedSoil.json | 3 +- .../assets/botania/blockstates/enchanter.json | 3 +- .../botania/blockstates/enderEyeBlock.json | 3 +- .../botania/blockstates/felPumpkin.json | 8 +- .../assets/botania/blockstates/ghostRail.json | 11 +- .../botania/blockstates/incensePlate.json | 3 +- .../botania/blockstates/livingrock.json | 17 +-- .../blockstates/livingrock0SlabFull.json | 6 +- .../blockstates/livingrock1SlabFull.json | 6 +- .../botania/blockstates/livingwood.json | 19 +-- .../blockstates/livingwood0SlabFull.json | 6 +- .../blockstates/livingwood1SlabFull.json | 6 +- .../assets/botania/blockstates/manaBomb.json | 3 +- .../botania/blockstates/manaDetector.json | 3 +- .../assets/botania/blockstates/manaGlass.json | 8 +- .../assets/botania/blockstates/manaVoid.json | 4 +- .../botania/blockstates/pistonRelay.json | 8 +- .../assets/botania/blockstates/prism.json | 23 +-- .../blockstates/redStringComparator.json | 3 +- .../blockstates/redStringContainer.json | 3 +- .../blockstates/redStringDispenser.json | 3 +- .../blockstates/redStringFertilizer.json | 3 +- .../blockstates/redStringInterceptor.json | 3 +- .../botania/blockstates/redStringRelay.json | 3 +- .../botania/blockstates/rfGenerator.json | 3 +- .../assets/botania/blockstates/root.json | 10 +- .../assets/botania/blockstates/seaLamp.json | 14 -- .../botania/blockstates/shimmerrock.json | 9 +- .../blockstates/shimmerrock0SlabFull.json | 6 +- .../blockstates/shimmerwoodPlanks.json | 9 +- .../shimmerwoodPlanks0SlabFull.json | 6 +- .../botania/blockstates/spawnerClaw.json | 4 +- .../assets/botania/blockstates/turntable.json | 13 +- .../models/block/alchemy_catalyst.json | 8 + .../botania/models/block/alfheim_portal.json | 6 + .../models/block/alfheim_portal_on.json | 6 + .../assets/botania/models/block/bifrost.json | 6 + .../botania/models/block/blaze_block.json | 6 + .../botania/models/block/dry_grass.json | 8 + .../botania/models/block/golden_grass.json | 8 + .../botania/models/block/infused_grass.json | 8 + .../botania/models/block/livingrock.json | 6 + .../models/block/livingrock_brick.json | 6 + .../block/livingrock_chiseled_brick.json | 6 + .../block/livingrock_cracked_brick.json | 6 + .../models/block/livingrock_mossy_brick.json | 6 + .../botania/models/block/livingwood.json | 6 + .../models/block/livingwood_framed.json | 6 + .../models/block/livingwood_glimmering.json | 6 + .../models/block/livingwood_mossy_planks.json | 6 + .../block/livingwood_pattern_framed.json | 6 + .../models/block/livingwood_planks.json | 6 + .../botania/models/block/mutated_grass.json | 8 + .../assets/botania/models/block/prism.json | 6 +- .../assets/botania/models/block/root.json | 6 + .../botania/models/block/scorched_grass.json | 8 + .../botania/models/block/shimmerrock.json | 6 + .../models/block/shimmerwood_planks.json | 6 + .../botania/models/block/turntable.json | 8 + .../botania/models/block/vivid_grass.json | 8 + .../models/item/{ => itemblock}/avatar.json | 0 .../models/item/{ => itemblock}/bellows.json | 0 .../models/item/{ => itemblock}/brewery.json | 0 .../corporea_index.json} | 0 .../models/item/itemblock/ghost_rail.json | 6 + .../hovering_hourglass.json} | 0 .../teru_teru_bozu.json} | 0 83 files changed, 349 insertions(+), 375 deletions(-) delete mode 100644 src/main/resources/assets/botania/blockstates/seaLamp.json create mode 100644 src/main/resources/assets/botania/models/block/alchemy_catalyst.json create mode 100644 src/main/resources/assets/botania/models/block/alfheim_portal.json create mode 100644 src/main/resources/assets/botania/models/block/alfheim_portal_on.json create mode 100644 src/main/resources/assets/botania/models/block/bifrost.json create mode 100644 src/main/resources/assets/botania/models/block/blaze_block.json create mode 100644 src/main/resources/assets/botania/models/block/dry_grass.json create mode 100644 src/main/resources/assets/botania/models/block/golden_grass.json create mode 100644 src/main/resources/assets/botania/models/block/infused_grass.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/mutated_grass.json create mode 100644 src/main/resources/assets/botania/models/block/root.json create mode 100644 src/main/resources/assets/botania/models/block/scorched_grass.json create mode 100644 src/main/resources/assets/botania/models/block/shimmerrock.json create mode 100644 src/main/resources/assets/botania/models/block/shimmerwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/turntable.json create mode 100644 src/main/resources/assets/botania/models/block/vivid_grass.json rename src/main/resources/assets/botania/models/item/{ => itemblock}/avatar.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/bellows.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/brewery.json (100%) rename src/main/resources/assets/botania/models/item/{corporeaIndex.json => itemblock/corporea_index.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json rename src/main/resources/assets/botania/models/item/{hourglass.json => itemblock/hovering_hourglass.json} (100%) rename src/main/resources/assets/botania/models/item/{teruTeruBozu.json => itemblock/teru_teru_bozu.json} (100%) 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 d93f1b4a1..b5adfe559 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,20 +8,15 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockSkull; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; @@ -48,7 +43,6 @@ import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.subtile.SubTileDecor; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; @@ -92,26 +86,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; -import vazkii.botania.common.block.tile.TileAvatar; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.block.tile.TileHourglass; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import java.util.List; import java.util.Locale; import java.util.function.IntFunction; -import static vazkii.botania.common.item.ModItems.*; - public final class ModelHandler { public static void registerModels() { @@ -209,79 +189,79 @@ public final class ModelHandler { } private static void registerStandardBlocks() { - registerBlockStandardPath(ModBlocks.avatar); - registerBlockStandardPath(ModBlocks.bellows); - registerBlockStandardPath(ModBlocks.brewery); - registerBlockStandardPath(ModBlocks.corporeaCrystalCube); - registerBlockStandardPath(ModBlocks.corporeaIndex); - registerBlockStandardPath(ModBlocks.hourglass); - registerBlockStandardPath(ModBlocks.teruTeruBozu); + registerBlockCustomPath(ModBlocks.avatar, "avatar"); + registerBlockCustomPath(ModBlocks.bellows, "bellows"); + registerBlockCustomPath(ModBlocks.brewery, "brewery"); + registerBlockVariantInventory(ModBlocks.corporeaCrystalCube); + registerBlockCustomPath(ModBlocks.corporeaIndex, "corporea_index"); + registerBlockCustomPath(ModBlocks.hourglass, "hovering_hourglass"); + registerBlockCustomPath(ModBlocks.teruTeruBozu, "teru_teru_bozu"); - registerBlockStandardPath(ModBlocks.alchemyCatalyst); - registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockVariantNormal(ModBlocks.alchemyCatalyst); + registerBlockVariant(ModBlocks.alfPortal, "state=off"); registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); - registerBlockStandardPath(ModBlocks.bifrost); + registerBlockVariantNormal(ModBlocks.bifrost); registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); - registerBlockStandardPath(ModBlocks.bifrostPerm); + registerBlockVariantNormal(ModBlocks.bifrostPerm); registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); - 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); + registerBlockVariantNormal(ModBlocks.blazeBlock); + registerBlockVariant(ModBlocks.cacophonium, "powered=false"); + registerBlockVariantNormal(ModBlocks.cellBlock); + registerBlockVariantNormal(ModBlocks.conjurationCatalyst); + registerBlockVariantNormal(ModBlocks.cocoon); + registerBlockVariant(ModBlocks.corporeaFunnel, "powered=false"); + registerBlockVariant(ModBlocks.corporeaInterceptor, "powered=false"); + registerBlockVariant(ModBlocks.corporeaRetainer, "powered=false"); + registerBlockVariantNormal(ModBlocks.dirtPath); registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); - registerBlockStandardPath(ModBlocks.distributor); + registerBlockVariantNormal(ModBlocks.distributor); registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); - registerBlockStandardPath(ModBlocks.elfGlass); - registerBlockStandardPath(ModBlocks.enchantedSoil); - registerBlockStandardPath(ModBlocks.enchanter); - registerBlockStandardPath(ModBlocks.enderEye); - registerBlockStandardPath(ModBlocks.felPumpkin); - registerBlockStandardPath(ModBlocks.floatingSpecialFlower); + registerBlockVariantNormal(ModBlocks.elfGlass); + registerBlockVariantNormal(ModBlocks.enchantedSoil); + registerBlockVariant(ModBlocks.enchanter, "facing=x"); + registerBlockVariant(ModBlocks.enderEye, "powered=false"); + registerBlockVariant(ModBlocks.felPumpkin, "facing=north"); + registerBlockVariantInventory(ModBlocks.floatingSpecialFlower); registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariant(ModBlocks.forestEye); - registerBlockStandardPath(ModBlocks.ghostRail); - registerBlockStandardPath(ModBlocks.incensePlate); + registerBlockVariantNormal(ModBlocks.forestEye); + registerBlockCustomPath(ModBlocks.ghostRail, "ghost_rail"); + registerBlockVariant(ModBlocks.incensePlate, "facing=south"); registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlockStandardPath(ModBlocks.manaBomb); - registerBlockStandardPath(ModBlocks.manaDetector); - registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockVariantNormal(ModBlocks.manaBomb); + registerBlockVariant(ModBlocks.manaDetector, "powered=false"); + registerBlockVariantNormal(ModBlocks.manaGlass); registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); - registerBlockStandardPath(ModBlocks.manaVoid); + registerBlockVariantNormal(ModBlocks.manaVoid); registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); // Explicit mapping needed because saved meta does not match EnumDyeColor EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN }; registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName()); - 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.prism, "has_lens=false,powered=false"); + registerBlockVariantNormal(ModBlocks.pistonRelay); + registerBlockVariantInventory(ModBlocks.pump); + registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); + registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); + registerBlockVariant(ModBlocks.redStringDispenser, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); + registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); + registerBlockVariantNormal(ModBlocks.rfGenerator); + registerBlockVariantNormal(ModBlocks.root); + registerBlockVariantNormal(ModBlocks.runeAltar); + registerBlockVariantNormal(ModBlocks.shimmerrock); + registerBlockVariantNormal(ModBlocks.shimmerwoodPlanks); registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); - registerBlockVariant(ModBlocks.spawnerClaw); - registerBlockStandardPath(ModBlocks.specialFlower); + registerBlockVariantNormal(ModBlocks.spawnerClaw); + registerBlockVariantInventory(ModBlocks.specialFlower); registerBlockVariant(ModBlocks.starfield, "powered=false"); - registerBlockVariant(ModBlocks.terraPlate); - registerBlockVariant(ModBlocks.tinyPlanet); + registerBlockVariantNormal(ModBlocks.terraPlate); + registerBlockVariantNormal(ModBlocks.tinyPlanet); registerBlockVariant(ModBlocks.tinyPotato, "facing=north"); - registerBlockStandardPath(ModBlocks.turntable); + registerBlockVariantNormal(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); @@ -371,10 +351,15 @@ public final class ModelHandler { } // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // - private static void registerBlockVariant(Block b) { + private static void registerBlockVariantNormal(Block b) { registerBlockVariant(b, "normal"); } + // Registers the ItemBlock to models/item/#inventory + private static void registerBlockVariantInventory(Block b) { + registerBlockVariant(b, "inventory"); + } + public static void registerBlockVariant(Block b, String variant) { registerBlockVariantMetas(b, 1, variant); } @@ -393,11 +378,6 @@ public final class ModelHandler { } } - // Registers the ItemBlock to models/item/#inventory - private static void registerBlockStandardPath(Block b) { - registerBlockVariant(b, "inventory"); - } - // Registers the ItemBlock to a custom path in models/item/itemblock/ private static void registerBlockCustomPath(Block b, String path) { registerBlockCustomPathMetas(b, 1, path); diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json index e054f42ab..1eed16194 100644 --- a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json +++ b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json @@ -1,17 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/alchemyCatalyst0", - "top": "botania:blocks/alchemyCatalyst1", - "side": "botania:blocks/alchemyCatalyst2" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:alchemy_catalyst" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/alfheimPortal.json b/src/main/resources/assets/botania/blockstates/alfheimPortal.json index 812637c1b..7f589eaf8 100644 --- a/src/main/resources/assets/botania/blockstates/alfheimPortal.json +++ b/src/main/resources/assets/botania/blockstates/alfheimPortal.json @@ -1,22 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/alfheimPortal0" - }, - "transform": "forge:default-block" - }, "variants": { - "state": { - "off": {}, - "on_x": { - "textures": { "all": "botania:blocks/alfheimPortal1" } - }, - "on_z": { - "textures": { "all": "botania:blocks/alfheimPortal1" } - } - }, - "inventory": [{}] + "state=off": { "model": "botania:alfheim_portal" }, + "state=on_x": { "model": "botania:alfheim_portal_on" }, + "state=on_z": { "model": "botania:alfheim_portal_on" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json index ec9f93048..58e0cf7f6 100644 --- a/src/main/resources/assets/botania/blockstates/altGrass.json +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -1,30 +1,40 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { "bottom": "minecraft:blocks/dirt" }, - "transform": "forge:default-block" - }, "variants": { - "variant": { - "dry": { - "textures": { "top": "botania:blocks/altGrass0", "side": "botania:blocks/altGrass1" } - }, - "golden": { - "textures": { "top": "botania:blocks/altGrass2", "side": "botania:blocks/altGrass3" } - }, - "vivid": { - "textures": { "top": "botania:blocks/altGrass4", "side": "botania:blocks/altGrass5" } - }, - "scorched": { - "textures": { "top": "botania:blocks/altGrass6", "side": "botania:blocks/altGrass7" } - }, - "infused": { - "textures": { "top": "botania:blocks/altGrass8", "side": "botania:blocks/altGrass9" } - }, - "mutated": { - "textures": { "top": "botania:blocks/altGrass10", "side": "botania:blocks/altGrass11" } - } - } + "variant=dry": [ + { "model": "botania:dry_grass" }, + { "model": "botania:dry_grass", "y": 90 }, + { "model": "botania:dry_grass", "y": 180 }, + { "model": "botania:dry_grass", "y": 270 } + ], + "variant=golden": [ + { "model": "botania:golden_grass" }, + { "model": "botania:golden_grass", "y": 90 }, + { "model": "botania:golden_grass", "y": 180 }, + { "model": "botania:golden_grass", "y": 270 } + ], + "variant=vivid": [ + { "model": "botania:vivid_grass" }, + { "model": "botania:vivid_grass", "y": 90 }, + { "model": "botania:vivid_grass", "y": 180 }, + { "model": "botania:vivid_grass", "y": 270 } + ], + "variant=scorched": [ + { "model": "botania:scorched_grass" }, + { "model": "botania:scorched_grass", "y": 90 }, + { "model": "botania:scorched_grass", "y": 180 }, + { "model": "botania:scorched_grass", "y": 270 } + ], + "variant=infused": [ + { "model": "botania:infused_grass" }, + { "model": "botania:infused_grass", "y": 90 }, + { "model": "botania:infused_grass", "y": 180 }, + { "model": "botania:infused_grass", "y": 270 } + ], + "variant=mutated": [ + { "model": "botania:mutated_grass" }, + { "model": "botania:mutated_grass", "y": 90 }, + { "model": "botania:mutated_grass", "y": 180 }, + { "model": "botania:mutated_grass", "y": 270 } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrost.json b/src/main/resources/assets/botania/blockstates/bifrost.json index e10154d99..73ebd7453 100644 --- a/src/main/resources/assets/botania/blockstates/bifrost.json +++ b/src/main/resources/assets/botania/blockstates/bifrost.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/bifrost" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:bifrost" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrostPerm.json b/src/main/resources/assets/botania/blockstates/bifrostPerm.json index e10154d99..73ebd7453 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPerm.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPerm.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/bifrost" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:bifrost" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blazeBlock.json b/src/main/resources/assets/botania/blockstates/blazeBlock.json index 128196b32..ecc5d1fbe 100644 --- a/src/main/resources/assets/botania/blockstates/blazeBlock.json +++ b/src/main/resources/assets/botania/blockstates/blazeBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/blazeBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:blaze_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json index 51790ca4a..7002906fc 100644 --- a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json +++ b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json index b14eadd13..d405b3ad3 100644 --- a/src/main/resources/assets/botania/blockstates/cellBlock.json +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json index 7d3170d3e..7b35ff907 100644 --- a/src/main/resources/assets/botania/blockstates/cocoon.json +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -13,7 +13,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json index e3f933d06..e623e55a2 100644 --- a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -10,8 +10,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json index ba2242e45..56d9638be 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json +++ b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json index 9e4db20af..64a7c9a34 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json index de67279d8..350fb96cd 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json +++ b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json @@ -11,7 +11,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json index 3a39b6b79..886ce900b 100644 --- a/src/main/resources/assets/botania/blockstates/distributor.json +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -6,12 +6,10 @@ "top": "botania:blocks/distributor0", "side": "botania:blocks/distributor1", "bottom": "botania:blocks/livingrock0" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json index c7217df6b..46e30264a 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlass.json +++ b/src/main/resources/assets/botania/blockstates/elfGlass.json @@ -1,7 +1,8 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all" + "model": "minecraft:cube_all", + "transform": "forge:default-block" }, "variants": { "normal": [ @@ -9,10 +10,6 @@ { "textures": { "all": "botania:blocks/elfGlass1" } }, { "textures": { "all": "botania:blocks/elfGlass2" } }, { "textures": { "all": "botania:blocks/elfGlass3" } } - ], - "inventory": [{ - "transform": "forge:default-block", - "textures": { "all": "botania:blocks/elfGlass" } - }] + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json index 9daa1928c..ad3fd5ec7 100644 --- a/src/main/resources/assets/botania/blockstates/enchantedSoil.json +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index 71a389c10..317ae0bd2 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -11,7 +11,6 @@ "facing": { "x": {}, "z": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index d49d0e4dc..d509fb021 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -12,7 +12,6 @@ "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, "false": {} }, - "powered=false": [{}], - "inventory": [{}] + "powered=false": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json index afb93a0bf..a883a82f2 100644 --- a/src/main/resources/assets/botania/blockstates/felPumpkin.json +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -6,7 +6,8 @@ "top": "minecraft:blocks/pumpkin_top", "front": "botania:blocks/felPumpkin", "side": "minecraft:blocks/pumpkin_side" - } + }, + "transform": "forge:default-block" }, "variants": { "facing": { @@ -14,9 +15,6 @@ "south": { "y": 180 }, "west": { "y": 270 }, "east": { "y": 90 } - }, - "inventory": [{ - "transform": "forge:default-block" - }] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json index 891a54fbd..d7a6becb1 100644 --- a/src/main/resources/assets/botania/blockstates/ghostRail.json +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -3,8 +3,7 @@ "defaults": { "textures": { "rail": "botania:blocks/ghostRail" - }, - "transform": "forge:default-item" + } }, "variants": { "shape": { @@ -14,12 +13,6 @@ "ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, "ascending_north": { "model": "minecraft:rail_raised_ne" }, "ascending_south": { "model": "minecraft:rail_raised_sw" } - }, - "inventory": [{ - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/ghostRail" - } - }] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 1a9af84eb..05eb4c866 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -13,7 +13,6 @@ "south": {}, "west": { "y": 90 }, "east": { "y": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index 2202ab749..3474630d0 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "default": { "textures": { "all": "botania:blocks/livingrock0" } }, - "brick": { "textures": { "all": "botania:blocks/livingrock1" } }, - "mossy_brick": { "textures": { "all": "botania:blocks/livingrock2" } }, - "cracked_brick": { "textures": { "all": "botania:blocks/livingrock3" } }, - "chiseled_brick": { "textures": { "all": "botania:blocks/livingrock4" } } - } + "variant=default": { "model": "botania:livingrock" }, + "variant=brick": { "model": "botania:livingrock_brick" }, + "variant=mossy_brick": { "model": "botania:livingrock_mossy_brick" }, + "variant=cracked_brick": { "model": "botania:livingrock_cracked_brick" }, + "variant=chiseled_brick": { "model": "botania:livingrock_chiseled_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json index 9bc4eca76..0ff8d3a0b 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingrock0" } - }] + "normal": { "model": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json index edf8dd3ea..ad78304be 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingrock1" } - }] + "normal": { "model": "botania:livingrock_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 5090da065..e3927b205 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -1,17 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "default": { "textures": { "all": "botania:blocks/livingwood0" } }, - "planks": { "textures": { "all": "botania:blocks/livingwood1" } }, - "mossy_planks": { "textures": { "all": "botania:blocks/livingwood2" } }, - "framed": { "textures": { "all": "botania:blocks/livingwood3" } }, - "pattern_framed": { "textures": { "all": "botania:blocks/livingwood4" } }, - "glimmering": { "textures": { "all": "botania:blocks/livingwood5" } } - } + "variant=default": { "model": "botania:livingwood" }, + "variant=planks": { "model": "botania:livingwood_planks" }, + "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, + "variant=framed": { "model": "botania:livingwood_framed" }, + "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:livingwood_glimmering" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json index 41e2ca5c6..71d8758ab 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingwood0" } - }] + "normal": { "model": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json index a7063094e..ee151acbe 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingwood1" } - }] + "normal": { "model": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBomb.json b/src/main/resources/assets/botania/blockstates/manaBomb.json index a0b707133..6eb3c0928 100644 --- a/src/main/resources/assets/botania/blockstates/manaBomb.json +++ b/src/main/resources/assets/botania/blockstates/manaBomb.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaDetector.json b/src/main/resources/assets/botania/blockstates/manaDetector.json index af949d40a..6e0e40770 100644 --- a/src/main/resources/assets/botania/blockstates/manaDetector.json +++ b/src/main/resources/assets/botania/blockstates/manaDetector.json @@ -11,7 +11,6 @@ "powered": { "true": { "textures": { "all": "botania:blocks/manaDetector1" } }, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json index 23e66042a..7579bf084 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlass.json +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -4,12 +4,10 @@ "model": "minecraft:cube_all", "textures": { "all": "botania:blocks/manaGlass" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json index 034836e67..dde8c8f4b 100644 --- a/src/main/resources/assets/botania/blockstates/manaVoid.json +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -8,8 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json index fb1ccb55e..bc7045a49 100644 --- a/src/main/resources/assets/botania/blockstates/pistonRelay.json +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -4,12 +4,10 @@ "model": "minecraft:cube_all", "textures": { "all": "botania:blocks/pistonRelay" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prism.json b/src/main/resources/assets/botania/blockstates/prism.json index 594c03ccd..70c9ec09f 100644 --- a/src/main/resources/assets/botania/blockstates/prism.json +++ b/src/main/resources/assets/botania/blockstates/prism.json @@ -1,23 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:prism", - "textures": { - "bottom": "botania:blocks/prism0", - "top": "botania:blocks/prism0", - "side": "botania:blocks/prism1" - }, - "transform": "forge:default-block" - }, "variants": { - "inventory": [{}], - "powered": { - "true": {}, - "false": {} - }, - "has_lens": { - "true": {}, - "false": {} - } + "has_lens=false,powered=false": { "model": "botania:prism" }, + "has_lens=true,powered=false": { "model": "botania:prism" }, + "has_lens=false,powered=true": { "model": "botania:prism" }, + "has_lens=true,powered=true": { "model": "botania:prism" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redStringComparator.json index 8c5c5f473..235c9f735 100644 --- a/src/main/resources/assets/botania/blockstates/redStringComparator.json +++ b/src/main/resources/assets/botania/blockstates/redStringComparator.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redStringContainer.json index 328bf9920..5e69b9040 100644 --- a/src/main/resources/assets/botania/blockstates/redStringContainer.json +++ b/src/main/resources/assets/botania/blockstates/redStringContainer.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redStringDispenser.json index 77ad927c0..b36fdda64 100644 --- a/src/main/resources/assets/botania/blockstates/redStringDispenser.json +++ b/src/main/resources/assets/botania/blockstates/redStringDispenser.json @@ -21,7 +21,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json index bffa455f4..341542a68 100644 --- a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json +++ b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json index decdcf9f2..2c4f60c88 100644 --- a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json @@ -21,7 +21,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redStringRelay.json index 1b61585ec..a430ae041 100644 --- a/src/main/resources/assets/botania/blockstates/redStringRelay.json +++ b/src/main/resources/assets/botania/blockstates/redStringRelay.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json index 1b7d47b4c..f7c71579d 100644 --- a/src/main/resources/assets/botania/blockstates/rfGenerator.json +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/root.json b/src/main/resources/assets/botania/blockstates/root.json index 6bced893d..c0360095f 100644 --- a/src/main/resources/assets/botania/blockstates/root.json +++ b/src/main/resources/assets/botania/blockstates/root.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/root" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:root" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/seaLamp.json b/src/main/resources/assets/botania/blockstates/seaLamp.json deleted file mode 100644 index a91f2a227..000000000 --- a/src/main/resources/assets/botania/blockstates/seaLamp.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/seaLamp" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock.json b/src/main/resources/assets/botania/blockstates/shimmerrock.json index 55193392b..91681a0e0 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerrock" }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:shimmerrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json index 7846bb4cb..91681a0e0 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerrock" } - }] + "normal": { "model": "botania:shimmerrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json index c80cb83d3..0e16dc267 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerwoodPlanks" }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:shimmerwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json index ee31766f3..0e16dc267 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerwoodPlanks" } - }] + "normal": { "model": "botania:shimmerwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index 8c9da4cac..392aae69c 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:life_imbuer" - } + "normal": { "model": "botania:life_imbuer" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/turntable.json b/src/main/resources/assets/botania/blockstates/turntable.json index 796d11f8f..a06bb863a 100644 --- a/src/main/resources/assets/botania/blockstates/turntable.json +++ b/src/main/resources/assets/botania/blockstates/turntable.json @@ -1,16 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/turntable1", - "top": "botania:blocks/turntable0", - "side": "botania:blocks/turntable1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:turntable" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json new file mode 100644 index 000000000..0fbe6496b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/alchemyCatalyst0", + "top": "botania:blocks/alchemyCatalyst1", + "side": "botania:blocks/alchemyCatalyst2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal.json b/src/main/resources/assets/botania/models/block/alfheim_portal.json new file mode 100644 index 000000000..c89f3e82d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alfheim_portal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json new file mode 100644 index 000000000..ed0629071 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bifrost.json b/src/main/resources/assets/botania/models/block/bifrost.json new file mode 100644 index 000000000..0b68b4f31 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bifrost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blaze_block.json b/src/main/resources/assets/botania/models/block/blaze_block.json new file mode 100644 index 000000000..876160d68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/blaze_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/blazeBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dry_grass.json b/src/main/resources/assets/botania/models/block/dry_grass.json new file mode 100644 index 000000000..f61bfde5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dry_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass0", + "side": "botania:blocks/altGrass1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/golden_grass.json b/src/main/resources/assets/botania/models/block/golden_grass.json new file mode 100644 index 000000000..8cb20c191 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/golden_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass2", + "side": "botania:blocks/altGrass3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/infused_grass.json b/src/main/resources/assets/botania/models/block/infused_grass.json new file mode 100644 index 000000000..07a8c64d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/infused_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass8", + "side": "botania:blocks/altGrass9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock.json b/src/main/resources/assets/botania/models/block/livingrock.json new file mode 100644 index 000000000..9a8786117 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick.json b/src/main/resources/assets/botania/models/block/livingrock_brick.json new file mode 100644 index 000000000..c79412d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json new file mode 100644 index 000000000..07ee851a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json new file mode 100644 index 000000000..8b4cafa2c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json new file mode 100644 index 000000000..bd6a802c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood.json b/src/main/resources/assets/botania/models/block/livingwood.json new file mode 100644 index 000000000..0a8062fd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json new file mode 100644 index 000000000..67ad48c5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json new file mode 100644 index 000000000..3f76a6831 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json new file mode 100644 index 000000000..88b9f8d3e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json new file mode 100644 index 000000000..a3edcc34f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json new file mode 100644 index 000000000..ff95b9ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mutated_grass.json b/src/main/resources/assets/botania/models/block/mutated_grass.json new file mode 100644 index 000000000..fa6af5245 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mutated_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass10", + "side": "botania:blocks/altGrass11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/prism.json b/src/main/resources/assets/botania/models/block/prism.json index 021d96f40..02cfd6f5a 100644 --- a/src/main/resources/assets/botania/models/block/prism.json +++ b/src/main/resources/assets/botania/models/block/prism.json @@ -1,6 +1,10 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#side" + "bottom": "botania:blocks/prism0", + "top": "botania:blocks/prism0", + "side": "botania:blocks/prism1", + "particle": "botania:blocks/prism1" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/root.json b/src/main/resources/assets/botania/models/block/root.json new file mode 100644 index 000000000..e36906545 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/root.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/root" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/scorched_grass.json b/src/main/resources/assets/botania/models/block/scorched_grass.json new file mode 100644 index 000000000..ad5d14643 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/scorched_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass6", + "side": "botania:blocks/altGrass7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerrock.json b/src/main/resources/assets/botania/models/block/shimmerrock.json new file mode 100644 index 000000000..ba5c0fd20 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shimmerrock.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/shimmerrock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json new file mode 100644 index 000000000..2843c22c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/shimmerwoodPlanks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json new file mode 100644 index 000000000..9fbef02b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/turntable.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/turntable1", + "top": "botania:blocks/turntable0", + "side": "botania:blocks/turntable1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/vivid_grass.json b/src/main/resources/assets/botania/models/block/vivid_grass.json new file mode 100644 index 000000000..a6b3c3112 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/vivid_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass4", + "side": "botania:blocks/altGrass5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/itemblock/avatar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/avatar.json rename to src/main/resources/assets/botania/models/item/itemblock/avatar.json diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/itemblock/bellows.json similarity index 100% rename from src/main/resources/assets/botania/models/item/bellows.json rename to src/main/resources/assets/botania/models/item/itemblock/bellows.json diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/itemblock/brewery.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewery.json rename to src/main/resources/assets/botania/models/item/itemblock/brewery.json diff --git a/src/main/resources/assets/botania/models/item/corporeaIndex.json b/src/main/resources/assets/botania/models/item/itemblock/corporea_index.json similarity index 100% rename from src/main/resources/assets/botania/models/item/corporeaIndex.json rename to src/main/resources/assets/botania/models/item/itemblock/corporea_index.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json new file mode 100644 index 000000000..5d7e72edb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/ghostRail" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hourglass.json b/src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/hourglass.json rename to src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json diff --git a/src/main/resources/assets/botania/models/item/teruTeruBozu.json b/src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json similarity index 100% rename from src/main/resources/assets/botania/models/item/teruTeruBozu.json rename to src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json