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 fe133e294..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/prismarine0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta deleted file mode 100644 index e0b5ef9e3..000000000 --- a/src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta +++ /dev/null @@ -1,30 +0,0 @@ -{ - "animation": { - "frametime": 300, - "interpolate": true, - "frames": [ - 0, - 1, - 0, - 2, - 0, - 3, - 0, - 1, - 2, - 1, - 3, - 1, - 0, - 2, - 1, - 2, - 3, - 2, - 0, - 3, - 1, - 3 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine1.png b/src/main/resources/assets/botania/textures/blocks/prismarine1.png deleted file mode 100644 index 58906903c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/prismarine1.png and /dev/null differ 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 07bed857b..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/prismarine2.png and /dev/null differ 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 4030b4c1b..000000000 Binary files a/src/main/resources/assets/botania/textures/items/prismarineShard.png and /dev/null differ