From 1b1e5e3bf01ad644d1ab17f5fbb1264d2f073502 Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 23:34:35 -0500 Subject: [PATCH] Fixed Formatting --- .../client/core/handler/ModelHandler.java | 447 ++++++++---------- .../botania/models/item/blackLotus.json | 9 +- .../botania/models/item/dragonstone.json | 8 +- .../botania/models/item/dreamwoodTwig.json | 8 +- .../botania/models/item/elementium.json | 8 +- .../botania/models/item/elementiumAxe.json | 8 +- .../botania/models/item/elementiumBoots.json | 8 +- .../botania/models/item/elementiumChest.json | 8 +- .../botania/models/item/elementiumHelm.json | 8 +- .../botania/models/item/elementiumLegs.json | 8 +- .../botania/models/item/elementiumNugget.json | 8 +- .../botania/models/item/elementiumPick.json | 8 +- .../botania/models/item/elementiumShears.json | 8 +- .../botania/models/item/elementiumShovel.json | 8 +- .../botania/models/item/elementiumSword.json | 8 +- .../botania/models/item/enderAirBottle.json | 8 +- .../assets/botania/models/item/gaiaIngot.json | 8 +- .../assets/botania/models/item/glassPick.json | 8 +- .../botania/models/item/lifeEssence.json | 8 +- .../botania/models/item/livingwoodTwig.json | 8 +- .../botania/models/item/manaDiamond.json | 8 +- .../assets/botania/models/item/manaPearl.json | 8 +- .../botania/models/item/manaPowder.json | 8 +- .../botania/models/item/manaString.json | 8 +- .../assets/botania/models/item/manasteel.json | 8 +- .../botania/models/item/manasteelAxe.json | 8 +- .../botania/models/item/manasteelBoots.json | 8 +- .../botania/models/item/manasteelChest.json | 8 +- .../botania/models/item/manasteelHelm.json | 8 +- .../botania/models/item/manasteelLegs.json | 8 +- .../botania/models/item/manasteelNugget.json | 8 +- .../botania/models/item/manasteelPick.json | 8 +- .../botania/models/item/manasteelShears.json | 8 +- .../botania/models/item/manasteelShovel.json | 8 +- .../botania/models/item/manasteelSword.json | 8 +- .../botania/models/item/manaweaveBoots.json | 8 +- .../models/item/manaweaveBootsHoliday.json | 8 +- .../botania/models/item/manaweaveChest.json | 8 +- .../models/item/manaweaveChestHoliday.json | 8 +- .../botania/models/item/manaweaveCloth.json | 8 +- .../botania/models/item/manaweaveHelm.json | 8 +- .../models/item/manaweaveHelmHoliday.json | 8 +- .../botania/models/item/manaweaveLegs.json | 8 +- .../models/item/manaweaveLegsHoliday.json | 8 +- .../assets/botania/models/item/pebble.json | 8 +- .../botania/models/item/pestleAndMortar.json | 9 +- .../assets/botania/models/item/pixieDust.json | 8 +- .../botania/models/item/placeholder.json | 8 +- .../botania/models/item/prismarineShard.json | 8 +- .../assets/botania/models/item/redString.json | 8 +- .../botania/models/item/redstoneRoot.json | 8 +- .../assets/botania/models/item/root.json | 8 +- .../assets/botania/models/item/starSword.json | 8 +- .../botania/models/item/terrasteel.json | 8 +- .../botania/models/item/terrasteelBoots.json | 8 +- .../botania/models/item/terrasteelChest.json | 8 +- .../botania/models/item/terrasteelHelm.json | 8 +- .../botania/models/item/terrasteelLegs.json | 8 +- .../botania/models/item/terrasteelNugget.json | 8 +- .../botania/models/item/thunderSword.json | 8 +- 60 files changed, 616 insertions(+), 305 deletions(-) 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 2b34508c3..bc360f576 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,19 +1,16 @@ package vazkii.botania.client.core.handler; -import static vazkii.botania.common.item.ModItems.*; - -import java.util.List; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; @@ -27,278 +24,248 @@ import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.lib.LibItemNames; +import static vazkii.botania.common.item.ModItems.*; + +import java.util.List; + public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // In addition, many of the jsons currently use the vanilla format (simple - // and verified bug-free). - // Once things settle down, we'll move to forge jsons, which will - // drastically cut down on the number of json files - public static void registerModels() { - /** Custom statemappers **/ - registerStateMappers(); + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); - /** ItemBlocks **/ - registerStorageItemBlocks(); - registerMushroomItemBlocks(); - registerFlowerItemBlocks(); - registerLivingRockWood(); - registerAltGrass(); - registerStairs(); - registerSlabs(); - registerFullSlabs(); - registerPanes(); - registerStandardItems(); - registerStandardBlocks(); - registerManaResources(); - /** Normal Items **/ + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + registerLivingRockWood(); + registerAltGrass(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); + registerPanes(); + registerStandardBlocks(); + registerManaResources(); + /** Normal Items **/ + - /** Special Item Meshers **/ - } + /** Special Item Meshers **/ + } + private static void registerStandardBlocks() { + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + } + private static void registerStandardItems() { + registerItemModel(pestleAndMortar); + registerItemModel(blackLotus); + registerItemModel(blackLotus, 1); + registerItemModel(lexicon); - private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + registerItemModel(manasteelHelm); + registerItemModel(manasteelChest); + registerItemModel(manasteelLegs); + registerItemModel(manasteelBoots); - } + registerItemModel(manasteelPick); + registerItemModel(manasteelShovel); + registerItemModel(manasteelAxe); + registerItemModel(manasteelShears); + registerItemModel(manasteelSword); - private static void registerStandardItems() { - registerItemModel(pestleAndMortar); - registerItemModel(blackLotus); - registerItemModel(blackLotus, 1); - registerItemModel(lexicon); + registerItemModel(elementiumHelm); + registerItemModel(elementiumChest); + registerItemModel(elementiumLegs); + registerItemModel(elementiumBoots); - registerItemModel(manasteelHelm); - registerItemModel(manasteelChest); - registerItemModel(manasteelLegs); - registerItemModel(manasteelBoots); + registerItemModel(elementiumPick); + registerItemModel(elementiumShovel); + registerItemModel(elementiumAxe); + registerItemModel(elementiumShears); + registerItemModel(elementiumSword); - registerItemModel(manasteelPick); - registerItemModel(manasteelShovel); - registerItemModel(manasteelAxe); - registerItemModel(manasteelShears); - registerItemModel(manasteelSword); + registerItemModel(manaweaveHelm); + registerItemModel(manaweaveChest); + registerItemModel(manaweaveLegs); + registerItemModel(manaweaveBoots); - registerItemModel(elementiumHelm); - registerItemModel(elementiumChest); - registerItemModel(elementiumLegs); - registerItemModel(elementiumBoots); + registerItemModel(terrasteelHelm); + registerItemModel(terrasteelHelmRevealing); + registerItemModel(terrasteelChest); + registerItemModel(terrasteelLegs); + registerItemModel(terrasteelBoots); - registerItemModel(elementiumPick); - registerItemModel(elementiumShovel); - registerItemModel(elementiumAxe); - registerItemModel(elementiumShears); - registerItemModel(elementiumSword); + registerItemModel(starSword); + registerItemModel(thunderSword); + registerItemModel(glassPick); + } + private static void registerManaResources() { + Item item = manaResource; + for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); + } + } - registerItemModel(manaweaveHelm); - registerItemModel(manaweaveChest); - registerItemModel(manaweaveLegs); - registerItemModel(manaweaveBoots); + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - registerItemModel(terrasteelHelm); - registerItemModel(terrasteelHelmRevealing); - registerItemModel(terrasteelChest); - registerItemModel(terrasteelLegs); - registerItemModel(terrasteelBoots); + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - registerItemModel(starSword); - registerItemModel(thunderSword); - registerItemModel(glassPick); - } + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - private static void registerStateMappers() { - // Ignore vanilla variant in flowers - ModelLoader.setCustomStateMapper(ModBlocks.flower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + List otherSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + }); - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : ModFluffBlocks.stoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - List otherSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlab, - ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, - ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, - ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, - ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, - ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab }); + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - for (Block b : otherSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + List otherFullSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + }); - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } - for (Block b : ModFluffBlocks.stoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlabFull, - ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, - ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, - ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, - ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, - ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, - ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, - ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, - ModFluffBlocks.sunnyQuartzSlabFull }); + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:storage_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - for (Block b : otherFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - } + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:mushroom_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:flower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } - private static void registerStorageItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:shinyFlower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } - private static void registerMushroomItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.mushroom); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerLivingRockWood() { + Item item = Item.getItemFromBlock(ModBlocks.livingrock); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:livingrock_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } - private static void registerFlowerItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.flower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - item = Item.getItemFromBlock(ModBlocks.shinyFlower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } + } - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerSlabs() { - private static void registerStairs() { - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); + } - } + private static void registerFullSlabs() { - private static void registerSlabs() { + } - } + private static void registerPanes() { - private static void registerFullSlabs() { + } - } + private static void registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); + } + private static void registerItemModel(Item i,int meta) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); + } + private static void registerItemModel(Item i) { + registerItemModel(i, 0); + } - private static void registerPanes() { - - } - - private static void registerManaResources() { - Item item = manaResource; - for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { - String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); - } - } - - private static void registerItemModel(Block b) { - registerItemModel(Item.getItemFromBlock(b)); - } - - private static void registerItemModel(Item i) { - registerItemModel(i, 0); - } - - private static void registerItemModel(Item i, int meta) { - ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); - System.out.println(loc); - ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); - } - -} + private ModelHandler() {} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus.json index 68a694482..0fdd68e10 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus.json +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -1,6 +1,7 @@ { - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:items/blackLotus" - } + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/blackLotus" + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone.json b/src/main/resources/assets/botania/models/item/dragonstone.json index 3f40ad93e..fe4171316 100644 --- a/src/main/resources/assets/botania/models/item/dragonstone.json +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dragonstone"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dragonstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json index 9ac500966..ad4cc65c0 100644 --- a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dreamwoodTwig"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dreamwoodTwig" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json index 1ea04b844..20557e911 100644 --- a/src/main/resources/assets/botania/models/item/elementium.json +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementium"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json index 85e484dba..fde365304 100644 --- a/src/main/resources/assets/botania/models/item/elementiumAxe.json +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumAxe"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumBoots.json index 0ff1659ae..3b3eac354 100644 --- a/src/main/resources/assets/botania/models/item/elementiumBoots.json +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumChest.json index da61c403c..abd22195e 100644 --- a/src/main/resources/assets/botania/models/item/elementiumChest.json +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumHelm.json index 7a9289ea5..d599aa5b3 100644 --- a/src/main/resources/assets/botania/models/item/elementiumHelm.json +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumLegs.json index 2c4b207e1..4f5b4eda4 100644 --- a/src/main/resources/assets/botania/models/item/elementiumLegs.json +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json index 809ecbc9d..4083a6e44 100644 --- a/src/main/resources/assets/botania/models/item/elementiumNugget.json +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumPick.json index 1ad0b5d21..4c71badcf 100644 --- a/src/main/resources/assets/botania/models/item/elementiumPick.json +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json index 5d1b51376..c7c41a82c 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShears"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumShovel.json index 75229c4c9..cda4564a9 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShovel.json +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShovel"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumSword.json index 9021143a9..e5f75013b 100644 --- a/src/main/resources/assets/botania/models/item/elementiumSword.json +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderAirBottle.json index 02103d348..ba6b1497e 100644 --- a/src/main/resources/assets/botania/models/item/enderAirBottle.json +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/enderAirBottle"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/enderAirBottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaIngot.json index 3acfe0742..03650aabd 100644 --- a/src/main/resources/assets/botania/models/item/gaiaIngot.json +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/gaiaIngot"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/gaiaIngot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/glassPick.json index b8406e26c..ae9b40053 100644 --- a/src/main/resources/assets/botania/models/item/glassPick.json +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/glassPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/glassPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeEssence.json index e4101a4af..25cdc3ac4 100644 --- a/src/main/resources/assets/botania/models/item/lifeEssence.json +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/lifeEssence"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/lifeEssence" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json index 195e38efa..82e629f29 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/livingwoodTwig"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/livingwoodTwig" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manaDiamond.json index 759281745..ec6de6840 100644 --- a/src/main/resources/assets/botania/models/item/manaDiamond.json +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaDiamond"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaDiamond" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manaPearl.json index 087c473bd..d52005f58 100644 --- a/src/main/resources/assets/botania/models/item/manaPearl.json +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPearl"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPearl" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manaPowder.json index 9df90c85a..b22f30d7c 100644 --- a/src/main/resources/assets/botania/models/item/manaPowder.json +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPowder"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manaString.json index 08fadb23f..aafad4fca 100644 --- a/src/main/resources/assets/botania/models/item/manaString.json +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaString"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaString" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json index a9a5973d8..c6bc8b4a3 100644 --- a/src/main/resources/assets/botania/models/item/manasteel.json +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteel"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelAxe.json index 46e580d2b..3618e4037 100644 --- a/src/main/resources/assets/botania/models/item/manasteelAxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelAxe"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json index ccff5d9f3..c48a7313f 100644 --- a/src/main/resources/assets/botania/models/item/manasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json index 2d81f27c0..50c29c8b6 100644 --- a/src/main/resources/assets/botania/models/item/manasteelChest.json +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json index d003d0003..fd7b58c68 100644 --- a/src/main/resources/assets/botania/models/item/manasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json index 809e37fce..f9a1e7d53 100644 --- a/src/main/resources/assets/botania/models/item/manasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json index 12fb2b672..29c5a61d6 100644 --- a/src/main/resources/assets/botania/models/item/manasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/manasteelPick.json index b97a22ec1..66e17bb4c 100644 --- a/src/main/resources/assets/botania/models/item/manasteelPick.json +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json index 658c3d499..bd49d11d8 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShears.json +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShears"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json index f1172ad55..979e63daf 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShovel.json +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShovel"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json index caf784268..8bbcfee9c 100644 --- a/src/main/resources/assets/botania/models/item/manasteelSword.json +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json index 478b74859..818be5b7e 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json index ed06cdca9..20cdebbb7 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBootsHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBootsHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json index 35ab59a9e..4e5a0a1bf 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json index acd1cd398..6bde05c69 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChestHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChestHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json index fd1ceb9fd..1fd6ddc37 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveCloth.json +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveCloth"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveCloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json index 7cdfc5a0c..e3ec41e5e 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json index 7de483baa..8ca9c66fb 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelmHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelmHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json index 65d4b9b57..fde3761e3 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json index 769acc423..b2f6bb10b 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegsHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegsHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pebble.json b/src/main/resources/assets/botania/models/item/pebble.json index 60a49dc9f..709f876ae 100644 --- a/src/main/resources/assets/botania/models/item/pebble.json +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pebble"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pebble" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json index ddf772436..0ac7b0451 100644 --- a/src/main/resources/assets/botania/models/item/pestleAndMortar.json +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -1,6 +1,7 @@ { - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:items/pestleAndMortar" - } + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pestleAndMortar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixieDust.json index 23612dd34..e89d13f8a 100644 --- a/src/main/resources/assets/botania/models/item/pixieDust.json +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pixieDust"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pixieDust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json index f5059861c..49f092321 100644 --- a/src/main/resources/assets/botania/models/item/placeholder.json +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/placeholder"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/placeholder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json index f7cdeea95..d87bab9a4 100644 --- a/src/main/resources/assets/botania/models/item/prismarineShard.json +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/prismarineShard"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/prismarineShard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redString.json index 53a201b2b..6a4dce193 100644 --- a/src/main/resources/assets/botania/models/item/redString.json +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redString"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redString" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json index 5d8b915d0..02a8b6173 100644 --- a/src/main/resources/assets/botania/models/item/redstoneRoot.json +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redstoneRoot"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redstoneRoot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/root.json index b8b664832..0d2f7b73d 100644 --- a/src/main/resources/assets/botania/models/item/root.json +++ b/src/main/resources/assets/botania/models/item/root.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/root"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/root" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/starSword.json index 61fc5fba0..bd9e12c03 100644 --- a/src/main/resources/assets/botania/models/item/starSword.json +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/starSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/starSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json index 10d7c5e58..33d20773a 100644 --- a/src/main/resources/assets/botania/models/item/terrasteel.json +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteel"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json index ba51f3bdf..4de87776d 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json index aef53a086..c09a12720 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelChest.json +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json index ee6cf6802..ceadee6f3 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json index c3172b010..80ab18f37 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json index 34a7681a3..548329dc1 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thunderSword.json index cca0b971f..aee5fd5ab 100644 --- a/src/main/resources/assets/botania/models/item/thunderSword.json +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/thunderSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/thunderSword" + } +} \ No newline at end of file