Clinker Brick alternative brick-swapped recipe added. Treated Wood Ladder with TW block H recipe. Furnace XP handling simplified. Crafting Table inventory sync forced for open containers, slot sync seems not to be enough. Prevented strong redstone power propagation for device blocks. Labeled Crate item Storage librarized. Fluid Funnel librarized. Inventories item handlers implemented. RF handling library. Furnace uses lib battery. Furnace item handlers librarized. Labeled Crate Tooltip refined. Crafting Table quick move when grid is placed. Forcing tooltip RE replacement escape to circumvent mixin cross-compat problems (issue #151).

This commit is contained in:
stfwi 2020-12-27 10:14:50 +01:00
parent d4d685693b
commit 98529fd961
33 changed files with 1096 additions and 1241 deletions

View file

@ -140,12 +140,12 @@
"block.engineersdecor.iron_floor_edge_light": "Inset Floor Edge Light",
"block.engineersdecor.iron_floor_edge_light.help": "Small glowstone light source,\n placed at the edge of a floor\n block. Useful to light up places\n where electrical light\n installations are problematic.",
"block.engineersdecor.iron_hatch": "Iron Hatch",
"block.engineersdecor.iron_hatch.help": "An upside down trapdoor, placed\n above mainenance shafts or ladders.\n Creeper-proof, works as ladder\n when open.",
"block.engineersdecor.iron_hatch.help": "An upside down trapdoor, placed\n above maintenance shafts or ladders.\n Creeper-proof, works as ladder\n when open.",
"block.engineersdecor.iron_inset_light": "Inset Light",
"block.engineersdecor.iron_inset_light.help": "Small glowstone light source, sunk\n into the floor, ceiling or wall.\n Useful to light up places where\n electrical light installations\n are problematic.",
"block.engineersdecor.labeled_crate": "Labeled Crate",
"block.engineersdecor.labeled_crate.help": "A storage crate with 9x6 slots and\n a built-in item frame at the front.\n Place an item into the frame slot\n at the bottom right of the GUI to\n define the shown label.",
"block.engineersdecor.labeled_crate.tip": "§6Label:§r %1$s\n%2$s slots used / %3$s free\n%4$s total items stored",
"block.engineersdecor.labeled_crate.tip": "§6Label:§r %1$s\n%2$s slots used / %3$s free\n%4$s total items stored\n---\n%5$s",
"block.engineersdecor.metal_crafting_table": "Metal Crafting Table",
"block.engineersdecor.metal_crafting_table.help": "Decorative crafting table with\n advanced features. Eighteen storage\n slots, keeps inventory, no vanilla\n recipe book. Click up/down arrow\n buttons for crafting history\n selection, output slot for item\n placement, X-button to clear\n crafting grid and history.\n Shift-click stack: player-to-storage\n stack transfer when crafting grid\n empty, otherwise player-to-grid\n stack transfer. Automatically\n distributes the clicked stack.\n Shift-Ctrl-click stack: Move all\n same stacks. Mouse wheel over\n crafting slot: Increase/decrease\n crafting grid items.",
"block.engineersdecor.metal_crafting_table.tooltips.clear": "Clear grid to player inventory",
@ -167,7 +167,7 @@
"block.engineersdecor.old_industrial_wood_slabslice": "Old Industrial Wood Slab Slice",
"block.engineersdecor.old_industrial_wood_stairs": "Old Industrial Wood Stairs",
"block.engineersdecor.panzerglass_block": "Panzer Glass Block",
"block.engineersdecor.panzerglass_block.help": "Reinforced glass block.\n Expensive, explosion-proof.\n Dark gray tint, faint structural\n lines visible, multi texture for\n seemless look.",
"block.engineersdecor.panzerglass_block.help": "Reinforced glass block.\n Expensive, explosion-proof.\n Dark gray tint, faint structural\n lines visible, multi texture for\n seamless look.",
"block.engineersdecor.panzerglass_slab": "Panzer Glass Slab",
"block.engineersdecor.panzerglass_slab.help": "Reinforced glass slab.\n Expensive, explosion-proof.\n Dark gray tint, faint structural\n lines visible.",
"block.engineersdecor.rebar_concrete": "Rebar Concrete Block",
@ -223,7 +223,7 @@
"block.engineersdecor.small_lab_furnace": "Small Laboratory Furnace",
"block.engineersdecor.small_lab_furnace.help": "Small metal cased lab kiln. Solid\n fuel consuming, updraught. Slightly\n hotter and better isolated than a\n cobblestone furnace, therefore\n more efficient. Two auxiliary\n slots e.g. for storage. Two stack\n internal hopper fifos for input,\n output, and fuel. Place an\n external heater into a aux slot\n and connect power for electrical\n smelting speed boost.",
"block.engineersdecor.small_milking_machine": "Small Milking Machine",
"block.engineersdecor.small_milking_machine.help": "Occasionally milks cows. Has an\n internal fluid tank. Does not\n feed the animals. Use buckets to\n retrieve the milk. Pulls/stores\n milk container items from/to\n inventories at the back or bottom\n (preferrs extracting from the\n back and inserting below, but can\n also put filled vessels back into\n the same inventory). Supports fluid\n output to tanks or pipes below\n (only if milk exists as fluid).\n Care that it's not too crowdy in\n the cow pen, only happy animals\n stroll by voluntarily.",
"block.engineersdecor.small_milking_machine.help": "Occasionally milks cows. Has an\n internal fluid tank. Does not\n feed the animals. Use buckets to\n retrieve the milk. Pulls/stores\n milk container items from/to\n inventories at the back or bottom\n (prefers extracting from the\n back and inserting below, but can\n also put filled vessels back into\n the same inventory). Supports fluid\n output to tanks or pipes below\n (only if milk exists as fluid).\n Care that it's not too crowdy in\n the cow pen, only happy animals\n stroll by voluntarily.",
"block.engineersdecor.small_milking_machine.status": "Milk: %1$smB %2$s",
"block.engineersdecor.small_milking_machine.status.rf": "| %1$sRF",
"block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
@ -232,14 +232,14 @@
"block.engineersdecor.small_solar_panel.help": "Produces a small amount of power\n when exposed to sunlight. Useful\n for charging LF capacitors in remote\n systems with low consumption. The\n internal charge pump circuit\n accumulates and frequently\n transfers RF. Production depends\n on day time and the weather.\nClick to see State Of Charge,\n production, and progress.",
"block.engineersdecor.small_solar_panel.status": "SOC: %1$s%% of %2$sRF§r | producing %3$sRF/t | feeding %4$sRF/t",
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
"block.engineersdecor.small_tree_cutter.help": "Chops grown trees in front of it.\n Does not collect the lumbers.\n Deactivate with a redstone signal.\n ${!tree_cuttter_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${tree_cuttter_requires_power?engineersdecor.tooltip.requires_rf_power}",
"block.engineersdecor.small_tree_cutter.help": "Chops grown trees in front of it.\n Does not collect the lumbers.\n Deactivate with a redstone signal.\n ${!tree_cutter_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${tree_cutter_requires_power?engineersdecor.tooltip.requires_rf_power}",
"block.engineersdecor.small_tree_cutter.status": "SOC: %1$s%% of %2$sRF§r | progress: %3$s%% (%4$ss)",
"block.engineersdecor.small_waste_incinerator": "Small Waste Incinerator",
"block.engineersdecor.small_waste_incinerator.help": "Trash with internal fifo slots.\n Items can be inserted on all sides,\n and are kept until there is no\n space left in the fifo. After that\n the oldest stack will be incinerated.\n Apply electrical RF/FE power to\n increase the processing speed.\n Keeps its inventory when being\n relocated.",
"block.engineersdecor.steel_catwalk": "Steel Catwalk",
"block.engineersdecor.steel_catwalk.help": "Simple catwalk for better access to\nbig machines. Can also be placed in\nlook direction from the top. Click\nwith a Railing to add the guardrail\nto a side (close click: exact\nplacemend, far click: auto best\nmatch). Click again to remove a\nguardrail.",
"block.engineersdecor.steel_catwalk.help": "Simple catwalk for better access to\nbig machines. Can also be placed in\nlook direction from the top. Click\nwith a Railing to add the guardrail\nto a side (close click: exact\nplacement, far click: auto best\nmatch). Click again to remove a\nguardrail.",
"block.engineersdecor.steel_catwalk_stairs": "Steel Catwalk Stairs",
"block.engineersdecor.steel_catwalk_stairs.help": "Click with a Steel Railing to add\nor remove guardrails. Cannot be\nplaced bottom-down, no corners\n(no'normal' Stairs).",
"block.engineersdecor.steel_catwalk_stairs.help": "Click with a Steel Railing to add\nor remove guardrails. Cannot be\nplaced bottom-down, no corners\n(no 'normal' Stairs).",
"block.engineersdecor.steel_catwalk_ta": "Raised Steel Catwalk",
"block.engineersdecor.steel_catwalk_ta.help": "Top aligned Catwalk, connects to\nSteel poles below.",
"block.engineersdecor.steel_double_t_support": "Steel Double T Support",

View file

@ -145,7 +145,7 @@
"block.engineersdecor.iron_inset_light.help": "Маленький источник света, интегрируемый в стены, пол или потолок.\n Полезно для освещения мест, где проблематичны электрические осветительные установки.",
"block.engineersdecor.labeled_crate": "Ящик с рамкой",
"block.engineersdecor.labeled_crate.help": "Ящик для хранения со слотами 9x6 и встроенной рамкой для предмета спереди.\nПоместите предмет в слот рамки в правом нижнем углу GUI, чтобы обозначить ящик.",
"block.engineersdecor.labeled_crate.tip": "§6Метка:§r %1$s\n%2$s слотов использовано / %3$s свободно\n%4$s общее количество хранимых предметов",
"block.engineersdecor.labeled_crate.tip": "§6Метка:§r %1$s\n%2$s слотов использовано / %3$s свободно\n%4$s общее количество хранимых предметов\n---\n%5$s",
"block.engineersdecor.metal_crafting_table": "Верстак из обработанного дерева",
"block.engineersdecor.metal_crafting_table.help": "Прочный и устойчивый к погодным условиям. Восемь слотов для хранения. Хранит инвентарь. Нажимайте кнопки со стрелками вверх/вниз для выбора из истории, выходной слот для размещения предметов, X-кнопка очистить сетку крафта и историю. Shift-клик по стеку: передача стека от игрока в хранилище при создании если сетка пуста, в противном случае перенос от игрока в сетку. Автоматически распределяет кликаемый стек. Shift-Ctrl-клик по стаку: перемещает одинаковые стаки. Колёсико мыши: добавляет/отнимает предметы в сетке.",
"block.engineersdecor.metal_crafting_table.tooltips.clear": "Очистить сетку в инвентарь игрока",
@ -232,7 +232,7 @@
"block.engineersdecor.small_solar_panel.help": "Вырабатывает небольшое количество энергии при воздействии солнечного света.\n Полезно для зарядки низковольтных конденсаторов в удаленных системах с низким потреблением.\nВнутренний контур насоса накапливает и часто передает RF.\nПроизводство зависит от времени суток и погоды.",
"block.engineersdecor.small_solar_panel.status": "SOC: %1$s%% из %2$sRF§r | производит %3$sRF/тик | отдаёт %4$sRF/тик",
"block.engineersdecor.small_tree_cutter": "Малый лесоруб",
"block.engineersdecor.small_tree_cutter.help": "Вырубает деревья перед ним.\n Не собирает срубленное. Выключается с помощью сигнала красного камня. ${!tree_cuttter_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${tree_cuttter_requires_power?engineersdecor.tooltip.requires_rf_power}",
"block.engineersdecor.small_tree_cutter.help": "Вырубает деревья перед ним.\n Не собирает срубленное. Выключается с помощью сигнала красного камня. ${!tree_cutter_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${tree_cutter_requires_power?engineersdecor.tooltip.requires_rf_power}",
"block.engineersdecor.small_tree_cutter.status": "SOC: %1$s%% из %2$sRF§r | прогресс: %3$s%% (%4$sсек)",
"block.engineersdecor.small_waste_incinerator": "Компактный сжигатель отходов",
"block.engineersdecor.small_waste_incinerator.help": "Отходы с слотами для очереди. Предметы могут помещаться с любой стороны,\nи храниться до тех пор, пока в очереди не останется свободного места.\nПосле этого самый старый стек будет сожжен. Подключите электричество (RF/FE)\nдля увеличения скорости обработки.\nСохраняет инвентарь при перемещении.",

View file

@ -145,7 +145,7 @@
"block.engineersdecor.iron_inset_light.help": "§6小型荧石光源能嵌入地板、天花板或墙里。§r\n 用于照亮电力光源难以安装的地方。 亮度与火把一样。",
"block.engineersdecor.labeled_crate": "贴标签的板条箱",
"block.engineersdecor.labeled_crate.help": "§6具备 9x6 大小格子的木箱前面自带一个物品展示框。§r\n将物品放置在 GUI 右下角的框架槽内,可以定义所显示的标签。",
"block.engineersdecor.labeled_crate.tip": "§6标签§r %1$s\n已使用 %2$s / 剩余 %3$s \n共存储 %4$s 件物品",
"block.engineersdecor.labeled_crate.tip": "§6标签§r %1$s\n已使用 %2$s / 剩余 %3$s \n共存储 %4$s 件物品\n---\n%5$s",
"block.engineersdecor.metal_crafting_table": "防腐木合成台",
"block.engineersdecor.metal_crafting_table.help": "§6坚固防风防雨。§r内含八个存储格破坏后保留内容物没有原版合成书。\n 单击上/下箭头按钮可选择合成历史单击输出格自动放置物品单击X按钮 清除合成栏和历史。Shift单击一叠物品合成格空时转移到存储格 非空时到合成栏。会自动分配转移的物品。",
"block.engineersdecor.metal_crafting_table.tooltips.clear": "Clear grid to player inventory",

View file

@ -0,0 +1,30 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"type": "engineersdecor:optional",
"result": "engineersdecor:clinker_brick_block"
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
"BAB",
"ANA",
"BAB"
],
"key": {
"A": { "item": "minecraft:brick" },
"B": { "tag" : "engineersdecor:brick_ingots" },
"N": { "item": "minecraft:bricks" }
},
"result": {
"item": "engineersdecor:clinker_brick_block",
"count": 8
}
}
}
]
}

View file

@ -1,6 +1,30 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"type": "engineersdecor:optional",
"result": "engineersdecor:treated_wood_ladder",
"required": ["#forge:treated_wood"]
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
"S S",
"SSS",
"S S"
],
"key": {
"S": { "tag": "forge:treated_wood" }
},
"result": {
"item": "engineersdecor:treated_wood_ladder",
"count": 8
}
}
},
{
"conditions": [
{
@ -21,31 +45,7 @@
},
"result": {
"item": "engineersdecor:treated_wood_ladder",
"count": 6
}
}
},
{
"conditions": [
{
"type": "engineersdecor:optional",
"result": "engineersdecor:treated_wood_ladder",
"required": ["minecraft:ladder"]
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
"S S",
"SSS",
"S S"
],
"key": {
"S": { "item": "minecraft:ladder"}
},
"result": {
"item": "engineersdecor:treated_wood_ladder",
"count": 7
"count": 8
}
}
}