From eed5bf76271a77c6f1464d7012cfcee58cc02c8f Mon Sep 17 00:00:00 2001 From: Adubbz Date: Fri, 12 Dec 2014 21:40:36 +1100 Subject: [PATCH] Readded gem/gem ore blocks --- .../biomesoplenty/api/block/BOPBlocks.java | 2 + .../biomesoplenty/common/block/BlockGem.java | 97 ++++++++++++++++++ .../common/block/BlockGemOre.java | 69 +++++++++++++ .../biomesoplenty/common/init/ModBlocks.java | 4 + .../assets/biomesoplenty/blockstates/gem.json | 12 +++ .../biomesoplenty/blockstates/gem_ore.json | 12 +++ .../biomesoplenty/blockstates/gems.json | 20 ---- .../assets/biomesoplenty/lang/en_US.lang | 33 +++--- .../{block_of_ruby.json => amber_block.json} | 2 +- ...lock_of_amber.json => amethyst_block.json} | 2 +- .../models/block/block_of_amethyst.json | 6 -- .../models/block/block_of_malachite.json | 6 -- .../models/block/block_of_sapphire.json | 6 -- .../models/block/block_of_tanzanite.json | 6 -- ...k_of_peridot.json => malachite_block.json} | 2 +- ...block_of_topaz.json => peridot_block.json} | 2 +- .../models/block/ruby_block.json | 6 ++ .../models/block/sapphire_block.json | 6 ++ .../models/block/tanzanite_block.json | 6 ++ .../models/block/topaz_block.json | 6 ++ .../{block_of_ruby.json => amber_block.json} | 2 +- ...lock_of_amber.json => amethyst_block.json} | 2 +- .../models/item/block_of_amethyst.json | 10 -- .../models/item/block_of_malachite.json | 10 -- .../models/item/block_of_sapphire.json | 10 -- .../models/item/block_of_tanzanite.json | 10 -- ...k_of_peridot.json => malachite_block.json} | 2 +- ...block_of_topaz.json => peridot_block.json} | 2 +- .../biomesoplenty/models/item/ruby_block.json | 10 ++ .../models/item/sapphire_block.json | 10 ++ .../models/item/tanzanite_block.json | 10 ++ .../models/item/topaz_block.json | 10 ++ .../{block_of_amber.png => amber_block.png} | Bin ...ock_of_amethyst.png => amethyst_block.png} | Bin ...k_of_malachite.png => malachite_block.png} | Bin ...block_of_peridot.png => peridot_block.png} | Bin .../{block_of_ruby.png => ruby_block.png} | Bin ...ock_of_sapphire.png => sapphire_block.png} | Bin ...k_of_tanzanite.png => tanzanite_block.png} | Bin .../{block_of_topaz.png => topaz_block.png} | Bin 40 files changed, 285 insertions(+), 108 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/block/BlockGem.java create mode 100644 src/main/java/biomesoplenty/common/block/BlockGemOre.java create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/gem.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/gem_ore.json delete mode 100644 src/main/resources/assets/biomesoplenty/blockstates/gems.json rename src/main/resources/assets/biomesoplenty/models/block/{block_of_ruby.json => amber_block.json} (53%) rename src/main/resources/assets/biomesoplenty/models/block/{block_of_amber.json => amethyst_block.json} (53%) delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/block_of_amethyst.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/block_of_malachite.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/block_of_sapphire.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/block_of_tanzanite.json rename src/main/resources/assets/biomesoplenty/models/block/{block_of_peridot.json => malachite_block.json} (52%) rename src/main/resources/assets/biomesoplenty/models/block/{block_of_topaz.json => peridot_block.json} (53%) create mode 100644 src/main/resources/assets/biomesoplenty/models/block/ruby_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sapphire_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/tanzanite_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/topaz_block.json rename src/main/resources/assets/biomesoplenty/models/item/{block_of_ruby.json => amber_block.json} (79%) rename src/main/resources/assets/biomesoplenty/models/item/{block_of_amber.json => amethyst_block.json} (78%) delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/block_of_amethyst.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/block_of_malachite.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/block_of_sapphire.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/block_of_tanzanite.json rename src/main/resources/assets/biomesoplenty/models/item/{block_of_peridot.json => malachite_block.json} (78%) rename src/main/resources/assets/biomesoplenty/models/item/{block_of_topaz.json => peridot_block.json} (78%) create mode 100644 src/main/resources/assets/biomesoplenty/models/item/ruby_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/sapphire_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/tanzanite_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/topaz_block.json rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_amber.png => amber_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_amethyst.png => amethyst_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_malachite.png => malachite_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_peridot.png => peridot_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_ruby.png => ruby_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_sapphire.png => sapphire_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_tanzanite.png => tanzanite_block.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{block_of_topaz.png => topaz_block.png} (100%) diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 26a0ccff4..6d884a974 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -16,6 +16,8 @@ public class BOPBlocks public static Block bamboo; public static Block flower; public static Block flower2; + public static Block gem; + public static Block gem_ore; public static Block log; public static Block log2; public static Block log3; diff --git a/src/main/java/biomesoplenty/common/block/BlockGem.java b/src/main/java/biomesoplenty/common/block/BlockGem.java new file mode 100644 index 000000000..334ee564c --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockGem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2014, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ + +package biomesoplenty.common.block; + +import biomesoplenty.api.block.BOPBlock; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.IStringSerializable; + +//TODO: Add gem ore drops, make gem item seperate +public class BlockGem extends BOPBlock +{ + public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", GemType.class); + + public BlockGem() + { + super(Material.rock); + + this.setDefaultState(this.blockState.getBaseState().withProperty(VARIANT_PROP, GemType.AMETHYST)); + + for (IBlockState state : presetStates) + { + this.setHarvestLevel("pickaxe", 2, state); + } + + this.setHarvestLevel("pickaxe", 3, this.getDefaultState().withProperty(VARIANT_PROP, GemType.AMETHYST)); + + this.setHardness(5.0F); + this.setResistance(10.0F); + this.setStepSound(Block.soundTypeMetal); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(VARIANT_PROP, GemType.values()[meta]); + } + + @Override + public int getMetaFromState(IBlockState state) + { + int meta = ((GemType)state.getValue(VARIANT_PROP)).ordinal(); + + return meta; + } + + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] { VARIANT_PROP }); + } + + @Override + public IProperty[] getPresetProperties() + { + return new IProperty[] { VARIANT_PROP }; + } + + @Override + public String getStateName(IBlockState state, boolean fullName) + { + return ((GemType)state.getValue(VARIANT_PROP)).getName() + (fullName ? "_block" : ""); + } + + public static enum GemType implements IStringSerializable + { + AMETHYST, + RUBY, + PERIDOT, + TOPAZ, + TANZANITE, + MALACHITE, + SAPPHIRE, + AMBER; + + public String getName() + { + return this.name().toLowerCase(); + } + + @Override + public String toString() + { + return getName(); + } + } +} diff --git a/src/main/java/biomesoplenty/common/block/BlockGemOre.java b/src/main/java/biomesoplenty/common/block/BlockGemOre.java new file mode 100644 index 000000000..e0c64a97c --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockGemOre.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright 2014, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ + +package biomesoplenty.common.block; + +import static biomesoplenty.common.block.BlockGem.VARIANT_PROP; +import biomesoplenty.api.block.BOPBlock; +import biomesoplenty.common.block.BlockGem.GemType; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; + +public class BlockGemOre extends BOPBlock +{ + public BlockGemOre() + { + super(Material.rock); + + this.setDefaultState(this.blockState.getBaseState().withProperty(VARIANT_PROP, GemType.AMETHYST)); + + for (IBlockState state : presetStates) + { + this.setHarvestLevel("pickaxe", 2, state); + } + + this.setHardness(3.0F); + this.setResistance(5.0F); + this.setStepSound(Block.soundTypePiston); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(VARIANT_PROP, GemType.values()[meta]); + } + + @Override + public int getMetaFromState(IBlockState state) + { + int meta = ((GemType)state.getValue(VARIANT_PROP)).ordinal(); + + return meta; + } + + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] { VARIANT_PROP }); + } + + @Override + public IProperty[] getPresetProperties() + { + return new IProperty[] { VARIANT_PROP }; + } + + @Override + public String getStateName(IBlockState state, boolean fullName) + { + return ((GemType)state.getValue(VARIANT_PROP)).getName() + (fullName ? "_ore" : ""); + } +} diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index 9e38d2a2b..aea7e6851 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -29,6 +29,8 @@ import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.block.BlockBOPPlanks; import biomesoplenty.common.block.BlockBOPStone; import biomesoplenty.common.block.BlockBamboo; +import biomesoplenty.common.block.BlockGem; +import biomesoplenty.common.block.BlockGemOre; import biomesoplenty.common.item.ItemBlockWithVariants; import biomesoplenty.common.util.block.BlockStateUtils; import biomesoplenty.core.BiomesOPlenty; @@ -41,6 +43,8 @@ public class ModBlocks bamboo = registerBlock(new BlockBamboo(), "bamboo"); flower = registerBlock(new BlockBOPFlower(), "flower"); flower2 = registerBlock(new BlockBOPFlower2(), "flower2"); + gem = registerBlock(new BlockGem(), "gem"); + gem_ore = registerBlock(new BlockGemOre(), "gem_ore"); log = registerBlock(new BlockBOPLog(), "log"); log2 = registerBlock(new BlockBOPLog2(), "log2"); log3 = registerBlock(new BlockBOPLog3(), "log3"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/gem.json b/src/main/resources/assets/biomesoplenty/blockstates/gem.json new file mode 100644 index 000000000..4f44f9cd2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/gem.json @@ -0,0 +1,12 @@ +{ + "variants": { + "variant=amethyst": { "model": "biomesoplenty:amethyst_block" }, + "variant=ruby": { "model": "biomesoplenty:ruby_block" }, + "variant=peridot": { "model": "biomesoplenty:peridot_block" }, + "variant=topaz": { "model": "biomesoplenty:topaz_block" }, + "variant=tanzanite": { "model": "biomesoplenty:tanzanite_block" }, + "variant=malachite": { "model": "biomesoplenty:malachite_block" }, + "variant=sapphire": { "model": "biomesoplenty:sapphire_block" }, + "variant=amber": { "model": "biomesoplenty:amber_block" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/gem_ore.json b/src/main/resources/assets/biomesoplenty/blockstates/gem_ore.json new file mode 100644 index 000000000..437422763 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/gem_ore.json @@ -0,0 +1,12 @@ +{ + "variants": { + "variant=amethyst": { "model": "biomesoplenty:amethyst_ore" }, + "variant=ruby": { "model": "biomesoplenty:ruby_ore" }, + "variant=peridot": { "model": "biomesoplenty:peridot_ore" }, + "variant=topaz": { "model": "biomesoplenty:topaz_ore" }, + "variant=tanzanite": { "model": "biomesoplenty:tanzanite_ore" }, + "variant=malachite": { "model": "biomesoplenty:malachite_ore" }, + "variant=sapphire": { "model": "biomesoplenty:sapphire_ore" }, + "variant=amber": { "model": "biomesoplenty:amber_ore" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/gems.json b/src/main/resources/assets/biomesoplenty/blockstates/gems.json deleted file mode 100644 index c1b4b2b76..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/gems.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "variant=amethyst_ore": { "model": "biomesoplenty:amethyst_ore" }, - "variant=block_of_amethyst": { "model": "biomesoplenty:block_of_amethyst" }, - "variant=ruby_ore": { "model": "biomesoplenty:ruby_ore" }, - "variant=block_of_ruby": { "model": "biomesoplenty:block_of_ruby" }, - "variant=peridot_ore": { "model": "biomesoplenty:peridot_ore" }, - "variant=block_of_peridot": { "model": "biomesoplenty:block_of_peridot" }, - "variant=topaz_ore": { "model": "biomesoplenty:topaz_ore" }, - "variant=block_of_topaz": { "model": "biomesoplenty:block_of_topaz" }, - "variant=tanzanite_ore": { "model": "biomesoplenty:tanzanite_ore" }, - "variant=block_of_tanzanite": { "model": "biomesoplenty:block_of_tanzanite" }, - "variant=malachite_ore": { "model": "biomesoplenty:malachite_ore" }, - "variant=block_of_malachite": { "model": "biomesoplenty:block_of_malachite" }, - "variant=sapphire_ore": { "model": "biomesoplenty:sapphire_ore" }, - "variant=block_of_sapphire": { "model": "biomesoplenty:block_of_sapphire" }, - "variant=amber_ore": { "model": "biomesoplenty:amber_ore" }, - "variant=block_of_amber": { "model": "biomesoplenty:block_of_amber" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index cc877a8ab..2ab08215c 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -43,22 +43,23 @@ tile.flower2.miners_delight.name=Miner's Delight tile.flower2.icy_iris.name=Icy Iris tile.flower2.rose.name=Rose -tile.gems.amethyst_ore.name=Ender Amethyst Ore -tile.gems.block_of_amethyst.name=Block of Amethyst -tile.gems.ruby_ore.name=Ruby Ore -tile.gems.block_of_ruby.name=Block of Ruby -tile.gems.peridot_ore.name=Peridot Ore -tile.gems.block_of_peridot.name=Block of Peridot -tile.gems.topaz_ore.name=Topaz Ore -tile.gems.block_of_topaz.name=Block of Topaz -tile.gems.tanzanite_ore.name=Tanzanite Ore -tile.gems.block_of_tanzanite.name=Block of Tanzanite -tile.gems.malachite_ore.name=Malachite Ore -tile.gems.block_of_malachite.name=Block of Malachite -tile.gems.sapphire_ore.name=Sapphire Ore -tile.gems.block_of_sapphire.name=Block of Sapphire -tile.gems.amber_ore.name=Amber Ore -tile.gems.block_of_amber.name=Block of Amber +tile.gem.amethyst.name=Block of Amethyst +tile.gem.ruby.name=Block of Ruby +tile.gem.peridot.name=Block of Peridot +tile.gem.topaz.name=Block of Topaz +tile.gem.tanzanite.name=Block of Tanzanite +tile.gem.malachite.name=Block of Malachite +tile.gem.sapphire.name=Block of Sapphire +tile.gem.amber.name=Block of Amber + +tile.gem_ore.amethyst.name=Ender Amethyst Ore +tile.gem_ore.ruby.name=Ruby Ore +tile.gem_ore.peridot.name=Peridot Ore +tile.gem_ore.topaz.name=Topaz Ore +tile.gem_ore.tanzanite.name=Tanzanite Ore +tile.gem_ore.malachite.name=Malachite Ore +tile.gem_ore.sapphire.name=Sapphire Ore +tile.gem_ore.amber.name=Amber Ore tile.hive.hive_block.name=Hive Block tile.hive.honeycomb_block.name=Honeycomb Block diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_ruby.json b/src/main/resources/assets/biomesoplenty/models/block/amber_block.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/models/block/block_of_ruby.json rename to src/main/resources/assets/biomesoplenty/models/block/amber_block.json index 62484f606..160b88eb9 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_ruby.json +++ b/src/main/resources/assets/biomesoplenty/models/block/amber_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/block_of_ruby" + "all": "biomesoplenty:blocks/amber_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_amber.json b/src/main/resources/assets/biomesoplenty/models/block/amethyst_block.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/models/block/block_of_amber.json rename to src/main/resources/assets/biomesoplenty/models/block/amethyst_block.json index 660f73ba0..2ca44f540 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_amber.json +++ b/src/main/resources/assets/biomesoplenty/models/block/amethyst_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/block_of_amber" + "all": "biomesoplenty:blocks/amethyst_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_amethyst.json b/src/main/resources/assets/biomesoplenty/models/block/block_of_amethyst.json deleted file mode 100644 index 9ee014634..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_amethyst.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/block_of_amethyst" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_malachite.json b/src/main/resources/assets/biomesoplenty/models/block/block_of_malachite.json deleted file mode 100644 index f36f716c3..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_malachite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/block_of_malachite" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_sapphire.json b/src/main/resources/assets/biomesoplenty/models/block/block_of_sapphire.json deleted file mode 100644 index 7b5b43af0..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_sapphire.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/block_of_sapphire" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_tanzanite.json b/src/main/resources/assets/biomesoplenty/models/block/block_of_tanzanite.json deleted file mode 100644 index 2610cc6d7..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_tanzanite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/block_of_tanzanite" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_peridot.json b/src/main/resources/assets/biomesoplenty/models/block/malachite_block.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/block_of_peridot.json rename to src/main/resources/assets/biomesoplenty/models/block/malachite_block.json index a02860382..a1a209966 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_peridot.json +++ b/src/main/resources/assets/biomesoplenty/models/block/malachite_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/block_of_peridot" + "all": "biomesoplenty:blocks/malachite_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/block_of_topaz.json b/src/main/resources/assets/biomesoplenty/models/block/peridot_block.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/models/block/block_of_topaz.json rename to src/main/resources/assets/biomesoplenty/models/block/peridot_block.json index 45d3d84f3..ebe19e665 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/block_of_topaz.json +++ b/src/main/resources/assets/biomesoplenty/models/block/peridot_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/block_of_topaz" + "all": "biomesoplenty:blocks/peridot_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/ruby_block.json b/src/main/resources/assets/biomesoplenty/models/block/ruby_block.json new file mode 100644 index 000000000..f06a80c44 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/ruby_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/ruby_block" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sapphire_block.json b/src/main/resources/assets/biomesoplenty/models/block/sapphire_block.json new file mode 100644 index 000000000..a23438ec8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sapphire_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/sapphire_block" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/tanzanite_block.json b/src/main/resources/assets/biomesoplenty/models/block/tanzanite_block.json new file mode 100644 index 000000000..3e07ab1f1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/tanzanite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/tanzanite_block" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/topaz_block.json b/src/main/resources/assets/biomesoplenty/models/block/topaz_block.json new file mode 100644 index 000000000..fa814f15f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/topaz_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/topaz_block" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_ruby.json b/src/main/resources/assets/biomesoplenty/models/item/amber_block.json similarity index 79% rename from src/main/resources/assets/biomesoplenty/models/item/block_of_ruby.json rename to src/main/resources/assets/biomesoplenty/models/item/amber_block.json index c6c7ed29a..94de5b721 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_ruby.json +++ b/src/main/resources/assets/biomesoplenty/models/item/amber_block.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/block_of_ruby", + "parent": "biomesoplenty:block/amber_block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_amber.json b/src/main/resources/assets/biomesoplenty/models/item/amethyst_block.json similarity index 78% rename from src/main/resources/assets/biomesoplenty/models/item/block_of_amber.json rename to src/main/resources/assets/biomesoplenty/models/item/amethyst_block.json index 85c477ee5..0786d85cb 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_amber.json +++ b/src/main/resources/assets/biomesoplenty/models/item/amethyst_block.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/block_of_amber", + "parent": "biomesoplenty:block/amethyst_block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_amethyst.json b/src/main/resources/assets/biomesoplenty/models/item/block_of_amethyst.json deleted file mode 100644 index ec9124406..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_amethyst.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/block_of_amethyst", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_malachite.json b/src/main/resources/assets/biomesoplenty/models/item/block_of_malachite.json deleted file mode 100644 index 6ff6bd2e8..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_malachite.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/block_of_malachite", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_sapphire.json b/src/main/resources/assets/biomesoplenty/models/item/block_of_sapphire.json deleted file mode 100644 index 04671a667..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_sapphire.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/block_of_sapphire", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_tanzanite.json b/src/main/resources/assets/biomesoplenty/models/item/block_of_tanzanite.json deleted file mode 100644 index 3bf724ddb..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_tanzanite.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/block_of_tanzanite", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_peridot.json b/src/main/resources/assets/biomesoplenty/models/item/malachite_block.json similarity index 78% rename from src/main/resources/assets/biomesoplenty/models/item/block_of_peridot.json rename to src/main/resources/assets/biomesoplenty/models/item/malachite_block.json index 83ad71325..7aca93e26 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_peridot.json +++ b/src/main/resources/assets/biomesoplenty/models/item/malachite_block.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/block_of_peridot", + "parent": "biomesoplenty:block/malachite_block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/block_of_topaz.json b/src/main/resources/assets/biomesoplenty/models/item/peridot_block.json similarity index 78% rename from src/main/resources/assets/biomesoplenty/models/item/block_of_topaz.json rename to src/main/resources/assets/biomesoplenty/models/item/peridot_block.json index 77d7adcb8..41e8a33cc 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/block_of_topaz.json +++ b/src/main/resources/assets/biomesoplenty/models/item/peridot_block.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/block_of_topaz", + "parent": "biomesoplenty:block/peridot_block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/ruby_block.json b/src/main/resources/assets/biomesoplenty/models/item/ruby_block.json new file mode 100644 index 000000000..200990311 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/ruby_block.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/ruby_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/sapphire_block.json b/src/main/resources/assets/biomesoplenty/models/item/sapphire_block.json new file mode 100644 index 000000000..aca570601 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/sapphire_block.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/sapphire_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/tanzanite_block.json b/src/main/resources/assets/biomesoplenty/models/item/tanzanite_block.json new file mode 100644 index 000000000..1807332ed --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/tanzanite_block.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/tanzanite_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/topaz_block.json b/src/main/resources/assets/biomesoplenty/models/item/topaz_block.json new file mode 100644 index 000000000..e121c3531 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/topaz_block.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/topaz_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_amber.png b/src/main/resources/assets/biomesoplenty/textures/blocks/amber_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_amber.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/amber_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_amethyst.png b/src/main/resources/assets/biomesoplenty/textures/blocks/amethyst_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_amethyst.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/amethyst_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_malachite.png b/src/main/resources/assets/biomesoplenty/textures/blocks/malachite_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_malachite.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/malachite_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_peridot.png b/src/main/resources/assets/biomesoplenty/textures/blocks/peridot_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_peridot.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/peridot_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_ruby.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ruby_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_ruby.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/ruby_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_sapphire.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapphire_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_sapphire.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapphire_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_tanzanite.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tanzanite_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_tanzanite.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/tanzanite_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/block_of_topaz.png b/src/main/resources/assets/biomesoplenty/textures/blocks/topaz_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/block_of_topaz.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/topaz_block.png