teehee

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt

@@ -215,6 +215,15 @@ fun addMachineAdvancements(serializer: Consumer<AdvancementHolder>, lang: Matter
 		russianSuffix = "Смотрите, чтоб он не просыпался во все сундуки",
 		englishSuffix = "Watch for not to spill it over all your chests").make(serializer, press, translation)
 
+		.also {
+			CraftEntry(
+				MItems.INFINITE_WATER_SOURCE, "We Got A Leak!",
+				russianName = "У нас утечка!",
+				russianSuffix = "Как это вообще возможно!?",
+				englishSuffix = "How is that even possible!?")
+				.make(serializer, it, translation)
+		}
+
 	CraftEntry(
 		MItems.POWERED_FURNACE.values, "One Big Resistor",
 		russianName = "Один большой резистор",

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt

@@ -31,7 +31,10 @@ fun addDecorativeLoot(lootTables: LootTables) {
 	lootTables.createSlabItemTable(MRegistry.FLOOR_TILES_SLAB.blocks.values) { condition(ExplosionCondition.survivesExplosion()) }
 
 	lootTables.dropsSelf(MBlocks.CARBON_FIBRE_BLOCK) { condition(ExplosionCondition.survivesExplosion()) }
+
 	lootTables.dropsSelf(MBlocks.METAL_MESH) { condition(ExplosionCondition.survivesExplosion()) }
+	lootTables.dropsSelf(MBlocks.METAL_RAILING) { condition(ExplosionCondition.survivesExplosion()) }
+
 	lootTables.dropsSelf(MBlocks.TRITANIUM_RAW_BLOCK) { condition(ExplosionCondition.survivesExplosion()) }
 	lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_BLOCK.values) { condition(ExplosionCondition.survivesExplosion()) }
 	lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_WALL.values) { condition(ExplosionCondition.survivesExplosion()) }

src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt

@@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.core.get
 import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 
-class EngineBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops().pushReaction(PushReaction.NORMAL)) {
+class EngineBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.VAULT).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops().pushReaction(PushReaction.NORMAL)) {
 	override fun appendHoverText(
 		itemStack: ItemStack,
 		context: Item.TooltipContext,

src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt

@@ -167,15 +167,24 @@ object MBlocks {
 	})
 
 	val FLYWHEEL_BATTERY by registry.register(MNames.FLYWHEEL_BATTERY) { FlywheelBatteryBlock() }
-	val FLYWHEEL_SHAFT   by registry.register(MNames.FLYWHEEL_SHAFT)   { MatteryBlock().addSimpleDescription() }
-	val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) { MatteryBlock().addSimpleDescription() }
+
+	val FLYWHEEL_SHAFT   by registry.register(MNames.FLYWHEEL_SHAFT)   {
+		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).explosionResistance(40f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops())
+			.addSimpleDescription()
+	}
+
+	val FLYWHEEL_HOUSING by registry.register(MNames.FLYWHEEL_HOUSING) {
+		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).explosionResistance(30f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops())
+
+			.addSimpleDescription()
+	}
 
 	val FLYWHEEL_BEARING by registry.register(MNames.FLYWHEEL_BEARING) {
-		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY))
+		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).explosionResistance(40f).mapColor(MapColor.COLOR_GRAY).destroyTime(2f).requiresCorrectToolForDrops())
 			.addSimpleDescription()
 	}
 	val GENERATOR_BLOCK by registry.register(MNames.GENERATOR_BLOCK) {
-		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY))
+		MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).explosionResistance(30f).mapColor(MapColor.COLOR_GRAY).destroyTime(2.5f).requiresCorrectToolForDrops())
 			.addSimpleDescription()
 	}
 
@@ -235,7 +244,8 @@ object MBlocks {
 		TransparentBlock(BlockBehaviour.Properties.of()
 				.mapColor(MapColor.COLOR_GRAY)
 				.noOcclusion()
-				.sound(SoundType.COPPER_GRATE).explosionResistance(30f)
+				.sound(SoundType.COPPER_GRATE)
+				.explosionResistance(30f)
 				.destroyTime(2f).requiresCorrectToolForDrops())
 	}
 
@@ -253,9 +263,9 @@ object MBlocks {
 		IronBarsBlock(BlockBehaviour.Properties.of()
 			.mapColor(MapColor.COLOR_GRAY)
 			.sound(SoundType.COPPER_GRATE)
-			.explosionResistance(45f)
+			.explosionResistance(30f)
 			.noOcclusion()
-			.destroyTime(2.5f)
+			.destroyTime(2f)
 			.requiresCorrectToolForDrops())
 	}
 
@@ -300,6 +310,7 @@ object MBlocks {
 	val REINFORCED_REDSTONE_LAMP by registry.register(MNames.REINFORCED_REDSTONE_LAMP) { RedstoneLampBlock(
 		BlockBehaviour.Properties.of()
 			.mapColor(MapColor.COLOR_LIGHT_GRAY)
+			.sound(SoundType.GLASS)
 			.explosionResistance(40f)
 			.destroyTime(1.5f)
 			.requiresCorrectToolForDrops()
@@ -310,6 +321,7 @@ object MBlocks {
 	val REINFORCED_REDSTONE_LAMP_INVERTED by registry.register(MNames.REINFORCED_REDSTONE_LAMP_INVERTED) { RedstoneLampBlock(
 		BlockBehaviour.Properties.of()
 			.mapColor(MapColor.COLOR_LIGHT_GRAY)
+			.sound(SoundType.GLASS)
 			.explosionResistance(40f)
 			.destroyTime(1.5f)
 			.requiresCorrectToolForDrops()