diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index a5775dc68..f31df9465 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -30,14 +30,11 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.EndBrickVariant; -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.LuminizerVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.api.state.enums.SpreaderVariant; @@ -90,18 +87,6 @@ public final class BotaniaStateProps { /** Properties for individual blocks **/ - // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); - - // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("fswall_variant", FutureStoneVariant.class, new Predicate() { - @Override - public boolean apply(FutureStoneVariant variant) { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; - } - }); - // BlockAlfPortal public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); @@ -134,9 +119,6 @@ public final class BotaniaStateProps { // BlockEnchanter public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); - // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); - // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); @@ -188,9 +170,6 @@ public final class BotaniaStateProps { // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); - // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); - // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java deleted file mode 100644 index bbec78401..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EndBrickVariant implements IStringSerializable { - END_STONE_BRICKS, - CHISELED_END_STONE_BRICKS, - ENDER_BRICKS, - PILLAR_ENDER_BRICKS; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java deleted file mode 100644 index 079c7aeef..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum FutureStoneVariant implements IStringSerializable { - ANDESITE, - BASALT, - DIORITE, - GRANITE, - POLISHED_ANDESITE, - POLISHED_BASALT, - POLISHED_DIORITE, - POLISHED_GRANITE, - ANDESITE_BRICK, - BASALT_BRICK, - DIORITE_BRICK, - GRANITE_BRICK, - CHISELED_ANDESITE, - CHISELED_BASALT, - CHISELED_DIORITE, - CHISELED_GRANITE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java deleted file mode 100644 index 15eb2e77a..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum PrismarineVariant implements IStringSerializable { - PRISMARINE, - PRISMARINE_BRICKS, - DARK_PRISMARINE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} 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 d931d9fd1..938ccbea4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -39,14 +39,11 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.EndBrickVariant; -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.LuminizerVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; @@ -355,7 +352,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture - registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } @@ -618,7 +614,6 @@ public final class ModelHandler { 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.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); // Ignore dummy variant in slabs for (Block b : ModFluffBlocks.biomeStoneSlabs) { @@ -629,10 +624,6 @@ public final class ModelHandler { 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()); - } - List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, @@ -655,10 +646,6 @@ public final class ModelHandler { 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()); - } - List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, @@ -753,10 +740,6 @@ public final class ModelHandler { } private static void registerStairs() { - for (Block b : ModFluffBlocks.stoneStairs) { - registerItemModel(b); - } - for (Block b : ModFluffBlocks.pavementStairs) { registerItemModel(b); } @@ -796,10 +779,6 @@ public final class ModelHandler { registerItemModel(b); } - for (Block b : ModFluffBlocks.stoneSlabs) { - registerItemModel(b); - } - registerItemModel(ModFluffBlocks.livingwoodSlab); registerItemModel(ModFluffBlocks.livingwoodPlankSlab); registerItemModel(ModFluffBlocks.livingrockSlab); @@ -832,12 +811,6 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } - item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); - for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { - String variantName = "inventory_" + variant.getName(); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); - } - registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 91302af9d..62691fd73 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -11,14 +11,11 @@ package vazkii.botania.common.block; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.decor.Block18Stone; import vazkii.botania.common.block.decor.BlockPavement; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB; @@ -28,7 +25,6 @@ import vazkii.botania.common.block.decor.panes.BlockManaglassPane; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; -import vazkii.botania.common.block.decor.slabs.Block18StoneSlab; import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -45,7 +41,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; -import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; @@ -60,7 +55,6 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; -import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -69,7 +63,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; import java.util.Locale; -import java.util.Set; public final class ModFluffBlocks { @@ -142,7 +135,6 @@ public final class ModFluffBlocks { public static Block biomeStoneA; public static Block biomeStoneB; - public static Block stone; public static Block pavement; public static final Block[] biomeStoneStairs = new Block[24]; @@ -150,11 +142,6 @@ public final class ModFluffBlocks { public static final Block[] biomeStoneFullSlabs = new Block[24]; public static Block biomeStoneWall; - public static final Block[] stoneStairs = new Block[8]; - public static final Block[] stoneSlabs = new Block[8]; - public static final Block[] stoneFullSlabs = new Block[8]; - public static Block stoneWall; - public static final Block[] pavementStairs = new Block[BlockPavement.TYPES]; public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES]; public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; @@ -208,7 +195,6 @@ public final class ModFluffBlocks { biomeStoneA = new BlockBiomeStoneA(); biomeStoneB = new BlockBiomeStoneB(); - stone = new Block18Stone(); pavement = new BlockPavement(); if(ConfigHandler.darkQuartzEnabled) { @@ -266,24 +252,6 @@ public final class ModFluffBlocks { } biomeStoneWall = new BlockBiomeStoneWall(); - Set allowed = ImmutableSet.of(FutureStoneVariant.ANDESITE, FutureStoneVariant.ANDESITE_BRICK, - FutureStoneVariant.BASALT, FutureStoneVariant.BASALT_BRICK, FutureStoneVariant.DIORITE, FutureStoneVariant.DIORITE_BRICK, - FutureStoneVariant.GRANITE, FutureStoneVariant.GRANITE_BRICK); - - count = 0; - for(FutureStoneVariant variant : FutureStoneVariant.values()) { - if (!allowed.contains(variant)) { - // Filter - only get the base blocks, and the brick versions - continue; - } - - stoneStairs[count] = new Block18StoneStairs(variant); - stoneSlabs[count] = new Block18StoneSlab(false, variant, count); - stoneFullSlabs[count] = new Block18StoneSlab(true, variant, count); - count++; - } - stoneWall = new Block18StoneWall(); - count = 0; for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) { @@ -356,11 +324,6 @@ public final class ModFluffBlocks { ((BlockModSlab) biomeStoneFullSlabs[i]).register(); } - for(int i = 0; i < 8; i++) { - ((BlockModSlab) stoneSlabs[i]).register(); - ((BlockModSlab) stoneFullSlabs[i]).register(); - } - for(int i = 0; i < pavementSlabs.length; i++) { ((BlockModSlab) pavementSlabs[i]).register(); ((BlockModSlab) pavementFullSlabs[i]).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java deleted file mode 100644 index e3d0c3286..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:34:31 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class Block18Stone extends BlockMod implements ILexiconable { - - public Block18Stone() { - super(Material.ROCK, LibBlockNames.STONE); - setHardness(1.5F); - setResistance(10F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= FutureStoneVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.values()[meta]); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 16; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java deleted file mode 100644 index b7d022956..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:52:06 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class Block18StoneSlab extends BlockLivingSlab { - - final int index; - - public Block18StoneSlab(boolean full, FutureStoneVariant variant, int index) { - super(full, ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); - this.index = index; - setHardness(1.5F); - setResistance(10F); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.stoneFullSlabs[index]; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.stoneSlabs[index]; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java deleted file mode 100644 index 9d7ef3f81..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:51:29 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class Block18StoneStairs extends BlockLivingStairs { - - public Block18StoneStairs(FutureStoneVariant variant) { - super(ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} 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 deleted file mode 100644 index bd74e05cd..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:41:10 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.util.List; - -public class Block18StoneWall extends BlockModWall { - - public Block18StoneWall() { - super(ModFluffBlocks.stone, 0); - setHardness(1.5F); - setResistance(10F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta > 3) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); - } - - @Override - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { - for(int i = 0; i < 4; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2bacc7390..8d0fd68f9 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -363,15 +363,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.sunnyQuartzSlab); addBlock(ModFluffBlocks.sunnyQuartzStairs); - if(ConfigHandler.stones18Enabled) { - addBlock(ModFluffBlocks.stone); - for(int i = 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneStairs[i]); - for(int i = 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneSlabs[i]); - addBlock(ModFluffBlocks.stoneWall); - } - addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); for(int i = 0; i < 24; i++) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 7b53fce60..5abea5661 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1764,12 +1764,12 @@ public final class ModCraftingRecipes { new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0), }; - for(int i = 0; i < 4; i++) { + /*for(int i = 0; i < 4; i++) { todo readd chiseled versions addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), "SS", "SS", 'S', quarkBlocks[i]); recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); - } + }*/ } // Blaze Light Recipe diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index e7e5f65b8..2c83807c3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -1,15 +1,8 @@ package vazkii.botania.common.crafting; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.ModItems; /** @@ -18,81 +11,8 @@ import vazkii.botania.common.item.ModItems; public final class ModMigrationRecipes { public static void init() { - boolean quark = Botania.quarkLoaded; - // Prismarine -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - - // Andesite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal())); - - if (quark) { - // Andesite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[0])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[0])); - // Andesite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4])); - // Andesite chiseled brick - not in quark - // Andesite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal())); - } - - if (quark) { - // Basalt normal + polished -> quark - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt")), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_BASALT.ordinal())); - // Basalt rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[1])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[1])); - // Basalt bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5])); - // Basalt chiseled brick - not in quark - // Basalt wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal())); - } - - // Diorite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal())); - - if (quark) { - // Diorite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[2])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[2])); - // Diorite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6])); - // Diorite chiseled brick - not in quark - // Diorite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal())); - } - - // Granite normal + polished -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.STONE, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); - - if (quark) { - // Granite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[3])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[3])); - // Granite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7])); - // Granite chiseled brick - not in quark - // Granite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal())); - } - } - - private static Block findQuarkBlock(String name) { - return Block.REGISTRY.getObject(new ResourceLocation("Quark", name)); } private ModMigrationRecipes() {} diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json deleted file mode 100644 index f62868e48..000000000 --- a/src/main/resources/assets/botania/blockstates/stone.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "variant": { - "andesite": { "textures": { "all": "botania:blocks/stone0" } }, - "basalt": { "textures": { "all": "botania:blocks/stone1" } }, - "diorite": { "textures": { "all": "botania:blocks/stone2" } }, - "granite": { "textures": { "all": "botania:blocks/stone3" } }, - "polished_andesite": { "textures": { "all": "botania:blocks/stone4" } }, - "polished_basalt": { "textures": { "all": "botania:blocks/stone5" } }, - "polished_diorite": { "textures": { "all": "botania:blocks/stone6" } }, - "polished_granite": { "textures": { "all": "botania:blocks/stone7" } }, - "andesite_brick": { "textures": { "all": "botania:blocks/stone8" } }, - "basalt_brick": { "textures": { "all": "botania:blocks/stone9" } }, - "diorite_brick": { "textures": { "all": "botania:blocks/stone10" } }, - "granite_brick": { "textures": { "all": "botania:blocks/stone11" } }, - "chiseled_andesite": { "textures": { "all": "botania:blocks/stone12" } }, - "chiseled_basalt": { "textures": { "all": "botania:blocks/stone13" } }, - "chiseled_diorite": { "textures": { "all": "botania:blocks/stone14" } }, - "chiseled_granite": { "textures": { "all": "botania:blocks/stone15" } } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json deleted file mode 100644 index e89c9749c..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone0", - "top": "botania:blocks/stone0", - "side": "botania:blocks/stone0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json deleted file mode 100644 index abf015306..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Stairs.json b/src/main/resources/assets/botania/blockstates/stone0Stairs.json deleted file mode 100644 index c584e6e60..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone0", - "top": "botania:blocks/stone0", - "side": "botania:blocks/stone0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json deleted file mode 100644 index 320bb94e1..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "textures": { - "particle": "#wall" - }, - "uvlock": true, - "transform": "forge:default-block" - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} - }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} - }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} - }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} - }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "fswall_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" }, - "model": "minecraft:wall_inventory" - }], - "inventory_basalt": [{ - "textures": { "wall": "botania:blocks/stone1" }, - "model": "minecraft:wall_inventory" - }], - "inventory_diorite": [{ - "textures": { "wall": "botania:blocks/stone2" }, - "model": "minecraft:wall_inventory" - }], - "inventory_granite": [{ - "textures": { "wall": "botania:blocks/stone3" }, - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json deleted file mode 100644 index a35008ce3..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone10", - "top": "botania:blocks/stone10", - "side": "botania:blocks/stone10" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json deleted file mode 100644 index 3c06d8495..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone10" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Stairs.json b/src/main/resources/assets/botania/blockstates/stone10Stairs.json deleted file mode 100644 index a882c36e3..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone10", - "top": "botania:blocks/stone10", - "side": "botania:blocks/stone10" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json deleted file mode 100644 index 9eb36491f..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone11", - "top": "botania:blocks/stone11", - "side": "botania:blocks/stone11" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json deleted file mode 100644 index c23b8fae1..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone11" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11Stairs.json b/src/main/resources/assets/botania/blockstates/stone11Stairs.json deleted file mode 100644 index a7b9b1660..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone11", - "top": "botania:blocks/stone11", - "side": "botania:blocks/stone11" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json deleted file mode 100644 index af0f40a52..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone1", - "top": "botania:blocks/stone1", - "side": "botania:blocks/stone1" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json deleted file mode 100644 index f4aabbb94..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone1" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1Stairs.json b/src/main/resources/assets/botania/blockstates/stone1Stairs.json deleted file mode 100644 index 6d0dccf35..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone1", - "top": "botania:blocks/stone1", - "side": "botania:blocks/stone1" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json deleted file mode 100644 index 9fd9a2319..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone2", - "top": "botania:blocks/stone2", - "side": "botania:blocks/stone2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json deleted file mode 100644 index 651f4de73..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2Stairs.json b/src/main/resources/assets/botania/blockstates/stone2Stairs.json deleted file mode 100644 index ef6a5e14f..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone2", - "top": "botania:blocks/stone2", - "side": "botania:blocks/stone2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json deleted file mode 100644 index 567b35dc0..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone3", - "top": "botania:blocks/stone3", - "side": "botania:blocks/stone3" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json deleted file mode 100644 index f12af79cc..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone3" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3Stairs.json b/src/main/resources/assets/botania/blockstates/stone3Stairs.json deleted file mode 100644 index 796df4563..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone3", - "top": "botania:blocks/stone3", - "side": "botania:blocks/stone3" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json deleted file mode 100644 index c841c3a9c..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone8", - "top": "botania:blocks/stone8", - "side": "botania:blocks/stone8" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json deleted file mode 100644 index b9418ced7..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone8" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8Stairs.json b/src/main/resources/assets/botania/blockstates/stone8Stairs.json deleted file mode 100644 index 0dde759af..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone8", - "top": "botania:blocks/stone8", - "side": "botania:blocks/stone8" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json deleted file mode 100644 index 85faa62e9..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone9", - "top": "botania:blocks/stone9", - "side": "botania:blocks/stone9" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json deleted file mode 100644 index 17c878f1b..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone9" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9Stairs.json b/src/main/resources/assets/botania/blockstates/stone9Stairs.json deleted file mode 100644 index 88dc97a8b..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone9", - "top": "botania:blocks/stone9", - "side": "botania:blocks/stone9" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/textures/blocks/stone0.png b/src/main/resources/assets/botania/textures/blocks/stone0.png deleted file mode 100644 index 680a899f2..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone1.png b/src/main/resources/assets/botania/textures/blocks/stone1.png deleted file mode 100644 index 8a8f460bf..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone1.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone10.png b/src/main/resources/assets/botania/textures/blocks/stone10.png deleted file mode 100644 index d0110b4b8..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone10.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone11.png b/src/main/resources/assets/botania/textures/blocks/stone11.png deleted file mode 100644 index 531ea8344..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone11.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone2.png b/src/main/resources/assets/botania/textures/blocks/stone2.png deleted file mode 100644 index 711c838b3..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone3.png b/src/main/resources/assets/botania/textures/blocks/stone3.png deleted file mode 100644 index 07c7af851..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone4.png b/src/main/resources/assets/botania/textures/blocks/stone4.png deleted file mode 100644 index a77809c04..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone4.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone5.png b/src/main/resources/assets/botania/textures/blocks/stone5.png deleted file mode 100644 index aa519396c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone5.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone6.png b/src/main/resources/assets/botania/textures/blocks/stone6.png deleted file mode 100644 index 72c413216..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone6.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone7.png b/src/main/resources/assets/botania/textures/blocks/stone7.png deleted file mode 100644 index d5b37f1b4..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone7.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone8.png b/src/main/resources/assets/botania/textures/blocks/stone8.png deleted file mode 100644 index ddcfaa394..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone8.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone9.png b/src/main/resources/assets/botania/textures/blocks/stone9.png deleted file mode 100644 index 468697763..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/stone9.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/stone12.png b/src/main/resources/assets/botania/textures/blocks/unused/stone12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone12.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone12.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone13.png b/src/main/resources/assets/botania/textures/blocks/unused/stone13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone13.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone13.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone14.png b/src/main/resources/assets/botania/textures/blocks/unused/stone14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone14.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone14.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone15.png b/src/main/resources/assets/botania/textures/blocks/unused/stone15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone15.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone15.png