стул. пока без функционала
@ -145,9 +145,14 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr
|
|||||||
"1" to "decorative/computer_screen",
|
"1" to "decorative/computer_screen",
|
||||||
"particle" to "decorative/computer_base",
|
"particle" to "decorative/computer_base",
|
||||||
))
|
))
|
||||||
|
|
||||||
blockStateProvider.block(MRegistry.COMPUTER_TERMINAL.allBlocks.values)
|
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)
|
blockStateProvider.simpleBlockM(MBlocks.FLUID_TANK)
|
||||||
|
|
||||||
for ((block, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.blocksWithColor) {
|
for ((block, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.blocksWithColor) {
|
||||||
|
@ -36,6 +36,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
|
|||||||
MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block)
|
MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block)
|
||||||
MRegistry.TRITANIUM_BLOCK.allItems.values.forEach(provider::block)
|
MRegistry.TRITANIUM_BLOCK.allItems.values.forEach(provider::block)
|
||||||
MRegistry.COMPUTER_TERMINAL.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)
|
MRegistry.INDUSTRIAL_GLASS.allItems.values.forEach(provider::block)
|
||||||
|
|
||||||
for (block in MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems) {
|
for (block in MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems) {
|
||||||
|
@ -8,6 +8,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
|
|||||||
add(MRegistry.VENT_ALTERNATIVE, "%s Alternative Vent")
|
add(MRegistry.VENT_ALTERNATIVE, "%s Alternative Vent")
|
||||||
|
|
||||||
add(MRegistry.COMPUTER_TERMINAL, "%s Computer Terminal")
|
add(MRegistry.COMPUTER_TERMINAL, "%s Computer Terminal")
|
||||||
|
add(MRegistry.STAR_CHAIR, "%s Star Chair")
|
||||||
add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block")
|
add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block")
|
||||||
add(MRegistry.TRITANIUM_STAIRS, "%s Tritanium Stairs")
|
add(MRegistry.TRITANIUM_STAIRS, "%s Tritanium Stairs")
|
||||||
add(MRegistry.TRITANIUM_SLAB, "%s Tritanium Slab")
|
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.CARGO_CRATES.block, "Cargo Crate")
|
||||||
add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal")
|
add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal")
|
||||||
|
add(MRegistry.STAR_CHAIR.block, "Star Chair")
|
||||||
add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block")
|
add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block")
|
||||||
add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs")
|
add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs")
|
||||||
add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab")
|
add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab")
|
||||||
|
@ -19,6 +19,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
|
|||||||
|
|
||||||
add(MRegistry.TRITANIUM_BLOCK, "%s тритановый блок")
|
add(MRegistry.TRITANIUM_BLOCK, "%s тритановый блок")
|
||||||
add(MRegistry.COMPUTER_TERMINAL, "%s компьютерный терминал")
|
add(MRegistry.COMPUTER_TERMINAL, "%s компьютерный терминал")
|
||||||
|
add(MRegistry.STAR_CHAIR, "%s звезданутый стул")
|
||||||
add(MRegistry.TRITANIUM_STAIRS, "%s тритановые ступеньки")
|
add(MRegistry.TRITANIUM_STAIRS, "%s тритановые ступеньки")
|
||||||
add(MRegistry.TRITANIUM_SLAB, "%s тритановая плита")
|
add(MRegistry.TRITANIUM_SLAB, "%s тритановая плита")
|
||||||
add(MRegistry.TRITANIUM_WALL, "%s тритановая ограда")
|
add(MRegistry.TRITANIUM_WALL, "%s тритановая ограда")
|
||||||
@ -65,6 +66,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
|
|||||||
|
|
||||||
add(MRegistry.CARGO_CRATES.block, "Грузовой ящик")
|
add(MRegistry.CARGO_CRATES.block, "Грузовой ящик")
|
||||||
add(MRegistry.COMPUTER_TERMINAL.block, "Компьютерный терминал")
|
add(MRegistry.COMPUTER_TERMINAL.block, "Компьютерный терминал")
|
||||||
|
add(MRegistry.STAR_CHAIR.block, "Звезданутый стул")
|
||||||
add(MRegistry.TRITANIUM_BLOCK.block, "Тритановый блок")
|
add(MRegistry.TRITANIUM_BLOCK.block, "Тритановый блок")
|
||||||
add(MRegistry.TRITANIUM_STAIRS.block, "Тритановые ступеньки")
|
add(MRegistry.TRITANIUM_STAIRS.block, "Тритановые ступеньки")
|
||||||
add(MRegistry.TRITANIUM_SLAB.block, "Тритановая плита")
|
add(MRegistry.TRITANIUM_SLAB.block, "Тритановая плита")
|
||||||
|
@ -49,6 +49,7 @@ fun addLootTables(lootTables: LootTables) {
|
|||||||
lootTables.dropsSelf(MRegistry.DECORATIVE_CRATE.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
|
lootTables.dropsSelf(MRegistry.DECORATIVE_CRATE.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
|
||||||
|
|
||||||
lootTables.dropsSelf(MRegistry.COMPUTER_TERMINAL.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.CARGO_CRATES.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
|
||||||
lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS.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()) }
|
lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values) { condition(ExplosionCondition.survivesExplosion()) }
|
||||||
|
@ -299,6 +299,7 @@ fun addPainterRecipes(consumer: RecipeOutput) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
generate(consumer, MRegistry.COMPUTER_TERMINAL.item, MRegistry.COMPUTER_TERMINAL.items)
|
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.item, MRegistry.VENT.items)
|
||||||
generate(consumer, MRegistry.VENT_ALTERNATIVE.item, MRegistry.VENT_ALTERNATIVE.items)
|
generate(consumer, MRegistry.VENT_ALTERNATIVE.item, MRegistry.VENT_ALTERNATIVE.items)
|
||||||
|
@ -257,6 +257,7 @@ fun addTags(tagsProvider: TagsProvider) {
|
|||||||
tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON)
|
tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON)
|
||||||
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.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.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_SLAB.allBlocks.values, Tiers.IRON)
|
||||||
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_WALL.allBlocks.values, Tiers.IRON)
|
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_WALL.allBlocks.values, Tiers.IRON)
|
||||||
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values, Tiers.IRON)
|
tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values, Tiers.IRON)
|
||||||
|
@ -805,6 +805,19 @@ public class BlockShapes {
|
|||||||
new SimpleCuboid(0.1875d, 0.5d, 0.875d, 0.8125d, 0.875d, 0.9375d)
|
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(
|
public static final BlockShape INFINITE_WATER_SOURCE = new BlockShape(
|
||||||
new SimpleCuboid(0.625d, 0d, 0d, 1d, 1d, 0.5625d),
|
new SimpleCuboid(0.625d, 0d, 0d, 1d, 1d, 0.5625d),
|
||||||
new SimpleCuboid(0d, 0.625d, 0d, 0.625d, 1d, 0.5625d),
|
new SimpleCuboid(0d, 0.625d, 0d, 0.625d, 1d, 0.5625d),
|
||||||
|
@ -53,6 +53,7 @@ class CondensedCreativeCompat : CondensedCreativeInitializer {
|
|||||||
addByFirst(MItems.TRITANIUM_ANVIL, MCreativeTabs.DECORATIVE)
|
addByFirst(MItems.TRITANIUM_ANVIL, MCreativeTabs.DECORATIVE)
|
||||||
|
|
||||||
addByBase(MRegistry.COMPUTER_TERMINAL.allItems, MCreativeTabs.DECORATIVE)
|
addByBase(MRegistry.COMPUTER_TERMINAL.allItems, MCreativeTabs.DECORATIVE)
|
||||||
|
addByBase(MRegistry.STAR_CHAIR.allItems, MCreativeTabs.DECORATIVE)
|
||||||
|
|
||||||
addByBase(MRegistry.DECORATIVE_CRATE.allItems, MCreativeTabs.DECORATIVE)
|
addByBase(MRegistry.DECORATIVE_CRATE.allItems, MCreativeTabs.DECORATIVE)
|
||||||
|
|
||||||
|
@ -247,6 +247,7 @@ private fun addDecorativeTabItems(consumer: CreativeModeTab.Output) {
|
|||||||
colored(MItems.CARGO_CRATE_MINECARTS)
|
colored(MItems.CARGO_CRATE_MINECARTS)
|
||||||
|
|
||||||
all(MRegistry.COMPUTER_TERMINAL.allItems)
|
all(MRegistry.COMPUTER_TERMINAL.allItems)
|
||||||
|
all(MRegistry.STAR_CHAIR.allItems)
|
||||||
|
|
||||||
all(MRegistry.DECORATIVE_CRATE.allItems)
|
all(MRegistry.DECORATIVE_CRATE.allItems)
|
||||||
|
|
||||||
|
@ -110,6 +110,14 @@ object MRegistry : IBlockItemRegistryAcceptor {
|
|||||||
.destroyTime(1.5f)
|
.destroyTime(1.5f)
|
||||||
}.also { decorativeBlocks.add(it) }
|
}.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) {
|
val TRITANIUM_STAIRS = DecorativeBlock(MNames.TRITANIUM_STAIRS) {
|
||||||
StairBlock(
|
StairBlock(
|
||||||
TRITANIUM_BLOCK.allBlocks[it]!!.defaultBlockState(),
|
TRITANIUM_BLOCK.allBlocks[it]!!.defaultBlockState(),
|
||||||
|
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 619 B |
After Width: | Height: | Size: 573 B |
After Width: | Height: | Size: 550 B |