diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt
index 14d98ff60..4a14aec70 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt
@@ -145,9 +145,14 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr
"1" to "decorative/computer_screen",
"particle" to "decorative/computer_base",
))
-
blockStateProvider.block(MRegistry.COMPUTER_TERMINAL.allBlocks.values)
+ blockModelProvider.colored("star_chair", mapOf(
+ "1" to "decorative/star_chair",
+ "2" to "powered_smoker_base",
+ ))
+ blockStateProvider.block(MRegistry.STAR_CHAIR.allBlocks.values)
+
blockStateProvider.simpleBlockM(MBlocks.FLUID_TANK)
for ((block, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.blocksWithColor) {
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
index 349820416..4bb5d4dd2 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
@@ -36,6 +36,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block)
MRegistry.TRITANIUM_BLOCK.allItems.values.forEach(provider::block)
MRegistry.COMPUTER_TERMINAL.allItems.values.forEach(provider::block)
+ MRegistry.STAR_CHAIR.allItems.values.forEach(provider::block)
MRegistry.INDUSTRIAL_GLASS.allItems.values.forEach(provider::block)
for (block in MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems) {
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
index ec3fe80d3..972b5eb89 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
@@ -8,6 +8,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
add(MRegistry.VENT_ALTERNATIVE, "%s Alternative Vent")
add(MRegistry.COMPUTER_TERMINAL, "%s Computer Terminal")
+ add(MRegistry.STAR_CHAIR, "%s Star Chair")
add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block")
add(MRegistry.TRITANIUM_STAIRS, "%s Tritanium Stairs")
add(MRegistry.TRITANIUM_SLAB, "%s Tritanium Slab")
@@ -55,6 +56,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
add(MRegistry.CARGO_CRATES.block, "Cargo Crate")
add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal")
+ add(MRegistry.STAR_CHAIR.block, "Star Chair")
add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block")
add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs")
add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab")
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
index 0185cd36c..f28ca8b7f 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
@@ -19,6 +19,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
add(MRegistry.TRITANIUM_BLOCK, "%s тритановый блок")
add(MRegistry.COMPUTER_TERMINAL, "%s компьютерный терминал")
+ add(MRegistry.STAR_CHAIR, "%s звезданутый стул")
add(MRegistry.TRITANIUM_STAIRS, "%s тритановые ступеньки")
add(MRegistry.TRITANIUM_SLAB, "%s тритановая плита")
add(MRegistry.TRITANIUM_WALL, "%s тритановая ограда")
@@ -65,6 +66,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
add(MRegistry.CARGO_CRATES.block, "Грузовой ящик")
add(MRegistry.COMPUTER_TERMINAL.block, "Компьютерный терминал")
+ add(MRegistry.STAR_CHAIR.block, "Звезданутый стул")
add(MRegistry.TRITANIUM_BLOCK.block, "Тритановый блок")
add(MRegistry.TRITANIUM_STAIRS.block, "Тритановые ступеньки")
add(MRegistry.TRITANIUM_SLAB.block, "Тритановая плита")
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt
index 23d790179..c1819cbf0 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt
@@ -49,6 +49,7 @@ fun addLootTables(lootTables: LootTables) {
lootTables.dropsSelf(MRegistry.DECORATIVE_CRATE.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
lootTables.dropsSelf(MRegistry.COMPUTER_TERMINAL.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
+ lootTables.dropsSelf(MRegistry.STAR_CHAIR.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
lootTables.dropsSelf(MRegistry.CARGO_CRATES.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt
index 95e7d8efe..145e4dd3d 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt
@@ -299,6 +299,7 @@ fun addPainterRecipes(consumer: RecipeOutput) {
}
generate(consumer, MRegistry.COMPUTER_TERMINAL.item, MRegistry.COMPUTER_TERMINAL.items)
+ generate(consumer, MRegistry.STAR_CHAIR.item, MRegistry.STAR_CHAIR.items)
generate(consumer, MRegistry.VENT.item, MRegistry.VENT.items)
generate(consumer, MRegistry.VENT_ALTERNATIVE.item, MRegistry.VENT_ALTERNATIVE.items)
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
index 754a3e21e..cde54e66c 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
@@ -257,6 +257,7 @@ fun addTags(tagsProvider: TagsProvider) {
tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON)
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.allBlocks.values, Tiers.IRON)
tagsProvider.requiresPickaxe(MRegistry.COMPUTER_TERMINAL.allBlocks.values, Tiers.STONE)
+ tagsProvider.requiresPickaxe(MRegistry.STAR_CHAIR.allBlocks.values, Tiers.STONE)
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_SLAB.allBlocks.values, Tiers.IRON)
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_WALL.allBlocks.values, Tiers.IRON)
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values, Tiers.IRON)
diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
index f3fa11787..36bc7dd1c 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
@@ -805,6 +805,19 @@ public class BlockShapes {
new SimpleCuboid(0.1875d, 0.5d, 0.875d, 0.8125d, 0.875d, 0.9375d)
);
+ public static final BlockShape STAR_CHAIR = new BlockShape(
+ new SimpleCuboid(0.125d, 0d, 0.125d, 0.875d, 0.125d, 0.875d),
+ new SimpleCuboid(0.25d, 0.00625d, 0.8125d, 0.75d, 0.31875d, 0.9375d),
+ new SimpleCuboid(0.25d, 0.00625d, 0.0625d, 0.75d, 0.31875d, 0.1875d),
+ new SimpleCuboid(0.125d, 0.25d, 0.125d, 0.875d, 0.4375d, 0.875d),
+ new SimpleCuboid(0.1875d, 0.375d, 0.6875d, 0.8125d, 1.4375d, 0.9375d),
+ new SimpleCuboid(0.1875d, 0.125d, 0.1875d, 0.8125d, 0.25d, 0.8125d),
+ new SimpleCuboid(0.1875d, 0.375d, 0.0625d, 0.8125d, 0.5625d, 0.6875d),
+ new SimpleCuboid(0.25d, 0.5d, 0.625d, 0.75d, 1.375d, 0.75d),
+ new SimpleCuboid(0.0625d, 0.375d, 0d, 0.1875d, 0.75d, 0.75d),
+ new SimpleCuboid(0.8125d, 0.375d, 0d, 0.9375d, 0.75d, 0.75d)
+ );
+
public static final BlockShape INFINITE_WATER_SOURCE = new BlockShape(
new SimpleCuboid(0.625d, 0d, 0d, 1d, 1d, 0.5625d),
new SimpleCuboid(0d, 0.625d, 0d, 0.625d, 1d, 0.5625d),
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt
index 9904ef4c6..48c3b7bdb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt
@@ -53,6 +53,7 @@ class CondensedCreativeCompat : CondensedCreativeInitializer {
addByFirst(MItems.TRITANIUM_ANVIL, MCreativeTabs.DECORATIVE)
addByBase(MRegistry.COMPUTER_TERMINAL.allItems, MCreativeTabs.DECORATIVE)
+ addByBase(MRegistry.STAR_CHAIR.allItems, MCreativeTabs.DECORATIVE)
addByBase(MRegistry.DECORATIVE_CRATE.allItems, MCreativeTabs.DECORATIVE)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
index d5d1462ec..578bcd500 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
@@ -247,6 +247,7 @@ private fun addDecorativeTabItems(consumer: CreativeModeTab.Output) {
colored(MItems.CARGO_CRATE_MINECARTS)
all(MRegistry.COMPUTER_TERMINAL.allItems)
+ all(MRegistry.STAR_CHAIR.allItems)
all(MRegistry.DECORATIVE_CRATE.allItems)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
index 6ee2f74d8..94a743924 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -110,6 +110,14 @@ object MRegistry : IBlockItemRegistryAcceptor {
.destroyTime(1.5f)
}.also { decorativeBlocks.add(it) }
+ val STAR_CHAIR = DecorativeBlock.rotatable("star_chair", BlockShapes.STAR_CHAIR, BlockRotationFreedom.HORIZONTAL) {
+ BlockBehaviour.Properties.of()
+ .mapColor(it?.mapColor ?: MapColor.COLOR_LIGHT_BLUE)
+ .sound(SoundType.METAL)
+ .explosionResistance(15f)
+ .destroyTime(1.5f)
+ }.also { decorativeBlocks.add(it) }
+
val TRITANIUM_STAIRS = DecorativeBlock(MNames.TRITANIUM_STAIRS) {
StairBlock(
TRITANIUM_BLOCK.allBlocks[it]!!.defaultBlockState(),
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/black.png
new file mode 100644
index 000000000..7b132f0d3
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/black.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/blue.png
new file mode 100644
index 000000000..bedaa7c59
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/blue.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/brown.png
new file mode 100644
index 000000000..b7d6ce8e2
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/brown.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/cyan.png
new file mode 100644
index 000000000..d9b4572ec
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/cyan.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/gray.png
new file mode 100644
index 000000000..a07efb5e5
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/gray.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/green.png
new file mode 100644
index 000000000..8d0f62741
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/green.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_blue.png
new file mode 100644
index 000000000..1f59d6c7d
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_blue.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_gray.png
new file mode 100644
index 000000000..feba18fd6
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/light_gray.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/lime.png
new file mode 100644
index 000000000..719cee9ff
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/lime.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/magenta.png
new file mode 100644
index 000000000..ac94f28f6
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/magenta.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/orange.png
new file mode 100644
index 000000000..ed024f691
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/orange.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/pink.png
new file mode 100644
index 000000000..03042f93f
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/pink.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/purple.png
new file mode 100644
index 000000000..e56b821fd
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/purple.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/red.png
new file mode 100644
index 000000000..92750ebcb
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/red.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/white.png
new file mode 100644
index 000000000..d34c66f1b
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/white.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/yellow.png
new file mode 100644
index 000000000..ca054ab46
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair/yellow.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair_mask.png
new file mode 100644
index 000000000..5375252a7
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair_mask.png differ