From c5d5e59b960f5eb56d3d41f41877728d2283d19c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 14:50:03 -0500 Subject: [PATCH] Byebye Future (hah) stones! --- .../botania/api/state/BotaniaStateProps.java | 21 ---- .../api/state/enums/EndBrickVariant.java | 26 ----- .../api/state/enums/FutureStoneVariant.java | 38 ------- .../api/state/enums/PrismarineVariant.java | 25 ----- .../client/core/handler/ModelHandler.java | 27 ----- .../botania/common/block/ModFluffBlocks.java | 37 ------- .../common/block/decor/Block18Stone.java | 94 ------------------ .../block/decor/slabs/Block18StoneSlab.java | 50 ---------- .../decor/stairs/Block18StoneStairs.java | 34 ------- .../block/decor/walls/Block18StoneWall.java | 80 --------------- .../common/core/BotaniaCreativeTab.java | 9 -- .../common/crafting/ModCraftingRecipes.java | 4 +- .../common/crafting/ModMigrationRecipes.java | 80 --------------- .../assets/botania/blockstates/stone.json | 27 ----- .../botania/blockstates/stone0Slab.json | 20 ---- .../botania/blockstates/stone0SlabFull.json | 9 -- .../botania/blockstates/stone0Stairs.json | 53 ---------- .../botania/blockstates/stone0Wall.json | 55 ---------- .../botania/blockstates/stone10Slab.json | 20 ---- .../botania/blockstates/stone10SlabFull.json | 9 -- .../botania/blockstates/stone10Stairs.json | 53 ---------- .../botania/blockstates/stone11Slab.json | 20 ---- .../botania/blockstates/stone11SlabFull.json | 9 -- .../botania/blockstates/stone11Stairs.json | 53 ---------- .../botania/blockstates/stone1Slab.json | 20 ---- .../botania/blockstates/stone1SlabFull.json | 9 -- .../botania/blockstates/stone1Stairs.json | 53 ---------- .../botania/blockstates/stone2Slab.json | 20 ---- .../botania/blockstates/stone2SlabFull.json | 9 -- .../botania/blockstates/stone2Stairs.json | 53 ---------- .../botania/blockstates/stone3Slab.json | 20 ---- .../botania/blockstates/stone3SlabFull.json | 9 -- .../botania/blockstates/stone3Stairs.json | 53 ---------- .../botania/blockstates/stone8Slab.json | 20 ---- .../botania/blockstates/stone8SlabFull.json | 9 -- .../botania/blockstates/stone8Stairs.json | 53 ---------- .../botania/blockstates/stone9Slab.json | 20 ---- .../botania/blockstates/stone9SlabFull.json | 9 -- .../botania/blockstates/stone9Stairs.json | 53 ---------- .../assets/botania/textures/blocks/stone0.png | Bin 1024 -> 0 bytes .../assets/botania/textures/blocks/stone1.png | Bin 15344 -> 0 bytes .../botania/textures/blocks/stone10.png | Bin 16597 -> 0 bytes .../botania/textures/blocks/stone11.png | Bin 15964 -> 0 bytes .../assets/botania/textures/blocks/stone2.png | Bin 984 -> 0 bytes .../assets/botania/textures/blocks/stone3.png | Bin 979 -> 0 bytes .../assets/botania/textures/blocks/stone4.png | Bin 850 -> 0 bytes .../assets/botania/textures/blocks/stone5.png | Bin 15239 -> 0 bytes .../assets/botania/textures/blocks/stone6.png | Bin 15236 -> 0 bytes .../assets/botania/textures/blocks/stone7.png | Bin 804 -> 0 bytes .../assets/botania/textures/blocks/stone8.png | Bin 15964 -> 0 bytes .../assets/botania/textures/blocks/stone9.png | Bin 15878 -> 0 bytes .../textures/blocks/{ => unused}/stone12.png | Bin .../textures/blocks/{ => unused}/stone13.png | Bin .../textures/blocks/{ => unused}/stone14.png | Bin .../textures/blocks/{ => unused}/stone15.png | Bin 55 files changed, 2 insertions(+), 1261 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java delete mode 100644 src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java delete mode 100644 src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/Block18Stone.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java delete mode 100644 src/main/resources/assets/botania/blockstates/stone.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Wall.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone10.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone11.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone3.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone4.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone5.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone6.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone7.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone8.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone9.png rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone12.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone13.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone14.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone15.png (100%) 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 680a899f2cee987edfe0c17654c26be18df46cce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 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 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 d0110b4b8e079f7a801b19b23945ebbf18b98e2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16597 zcmeI3U2GKB6@ZWJwXxSWwlP00q++uvQQLHPcJ{~X8Lc-WHo=y%)PO5YUy||8tUY3P zXS=(`i`9p!eW?1{r>g2pmG>%@5Trs0sj7;gP$+pwAc+msMPMj4*kJGvY|p*>>+AIm zO(Ip1W~7CnOFjQqwdvALJ1$!(zao3M2~md=gyq9 z+jOG+>%2SWv^cr zJ8k*H9<<`GKvIp!hk9SnheN5`KAKJ^WI-4oA9s#>oJMj)5G6?xTyDYbc3=-j>O?%P zWE}C-OF1V6KfPKioYWI(-H6+WUuD=BOLyDtBvA3l&nuQF28yTh?2w|6Q4)gabP1J= z)Ns)zF_w(dp{Zd(i)t|~o=%~iSkW#qYNUH*|+2=Yj<{?AXBPUpM(I@-7vbSJf)`>O81*0ly<;xtDcPn$DhUJKnj4A1$ z9#cj%ArT)52&Kldp2Z51dyJ@UyhPe7>DT+yo62#=8x-Wv~VDFmM?O9-ZgF4EVO zk+rP_MN|)B7M!ZC$`Q?{dR4`Z`+($eNTRpPp@?F{(dBoE!(Eyxs$LuxS(<268VT`4 zTi3=Yp8#)!B-5dg+#gS+6`VkSFCCAL<8iCL&SAG-a(E*?w7*_47|PH?lJGb*_J$)Ny-OqGf&lH=4N+72K=~)u)r(o?yU} zY#i2pwzjpDTe^`Zlw?XH+eEj$uul|sUhG;t0(85Pl`z?YgJH6YH8mitX)O(lHPhE8 z@c9ZV=fBK+;~3+kT6}}8Am@d4*w{X0MAG9*QrkO%%jHY>gmF_0^EoH zFYpQGT;TAi5+Bjjpime|q2b$E~XivhwHO&?`7l}&7XySZnz;CU7_Etm0m2teTzo!^*2KjC z;fp3NJ|9MF;$ndCMH3gF52H14F+ljDiHpyN(VDmzAbiop#plClO>oJAfU=Z{Pg;>i`y8fA8MGOck_R z=2oh{_+l#C&`=M}&CRg5_?Uca40CgH(B9q-b#=Ay4cxkQ3toKD2G_1#hx6ypqvNfxXV3TG z!i5WP|NaB0x_$djc6$0IHT?MF%k;iw%NBZn`Q<$@HFXVES6AVM7rsl|tk!yHY1s_# zyz^(ce*Fei6D2Y1=-38Mr$A5I6ECf;EwFRvE@*3Oqoe!q!*e*LWtf@y53H=L!qO5> zZ+UqcKK=9)YWVc&QykVTyz`6;1d=W=8L~qS69G7pd2}Jlr|D$ zGPjP74!C`L20r`jDoB!C994UJ8=O7+0qsjhwRLMd0bB!Du6zPFZv2ZXT3cJ;(xpo@ z6D=(*2y+20Ui=3%H8sMsXV0LfrUo`|ZpN%Ez~jeDP?bm|v%7cO;O5PnbeLRKK(B3Fh8FIMx5^0u?9lvib=2@9)nQ5}E7Z;9bdGPo{YT8gcVN?|P4pxsOpcQ$Pr|)>cj3Wd|ou&qhi!5!j@^e?Occ9{cwl=>5}cZ~gMW DIh8%I 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 531ea834425760f37de6d5682988b49646b9f248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15964 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 ByNdt- 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 a77809c04b651d9f92c7ee1347cdd71823c5453c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 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 U_^ETl&i7<>$>~W)SLMI-KN{s1Gynhq 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 d5b37f1b4cd3a70ecd804c81266e6fee9e324026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 804 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 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 468697763a6e966e6a124a7468f96398e8110d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15878 zcmeI3eTWog9LGn6v@^xSz)O+VQ6uqY=Vf>HcE-Kc^H#l!)-GN1&I+BKm%H(HXSSU= zckhz4`bRA+H1LI_C=5ADFnUqM5t(!du=4I~sxyhN~6)SlVdw|j2yNmB^n8Q7QK z^LxI(=XpNAd44nV$ExhXsW5rB8ZV= zozD-#kX5enW)@Lryh8IJYT30{`>3oKjf;TYCOvkc7%6w8YKI*|={@&_5N z0{=p3MH3f9=H`b3Rz2Ba+bNNzGntGx6wP`Wx{^qdi<(qdI+2^2 zBGYO@O{#`%0UcXWm+CNW)9Nq>8M5debYPH^XtX$X#rY@7~cBN%?&I+)U$(2@b>sl!}{USM@LFcY!^+9Bg$Cc$y1vf(>uvW1#txC3;j+tg6 z?4D&U1%#f)M$glWbwe>T*0c}}_b#Qn6iAIowi*VfB2O_siVegVMr3)>7hF=NcRNAy zsHx~$cbVKzu}q8u@;Z?ZOlMe;VcZyHJ>eK&*C>)L-BpzGzGZO~S=7vQQnJH(QfgP} zl+hldOO0hci|3NqXeP`wn3fv$h3HDn6;%;a?s87%218aYkOHeLH6TH`?K)d(@84Q* zB=j)IhgZ=RQP6^l&nNgOfsHGaqWLvS3d(*;@kxA;lbArz52od8QXneL#EFz^?LS8O z0#Gw_avqI}&4y)5U;)jM+tEYAI3H=iX?#LsSSeV5lbD$!#|T-pR&7^_Bju zrQGI9YD!95s#7rP$wI{_)?m=Jc!Y9=N0elz7>8wNKdVZJ?$=tH7A(^TCh+b~C^vqY zeDEv&d+^YNg+klgtDw)-~ji<;K)nM-LSL`EiHG$(votKq1$0DKN{3rrgHAd+*^l*;PF8X z2YBAchiJGNRAe(q}Jwt~k9@B~8_ zA7KVu$cmSl2l=P8q6ZljiiHP(fS^r`3(W`eVq6dqw25({`9NNb3j%^RF)lP8$cu47 zK+q<}h2{f!F)j!Q+Qhifd>}8z1pz^u7#ErkN@?u;N5VVPLq4_{wj0*ySHZd+VAIOVwK|s(Z#)aksc`+^s2-?KB(0m{- z#svXEn-~|G59GzTARuTH<3jU+ycib*1Z`qmXg-h^J9aiRG@ zUW^L@f;KTOG#|)|aX~=PCK6Xw>7`)R0B-_kz$?F}&mZdquM2zRrUg-g=$T3otKTGu z>vzEKMS|#J2;%o;1R-uFh;inIr3dE{#E{v|k%n0I=amazTz_EJV;1KG6HL<$)z!B#AnqlP7YiD;QC!C(x zyX2j{lSvQB&x)kPZOdo%O^hw7Jv`L+UCpq|>rX71wB^_rCzfezM(mzJtkz!mv+2aO z+9QV|?=|^0)4f&I)26Jwv~iV}ATq;$yx`LwuO6~t&ZM_CuG=!vIN0^_m7aa0Cur-f ztDpY#`hjoyh8rJ*E^OYkXU6W@kvmWRv3OhGUo*U$4o|vsaqQ)rqlvEl*Jt%sZD>9D z<#KI1d5)4_dwb2&qrSRBJ6_s)_)J6fv@^}OxkclrPe`|Pj+*l8yeVz(j(wh-wD#<) zd#+kzCV%wdCpWcQ*3p`eNAKwE_-vo)A#3E7$J-WN$%fWFb3?xU!`~~zcaA?n^z^N| c@mo8w{M1vcyL-j+&YRlJbLK~O&R+J$KOSURvj6}9 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