Add tooltips to a handful of machines
This commit is contained in:
parent
882f1ce408
commit
bfd3c89bbf
src
data/kotlin/ru/dbotthepony/mc/otm/datagen/lang
main/kotlin/ru/dbotthepony/mc/otm/block
@ -434,29 +434,59 @@ private fun death(provider: MatteryLanguageProvider) {
|
|||||||
private fun blocks(provider: MatteryLanguageProvider) {
|
private fun blocks(provider: MatteryLanguageProvider) {
|
||||||
with(provider.english) {
|
with(provider.english) {
|
||||||
addBlock(MBlocks.ANDROID_STATION.values, "Android Station")
|
addBlock(MBlocks.ANDROID_STATION.values, "Android Station")
|
||||||
|
addBlock(MBlocks.ANDROID_STATION.values, "desc", "Grants access to android upgrades")
|
||||||
|
|
||||||
addBlock(MBlocks.ANDROID_CHARGER.values, "Wireless Charger")
|
addBlock(MBlocks.ANDROID_CHARGER.values, "Wireless Charger")
|
||||||
addBlock(MBlocks.ANDROID_CHARGER.values, "desc", "Charges nearby androids and exopacks")
|
addBlock(MBlocks.ANDROID_CHARGER.values, "desc", "Charges nearby androids and exopacks")
|
||||||
|
|
||||||
addBlock(MBlocks.BATTERY_BANK.values, "Battery Bank")
|
addBlock(MBlocks.BATTERY_BANK.values, "Battery Bank")
|
||||||
|
addBlock(MBlocks.BATTERY_BANK.values, "desc", "Provides a way to use battery items as ordinary energy storage cell")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_DECOMPOSER.values, "Matter Decomposer")
|
addBlock(MBlocks.MATTER_DECOMPOSER.values, "Matter Decomposer")
|
||||||
|
addBlock(MBlocks.MATTER_DECOMPOSER.values, "desc", "Breaks down items into pure matter")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Matter Capacitor Bank")
|
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Matter Capacitor Bank")
|
||||||
|
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "desc", "Provides matter storage for system when matter capacitors are attached to it")
|
||||||
|
|
||||||
add(MBlocks.MATTER_CABLE, "Matter Network Cable")
|
add(MBlocks.MATTER_CABLE, "Matter Network Cable")
|
||||||
|
|
||||||
add(MBlocks.PATTERN_STORAGE, "Pattern Storage")
|
add(MBlocks.PATTERN_STORAGE, "Pattern Storage")
|
||||||
|
add(MBlocks.PATTERN_STORAGE, "desc", "Stores Patterns for system usage")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_SCANNER.values, "Matter Scanner")
|
addBlock(MBlocks.MATTER_SCANNER.values, "Matter Scanner")
|
||||||
|
addBlock(MBlocks.MATTER_SCANNER.values, "desc", "Scans items into Patterns for future replication")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_PANEL.values, "Pattern Monitor")
|
addBlock(MBlocks.MATTER_PANEL.values, "Pattern Monitor")
|
||||||
|
addBlock(MBlocks.MATTER_PANEL.values, "desc", "Allows to dispatch replication tasks")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_REPLICATOR.values, "Matter Replicator")
|
addBlock(MBlocks.MATTER_REPLICATOR.values, "Matter Replicator")
|
||||||
|
addBlock(MBlocks.MATTER_REPLICATOR.values, "desc", "Executes replication tasks")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_BOTTLER.values, "Matter Bottler")
|
addBlock(MBlocks.MATTER_BOTTLER.values, "Matter Bottler")
|
||||||
addBlock(MBlocks.DRIVE_VIEWER.values, "Drive Viewer")
|
addBlock(MBlocks.MATTER_BOTTLER.values, "desc", "Exchanges matter between matter holding items")
|
||||||
add(MBlocks.BLACK_HOLE, "Local Anomalous Spacetime Dilation Singular Point")
|
|
||||||
addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Cobblestone Generator")
|
|
||||||
add(MBlocks.INFINITE_WATER_SOURCE, "Infinite Water Source")
|
|
||||||
addBlock(MBlocks.ESSENCE_STORAGE.values, "Essence Storage")
|
addBlock(MBlocks.ESSENCE_STORAGE.values, "Essence Storage")
|
||||||
addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Allows to store and retrieve experience levels")
|
addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Allows to store and retrieve experience levels")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Matter Reconstructor")
|
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Matter Reconstructor")
|
||||||
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Repairs tools using matter")
|
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Repairs tools using matter")
|
||||||
|
|
||||||
|
addBlock(MBlocks.MATTER_RECYCLER.values, "Matter Recycler")
|
||||||
|
addBlock(MBlocks.MATTER_RECYCLER.values, "desc", "Refines matter dust back into pure matter")
|
||||||
|
|
||||||
|
add(MBlocks.MATTER_ENTANGLER, "Matter Entangler")
|
||||||
|
|
||||||
|
addBlock(MBlocks.DRIVE_VIEWER.values, "Drive Viewer")
|
||||||
|
|
||||||
|
add(MBlocks.BLACK_HOLE, "Local Anomalous Spacetime Dilation Singular Point")
|
||||||
|
|
||||||
|
addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Cobblestone Generator")
|
||||||
|
add(MBlocks.INFINITE_WATER_SOURCE, "Infinite Water Source")
|
||||||
|
add(MBlocks.INFINITE_WATER_SOURCE, "desc", "Pushes water into all neighbour blocks")
|
||||||
|
|
||||||
add(MBlocks.DEV_CHEST, "Dev Chest")
|
add(MBlocks.DEV_CHEST, "Dev Chest")
|
||||||
add(MBlocks.DEV_CHEST, "desc", "Contains all items present in game")
|
add(MBlocks.DEV_CHEST, "desc", "Contains all items present in game")
|
||||||
add(MBlocks.PAINTER, "Painting Table")
|
add(MBlocks.PAINTER, "Painting Table")
|
||||||
add(MBlocks.MATTER_ENTANGLER, "Matter Entangler")
|
|
||||||
|
|
||||||
add(MBlocks.LIQUID_XP, "Liquid XP")
|
add(MBlocks.LIQUID_XP, "Liquid XP")
|
||||||
add(MItems.LIQUID_XP_BUCKET, "Liquid XP Bucket")
|
add(MItems.LIQUID_XP_BUCKET, "Liquid XP Bucket")
|
||||||
@ -466,26 +496,37 @@ private fun blocks(provider: MatteryLanguageProvider) {
|
|||||||
|
|
||||||
add(MBlocks.ENGINE, "Ship Engine")
|
add(MBlocks.ENGINE, "Ship Engine")
|
||||||
add(MBlocks.ENGINE, "desc", "Unfortunately, it doesn't seem to be functional anymore.")
|
add(MBlocks.ENGINE, "desc", "Unfortunately, it doesn't seem to be functional anymore.")
|
||||||
|
|
||||||
add(MBlocks.HOLO_SIGN, "Holo Sign")
|
add(MBlocks.HOLO_SIGN, "Holo Sign")
|
||||||
|
add(MBlocks.HOLO_SIGN, "desc", "Multi-line, colored and glowing, text sign")
|
||||||
|
|
||||||
add(MBlocks.TRITANIUM_INGOT_BLOCK, "Tritanium Plating Block")
|
add(MBlocks.TRITANIUM_INGOT_BLOCK, "Tritanium Plating Block")
|
||||||
|
|
||||||
addBlock(MBlocks.ENERGY_COUNTER.values, "Energy Counter")
|
addBlock(MBlocks.ENERGY_COUNTER.values, "Energy Counter")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc", "Restricts energy flow;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc2", "Allows to limit energy throughput;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc3", "Collects statistics of passed energy;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc4", "Displays flow activity on its monitor")
|
||||||
|
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "facing", "Input facing: %s")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "facing", "Input facing: %s")
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "switch", "Switch input facing")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "switch", "Switch input facing")
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "limit", "I/O Limit. -1 means no limit")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "limit", "I/O Limit. -1 means no limit")
|
||||||
|
|
||||||
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "Chemical Generator")
|
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "Chemical Generator")
|
||||||
|
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "desc", "Generates power by burning solid fuels")
|
||||||
|
|
||||||
add(MBlocks.DRIVE_RACK, "Condensation Drive Rack")
|
add(MBlocks.DRIVE_RACK, "Condensation Drive Rack")
|
||||||
addBlock(MBlocks.ITEM_MONITOR.values, "Item Monitor")
|
addBlock(MBlocks.ITEM_MONITOR.values, "Item Monitor")
|
||||||
addBlock(MBlocks.PLATE_PRESS.values, "Plate Press")
|
addBlock(MBlocks.PLATE_PRESS.values, "Plate Press")
|
||||||
addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Twin Plate Press")
|
addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Twin Plate Press")
|
||||||
|
|
||||||
addBlock(MBlocks.POWERED_FURNACE.values, "Electric Furnace")
|
addBlock(MBlocks.POWERED_FURNACE.values, "Electric Furnace")
|
||||||
|
addBlock(MBlocks.POWERED_FURNACE.values, "desc", "Allows to smelt items using energy")
|
||||||
addBlock(MBlocks.POWERED_SMOKER.values, "Microwave Oven")
|
addBlock(MBlocks.POWERED_SMOKER.values, "Microwave Oven")
|
||||||
|
addBlock(MBlocks.POWERED_SMOKER.values, "desc", "Allows to process smoker recipes using energy")
|
||||||
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Induction Furnace")
|
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Induction Furnace")
|
||||||
|
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "desc", "Allows to process blasting recipes using energy")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_RECYCLER.values, "Matter Recycler")
|
|
||||||
addBlock(MBlocks.ENERGY_SERVO.values, "Energy Servo")
|
addBlock(MBlocks.ENERGY_SERVO.values, "Energy Servo")
|
||||||
addBlock(MBlocks.ENERGY_SERVO.values, "desc", "Charges, Discharges or Exchanges energy of items")
|
addBlock(MBlocks.ENERGY_SERVO.values, "desc", "Charges, Discharges or Exchanges energy of items")
|
||||||
|
|
||||||
|
@ -439,29 +439,58 @@ private fun death(provider: MatteryLanguageProvider) {
|
|||||||
private fun blocks(provider: MatteryLanguageProvider) {
|
private fun blocks(provider: MatteryLanguageProvider) {
|
||||||
with(provider.russian) {
|
with(provider.russian) {
|
||||||
addBlock(MBlocks.ANDROID_STATION.values, "Станция андроидов")
|
addBlock(MBlocks.ANDROID_STATION.values, "Станция андроидов")
|
||||||
|
addBlock(MBlocks.ANDROID_STATION.values, "desc", "Даёт доступ к улучшениям андроида")
|
||||||
|
|
||||||
addBlock(MBlocks.ANDROID_CHARGER.values, "Беспроводной зарядник")
|
addBlock(MBlocks.ANDROID_CHARGER.values, "Беспроводной зарядник")
|
||||||
addBlock(MBlocks.ANDROID_CHARGER.values, "desc", "Заряжает ближайших андроидов и экзопаки")
|
addBlock(MBlocks.ANDROID_CHARGER.values, "desc", "Заряжает ближайших андроидов и экзопаки")
|
||||||
|
|
||||||
addBlock(MBlocks.BATTERY_BANK.values, "Банк аккумуляторов")
|
addBlock(MBlocks.BATTERY_BANK.values, "Банк аккумуляторов")
|
||||||
|
addBlock(MBlocks.BATTERY_BANK.values, "desc", "Позволяет использовать аккумуляторы как обычное хранилище энергии")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_DECOMPOSER.values, "Декомпозитор материи")
|
addBlock(MBlocks.MATTER_DECOMPOSER.values, "Декомпозитор материи")
|
||||||
|
addBlock(MBlocks.MATTER_DECOMPOSER.values, "desc", "Разбивает предметы в чистую материю")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Банк накопителей материи")
|
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Банк накопителей материи")
|
||||||
|
addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "desc", "Является хранилищем материи для системы в связке с накопителями материи")
|
||||||
|
|
||||||
add(MBlocks.MATTER_CABLE, "Кабель сети материи")
|
add(MBlocks.MATTER_CABLE, "Кабель сети материи")
|
||||||
|
|
||||||
add(MBlocks.PATTERN_STORAGE, "Хранилище шаблонов")
|
add(MBlocks.PATTERN_STORAGE, "Хранилище шаблонов")
|
||||||
|
add(MBlocks.PATTERN_STORAGE, "desc", "Хранит шаблоны предметов для пользования сетью")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_SCANNER.values, "Сканер материи")
|
addBlock(MBlocks.MATTER_SCANNER.values, "Сканер материи")
|
||||||
|
addBlock(MBlocks.MATTER_SCANNER.values, "desc", "Сканирует предметы в шаблоны для будущей репликации")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_PANEL.values, "Монитор шаблонов")
|
addBlock(MBlocks.MATTER_PANEL.values, "Монитор шаблонов")
|
||||||
|
addBlock(MBlocks.MATTER_PANEL.values, "desc", "Позволяет создавать задачи репликации")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_REPLICATOR.values, "Репликатор материи")
|
addBlock(MBlocks.MATTER_REPLICATOR.values, "Репликатор материи")
|
||||||
|
addBlock(MBlocks.MATTER_REPLICATOR.values, "desc", "Исполняет задачи репликации")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_BOTTLER.values, "Бутилировщик материи")
|
addBlock(MBlocks.MATTER_BOTTLER.values, "Бутилировщик материи")
|
||||||
addBlock(MBlocks.DRIVE_VIEWER.values, "Просмотрщик дисков конденсации")
|
addBlock(MBlocks.MATTER_BOTTLER.values, "desc", "Позволяет переливать материю между предметами, хранящими материю")
|
||||||
add(MBlocks.BLACK_HOLE, "Локализированная сингулярная точка аномального искажения пространства-времени")
|
|
||||||
addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Генератор булыжника")
|
|
||||||
add(MBlocks.INFINITE_WATER_SOURCE, "Неиссякаемый источник воды")
|
|
||||||
addBlock(MBlocks.ESSENCE_STORAGE.values, "Хранилище эссенции")
|
addBlock(MBlocks.ESSENCE_STORAGE.values, "Хранилище эссенции")
|
||||||
addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Позволяет хранить очки опыта")
|
addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Позволяет хранить очки опыта")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Материальный реконструктор")
|
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Материальный реконструктор")
|
||||||
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Чинит инструменты используя материю")
|
addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Чинит инструменты используя материю")
|
||||||
|
|
||||||
|
addBlock(MBlocks.MATTER_RECYCLER.values, "Перерабатыватель материи")
|
||||||
|
addBlock(MBlocks.MATTER_RECYCLER.values, "desc", "Перерабатывает материальную пыль обратно в чистую материю")
|
||||||
|
|
||||||
|
add(MBlocks.MATTER_ENTANGLER, "Квантовый запутыватель материи")
|
||||||
|
|
||||||
|
addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Генератор булыжника")
|
||||||
|
add(MBlocks.INFINITE_WATER_SOURCE, "Неиссякаемый источник воды")
|
||||||
|
add(MBlocks.INFINITE_WATER_SOURCE, "desc", "Выталкивает воду в соседние блоки автоматически")
|
||||||
|
add(MBlocks.BLACK_HOLE, "Локализированная сингулярная точка аномального искажения пространства-времени")
|
||||||
|
|
||||||
add(MBlocks.DEV_CHEST, "Сундук разработчика")
|
add(MBlocks.DEV_CHEST, "Сундук разработчика")
|
||||||
add(MBlocks.DEV_CHEST, "desc", "Хранит все предметы, которые есть в игре")
|
add(MBlocks.DEV_CHEST, "desc", "Хранит все предметы, которые есть в игре")
|
||||||
add(MBlocks.PAINTER, "Стол маляра")
|
add(MBlocks.PAINTER, "Стол маляра")
|
||||||
add(MBlocks.MATTER_ENTANGLER, "Квантовый запутыватель материи")
|
|
||||||
|
addBlock(MBlocks.DRIVE_VIEWER.values, "Просмотрщик дисков конденсации")
|
||||||
|
|
||||||
add(MBlocks.LIQUID_XP, "Жидкий опыт")
|
add(MBlocks.LIQUID_XP, "Жидкий опыт")
|
||||||
add(MItems.LIQUID_XP_BUCKET, "Ведро жидкого опыта")
|
add(MItems.LIQUID_XP_BUCKET, "Ведро жидкого опыта")
|
||||||
@ -470,27 +499,38 @@ private fun blocks(provider: MatteryLanguageProvider) {
|
|||||||
add(MBlocks.FLUID_TANK, "named", "Жидкостный бак (%s)")
|
add(MBlocks.FLUID_TANK, "named", "Жидкостный бак (%s)")
|
||||||
|
|
||||||
add(MBlocks.ENGINE, "Двигатель корабля")
|
add(MBlocks.ENGINE, "Двигатель корабля")
|
||||||
add(MBlocks.ENGINE, "desc", "К сожалению, он больше не выглядит рабочим.")
|
add(MBlocks.ENGINE, "desc", "К сожалению, он более не функционирует")
|
||||||
|
|
||||||
add(MBlocks.HOLO_SIGN, "Голографическая табличка")
|
add(MBlocks.HOLO_SIGN, "Голографическая табличка")
|
||||||
|
add(MBlocks.HOLO_SIGN, "desc", "Многострочная, крашеная и светящееся, табличка")
|
||||||
|
|
||||||
add(MBlocks.TRITANIUM_INGOT_BLOCK, "Блок слитков тритана")
|
add(MBlocks.TRITANIUM_INGOT_BLOCK, "Блок слитков тритана")
|
||||||
|
|
||||||
addBlock(MBlocks.ENERGY_COUNTER.values, "Счётчик энергии")
|
addBlock(MBlocks.ENERGY_COUNTER.values, "Счётчик энергии")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc", "Ограничивает направление передачи энергии;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc2", "Позволяет ограничивать максимальную пропускную способность;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc3", "Собирает статистику о переданной через себя энергии;")
|
||||||
|
addBlock(MBlocks.ENERGY_COUNTER.values, "desc4", "Отображает текущую активность передачи энергии на своём экране")
|
||||||
|
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "Facing", "сторона входа: %s")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "Facing", "сторона входа: %s")
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "Switch", "сменить сторону входа")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "Switch", "сменить сторону входа")
|
||||||
add(MBlocks.ENERGY_COUNTER[null]!!, "Limit", "лимит ввода/вывода. -1 для отключения лимитов")
|
add(MBlocks.ENERGY_COUNTER[null]!!, "Limit", "лимит ввода/вывода. -1 для отключения лимитов")
|
||||||
|
|
||||||
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "Химический генератор")
|
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "Химический генератор")
|
||||||
|
addBlock(MBlocks.CHEMICAL_GENERATOR.values, "desc", "Генерирует энергию сжигая твёрдое топливо")
|
||||||
|
|
||||||
add(MBlocks.DRIVE_RACK, "Стеллаж дисков конденсации")
|
add(MBlocks.DRIVE_RACK, "Стеллаж дисков конденсации")
|
||||||
addBlock(MBlocks.ITEM_MONITOR.values, "Монитор предметов")
|
addBlock(MBlocks.ITEM_MONITOR.values, "Монитор предметов")
|
||||||
addBlock(MBlocks.PLATE_PRESS.values, "Пресс пластин")
|
addBlock(MBlocks.PLATE_PRESS.values, "Пресс пластин")
|
||||||
addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Двойной пресс пластин")
|
addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Двойной пресс пластин")
|
||||||
|
|
||||||
addBlock(MBlocks.POWERED_FURNACE.values, "Электрическая печь")
|
addBlock(MBlocks.POWERED_FURNACE.values, "Электрическая печь")
|
||||||
|
addBlock(MBlocks.POWERED_FURNACE.values, "desc", "Позволяет обрабатывать рецепты печи используя энергию")
|
||||||
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Индукционная печь")
|
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Индукционная печь")
|
||||||
|
addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "desc", "Позволяет обрабатывать рецепты плавильной печи используя энергию")
|
||||||
addBlock(MBlocks.POWERED_SMOKER.values, "Микроволновая печь")
|
addBlock(MBlocks.POWERED_SMOKER.values, "Микроволновая печь")
|
||||||
|
addBlock(MBlocks.POWERED_SMOKER.values, "desc", "Позволяет обрабатывать рецепты коптильни используя энергию")
|
||||||
|
|
||||||
addBlock(MBlocks.MATTER_RECYCLER.values, "Перерабатыватель материи")
|
|
||||||
addBlock(MBlocks.ENERGY_SERVO.values, "Энергетическая помпа")
|
addBlock(MBlocks.ENERGY_SERVO.values, "Энергетическая помпа")
|
||||||
addBlock(MBlocks.ENERGY_SERVO.values, "desc", "заряжает, разряжает и передаёт энергию между предметами")
|
addBlock(MBlocks.ENERGY_SERVO.values, "desc", "заряжает, разряжает и передаёт энергию между предметами")
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package ru.dbotthepony.mc.otm.block.entity.matter
|
package ru.dbotthepony.mc.otm.block.entity.matter
|
||||||
|
|
||||||
import javax.annotation.ParametersAreNonnullByDefault
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.world.level.block.state.BlockState
|
import net.minecraft.world.level.block.state.BlockState
|
||||||
import ru.dbotthepony.mc.otm.container.MatteryContainer
|
import ru.dbotthepony.mc.otm.container.MatteryContainer
|
||||||
@ -11,7 +10,6 @@ import net.minecraft.world.entity.player.Inventory
|
|||||||
import net.minecraft.world.entity.player.Player
|
import net.minecraft.world.entity.player.Player
|
||||||
import net.minecraft.world.inventory.AbstractContainerMenu
|
import net.minecraft.world.inventory.AbstractContainerMenu
|
||||||
import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu
|
import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu
|
||||||
import net.minecraft.MethodsReturnNonnullByDefault
|
|
||||||
import net.minecraft.world.level.Level
|
import net.minecraft.world.level.Level
|
||||||
import net.minecraft.world.level.block.Block
|
import net.minecraft.world.level.block.Block
|
||||||
import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity
|
||||||
@ -26,8 +24,6 @@ import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode
|
|||||||
import ru.dbotthepony.mc.otm.registry.MBlockEntities
|
import ru.dbotthepony.mc.otm.registry.MBlockEntities
|
||||||
import java.util.stream.Stream
|
import java.util.stream.Stream
|
||||||
|
|
||||||
@MethodsReturnNonnullByDefault
|
|
||||||
@ParametersAreNonnullByDefault
|
|
||||||
class PatternStorageBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
|
class PatternStorageBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
|
||||||
MatteryDeviceBlockEntity(MBlockEntities.PATTERN_STORAGE, p_155229_, p_155230_), IPatternStorage {
|
MatteryDeviceBlockEntity(MBlockEntities.PATTERN_STORAGE, p_155229_, p_155230_), IPatternStorage {
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
@ -26,6 +27,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterBottlerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterBottlerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
tooltips.blockEntityMatter()
|
tooltips.blockEntityMatter()
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ import net.minecraft.world.phys.shapes.CollisionContext
|
|||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.tech.BatteryBankBlock
|
import ru.dbotthepony.mc.otm.block.tech.BatteryBankBlock
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
import ru.dbotthepony.mc.otm.core.get
|
import ru.dbotthepony.mc.otm.core.get
|
||||||
@ -22,6 +23,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterCapacitorBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterCapacitorBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
||||||
|
@ -15,6 +15,7 @@ import net.minecraft.world.level.block.Block
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
import ru.dbotthepony.mc.otm.core.get
|
import ru.dbotthepony.mc.otm.core.get
|
||||||
@ -24,6 +25,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterDecomposerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterDecomposerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
tooltips.blockEntityMatter()
|
tooltips.blockEntityMatter()
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ import net.minecraft.world.level.BlockGetter
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.item.context.BlockPlaceContext
|
import net.minecraft.world.item.context.BlockPlaceContext
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.core.get
|
import ru.dbotthepony.mc.otm.core.get
|
||||||
import ru.dbotthepony.mc.otm.core.math.BlockRotation
|
import ru.dbotthepony.mc.otm.core.math.BlockRotation
|
||||||
import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom
|
import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom
|
||||||
@ -20,6 +21,7 @@ import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom
|
|||||||
class MatterPanelBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterPanelBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
||||||
|
@ -21,6 +21,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterReconstructorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterReconstructorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy("energy")
|
tooltips.blockEntityEnergy("energy")
|
||||||
tooltips.blockEntityMatter("matter")
|
tooltips.blockEntityMatter("matter")
|
||||||
}
|
}
|
||||||
@ -36,10 +37,6 @@ class MatterReconstructorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEF
|
|||||||
return BlockEntityTicker { _, _, _, pBlockEntity -> if (pBlockEntity is MatterReconstructorBlockEntity) pBlockEntity.tick() }
|
return BlockEntityTicker { _, _, _, pBlockEntity -> if (pBlockEntity is MatterReconstructorBlockEntity) pBlockEntity.tick() }
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
addSimpleDescription()
|
|
||||||
}
|
|
||||||
|
|
||||||
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.MATTER_RECONSTRUCTOR.rotateFromNorth(it[rotationProperty]).computeShape() }
|
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.MATTER_RECONSTRUCTOR.rotateFromNorth(it[rotationProperty]).computeShape() }
|
||||||
|
|
||||||
@Suppress("override_deprecation")
|
@Suppress("override_deprecation")
|
||||||
|
@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.StateDefinition
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
@ -24,6 +25,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterRecyclerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterRecyclerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
tooltips.blockEntityMatter()
|
tooltips.blockEntityMatter()
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.StateDefinition
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
@ -24,6 +25,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterReplicatorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterReplicatorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
tooltips.blockEntityMatter()
|
tooltips.blockEntityMatter()
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.StateDefinition
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
@ -24,6 +25,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class MatterScannerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class MatterScannerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.colored(color)
|
tooltips.colored(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,12 +14,17 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
import ru.dbotthepony.mc.otm.core.get
|
import ru.dbotthepony.mc.otm.core.get
|
||||||
import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
||||||
|
|
||||||
class PatternStorageBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class PatternStorageBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
|
init {
|
||||||
|
addSimpleDescription()
|
||||||
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
||||||
return PatternStorageBlockEntity(blockPos, blockState)
|
return PatternStorageBlockEntity(blockPos, blockState)
|
||||||
}
|
}
|
||||||
@ -38,25 +43,6 @@ class PatternStorageBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), E
|
|||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onRemove(
|
|
||||||
oldBlockState: BlockState,
|
|
||||||
level: Level,
|
|
||||||
blockPos: BlockPos,
|
|
||||||
newBlockState: BlockState,
|
|
||||||
movedByPiston: Boolean
|
|
||||||
) {
|
|
||||||
if (!oldBlockState.`is`(newBlockState.block)) {
|
|
||||||
val blockentity = level.getBlockEntity(blockPos)
|
|
||||||
|
|
||||||
if (blockentity is PatternStorageBlockEntity) {
|
|
||||||
Containers.dropContents(level, blockPos, blockentity.container)
|
|
||||||
level.updateNeighbourForOutputSignal(blockPos, this)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
super.onRemove(oldBlockState, level, blockPos, newBlockState, movedByPiston)
|
|
||||||
}
|
|
||||||
|
|
||||||
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.PATTERN_STORAGE.rotateFromNorth(it[rotationProperty]).computeShape() }
|
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.PATTERN_STORAGE.rotateFromNorth(it[rotationProperty]).computeShape() }
|
||||||
|
|
||||||
@Suppress("override_deprecation")
|
@Suppress("override_deprecation")
|
||||||
|
@ -15,6 +15,7 @@ import net.minecraft.world.phys.shapes.CollisionContext
|
|||||||
import net.minecraft.world.phys.shapes.Shapes
|
import net.minecraft.world.phys.shapes.Shapes
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.AbstractPoweredFurnaceBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.AbstractPoweredFurnaceBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.PoweredBlastFurnaceBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.PoweredBlastFurnaceBlockEntity
|
||||||
@ -32,6 +33,7 @@ sealed class AbstractPoweredFurnaceBlock<T : AbstractPoweredFurnaceBlockEntity<*
|
|||||||
) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.doubleProcessing()
|
tooltips.doubleProcessing()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@ import net.minecraft.world.level.material.PushReaction
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerMiddleBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerMiddleBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerTopBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerTopBlockEntity
|
||||||
@ -37,7 +38,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class AndroidChargerBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().destroyTime(2.5f).explosionResistance(40f).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops()), EntityBlock {
|
class AndroidChargerBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().destroyTime(2.5f).explosionResistance(40f).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops()), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
tooltips.add { TranslatableComponent("$descriptionId.desc").withStyle(ChatFormatting.GRAY) }
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ import net.minecraft.world.phys.BlockHitResult
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.MatteryBlock
|
import ru.dbotthepony.mc.otm.block.MatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidStationBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.AndroidStationBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.capability.MatteryCapability
|
import ru.dbotthepony.mc.otm.capability.MatteryCapability
|
||||||
@ -28,6 +29,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class AndroidStationBlock(val color: DyeColor?) : MatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class AndroidStationBlock(val color: DyeColor?) : MatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ import net.minecraft.world.level.block.state.BlockState
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
import ru.dbotthepony.mc.otm.core.get
|
import ru.dbotthepony.mc.otm.core.get
|
||||||
@ -22,6 +23,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class BatteryBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class BatteryBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun <T : BlockEntity> getTicker(
|
override fun <T : BlockEntity> getTicker(
|
||||||
|
@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.StateDefinition
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.ChemicalGeneratorBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.ChemicalGeneratorBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
import ru.dbotthepony.mc.otm.block.entity.WorkerState
|
||||||
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
import ru.dbotthepony.mc.otm.block.getShapeForEachState
|
||||||
@ -24,6 +25,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class ChemicalGeneratorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class ChemicalGeneratorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
tooltips.blockEntityEnergy()
|
tooltips.blockEntityEnergy()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ import net.minecraft.world.level.block.state.properties.EnumProperty
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import ru.dbotthepony.mc.otm.block.MatteryBlock
|
import ru.dbotthepony.mc.otm.block.MatteryBlock
|
||||||
|
import ru.dbotthepony.mc.otm.block.addSimpleDescription
|
||||||
import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity
|
import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity
|
||||||
import ru.dbotthepony.mc.otm.core.asSupplier
|
import ru.dbotthepony.mc.otm.core.asSupplier
|
||||||
import ru.dbotthepony.mc.otm.core.collect.SupplierMap
|
import ru.dbotthepony.mc.otm.core.collect.SupplierMap
|
||||||
@ -30,6 +31,10 @@ import java.util.function.Supplier
|
|||||||
class EnergyCounterBlock(val color: DyeColor?) : MatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class EnergyCounterBlock(val color: DyeColor?) : MatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
|
addSimpleDescription("2")
|
||||||
|
addSimpleDescription("3")
|
||||||
|
addSimpleDescription("4")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {
|
||||||
|
@ -24,6 +24,7 @@ import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
|||||||
class EnergyServoBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
class EnergyServoBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock {
|
||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
addSimpleDescription()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
|
override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
|
||||||
@ -42,10 +43,6 @@ class EnergyServoBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MAC
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
addSimpleDescription()
|
|
||||||
}
|
|
||||||
|
|
||||||
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.ENERGY_SERVO.rotateFromNorth(it[rotationProperty]).computeShape() }
|
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.ENERGY_SERVO.rotateFromNorth(it[rotationProperty]).computeShape() }
|
||||||
|
|
||||||
@Suppress("override_deprecation")
|
@Suppress("override_deprecation")
|
||||||
|
@ -35,6 +35,8 @@ class EssenceStorageBlock(val color: DyeColor?) : RotatableMatteryBlock(Properti
|
|||||||
init {
|
init {
|
||||||
tooltips.painted(color)
|
tooltips.painted(color)
|
||||||
|
|
||||||
|
addSimpleDescription()
|
||||||
|
|
||||||
tooltips.blockEntityData<LongTag>("experienceStored") { _, l, acceptor ->
|
tooltips.blockEntityData<LongTag>("experienceStored") { _, l, acceptor ->
|
||||||
if (minecraft.window.isShiftDown) {
|
if (minecraft.window.isShiftDown) {
|
||||||
acceptor(TranslatableComponent("otm.gui.experience", l.asLong).withStyle(ChatFormatting.GRAY))
|
acceptor(TranslatableComponent("otm.gui.experience", l.asLong).withStyle(ChatFormatting.GRAY))
|
||||||
@ -65,10 +67,6 @@ class EssenceStorageBlock(val color: DyeColor?) : RotatableMatteryBlock(Properti
|
|||||||
return super.use(blockState, level, blockPos, ply, hand, blockHitResult)
|
return super.use(blockState, level, blockPos, ply, hand, blockHitResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
addSimpleDescription()
|
|
||||||
}
|
|
||||||
|
|
||||||
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.ESSENCE_STORAGE.rotateFromNorth(it[rotationProperty]).computeShape() }
|
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.ESSENCE_STORAGE.rotateFromNorth(it[rotationProperty]).computeShape() }
|
||||||
|
|
||||||
@Suppress("override_deprecation")
|
@Suppress("override_deprecation")
|
||||||
|
@ -43,6 +43,13 @@ import kotlin.math.PI
|
|||||||
private val props = BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(3f, 600.0f)
|
private val props = BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(3f, 600.0f)
|
||||||
|
|
||||||
class BlockGravitationStabilizer : RotatableMatteryBlock(props), EntityBlock {
|
class BlockGravitationStabilizer : RotatableMatteryBlock(props), EntityBlock {
|
||||||
|
init {
|
||||||
|
addSimpleDescription()
|
||||||
|
tooltips.needsNoPower(ChatFormatting.DARK_GRAY)
|
||||||
|
addSimpleDescription("2", ChatFormatting.DARK_GRAY)
|
||||||
|
addSimpleDescription("3", ChatFormatting.DARK_GRAY)
|
||||||
|
}
|
||||||
|
|
||||||
override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
|
override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
|
||||||
return GravitationStabilizerBlockEntity(p_153215_, p_153216_)
|
return GravitationStabilizerBlockEntity(p_153215_, p_153216_)
|
||||||
}
|
}
|
||||||
@ -144,13 +151,6 @@ class BlockGravitationStabilizer : RotatableMatteryBlock(props), EntityBlock {
|
|||||||
return shapes[p_60555_[BlockRotationFreedom.DIRECTIONAL].ordinal]
|
return shapes[p_60555_[BlockRotationFreedom.DIRECTIONAL].ordinal]
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
addSimpleDescription()
|
|
||||||
tooltips.needsNoPower(ChatFormatting.DARK_GRAY)
|
|
||||||
addSimpleDescription("2", ChatFormatting.DARK_GRAY)
|
|
||||||
addSimpleDescription("3", ChatFormatting.DARK_GRAY)
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val shapes = SupplierList.ofFuture(
|
private val shapes = SupplierList.ofFuture(
|
||||||
runInBackground { BlockShapes.GRAVITATION_STABILIZER.rotateAroundX(PI / 2).computeShape() },
|
runInBackground { BlockShapes.GRAVITATION_STABILIZER.rotateAroundX(PI / 2).computeShape() },
|
||||||
|
@ -37,6 +37,11 @@ import ru.dbotthepony.mc.otm.registry.MBlocks
|
|||||||
import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
import ru.dbotthepony.mc.otm.shapes.BlockShapes
|
||||||
|
|
||||||
class PhantomAttractorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).destroyTime(3f).explosionResistance(12f).randomTicks()) {
|
class PhantomAttractorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).destroyTime(3f).explosionResistance(12f).randomTicks()) {
|
||||||
|
init {
|
||||||
|
addSimpleDescription()
|
||||||
|
tooltips.needsNoPower()
|
||||||
|
}
|
||||||
|
|
||||||
@Suppress("OVERRIDE_DEPRECATION")
|
@Suppress("OVERRIDE_DEPRECATION")
|
||||||
override fun randomTick(
|
override fun randomTick(
|
||||||
blockState: BlockState,
|
blockState: BlockState,
|
||||||
@ -135,9 +140,4 @@ class PhantomAttractorBlock : RotatableMatteryBlock(Properties.of().mapColor(Map
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
addSimpleDescription()
|
|
||||||
tooltips.needsNoPower()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user