From 1344bb8c081310ac0899ea6922ca61ea1adebb60 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 13:51:19 -0500 Subject: [PATCH] Exorcism begins: remove (almost) all prismarine --- .../client/core/handler/ModelHandler.java | 14 +-- .../botania/common/block/ModBlocks.java | 6 -- .../botania/common/block/ModFluffBlocks.java | 36 ------- .../common/block/decor/BlockPrismarine.java | 95 ------------------ .../common/block/decor/BlockSeaLamp.java | 39 ------- .../prismarine/BlockDarkPrismarineSlab.java | 23 ----- .../prismarine/BlockPrismarineBrickSlab.java | 23 ----- .../slabs/prismarine/BlockPrismarineSlab.java | 45 --------- .../prismarine/BlockDarkPrismarineStairs.java | 12 --- .../BlockPrismarineBrickStairs.java | 12 --- .../prismarine/BlockPrismarineStairs.java | 29 ------ .../decor/walls/BlockPrismarineWall.java | 36 ------- .../common/crafting/ModMigrationRecipes.java | 15 --- .../botania/common/lexicon/LexiconData.java | 9 -- .../botania/blockstates/prismarine.json | 14 --- .../botania/blockstates/prismarine0Slab.json | 20 ---- .../blockstates/prismarine0SlabFull.json | 9 -- .../blockstates/prismarine0Stairs.json | 53 ---------- .../botania/blockstates/prismarine0Wall.json | 34 ------- .../botania/blockstates/prismarine1Slab.json | 20 ---- .../blockstates/prismarine1SlabFull.json | 9 -- .../blockstates/prismarine1Stairs.json | 53 ---------- .../botania/blockstates/prismarine2Slab.json | 20 ---- .../blockstates/prismarine2SlabFull.json | 9 -- .../blockstates/prismarine2Stairs.json | 53 ---------- .../botania/models/item/prismarineShard.json | 6 +- .../botania/textures/blocks/prismarine0.png | Bin 3378 -> 0 bytes .../textures/blocks/prismarine0.png.mcmeta | 30 ------ .../botania/textures/blocks/prismarine1.png | Bin 936 -> 0 bytes .../botania/textures/blocks/prismarine2.png | Bin 867 -> 0 bytes .../textures/items/prismarineShard.png | Bin 579 -> 0 bytes 31 files changed, 3 insertions(+), 721 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Wall.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine2.png delete mode 100644 src/main/resources/assets/botania/textures/items/prismarineShard.png 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 a602d4e68..ce7bc5ef3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -323,7 +323,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.runeAltar); - registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); @@ -357,7 +356,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.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"); @@ -623,7 +621,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.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -641,7 +638,7 @@ public final class ModelHandler { } List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, @@ -667,7 +664,7 @@ public final class ModelHandler { } List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, @@ -773,7 +770,6 @@ public final class ModelHandler { } registerItemModel(ModFluffBlocks.blazeQuartzStairs); - registerItemModel(ModFluffBlocks.darkPrismarineStairs); if (ConfigHandler.darkQuartzEnabled) registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); @@ -788,8 +784,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingwoodPlankStairs); registerItemModel(ModFluffBlocks.manaQuartzStairs); registerItemModel(ModFluffBlocks.netherBrickStairs); - registerItemModel(ModFluffBlocks.prismarineStairs); - registerItemModel(ModFluffBlocks.prismarineBrickStairs); registerItemModel(ModFluffBlocks.redQuartzStairs); registerItemModel(ModFluffBlocks.reedStairs); registerItemModel(ModFluffBlocks.shimmerrockStairs); @@ -830,9 +824,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dreamwoodSlab); registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); - registerItemModel(ModFluffBlocks.prismarineSlab); - registerItemModel(ModFluffBlocks.prismarineBrickSlab); - registerItemModel(ModFluffBlocks.darkPrismarineSlab); registerItemModel(ModFluffBlocks.dirtPathSlab); registerItemModel(ModFluffBlocks.shimmerrockSlab); registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); @@ -863,7 +854,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); - registerItemModel(ModFluffBlocks.prismarineWall); registerItemModel(ModFluffBlocks.reedWall); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index cb28eb687..faf98ab43 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -41,9 +41,7 @@ import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; -import vazkii.botania.common.block.decor.BlockPrismarine; import vazkii.botania.common.block.decor.BlockReeds; -import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShimmerrock; import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; @@ -213,8 +211,6 @@ public final class ModBlocks { public static Block bifrost; public static Block solidVines; public static Block buriedPetals; - public static Block prismarine; - public static Block seaLamp; public static Block floatingFlower; public static Block tinyPotato; public static Block spawnerClaw; @@ -305,8 +301,6 @@ public final class ModBlocks { bifrost = new BlockBifrost(); solidVines = new BlockSolidVines(); buriedPetals = new BlockBuriedPetals(); - prismarine = new BlockPrismarine(); - seaLamp = new BlockSeaLamp(); floatingFlower = new BlockFloatingFlower(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 6b840a64a..03ab840d7 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -49,9 +49,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.slabs.prismarine.BlockDarkPrismarineSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; @@ -71,12 +68,8 @@ 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.stairs.prismarine.BlockDarkPrismarineStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs; import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; -import vazkii.botania.common.block.decor.walls.BlockPrismarineWall; import vazkii.botania.common.block.decor.walls.BlockReedWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -111,17 +104,6 @@ public final class ModFluffBlocks { public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; - public static Block prismarineStairs; - public static Block prismarineSlab; - public static Block prismarineSlabFull; - public static Block prismarineWall; - public static Block prismarineBrickStairs; - public static Block prismarineBrickSlab; - public static Block prismarineBrickSlabFull; - public static Block darkPrismarineStairs; - public static Block darkPrismarineSlab; - public static Block darkPrismarineSlabFull; - public static Block reedStairs; public static Block reedSlab; public static Block reedSlabFull; @@ -235,17 +217,6 @@ public final class ModFluffBlocks { dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - prismarineStairs = new BlockPrismarineStairs(); - prismarineSlab = new BlockPrismarineSlab(false); - prismarineSlabFull = new BlockPrismarineSlab(true); - prismarineWall = new BlockPrismarineWall(); - prismarineBrickStairs = new BlockPrismarineBrickStairs(); - prismarineBrickSlab = new BlockPrismarineBrickSlab(false); - prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); - darkPrismarineStairs = new BlockDarkPrismarineStairs(); - darkPrismarineSlab = new BlockDarkPrismarineSlab(false); - darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); - reedStairs = new BlockReedStairs(); reedSlab = new BlockReedSlab(false); reedSlabFull = new BlockReedSlab(true); @@ -407,13 +378,6 @@ public final class ModFluffBlocks { ((BlockModSlab) thatchSlab).register(); ((BlockModSlab) thatchSlabFull).register(); - ((BlockModSlab) prismarineSlab).register(); - ((BlockModSlab) prismarineSlabFull).register(); - ((BlockModSlab) prismarineBrickSlab).register(); - ((BlockModSlab) prismarineBrickSlabFull).register(); - ((BlockModSlab) darkPrismarineSlab).register(); - ((BlockModSlab) darkPrismarineSlabFull).register(); - ((BlockModSlab) netherBrickSlab).register(); ((BlockModSlab) netherBrickSlabFull).register(); ((BlockModSlab) soulBrickSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java deleted file mode 100644 index 684e698b0..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ /dev/null @@ -1,95 +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 @ [Jun 28, 2014, 8:25:39 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.PrismarineVariant; -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 BlockPrismarine extends BlockMod implements ILexiconable { - - private static final int TYPES = 3; - - public BlockPrismarine() { - super(Material.ROCK, LibBlockNames.PRISMARINE); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= PrismarineVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < TYPES; i++) - stacks.add(new ItemStack(item, 1, i)); - } - - @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.prismarine; - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java deleted file mode 100644 index 1691341a1..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ /dev/null @@ -1,39 +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 @ [Jun 28, 2014, 9:24:43 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockSeaLamp extends BlockMod implements ILexiconable { - - public BlockSeaLamp() { - super(Material.GLASS, LibBlockNames.SEA_LAMP); - setHardness(0.3F); - setSoundType(SoundType.GLASS); - setLightLevel(1.0F); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java deleted file mode 100644 index b89bc6f21..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { - - public BlockDarkPrismarineSlab(boolean full) { - super(full, PrismarineVariant.DARK_PRISMARINE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java deleted file mode 100644 index 23fe690a0..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { - - public BlockPrismarineBrickSlab(boolean full) { - super(full, PrismarineVariant.PRISMARINE_BRICKS); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java deleted file mode 100644 index 2cc57b012..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ /dev/null @@ -1,45 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -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.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineSlab extends BlockLivingSlab { - - public BlockPrismarineSlab(boolean full) { - this(full, PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineSlab(boolean full, PrismarineVariant variant) { - super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java deleted file mode 100644 index db71c7774..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { - - public BlockDarkPrismarineStairs() { - super(PrismarineVariant.DARK_PRISMARINE); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java deleted file mode 100644 index 4babc82fa..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockPrismarineBrickStairs extends BlockPrismarineStairs { - - public BlockPrismarineBrickStairs() { - super(PrismarineVariant.PRISMARINE_BRICKS); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java deleted file mode 100644 index 4d4fee99d..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ /dev/null @@ -1,29 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - -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.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineStairs extends BlockLivingStairs { - - public BlockPrismarineStairs() { - this(PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineStairs(PrismarineVariant variant) { - super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java deleted file mode 100644 index 7067dc353..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ /dev/null @@ -1,36 +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:30:00 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.SoundType; -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.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineWall extends BlockModWall { - - public BlockPrismarineWall() { - super(ModBlocks.prismarine, 0); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index ec6e4d4a3..44fb482ff 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -22,21 +22,6 @@ public final class ModMigrationRecipes { // Prismarine -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.PRISMARINE, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.SEA_LANTERN), new ItemStack(ModBlocks.seaLamp)); - - // Prismarine -> quark - if (quark) { - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_rough_wall")), new ItemStack(ModFluffBlocks.prismarineWall)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_stairs")), new ItemStack(ModFluffBlocks.prismarineStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab)); - } // End stuff -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Blocks.END_BRICKS), new ItemStack(ModBlocks.endStoneBrick)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 5a9d0a773..819c39092 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -275,7 +275,6 @@ public final class LexiconData { public static LexiconEntry decorativeBlocks; public static LexiconEntry dispenserTweaks; public static LexiconEntry shinyFlowers; - public static LexiconEntry prismarine; public static LexiconEntry shedding; public static LexiconEntry tinyPotato; public static LexiconEntry headCreating; @@ -1383,14 +1382,6 @@ public final class LexiconData { new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); - /*prismarine = new BLexiconEntry(LibLexicon.MISC_PRISMARINE, categoryMisc); - prismarine.setLexiconPages(new PageText("0"), new PageText("1"), - new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), - new PageCraftingRecipe("3", ModCraftingRecipes.recipePrismarine), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePrismarineBrick), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeDarkPrismarine), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeSeaLamp));*/ - tinyPotato = new BasicLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); diff --git a/src/main/resources/assets/botania/blockstates/prismarine.json b/src/main/resources/assets/botania/blockstates/prismarine.json deleted file mode 100644 index 06f4f69ea..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "variant": { - "prismarine": { "textures": { "all": "botania:blocks/prismarine0" } }, - "prismarine_bricks": { "textures": { "all": "botania:blocks/prismarine1" } }, - "dark_prismarine": { "textures": { "all": "botania:blocks/prismarine2" } } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json deleted file mode 100644 index 24486d75c..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine0", - "top": "botania:blocks/prismarine0", - "side": "botania:blocks/prismarine0" - }, - "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/prismarine0SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json deleted file mode 100644 index 461c065a6..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json deleted file mode 100644 index 7859d57bc..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine0", - "top": "botania:blocks/prismarine0", - "side": "botania:blocks/prismarine0" - } - }, - "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/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json deleted file mode 100644 index 94f6ccc2a..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#wall", "wall": "botania:blocks/prismarine0" } - }, - "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": {} - }, - "inventory": [{ - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json deleted file mode 100644 index 9c9871a93..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine1", - "top": "botania:blocks/prismarine1", - "side": "botania:blocks/prismarine1" - }, - "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/prismarine1SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json deleted file mode 100644 index 6bf1e8c65..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine1" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json deleted file mode 100644 index 577d100d9..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine1", - "top": "botania:blocks/prismarine1", - "side": "botania:blocks/prismarine1" - } - }, - "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/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json deleted file mode 100644 index e4a919630..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine2", - "top": "botania:blocks/prismarine2", - "side": "botania:blocks/prismarine2" - }, - "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/prismarine2SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json deleted file mode 100644 index ed540022e..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json deleted file mode 100644 index edfc32a39..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine2", - "top": "botania:blocks/prismarine2", - "side": "botania:blocks/prismarine2" - } - }, - "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/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json index 7e2137c98..a7126693f 100644 --- a/src/main/resources/assets/botania/models/item/prismarineShard.json +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -1,7 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/prismarineShard" - } + "parent": "minecraft:item/prismarine_shard" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine0.png b/src/main/resources/assets/botania/textures/blocks/prismarine0.png deleted file mode 100644 index fe133e294841a56f396ba17d097930006919b754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3378 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 KMNUMnLSTY0rm!0T diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine2.png b/src/main/resources/assets/botania/textures/blocks/prismarine2.png deleted file mode 100644 index 07bed857b00a51c7169a011dea51235fcf7e601b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmV-p1DyPcP)Px#24YJ`L;xiKIRKKy**AOu000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^q` z4+Aj`wj0y{00QGlL_t(I%LT#NZsSw{fZ_kxCw7*muA7ClWoC-dun2(!NW2AiT=D>j zd!BP{kVc)B(v;e9yx02@`|y3@*FS$(P1~Z>fb36nz}dM)cN$2ZUwHS!chq@F-PBN* zD18E&&dry%_zw?g#$+T-BjnkFD9aFlt(d#|aTqN6bzB{_uf= z>!M|G%IdQXd6bgHIomh4s9_)v0!(8<;sz+8gOmtBNEH38MNkWp9bbUkLHjH&k?D%A!Pv4D*-~ReT=~AaiUMYhJ^TOiPH|*Z5 zIefflvb2%LoU^q>^t4A!rYz2vG*w9zCunlI!1V&$V~FD&vDP+*ZF6_G$8iG;L!sLX z;_Q`!AEN0RS*PgalsGMr!SfSxzC_B3rM09fO42lA7&L@oqG<+)rx&`erKu{$aiC68 zW|l?Uw#c!paUb^xsnOLf+Nmc@a?Gj8?A)fVd)hLmP75wKD@4~av@ zykB1sI5Ewrh>s!WVu2qgoK8Jmma`cZNnRsnK5>#D?du)FvUqiTlDZ=GV}w4?6(LQP z(KI!eyDb3Ge$Q-qj=9+qI0v%y6?yo0N1T^*Rl_j!v{?p1F=~p%+@MKfvS$xrLR;3% z5M=!bY5+ir`5a5r`23fj@b2$HYOLo|&a5fne=e&pzCtmf@;&^gXRg2hmQ6P@bS>Ve zd*rF9G3^!3vqN}{*j{aL{0Q8Ep(r@BBhm(jVI(eVZb!w@J))E%Ofxh9_i2xu8dOEj z`ud9X?wZ;1g1SDD=PhX%GoDT;1xXZBmIYN+Vs9>yv>inl@fb&d;_&GK=MbRjI^#H! tA49sXCwXyLUu~f($vltMc1=~*{0~}Q!*tZW(<%S}002ovPDHLkV1mUbj~oC1 diff --git a/src/main/resources/assets/botania/textures/items/prismarineShard.png b/src/main/resources/assets/botania/textures/items/prismarineShard.png deleted file mode 100644 index 4030b4c1bc1f08a26491c6b7b05942ecf1beda61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ1_}%f10kRkr~m)~)k#D_R5;7c zlg~?&aU92A-)EM~wl=ptZS(_{dhoD==)nvRf<=dghkV?n4jm-c#akX_23__KXal1| z9%|M>u!DqvPq&6}4>`}iRs{ZZh>>!&CZ zg6&->v8V)yUmY%ilyY(7Qc+CL&0{$L1=9c^qkrN`C`5W?h3?iSx?7tVh(%?`wM()B zplM;^@iC0eE&OgD9;@K6)j@w>kT{KJ$@hi3E9Rq9>O*m9tljv}!Dx76#z0Ehkm~aeBHs z@z@)=b^8u2>#nMO5VbZ;)53gEH>A_+#_98*Cznf&+f%d+hGg4dNbcJK{shh7tNqwE Rh-d%+002ovPDHLkV1jTo`x^iN