diff --git a/build.properties b/build.properties index ed6bf3472..2c249269e 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1635-1.8.8 +forge_version=11.15.0.1649-1.8.8 mc_version=1.8.8 build_number=246 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 8f1f680fb..7bfd2bed8 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,6 +10,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; +import javax.annotation.Nullable; + /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -71,6 +73,14 @@ public class BotaniaStateProps { // BlockBiomeStoneB public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + // BlockBiomeStoneWall + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + @Override + public boolean apply(BiomeStoneVariant input) { + return input.getName().contains("cobble"); + } + }); + // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); 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 afa78b5be..e5e390a24 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; 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.client.model.ModelLoaderRegistry; @@ -17,8 +18,12 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -65,13 +70,13 @@ 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.item.ItemGaiaHead; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.item.ModItems.*; +import java.util.Collection; import java.util.List; import java.util.Locale; @@ -92,18 +97,14 @@ public final class ModelHandler { /** ItemBlocks **/ registerStandardBlocks(); - registerStorage(); registerMushrooms(); registerFlowers(); - registerLivingRockWood(); - registerAltGrass(); registerStairs(); registerSlabs(); registerFullSlabs(); + registerWalls(); registerPanes(); - registerPylons(); registerUnstableBeaconPetal(); - registerDrums(); /** Normal Items **/ registerStandardItems(); @@ -180,6 +181,14 @@ public final class ModelHandler { registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.dirtPath); registerItemModel(ModBlocks.felPumpkin); + + // Blocks which share models with their item, and have only one variant to switch over + registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "botania:altGrass", "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "botania:storage", "variant"); + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "botania:pylon", "variant"); + registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "botania:forestDrum", "variant"); + registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "botania:livingrock", "variant"); + registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "botania:livingwood", "variant"); } private static void registerStandardItems() { @@ -231,7 +240,7 @@ public final class ModelHandler { 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.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); } } @@ -310,29 +319,11 @@ public final class ModelHandler { } } - 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 registerStorage() { - 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")); - } - } - private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } } @@ -341,34 +332,18 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), 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.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); 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")); - } - - 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 registerStairs() { for (Block b : ModFluffBlocks.stoneStairs) { registerItemModel(b); @@ -418,19 +393,28 @@ public final class ModelHandler { } + private static void registerWalls() { + Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); + for (BiomeStoneVariant variant : ((Collection) BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues())) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + } + + item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); + for (FutureStoneVariant variant : ((Collection) BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues())) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); + } + } + private static void registerPanes() { registerItemModel(ModFluffBlocks.alfglassPane); registerItemModel(ModFluffBlocks.bifrostPane); registerItemModel(ModFluffBlocks.managlassPane); } - private static void registerPylons() { - Item item = Item.getItemFromBlock(ModBlocks.pylon); - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("botania:pylon", "variant=mana")); - ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); - ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); - } - private static void registerUnstableBeaconPetal() { // The blocks that are dynamically colored, not through their states for (EnumDyeColor color : EnumDyeColor.values()) { @@ -443,15 +427,16 @@ public final class ModelHandler { } } - private static void registerDrums() { - Item item = Item.getItemFromBlock(ModBlocks.forestDrum); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:drum_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String baseName, String variantHeader) { + Item item = Item.getItemFromBlock(b); + for (T e : enumclazz.getEnumConstants()) { + String variantName = variantHeader + "=" + e.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); + ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 86cc6edde..c5ced6659 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,10 +32,10 @@ import java.util.List; public class Block18StoneWall extends BlockModWall { public Block18StoneWall() { - super(ModFluffBlocks.stone, 4); + super(ModFluffBlocks.stone, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } @Override @@ -52,7 +53,12 @@ public class Block18StoneWall extends BlockModWall { if (meta < 0 || meta > 3) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); } @Override @@ -71,4 +77,9 @@ public class Block18StoneWall extends BlockModWall { return LexiconData.stoneAlchemy; } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 44da2cace..6f795ed32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,28 +32,33 @@ import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall() { - super(ModFluffBlocks.biomeStoneA, 8); + super(ModFluffBlocks.biomeStoneA, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); } @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT)).ordinal() - 8; } @Override public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= BiomeStoneVariant.values().length) { + if (meta < 0 || meta >= BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues().size()) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); } @Override @@ -71,4 +77,9 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + } diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json index a9c6f7706..ec9f93048 100644 --- a/src/main/resources/assets/botania/blockstates/altGrass.json +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -1,10 +1,30 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "minecraft:blocks/dirt" }, + "transform": "forge:default-block" + }, "variants": { - "variant=dry": { "model": "botania:altGrass_dry" }, - "variant=golden": { "model": "botania:altGrass_golden" }, - "variant=vivid": { "model": "botania:altGrass_vivid" }, - "variant=scorched": { "model": "botania:altGrass_scorched" }, - "variant=infused": { "model": "botania:altGrass_infused" }, - "variant=mutated": { "model": "botania:altGrass_mutated" } + "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" } + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json new file mode 100644 index 000000000..e06c39112 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -0,0 +1,90 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=forest_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=plains_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mountain_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=fungal_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=swamp_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=desert_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=taiga_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mesa_cobble,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=forest_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=plains_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mountain_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=fungal_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=swamp_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=desert_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=taiga_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mesa_cobble,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } }, + "plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } }, + "mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } }, + "fungal_cobble": { "textures": { "wall": "botania:blocks/biomeStone11" } }, + "swamp_cobble": { "textures": { "wall": "botania:blocks/biomeStone12" } }, + "desert_cobble": { "textures": { "wall": "botania:blocks/biomeStone13" } }, + "taiga_cobble": { "textures": { "wall": "botania:blocks/biomeStone14" } }, + "mesa_cobble": { "textures": { "wall": "botania:blocks/biomeStone15" } } + }, + "inventory_forest_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone8" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_plains_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone9" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mountain_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone10" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_fungal_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone11" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_swamp_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone12" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_desert_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone13" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_taiga_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone14" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mesa_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone15" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index a7f73aba4..a20f0ed41 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -1,7 +1,12 @@ { + "forge_marker": 1, + "defaults": { + "model": "botania:drum", + "transform": "forge:default-block" + }, "variants": { - "variant=wild": { "model": "botania:drum_wild" }, - "variant=gathering": { "model": "botania:drum_gathering" }, - "variant=canopy": { "model": "botania:drum_canopy" } + "variant=wild": [{ "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }], + "variant=gathering": [{ "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }], + "variant=canopy": [{ "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } }] } } \ 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 ae0681bca..4893484b9 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,19 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { - "model": "botania:livingrock_default" - }, - "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" - } + "variant=default": [{ "textures": { "all": "botania:blocks/livingrock0" } }], + "variant=brick": [{ "textures": { "all": "botania:blocks/livingrock1" } }], + "variant=mossy_brick": [{ "textures": { "all": "botania:blocks/livingrock2" } }], + "variant=cracked_brick": [{ "textures": { "all": "botania:blocks/livingrock3" } }], + "variant=chiseled_brick": [{ "textures": { "all": "botania:blocks/livingrock4" } }] } } \ 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 87074e2b3..3f6c42938 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -1,10 +1,15 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { "model": "botania:livingwood_default" }, - "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" } + "variant=default": [{ "textures": { "all": "botania:blocks/livingwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/livingwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/livingwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/livingwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/livingwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/livingwood5" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json new file mode 100644 index 000000000..c77f3f3f8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -0,0 +1,62 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=andesite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=basalt,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=diorite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=granite,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=andesite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=basalt,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=diorite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=granite,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "andesite": { "textures": { "wall": "botania:blocks/stone0" } }, + "basalt": { "textures": { "wall": "botania:blocks/stone1" } }, + "diorite": { "textures": { "wall": "botania:blocks/stone2" } }, + "granite": { "textures": { "wall": "botania:blocks/stone3" } } + }, + "inventory_andesite": [{ + "textures": { "wall": "botania:blocks/stone0" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_basalt": [{ + "textures": { "wall": "botania:blocks/stone1" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_diorite": [{ + "textures": { "wall": "botania:blocks/stone2" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_granite": [{ + "textures": { "wall": "botania:blocks/stone3" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 8099a05fb..0b3e7899a 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,9 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=manasteel": { "model": "botania:storage_manasteel" }, - "variant=terrasteel": { "model": "botania:storage_terrasteel" }, - "variant=elementium": { "model": "botania:storage_elementium" }, - "variant=mana_diamond": { "model": "botania:storage_mana_diamond" }, - "variant=dragonstone": { "model": "botania:storage_dragonstone" } + "variant=manasteel": [{ "textures": { "all": "botania:blocks/storage0" } }], + "variant=terrasteel": [{ "textures": { "all": "botania:blocks/storage1" } }], + "variant=elementium": [{ "textures": { "all": "botania:blocks/storage2" } }], + "variant=mana_diamond": [{ "textures": { "all": "botania:blocks/storage3" } }], + "variant=dragonstone": [{ "textures": { "all": "botania:blocks/storage4" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_dry.json b/src/main/resources/assets/botania/models/block/altGrass_dry.json deleted file mode 100644 index dfb175331..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_dry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass0", - "side": "botania:blocks/altGrass1", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_golden.json b/src/main/resources/assets/botania/models/block/altGrass_golden.json deleted file mode 100644 index 24668bae6..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_golden.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass2", - "side": "botania:blocks/altGrass3", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_infused.json b/src/main/resources/assets/botania/models/block/altGrass_infused.json deleted file mode 100644 index cba653bda..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_infused.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass8", - "side": "botania:blocks/altGrass9", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_mutated.json b/src/main/resources/assets/botania/models/block/altGrass_mutated.json deleted file mode 100644 index 33e9ce82b..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_mutated.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass10", - "side": "botania:blocks/altGrass11", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_scorched.json b/src/main/resources/assets/botania/models/block/altGrass_scorched.json deleted file mode 100644 index c79993e04..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_scorched.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass6", - "side": "botania:blocks/altGrass7", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_vivid.json b/src/main/resources/assets/botania/models/block/altGrass_vivid.json deleted file mode 100644 index f1226714e..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_vivid.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass4", - "side": "botania:blocks/altGrass5", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json deleted file mode 100644 index 915c02d27..000000000 --- a/src/main/resources/assets/botania/models/block/drum_canopy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum4", - "side": "botania:blocks/forestDrum5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json deleted file mode 100644 index b92f432f5..000000000 --- a/src/main/resources/assets/botania/models/block/drum_gathering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum2", - "side": "botania:blocks/forestDrum3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json deleted file mode 100644 index 86bd38747..000000000 --- a/src/main/resources/assets/botania/models/block/drum_wild.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum0", - "side": "botania:blocks/forestDrum1" - } -} \ 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 deleted file mode 100644 index c79412d70..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 07ee851a4..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 8b4cafa2c..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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_default.json b/src/main/resources/assets/botania/models/block/livingrock_default.json deleted file mode 100644 index 9a8786117..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json deleted file mode 100644 index bd6a802c2..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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_default.json b/src/main/resources/assets/botania/models/block/livingwood_default.json deleted file mode 100644 index 0a8062fd9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 67ad48c5f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 3f76a6831..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json deleted file mode 100644 index 98ec94ac6..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingwood0", - "top": "botania:blocks/livingwood0", - "side": "botania:blocks/livingwood0" - } -} 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 deleted file mode 100644 index 88b9f8d3e..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index a3edcc34f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ff95b9ae9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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/storage_dragonstone.json b/src/main/resources/assets/botania/models/block/storage_dragonstone.json deleted file mode 100644 index 7d0c130d0..000000000 --- a/src/main/resources/assets/botania/models/block/storage_dragonstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_elementium.json b/src/main/resources/assets/botania/models/block/storage_elementium.json deleted file mode 100644 index a55282f38..000000000 --- a/src/main/resources/assets/botania/models/block/storage_elementium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json b/src/main/resources/assets/botania/models/block/storage_mana_diamond.json deleted file mode 100644 index 4a875189b..000000000 --- a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_manasteel.json b/src/main/resources/assets/botania/models/block/storage_manasteel.json deleted file mode 100644 index bdb8f0a68..000000000 --- a/src/main/resources/assets/botania/models/block/storage_manasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_terrasteel.json b/src/main/resources/assets/botania/models/block/storage_terrasteel.json deleted file mode 100644 index add746c6d..000000000 --- a/src/main/resources/assets/botania/models/block/storage_terrasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect.json b/src/main/resources/assets/botania/models/block/wall_connect.json new file mode 100644 index 000000000..281d9a7b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect.json @@ -0,0 +1,19 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#wall" + }, + "elements": [ + { "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#wall", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/altGrass_dry.json b/src/main/resources/assets/botania/models/item/altGrass_dry.json deleted file mode 100644 index 6a70baf25..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_dry.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_dry", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_golden.json b/src/main/resources/assets/botania/models/item/altGrass_golden.json deleted file mode 100644 index 45751fb50..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_golden.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_golden", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_infused.json b/src/main/resources/assets/botania/models/item/altGrass_infused.json deleted file mode 100644 index d55365d64..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_infused.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_infused", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_mutated.json b/src/main/resources/assets/botania/models/item/altGrass_mutated.json deleted file mode 100644 index e4632a5c2..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_mutated.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_mutated", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_scorched.json b/src/main/resources/assets/botania/models/item/altGrass_scorched.json deleted file mode 100644 index d050bcd74..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_scorched.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_scorched", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_vivid.json b/src/main/resources/assets/botania/models/item/altGrass_vivid.json deleted file mode 100644 index 47d5b9a35..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_vivid.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_vivid", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/main/resources/assets/botania/models/item/drum_canopy.json deleted file mode 100644 index 0146560c5..000000000 --- a/src/main/resources/assets/botania/models/item/drum_canopy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_canopy", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/main/resources/assets/botania/models/item/drum_gathering.json deleted file mode 100644 index d23ff797b..000000000 --- a/src/main/resources/assets/botania/models/item/drum_gathering.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_gathering", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/main/resources/assets/botania/models/item/drum_wild.json deleted file mode 100644 index 9d0bf43ab..000000000 --- a/src/main/resources/assets/botania/models/item/drum_wild.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_wild", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_brick.json b/src/main/resources/assets/botania/models/item/livingrock_brick.json deleted file mode 100644 index e7db2c9a4..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json deleted file mode 100644 index 82ca1f8a1..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_chiseled_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json deleted file mode 100644 index b134b5b62..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_cracked_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_default.json b/src/main/resources/assets/botania/models/item/livingrock_default.json deleted file mode 100644 index b87480b27..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json deleted file mode 100644 index 972cf35c5..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_mossy_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_default.json b/src/main/resources/assets/botania/models/item/livingwood_default.json deleted file mode 100644 index 26fa10fad..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_framed.json b/src/main/resources/assets/botania/models/item/livingwood_framed.json deleted file mode 100644 index e9cee1d0f..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json deleted file mode 100644 index a5ce44ad5..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_glimmering", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json deleted file mode 100644 index 949174e54..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_mossy_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json deleted file mode 100644 index 6866a6652..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_pattern_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/main/resources/assets/botania/models/item/livingwood_planks.json deleted file mode 100644 index 82cf0d370..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_dragonstone.json b/src/main/resources/assets/botania/models/item/storage_dragonstone.json deleted file mode 100644 index bd06a4a3c..000000000 --- a/src/main/resources/assets/botania/models/item/storage_dragonstone.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_dragonstone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_elementium.json b/src/main/resources/assets/botania/models/item/storage_elementium.json deleted file mode 100644 index 882bed65b..000000000 --- a/src/main/resources/assets/botania/models/item/storage_elementium.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_elementium", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json b/src/main/resources/assets/botania/models/item/storage_mana_diamond.json deleted file mode 100644 index 5d0e79f83..000000000 --- a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_mana_diamond", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_manasteel.json b/src/main/resources/assets/botania/models/item/storage_manasteel.json deleted file mode 100644 index 3a90a8b51..000000000 --- a/src/main/resources/assets/botania/models/item/storage_manasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_manasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_terrasteel.json b/src/main/resources/assets/botania/models/item/storage_terrasteel.json deleted file mode 100644 index a507f6606..000000000 --- a/src/main/resources/assets/botania/models/item/storage_terrasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_terrasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file