Merge pull request #362 from Brycey92/BOP-1.8-3.0.x

Added blockstate and block and item models files for gem ores and blocks, and flesh, as well as their renamed textures. Also added them to the localization file with the new naming scheme.

src/main/resources/assets/biomesoplenty/blockstates/flesh.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "variant=flesh": { "model": "biomesoplenty:flesh" }
+    }
+}

src/main/resources/assets/biomesoplenty/blockstates/gems.json

@@ -0,0 +1,20 @@
+{
+    "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" }
+    }
+}

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -15,6 +15,8 @@ tile.coral.blue_coral.name=Blue Coral
 tile.coral.glowing_coral.name=Glowing Coral
 tile.coral.algae.name=Algae
 
+tile.flesh.name=Flesh
+
 tile.flower.clover.name=Clover
 tile.flower.swampflower.name=Swampflower
 tile.flower.deathbloom.name=Deathbloom
@@ -39,6 +41,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.log.sacred_oak.name=Sacred Oak Wood
 tile.log.cherry.name=Cherry Wood
 tile.log.dark.name=Dark Wood

src/main/resources/assets/biomesoplenty/models/block/amber_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/amber_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/amethyst_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/amethyst_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_amber.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_amber"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_amethyst.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_amethyst"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_malachite.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_malachite"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_peridot.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_peridot"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_ruby.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_ruby"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_sapphire.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_sapphire"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_tanzanite.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_tanzanite"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/block_of_topaz.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/block_of_topaz"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/flesh.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/flesh"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/malachite_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/malachite_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/peridot_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/peridot_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/ruby_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/ruby_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/sapphire_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/sapphire_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/tanzanite_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/tanzanite_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/block/topaz_ore.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "biomesoplenty:blocks/topaz_ore"
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/amber_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/amber_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/amethyst_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/amethyst_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_amber.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/block_of_amber",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_amethyst.json

@@ -0,0 +1,10 @@
+{
+    "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 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_malachite.json

@@ -0,0 +1,10 @@
+{
+    "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 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_peridot.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/block_of_peridot",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_ruby.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/block_of_ruby",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_sapphire.json

@@ -0,0 +1,10 @@
+{
+    "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 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_tanzanite.json

@@ -0,0 +1,10 @@
+{
+    "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 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/block_of_topaz.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/block_of_topaz",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/flesh.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/flesh",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/malachite_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/malachite_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/peridot_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/peridot_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/ruby_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/ruby_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/sapphire_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/sapphire_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/tanzanite_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/tanzanite_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/biomesoplenty/models/item/topaz_ore.json

@@ -0,0 +1,10 @@
+{
+    "parent": "biomesoplenty:block/topaz_ore",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}