From 687abaa113a790070c40de7a0257f0beeea8971a Mon Sep 17 00:00:00 2001 From: Brycey92 Date: Tue, 21 Oct 2014 01:46:50 -0400 Subject: [PATCH 1/2] Added coral blockstates and item and block models files. Also updated localization file to contain corals, rocks, and grass. --- .../biomesoplenty/blockstates/coral.json | 13 +++++++++++ .../assets/biomesoplenty/lang/en_US.lang | 22 ++++++++++++++++++- .../biomesoplenty/models/block/algae.json | 6 +++++ .../models/block/blue_coral.json | 6 +++++ .../models/block/glowing_coral.json | 6 +++++ .../biomesoplenty/models/block/kelp.json | 6 +++++ .../models/block/kelp_bottom.json | 6 +++++ .../models/block/kelp_middle.json | 6 +++++ .../biomesoplenty/models/block/kelp_top.json | 6 +++++ .../models/block/orange_coral.json | 6 +++++ .../models/block/pink_coral.json | 6 +++++ .../biomesoplenty/models/item/algae.json | 18 +++++++++++++++ .../biomesoplenty/models/item/blue_coral.json | 18 +++++++++++++++ .../models/item/glowing_coral.json | 18 +++++++++++++++ .../biomesoplenty/models/item/kelp.json | 18 +++++++++++++++ .../models/item/kelp_bottom.json | 18 +++++++++++++++ .../models/item/kelp_middle.json | 18 +++++++++++++++ .../biomesoplenty/models/item/kelp_top.json | 18 +++++++++++++++ .../models/item/orange_coral.json | 18 +++++++++++++++ .../biomesoplenty/models/item/pink_coral.json | 18 +++++++++++++++ 20 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/algae.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/blue_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/kelp.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/kelp_top.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/orange_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/pink_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/algae.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/blue_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/kelp.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/kelp_bottom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/kelp_middle.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/kelp_top.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/orange_coral.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/pink_coral.json diff --git a/src/main/resources/assets/biomesoplenty/blockstates/coral.json b/src/main/resources/assets/biomesoplenty/blockstates/coral.json new file mode 100644 index 000000000..2016d64e3 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/coral.json @@ -0,0 +1,13 @@ +{ + "variants": { + "variant=kelp_bottom": { "model": "biomesoplenty:kelp_bottom" }, + "variant=kelp_middle": { "model": "biomesoplenty:kelp_middle" }, + "variant=kelp_top": { "model": "biomesoplenty:kelp_top" }, + "variant=kelp": { "model": "biomesoplenty:kelp" }, + "variant=pink_coral": { "model": "biomesoplenty:pink_coral" }, + "variant=orange_coral": { "model": "biomesoplenty:orange_coral" }, + "variant=blue_coral": { "model": "biomesoplenty:blue_coral" }, + "variant=glowing_coral": { "model": "biomesoplenty:glowing_coral" }, + "variant=algae": { "model": "biomesoplenty:algae" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 6988590a1..19d5ed603 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -2,6 +2,19 @@ tile.ash_block.name=Ash Block tile.bamboo.name=Bamboo +tile.bopGrass.spectral_moss.name=Spectral Moss +tile.bopGrass.smoldering_grass_block.name=Smoldering Grass Block + +tile.coral.kelp_bottom.name=Kelp Bottom +tile.coral.kelp_middle.name=Kelp Middle +tile.coral.kelp_top.name=Kelp Top +tile.coral.kelp.name=Kelp +tile.coral.pink_coral.name=Pink Coral +tile.coral.orange_coral.name=Orange Coral +tile.coral.blue_coral.name=Blue Coral +tile.coral.glowing_coral.name=Glowing Coral +tile.coral.algae.name=Algae + tile.flower.clover.name=Clover tile.flower.swampflower.name=Swampflower tile.flower.deathbloom.name=Deathbloom @@ -64,4 +77,11 @@ tile.planks.bamboo_thatching.name=Bamboo Thatching tile.planks.pine.name=Pine Wood Planks tile.planks.hell_bark.name=Hell Bark Wood Planks tile.planks.jacaranda.name=Jacaranda Wood Planks -tile.planks.mahogany.name=Mahogany Wood Planks \ No newline at end of file +tile.planks.mahogany.name=Mahogany Wood Planks + +tile.rocks.limestone.name=Limestone +tile.rocks.limestonesmooth.name=Polished Limestone +tile.rocks.siltstone.name=Siltstone +tile.rocks.siltstonesmooth.name=Polished Siltstone +tile.rocks.shale.name=Shale +tile.rocks.shalesmooth.name=Polished Shale diff --git a/src/main/resources/assets/biomesoplenty/models/block/algae.json b/src/main/resources/assets/biomesoplenty/models/block/algae.json new file mode 100644 index 000000000..57b397a58 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/algae.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/algae" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json b/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json new file mode 100644 index 000000000..3538308cb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/blue_coral" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json b/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json new file mode 100644 index 000000000..c369ee78a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/glowing_coral" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp.json b/src/main/resources/assets/biomesoplenty/models/block/kelp.json new file mode 100644 index 000000000..4007fe0d7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/kelp.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/kelp" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json new file mode 100644 index 000000000..790fbfa25 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/kelp_bottom" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json new file mode 100644 index 000000000..e3a0be56b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/kelp_middle" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json new file mode 100644 index 000000000..5070d476c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/kelp_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json b/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json new file mode 100644 index 000000000..1cf377934 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/orange_coral" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json b/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json new file mode 100644 index 000000000..30bd0dbf4 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/pink_coral" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/algae.json b/src/main/resources/assets/biomesoplenty/models/item/algae.json new file mode 100644 index 000000000..4df73ffab --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/algae.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/algae" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json b/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json new file mode 100644 index 000000000..faec5f3c8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/blue_coral" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json b/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json new file mode 100644 index 000000000..0b856da9e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/glowing_coral" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/kelp.json b/src/main/resources/assets/biomesoplenty/models/item/kelp.json new file mode 100644 index 000000000..c12796e70 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/kelp.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/kelp" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/kelp_bottom.json b/src/main/resources/assets/biomesoplenty/models/item/kelp_bottom.json new file mode 100644 index 000000000..78a721cb4 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/kelp_bottom.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/kelp_bottom" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/kelp_middle.json b/src/main/resources/assets/biomesoplenty/models/item/kelp_middle.json new file mode 100644 index 000000000..9f9eb337a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/kelp_middle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/kelp_middle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/kelp_top.json b/src/main/resources/assets/biomesoplenty/models/item/kelp_top.json new file mode 100644 index 000000000..fb7767031 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/kelp_top.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/kelp_top" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json b/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json new file mode 100644 index 000000000..9004eefee --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/orange_coral" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json b/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json new file mode 100644 index 000000000..b25c491ab --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/pink_coral" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} From a4579176332a4c720d9858a03111bebf2c8c443a Mon Sep 17 00:00:00 2001 From: Brycey92 Date: Tue, 21 Oct 2014 01:52:27 -0400 Subject: [PATCH 2/2] Herp, forgot to change the rocks in the localization file to match new naming scheme in last commit. Fixed now! --- src/main/resources/assets/biomesoplenty/lang/en_US.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 19d5ed603..145ca8a3f 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -80,8 +80,8 @@ tile.planks.jacaranda.name=Jacaranda Wood Planks tile.planks.mahogany.name=Mahogany Wood Planks tile.rocks.limestone.name=Limestone -tile.rocks.limestonesmooth.name=Polished Limestone +tile.rocks.polished_limestone.name=Polished Limestone tile.rocks.siltstone.name=Siltstone -tile.rocks.siltstonesmooth.name=Polished Siltstone +tile.rocks.polished_siltstone.name=Polished Siltstone tile.rocks.shale.name=Shale -tile.rocks.shalesmooth.name=Polished Shale +tile.rocks.polished_shale.name=Polished Shale